Fix compilation.

Projects/Compil32.dpr

@@ -15,16 +15,16 @@ uses
   SysUtils,
   Forms,
   PathFunc in '..\Components\PathFunc.pas',
-  CompForm in 'Src\CompForm.pas' {CompileForm},
+  CompForm in 'Src\Compil32\CompForm.pas' {CompileForm},
   CmnFunc in 'Src\CmnFunc.pas',
   CmnFunc2 in 'Src\CmnFunc2.pas',
-  CompFunc in 'Src\CompFunc.pas',
+  CompFunc in 'Src\Compil32\CompFunc.pas',
   CompMsgs2 in 'Src\Compil32\CompMsgs2.pas',
   CompInt in 'Src\CompInt.pas',
   CompOptions in 'Src\Compil32\CompOptions.pas' {OptionsForm},
-  CompStartup in 'Src\CompStartup.pas' {StartupForm},
-  CompWizard in 'Src\CompWizard.pas' {WizardForm},
-  CompWizardFile in 'Src\CompWizardFile.pas' {WizardFileForm},
+  CompStartup in 'Src\Compil32\CompStartup.pas' {StartupForm},
+  CompWizard in 'Src\Compil32\CompWizard.pas' {WizardForm},
+  CompWizardFile in 'Src\Compil32\CompWizardFile.pas' {WizardFileForm},
   CompFileAssoc in 'Src\Compil32\CompFileAssoc.pas',
   TmSchema in '..\Components\TmSchema.pas',
   NewUxTheme in '..\Components\NewUxTheme.pas',
@@ -36,10 +36,10 @@ uses
   ScintEdit in '..\Components\ScintEdit.pas',
   ScintStylerInnoSetup in '..\Components\ScintStylerInnoSetup.pas',
   ModernColors in '..\Components\ModernColors.pas',
-  CompMsgBoxDesigner in 'Src\CompMsgBoxDesigner.pas' {MsgBoxDesignerForm},
-  CompScintEdit in 'Src\CompScintEdit.pas',
+  CompMsgBoxDesigner in 'Src\Compil32\CompMsgBoxDesigner.pas' {MsgBoxDesignerForm},
+  CompScintEdit in 'Src\Compil32\CompScintEdit.pas',
   CompFilesDesigner in 'Src\Compil32\CompFilesDesigner.pas' {FilesDesignerForm},
-  CompWizardFilesHelper in 'Src\CompWizardFilesHelper.pas',
+  CompWizardFilesHelper in 'Src\Compil32\CompWizardFilesHelper.pas',
   NewTabSet in '..\Components\NewTabSet.pas',
   NewStaticText in '..\Components\NewStaticText.pas',
   BidiUtils in '..\Components\BidiUtils.pas',
@@ -58,7 +58,7 @@ uses
   Compress in 'Src\Compress.pas',
   TaskDialog in 'Src\TaskDialog.pas',
   CompRegistryDesigner in 'Src\Compil32\CompRegistryDesigner.pas' {RegistryDesignerForm},
-  CompWizardRegistryHelper in 'Src\CompWizardRegistryHelper.pas',
+  CompWizardRegistryHelper in 'Src\Compil32\CompWizardRegistryHelper.pas',
   MD5 in 'Src\MD5.pas',
   IsscintInt in 'Src\Compil32\IsscintInt.pas',
   ScriptFunc in 'Src\ScriptFunc.pas';

Projects/Compil32.dproj

@@ -78,24 +78,24 @@
         </DelphiCompile>
         <DCCReference Include="Src\SafeDLLPath.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
-        <DCCReference Include="Src\CompForm.pas">
+        <DCCReference Include="Src\Compil32\CompForm.pas">
             <Form>CompileForm</Form>
         </DCCReference>
         <DCCReference Include="Src\CmnFunc.pas"/>
         <DCCReference Include="Src\CmnFunc2.pas"/>
