refactor, improve surface area across namespaces