Renamed files, deleted unused imports.