fixed directory structure and namespaces.