Renaming some files and tiding up