move some namespaces around