Renaming some files
Cleaning up imports