Reorganizing some files