Move controllers to seperate file