Organising the patch files