namespace restructuring