refactored infra namespaces