Move controllers into components