DRAFT: directory and include refactoring