Rebase namespaces

reconstruct your namespaces