diff --git a/Contrib/VPatch/Source/GUI/VPatchGUI.dpr b/Contrib/VPatch/Source/GUI/VPatchGUI.dpr
index 6043f94a..712d554b 100644
--- a/Contrib/VPatch/Source/GUI/VPatchGUI.dpr
+++ b/Contrib/VPatch/Source/GUI/VPatchGUI.dpr
@@ -4,11 +4,11 @@ uses
   Forms,
   MainForm in 'MainForm.pas' {frmMain},
   PatchClasses in 'PatchClasses.pas',
-  VDSP_CRC in '..\VDSP_CRC.pas',
+  VDSP_CRC in '..\GenPat\VDSP_CRC.pas',
   DLLWrapper in 'DLLWrapper.pas',
   AboutForm in 'AboutForm.pas' {frmAbout},
-  PatchGenerator in '..\PatchGenerator.pas',
-  TreeCode in '..\TreeCode.pas';
+  PatchGenerator in '..\GenPat\PatchGenerator.pas',
+  TreeCode in '..\GenPat\TreeCode.pas';
 
 {$R *.res}
 
diff --git a/Contrib/VPatch/Source/GenPat/VPatch2.bpg b/Contrib/VPatch/Source/VPatch2.bpg
similarity index 92%
rename from Contrib/VPatch/Source/GenPat/VPatch2.bpg
rename to Contrib/VPatch/Source/VPatch2.bpg
index 536fe3d1..163dd3d9 100644
--- a/Contrib/VPatch/Source/GenPat/VPatch2.bpg
+++ b/Contrib/VPatch/Source/VPatch2.bpg
@@ -14,10 +14,10 @@ PROJECTS = GenPat2.exe VAppend.exe VPatchGUI.exe
 default: $(PROJECTS)
 #------------------------------------------------------------------------------
 
-GenPat2.exe: GenPat2.dpr
+GenPat2.exe: GenPat\GenPat2.dpr
   $(DCC)
 
-VAppend.exe: VAppend.dpr
+VAppend.exe: GenPat\VAppend.dpr
   $(DCC)
 
 VPatchGUI.exe: gui\VPatchGUI.dpr
diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi
index 40392e7e..92a6c04e 100644
--- a/Examples/makensis.nsi
+++ b/Examples/makensis.nsi
@@ -822,11 +822,11 @@ Section "VPatch Source" SecContribVPatchS
 
   SectionIn 1
   SetOutPath $INSTDIR\Contrib\VPatch\Source
+  File ..\Contrib\VPatch\Source\*.bpg
   
   SetOutPath $INSTDIR\Contrib\VPatch\Source\GenPat
   File ..\Contrib\VPatch\Source\GenPat\*.pas
   File ..\Contrib\VPatch\Source\GenPat\*.dpr
-  File ..\Contrib\VPatch\Source\GenPat\*.bpg
   
   SetOutPath $INSTDIR\Contrib\VPatch\Source\Plugin
   File ..\Contrib\VPatch\Source\Plugin\*.c