Removal of redundant files, and renaming