Minor refactor - renaming some files