* directory structure updated according to namespaces.