Move controllers to one controller