Namespace restructuring