Merges folder structure updates