rename files, remove unused imports