Add ServiceBroker and Configuration file

Use cleaner include path manipulation