More work on refactoring code into namespaces as the codebase grows