updated: directory structure