Correct directory structure issue