Moved the controller builder classes into their own namespace