diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchBase.h b/deps/instpatch/include/libinstpatch/IpatchBase.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchBase.h
rename to deps/instpatch/include/libinstpatch/IpatchBase.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchContainer.h b/deps/instpatch/include/libinstpatch/IpatchContainer.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchContainer.h
rename to deps/instpatch/include/libinstpatch/IpatchContainer.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchConvert_DLS2.h b/deps/instpatch/include/libinstpatch/IpatchConvert_DLS2.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchConvert_DLS2.h
rename to deps/instpatch/include/libinstpatch/IpatchConvert_DLS2.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchConvert_Gig.h b/deps/instpatch/include/libinstpatch/IpatchConvert_Gig.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchConvert_Gig.h
rename to deps/instpatch/include/libinstpatch/IpatchConvert_Gig.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchConvert_SF2.h b/deps/instpatch/include/libinstpatch/IpatchConvert_SF2.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchConvert_SF2.h
rename to deps/instpatch/include/libinstpatch/IpatchConvert_SF2.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchConvert_SLI.h b/deps/instpatch/include/libinstpatch/IpatchConvert_SLI.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchConvert_SLI.h
rename to deps/instpatch/include/libinstpatch/IpatchConvert_SLI.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchConverter.h b/deps/instpatch/include/libinstpatch/IpatchConverter.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchConverter.h
rename to deps/instpatch/include/libinstpatch/IpatchConverter.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchConverterSF2VoiceCache.h b/deps/instpatch/include/libinstpatch/IpatchConverterSF2VoiceCache.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchConverterSF2VoiceCache.h
rename to deps/instpatch/include/libinstpatch/IpatchConverterSF2VoiceCache.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchDLS2.h b/deps/instpatch/include/libinstpatch/IpatchDLS2.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchDLS2.h
rename to deps/instpatch/include/libinstpatch/IpatchDLS2.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchDLS2Conn.h b/deps/instpatch/include/libinstpatch/IpatchDLS2Conn.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchDLS2Conn.h
rename to deps/instpatch/include/libinstpatch/IpatchDLS2Conn.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchDLS2Info.h b/deps/instpatch/include/libinstpatch/IpatchDLS2Info.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchDLS2Info.h
rename to deps/instpatch/include/libinstpatch/IpatchDLS2Info.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchDLS2Inst.h b/deps/instpatch/include/libinstpatch/IpatchDLS2Inst.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchDLS2Inst.h
rename to deps/instpatch/include/libinstpatch/IpatchDLS2Inst.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchDLS2Region.h b/deps/instpatch/include/libinstpatch/IpatchDLS2Region.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchDLS2Region.h
rename to deps/instpatch/include/libinstpatch/IpatchDLS2Region.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchDLS2Sample.h b/deps/instpatch/include/libinstpatch/IpatchDLS2Sample.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchDLS2Sample.h
rename to deps/instpatch/include/libinstpatch/IpatchDLS2Sample.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchDLSFile.h b/deps/instpatch/include/libinstpatch/IpatchDLSFile.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchDLSFile.h
rename to deps/instpatch/include/libinstpatch/IpatchDLSFile.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchDLSReader.h b/deps/instpatch/include/libinstpatch/IpatchDLSReader.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchDLSReader.h
rename to deps/instpatch/include/libinstpatch/IpatchDLSReader.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchDLSWriter.h b/deps/instpatch/include/libinstpatch/IpatchDLSWriter.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchDLSWriter.h
rename to deps/instpatch/include/libinstpatch/IpatchDLSWriter.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchFile.h b/deps/instpatch/include/libinstpatch/IpatchFile.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchFile.h
rename to deps/instpatch/include/libinstpatch/IpatchFile.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchGig.h b/deps/instpatch/include/libinstpatch/IpatchGig.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchGig.h
rename to deps/instpatch/include/libinstpatch/IpatchGig.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchGigDimension.h b/deps/instpatch/include/libinstpatch/IpatchGigDimension.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchGigDimension.h
rename to deps/instpatch/include/libinstpatch/IpatchGigDimension.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchGigEffects.h b/deps/instpatch/include/libinstpatch/IpatchGigEffects.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchGigEffects.h
rename to deps/instpatch/include/libinstpatch/IpatchGigEffects.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchGigFile.h b/deps/instpatch/include/libinstpatch/IpatchGigFile.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchGigFile.h
rename to deps/instpatch/include/libinstpatch/IpatchGigFile.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchGigInst.h b/deps/instpatch/include/libinstpatch/IpatchGigInst.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchGigInst.h
rename to deps/instpatch/include/libinstpatch/IpatchGigInst.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchGigRegion.h b/deps/instpatch/include/libinstpatch/IpatchGigRegion.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchGigRegion.h
rename to deps/instpatch/include/libinstpatch/IpatchGigRegion.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchGigSample.h b/deps/instpatch/include/libinstpatch/IpatchGigSample.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchGigSample.h
rename to deps/instpatch/include/libinstpatch/IpatchGigSample.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchGigSubRegion.h b/deps/instpatch/include/libinstpatch/IpatchGigSubRegion.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchGigSubRegion.h
rename to deps/instpatch/include/libinstpatch/IpatchGigSubRegion.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchItem.h b/deps/instpatch/include/libinstpatch/IpatchItem.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchItem.h
rename to deps/instpatch/include/libinstpatch/IpatchItem.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchIter.h b/deps/instpatch/include/libinstpatch/IpatchIter.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchIter.h
rename to deps/instpatch/include/libinstpatch/IpatchIter.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchList.h b/deps/instpatch/include/libinstpatch/IpatchList.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchList.h
rename to deps/instpatch/include/libinstpatch/IpatchList.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchParamProp.h b/deps/instpatch/include/libinstpatch/IpatchParamProp.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchParamProp.h
rename to deps/instpatch/include/libinstpatch/IpatchParamProp.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchPaste.h b/deps/instpatch/include/libinstpatch/IpatchPaste.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchPaste.h
rename to deps/instpatch/include/libinstpatch/IpatchPaste.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchRange.h b/deps/instpatch/include/libinstpatch/IpatchRange.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchRange.h
rename to deps/instpatch/include/libinstpatch/IpatchRange.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchRiff.h b/deps/instpatch/include/libinstpatch/IpatchRiff.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchRiff.h
rename to deps/instpatch/include/libinstpatch/IpatchRiff.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2.h b/deps/instpatch/include/libinstpatch/IpatchSF2.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2.h
rename to deps/instpatch/include/libinstpatch/IpatchSF2.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2File.h b/deps/instpatch/include/libinstpatch/IpatchSF2File.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2File.h
rename to deps/instpatch/include/libinstpatch/IpatchSF2File.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2Gen.h b/deps/instpatch/include/libinstpatch/IpatchSF2Gen.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2Gen.h
rename to deps/instpatch/include/libinstpatch/IpatchSF2Gen.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2GenItem.h b/deps/instpatch/include/libinstpatch/IpatchSF2GenItem.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2GenItem.h
rename to deps/instpatch/include/libinstpatch/IpatchSF2GenItem.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2IZone.h b/deps/instpatch/include/libinstpatch/IpatchSF2IZone.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2IZone.h
rename to deps/instpatch/include/libinstpatch/IpatchSF2IZone.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2Inst.h b/deps/instpatch/include/libinstpatch/IpatchSF2Inst.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2Inst.h
rename to deps/instpatch/include/libinstpatch/IpatchSF2Inst.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2Mod.h b/deps/instpatch/include/libinstpatch/IpatchSF2Mod.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2Mod.h
rename to deps/instpatch/include/libinstpatch/IpatchSF2Mod.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2ModItem.h b/deps/instpatch/include/libinstpatch/IpatchSF2ModItem.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2ModItem.h
rename to deps/instpatch/include/libinstpatch/IpatchSF2ModItem.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2ModList.h b/deps/instpatch/include/libinstpatch/IpatchSF2ModList.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2ModList.h
rename to deps/instpatch/include/libinstpatch/IpatchSF2ModList.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2PZone.h b/deps/instpatch/include/libinstpatch/IpatchSF2PZone.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2PZone.h
rename to deps/instpatch/include/libinstpatch/IpatchSF2PZone.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2Preset.h b/deps/instpatch/include/libinstpatch/IpatchSF2Preset.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2Preset.h
rename to deps/instpatch/include/libinstpatch/IpatchSF2Preset.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2Reader.h b/deps/instpatch/include/libinstpatch/IpatchSF2Reader.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2Reader.h
rename to deps/instpatch/include/libinstpatch/IpatchSF2Reader.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2Sample.h b/deps/instpatch/include/libinstpatch/IpatchSF2Sample.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2Sample.h
rename to deps/instpatch/include/libinstpatch/IpatchSF2Sample.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2VoiceCache.h b/deps/instpatch/include/libinstpatch/IpatchSF2VoiceCache.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2VoiceCache.h
rename to deps/instpatch/include/libinstpatch/IpatchSF2VoiceCache.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2VoiceCache_DLS.h b/deps/instpatch/include/libinstpatch/IpatchSF2VoiceCache_DLS.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2VoiceCache_DLS.h
rename to deps/instpatch/include/libinstpatch/IpatchSF2VoiceCache_DLS.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2VoiceCache_Gig.h b/deps/instpatch/include/libinstpatch/IpatchSF2VoiceCache_Gig.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2VoiceCache_Gig.h
rename to deps/instpatch/include/libinstpatch/IpatchSF2VoiceCache_Gig.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2VoiceCache_SF2.h b/deps/instpatch/include/libinstpatch/IpatchSF2VoiceCache_SF2.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2VoiceCache_SF2.h
rename to deps/instpatch/include/libinstpatch/IpatchSF2VoiceCache_SF2.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2VoiceCache_SLI.h b/deps/instpatch/include/libinstpatch/IpatchSF2VoiceCache_SLI.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2VoiceCache_SLI.h
rename to deps/instpatch/include/libinstpatch/IpatchSF2VoiceCache_SLI.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2VoiceCache_VBank.h b/deps/instpatch/include/libinstpatch/IpatchSF2VoiceCache_VBank.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2VoiceCache_VBank.h
rename to deps/instpatch/include/libinstpatch/IpatchSF2VoiceCache_VBank.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2Writer.h b/deps/instpatch/include/libinstpatch/IpatchSF2Writer.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2Writer.h
rename to deps/instpatch/include/libinstpatch/IpatchSF2Writer.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2Zone.h b/deps/instpatch/include/libinstpatch/IpatchSF2Zone.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSF2Zone.h
rename to deps/instpatch/include/libinstpatch/IpatchSF2Zone.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSLI.h b/deps/instpatch/include/libinstpatch/IpatchSLI.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSLI.h
rename to deps/instpatch/include/libinstpatch/IpatchSLI.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSLIFile.h b/deps/instpatch/include/libinstpatch/IpatchSLIFile.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSLIFile.h
rename to deps/instpatch/include/libinstpatch/IpatchSLIFile.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSLIInst.h b/deps/instpatch/include/libinstpatch/IpatchSLIInst.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSLIInst.h
rename to deps/instpatch/include/libinstpatch/IpatchSLIInst.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSLIReader.h b/deps/instpatch/include/libinstpatch/IpatchSLIReader.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSLIReader.h
rename to deps/instpatch/include/libinstpatch/IpatchSLIReader.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSLISample.h b/deps/instpatch/include/libinstpatch/IpatchSLISample.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSLISample.h
rename to deps/instpatch/include/libinstpatch/IpatchSLISample.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSLIWriter.h b/deps/instpatch/include/libinstpatch/IpatchSLIWriter.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSLIWriter.h
rename to deps/instpatch/include/libinstpatch/IpatchSLIWriter.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSLIZone.h b/deps/instpatch/include/libinstpatch/IpatchSLIZone.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSLIZone.h
rename to deps/instpatch/include/libinstpatch/IpatchSLIZone.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSample.h b/deps/instpatch/include/libinstpatch/IpatchSample.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSample.h
rename to deps/instpatch/include/libinstpatch/IpatchSample.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleData.h b/deps/instpatch/include/libinstpatch/IpatchSampleData.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleData.h
rename to deps/instpatch/include/libinstpatch/IpatchSampleData.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleList.h b/deps/instpatch/include/libinstpatch/IpatchSampleList.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleList.h
rename to deps/instpatch/include/libinstpatch/IpatchSampleList.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleStore.h b/deps/instpatch/include/libinstpatch/IpatchSampleStore.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleStore.h
rename to deps/instpatch/include/libinstpatch/IpatchSampleStore.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleStoreCache.h b/deps/instpatch/include/libinstpatch/IpatchSampleStoreCache.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleStoreCache.h
rename to deps/instpatch/include/libinstpatch/IpatchSampleStoreCache.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleStoreFile.h b/deps/instpatch/include/libinstpatch/IpatchSampleStoreFile.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleStoreFile.h
rename to deps/instpatch/include/libinstpatch/IpatchSampleStoreFile.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleStoreRam.h b/deps/instpatch/include/libinstpatch/IpatchSampleStoreRam.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleStoreRam.h
rename to deps/instpatch/include/libinstpatch/IpatchSampleStoreRam.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleStoreRom.h b/deps/instpatch/include/libinstpatch/IpatchSampleStoreRom.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleStoreRom.h
rename to deps/instpatch/include/libinstpatch/IpatchSampleStoreRom.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleStoreSndFile.h b/deps/instpatch/include/libinstpatch/IpatchSampleStoreSndFile.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleStoreSndFile.h
rename to deps/instpatch/include/libinstpatch/IpatchSampleStoreSndFile.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleStoreSplit24.h b/deps/instpatch/include/libinstpatch/IpatchSampleStoreSplit24.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleStoreSplit24.h
rename to deps/instpatch/include/libinstpatch/IpatchSampleStoreSplit24.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleStoreSwap.h b/deps/instpatch/include/libinstpatch/IpatchSampleStoreSwap.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleStoreSwap.h
rename to deps/instpatch/include/libinstpatch/IpatchSampleStoreSwap.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleStoreVirtual.h b/deps/instpatch/include/libinstpatch/IpatchSampleStoreVirtual.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleStoreVirtual.h
rename to deps/instpatch/include/libinstpatch/IpatchSampleStoreVirtual.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleTransform.h b/deps/instpatch/include/libinstpatch/IpatchSampleTransform.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSampleTransform.h
rename to deps/instpatch/include/libinstpatch/IpatchSampleTransform.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSndFile.h b/deps/instpatch/include/libinstpatch/IpatchSndFile.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchSndFile.h
rename to deps/instpatch/include/libinstpatch/IpatchSndFile.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchTypeProp.h b/deps/instpatch/include/libinstpatch/IpatchTypeProp.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchTypeProp.h
rename to deps/instpatch/include/libinstpatch/IpatchTypeProp.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchUnit.h b/deps/instpatch/include/libinstpatch/IpatchUnit.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchUnit.h
rename to deps/instpatch/include/libinstpatch/IpatchUnit.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchUnit_DLS.h b/deps/instpatch/include/libinstpatch/IpatchUnit_DLS.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchUnit_DLS.h
rename to deps/instpatch/include/libinstpatch/IpatchUnit_DLS.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchUnit_SF2.h b/deps/instpatch/include/libinstpatch/IpatchUnit_SF2.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchUnit_SF2.h
rename to deps/instpatch/include/libinstpatch/IpatchUnit_SF2.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchUnit_generic.h b/deps/instpatch/include/libinstpatch/IpatchUnit_generic.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchUnit_generic.h
rename to deps/instpatch/include/libinstpatch/IpatchUnit_generic.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchVBank.h b/deps/instpatch/include/libinstpatch/IpatchVBank.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchVBank.h
rename to deps/instpatch/include/libinstpatch/IpatchVBank.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchVBankInst.h b/deps/instpatch/include/libinstpatch/IpatchVBankInst.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchVBankInst.h
rename to deps/instpatch/include/libinstpatch/IpatchVBankInst.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchVBankRegion.h b/deps/instpatch/include/libinstpatch/IpatchVBankRegion.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchVBankRegion.h
rename to deps/instpatch/include/libinstpatch/IpatchVBankRegion.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchVirtualContainer.h b/deps/instpatch/include/libinstpatch/IpatchVirtualContainer.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchVirtualContainer.h
rename to deps/instpatch/include/libinstpatch/IpatchVirtualContainer.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchVirtualContainer_types.h b/deps/instpatch/include/libinstpatch/IpatchVirtualContainer_types.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchVirtualContainer_types.h
rename to deps/instpatch/include/libinstpatch/IpatchVirtualContainer_types.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchXml.h b/deps/instpatch/include/libinstpatch/IpatchXml.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchXml.h
rename to deps/instpatch/include/libinstpatch/IpatchXml.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchXmlObject.h b/deps/instpatch/include/libinstpatch/IpatchXmlObject.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/IpatchXmlObject.h
rename to deps/instpatch/include/libinstpatch/IpatchXmlObject.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/builtin_enums.h b/deps/instpatch/include/libinstpatch/builtin_enums.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/builtin_enums.h
rename to deps/instpatch/include/libinstpatch/builtin_enums.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/compat.h b/deps/instpatch/include/libinstpatch/compat.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/compat.h
rename to deps/instpatch/include/libinstpatch/compat.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/libinstpatch.h b/deps/instpatch/include/libinstpatch/libinstpatch.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/libinstpatch.h
rename to deps/instpatch/include/libinstpatch/libinstpatch.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/misc.h b/deps/instpatch/include/libinstpatch/misc.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/misc.h
rename to deps/instpatch/include/libinstpatch/misc.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/sample.h b/deps/instpatch/include/libinstpatch/sample.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/sample.h
rename to deps/instpatch/include/libinstpatch/sample.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/util.h b/deps/instpatch/include/libinstpatch/util.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/util.h
rename to deps/instpatch/include/libinstpatch/util.h
diff --git a/deps/instpatch/include/libinstpatch-2/libinstpatch/version.h b/deps/instpatch/include/libinstpatch/version.h
similarity index 100%
rename from deps/instpatch/include/libinstpatch-2/libinstpatch/version.h
rename to deps/instpatch/include/libinstpatch/version.h