Rearranging namespaces