Fixed directory structure and namespaces