still issues with directory structure