- cleanup unused stuff
- removing structuremap
- combining ServiceBroker into the Core assembly