Move site_url over to mainline config, and not in a sub-hash