Fixing a bug related to directory structure