Merge old folder-structure with new