Move files into proper directories