Renaming files and getting imports done correctly.