refactor namespaces