Move to BrokeredMessages folder, added some properties and mapping