cleanup and renaming files for new project