Moved everything to proper directories