Making the controller namespace a little more sane.