Some namespace restructuring.