On import, fix when there are several subfolders which correspond to
different repository stores due to previous refactoring code commit