A lot of refactoring in xml files and file hierarchy. #Close 108