Cleaning up directory structure and renaming files