Move controllers to sub namespace