cleaning and renaming controllers/models