Update config files
Correct Url for broker
Remove obsolete files