Renaming files and other minor changes