move namespaces around