Namespaces reorganization