Moving Hubs in to own namespace