Project cleanup and renaming