Moved controllers to the right places