More restructuring of the service bus namespace.