Fixed issue with directory structure