Patch creation now handles multiple folders at the same level