Add in MessageAgentBus definition
Rename server broker folder to framework