Reorganized directories and namespaces.