more moving of namespaces