Controllers&models refactoring