namespaces refactor