Cleanup of files - removal of stuff from other projects and renaming for consistency