adapted directory structure