Restructure namespaces