Ability to change xwiki directories

Hello, For a project I work on I need ability to change all (or most) of XWiki directories, basically I need to: 1. Move everything from /WEB-INF/ to /WEB-INF/xwiki 2. Move everything from / to /xwiki 3. Everything in /WEB-INF/classes and /WEB-INF/lib can obviously remain where it is. 4. Merge two web.xml 5. Normally XWiki would have "/" directory on "/xwiki" context. What I need is for it to have "/xwiki" directory on "/" context. Why: To be able to place XWiki on the same ServletContext as the main project, while maintaining "separate" directory structure. I have to use custom RightService and UserService which has to have access to main project's data through the ServletContext, so both this project and XWiki have to share the ServletContext, effectively being one web-app from container's point of view. How: I was thinking about: 1. Modifying the default initialization so XWiki first tries to load /WEB-INF/xwiki.cfg, then if it fails /WEB-INF/xwiki/xwiki.cfg. 2.1. Having the ability to specify each configuration file (like hibernate.xml, velocity.properties) path in xwiki.cfg. or 2.2. Doing the same for every configuration file, first trying to load it from /WEB-INF/, then from /WEB-INF/xwiki/ (I think it's less prone to errors) 3. Changing the top-level directories (like /templates/) paths from xwiki.cfg 4. Changing the Struts paths (like /bin/) Would such a functionality be welcome? I think I can do much work on my own, but I'll probably need some pointers now and then. Greetings, Lilianne E. Blaze