Namespace restructure