Fixed duplicated basic directories