fix bug related to folder structure