Converted all existing brokers to modules