Fix incorrect directory structure merging