Renaming some files, and general tidying up