reorganinsing namespaces