Added: Main build XML
Moved modules in to subfolder