Fix import statements
Refactoring: move code between controllers