Moved controllers to their own file