Renaming some files and fixing linting errors