File cleanup and renaming