Moved controllers to the end