Isolate and refactor broker controllers for better maintainability