Reorganize to implement Master controller.