refactor of namespaces