Move files into correct locations