Remove random added files that shouldn't be here
Add re-ordered and new modules to assembly bin.xml