Refactoring. Move controllers to separate package
Refactoring. Move test classes