Namespaces structure optimizing