use new namespace and directory structure.