Removed old config + updated examples
Added broker port to be configured + renamed broker config parameters