wee bit of namespace restructuring