Fixed unnested sub-dirs