....more issues with directory structure