-        <DCCReference Include="Src\CompFunc.pas"/>
+        <DCCReference Include="Src\Compil32\CompFunc.pas"/>
         <DCCReference Include="Src\Compil32\CompMsgs2.pas"/>
         <DCCReference Include="Src\CompInt.pas"/>
         <DCCReference Include="Src\Compil32\CompOptions.pas">
             <Form>OptionsForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\CompStartup.pas">
+        <DCCReference Include="Src\Compil32\CompStartup.pas">
             <Form>StartupForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\CompWizard.pas">
+        <DCCReference Include="Src\Compil32\CompWizard.pas">
             <Form>WizardForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\CompWizardFile.pas">
+        <DCCReference Include="Src\Compil32\CompWizardFile.pas">
             <Form>WizardFileForm</Form>
         </DCCReference>
         <DCCReference Include="Src\Compil32\CompFileAssoc.pas"/>
@@ -111,14 +111,14 @@
         <DCCReference Include="..\Components\ScintEdit.pas"/>
         <DCCReference Include="..\Components\ScintStylerInnoSetup.pas"/>
         <DCCReference Include="..\Components\ModernColors.pas"/>
-        <DCCReference Include="Src\CompMsgBoxDesigner.pas">
+        <DCCReference Include="Src\Compil32\CompMsgBoxDesigner.pas">
             <Form>MsgBoxDesignerForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\CompScintEdit.pas"/>
+        <DCCReference Include="Src\Compil32\CompScintEdit.pas"/>
         <DCCReference Include="Src\Compil32\CompFilesDesigner.pas">
             <Form>FilesDesignerForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\CompWizardFilesHelper.pas"/>
+        <DCCReference Include="Src\Compil32\CompWizardFilesHelper.pas"/>
         <DCCReference Include="..\Components\NewTabSet.pas"/>
         <DCCReference Include="..\Components\NewStaticText.pas"/>
         <DCCReference Include="..\Components\BidiUtils.pas"/>
@@ -139,7 +139,7 @@
         <DCCReference Include="Src\Compil32\CompRegistryDesigner.pas">
             <Form>RegistryDesignerForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\CompWizardRegistryHelper.pas"/>
+        <DCCReference Include="Src\Compil32\CompWizardRegistryHelper.pas"/>
         <DCCReference Include="Src\MD5.pas"/>
         <DCCReference Include="Src\Compil32\IsscintInt.pas"/>
         <DCCReference Include="Src\ScriptFunc.pas"/>

Projects/Setup.dpr

@@ -29,7 +29,7 @@ uses
   InstFunc in 'Src\SetupLdrAndSetup\InstFunc.pas',
   InstFnc2 in 'Src\Setup\InstFnc2.pas',
   Wizard in 'Src\Setup\Wizard.pas' {WizardForm},
-  ScriptFunc_R in 'Src\ScriptFunc_R.pas',
+  ScriptFunc_R in 'Src\Setup\ScriptFunc_R.pas',
   ScriptFunc in 'Src\ScriptFunc.pas',
   SetupTypes in 'Src\SetupTypes.pas',
   ScriptRunner in 'Src\Setup\ScriptRunner.pas',
@@ -58,7 +58,7 @@ uses
   SetupForm in 'Src\Setup\SetupForm.pas',
   RegSvr in 'Src\Setup\RegSvr.pas',
   BrowseFunc in 'Src\BrowseFunc.pas',
-  RedirFunc in 'Src\RedirFunc.pas',
+  RedirFunc in 'Src\SetupLdrAndSetup\RedirFunc.pas',
   SecurityFunc in 'Src\Setup\SecurityFunc.pas',
   Helper in 'Src\Setup\Helper.pas',
   VerInfo in 'Src\VerInfo.pas',

Projects/Setup.dproj

@@ -95,7 +95,7 @@
         <DCCReference Include="Src\Setup\Wizard.pas">
             <Form>WizardForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\ScriptFunc_R.pas"/>
+        <DCCReference Include="Src\Setup\ScriptFunc_R.pas"/>
         <DCCReference Include="Src\ScriptFunc.pas"/>
         <DCCReference Include="Src\SetupTypes.pas"/>
         <DCCReference Include="Src\Setup\ScriptRunner.pas"/>