Move files for flatter layout