Reorganizing File Structure and renaming files