Fixed directory structure issue