Move controllers from main-controller to its belonging scope