Moved files into proper directories