Refactoring annotations controller
Refactoring collections controller
Refactoring map controller
Refactoring search controllers
Merge branch 'refactoring-controllers'