Restructuring continued...
Moved several references to BlueController.