Fixed patchsets file structure