Move a bunch of the controllers into the controller package.