Move controllers into their own package