Reorganizing some files in the directory structure