Same for Compil32.

Projects/Compil32.dpr

@@ -21,24 +21,24 @@ uses
   CompFunc in 'Src\CompFunc.pas',
   CompMsgs2 in 'Src\Compil32\CompMsgs2.pas',
   CompInt in 'Src\CompInt.pas',
-  CompOptions in 'Src\CompOptions.pas' {OptionsForm},
+  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},
-  CompFileAssoc in 'Src\CompFileAssoc.pas',
+  CompFileAssoc in 'Src\Compil32\CompFileAssoc.pas',
   TmSchema in '..\Components\TmSchema.pas',
   NewUxTheme in '..\Components\NewUxTheme.pas',
   DebugStruct in 'Src\DebugStruct.pas',
   BrowseFunc in 'Src\BrowseFunc.pas',
-  CompSignTools in 'Src\CompSignTools.pas' {SignToolsForm},
-  CompInputQueryCombo in 'Src\CompInputQueryCombo.pas',
+  CompSignTools in 'Src\Compil32\CompSignTools.pas' {SignToolsForm},
+  CompInputQueryCombo in 'Src\Compil32\CompInputQueryCombo.pas',
   ScintInt in '..\Components\ScintInt.pas',
   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',
-  CompFilesDesigner in 'Src\CompFilesDesigner.pas' {FilesDesignerForm},
+  CompFilesDesigner in 'Src\Compil32\CompFilesDesigner.pas' {FilesDesignerForm},
   CompWizardFilesHelper in 'Src\CompWizardFilesHelper.pas',
   NewTabSet in '..\Components\NewTabSet.pas',
   NewStaticText in '..\Components\NewStaticText.pas',
@@ -47,7 +47,7 @@ uses
   NewCheckListBox in '..\Components\NewCheckListBox.pas',
   NewNotebook in '..\Components\NewNotebook.pas',
   TaskbarProgressFunc in 'Src\TaskbarProgressFunc.pas',
-  HtmlHelpFunc in 'Src\HtmlHelpFunc.pas',
+  HtmlHelpFunc in 'Src\Compil32\HtmlHelpFunc.pas',
   UIStateForm in 'Src\UIStateForm.pas',
   LangOptionsSectionDirectives in 'Src\LangOptionsSectionDirectives.pas',
   MsgIDs in 'Src\MsgIDs.pas',
@@ -57,10 +57,10 @@ uses
   Int64Em in 'Src\Int64Em.pas',
   Compress in 'Src\Compress.pas',
   TaskDialog in 'Src\TaskDialog.pas',
-  CompRegistryDesigner in 'Src\CompRegistryDesigner.pas' {RegistryDesignerForm},
+  CompRegistryDesigner in 'Src\Compil32\CompRegistryDesigner.pas' {RegistryDesignerForm},
   CompWizardRegistryHelper in 'Src\CompWizardRegistryHelper.pas',
   MD5 in 'Src\MD5.pas',
-  IsscintInt in 'Src\IsscintInt.pas',
+  IsscintInt in 'Src\Compil32\IsscintInt.pas',
   ScriptFunc in 'Src\ScriptFunc.pas';
 
 {$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED}

Projects/Compil32.dproj

@@ -86,7 +86,7 @@
         <DCCReference Include="Src\CompFunc.pas"/>
         <DCCReference Include="Src\Compil32\CompMsgs2.pas"/>
         <DCCReference Include="Src\CompInt.pas"/>
-        <DCCReference Include="Src\CompOptions.pas">
+        <DCCReference Include="Src\Compil32\CompOptions.pas">
             <Form>OptionsForm</Form>
         </DCCReference>
         <DCCReference Include="Src\CompStartup.pas">
@@ -98,15 +98,15 @@
         <DCCReference Include="Src\CompWizardFile.pas">
             <Form>WizardFileForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\CompFileAssoc.pas"/>
+        <DCCReference Include="Src\Compil32\CompFileAssoc.pas"/>
         <DCCReference Include="..\Components\TmSchema.pas"/>
         <DCCReference Include="..\Components\NewUxTheme.pas"/>
         <DCCReference Include="Src\DebugStruct.pas"/>
         <DCCReference Include="Src\BrowseFunc.pas"/>
-        <DCCReference Include="Src\CompSignTools.pas">
+        <DCCReference Include="Src\Compil32\CompSignTools.pas">
             <Form>SignToolsForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\CompInputQueryCombo.pas"/>
+        <DCCReference Include="Src\Compil32\CompInputQueryCombo.pas"/>
         <DCCReference Include="..\Components\ScintInt.pas"/>
         <DCCReference Include="..\Components\ScintEdit.pas"/>
         <DCCReference Include="..\Components\ScintStylerInnoSetup.pas"/>
@@ -115,7 +115,7 @@
             <Form>MsgBoxDesignerForm</Form>
         </DCCReference>
         <DCCReference Include="Src\CompScintEdit.pas"/>
-        <DCCReference Include="Src\CompFilesDesigner.pas">
+        <DCCReference Include="Src\Compil32\CompFilesDesigner.pas">
             <Form>FilesDesignerForm</Form>
         </DCCReference>
         <DCCReference Include="Src\CompWizardFilesHelper.pas"/>
@@ -126,7 +126,7 @@
         <DCCReference Include="..\Components\NewCheckListBox.pas"/>
         <DCCReference Include="..\Components\NewNotebook.pas"/>
         <DCCReference Include="Src\TaskbarProgressFunc.pas"/>
-        <DCCReference Include="Src\HtmlHelpFunc.pas"/>
+        <DCCReference Include="Src\Compil32\HtmlHelpFunc.pas"/>
         <DCCReference Include="Src\UIStateForm.pas"/>
         <DCCReference Include="Src\LangOptionsSectionDirectives.pas"/>
         <DCCReference Include="Src\MsgIDs.pas"/>
@@ -136,12 +136,12 @@
         <DCCReference Include="Src\Int64Em.pas"/>
         <DCCReference Include="Src\Compress.pas"/>
         <DCCReference Include="Src\TaskDialog.pas"/>
-        <DCCReference Include="Src\CompRegistryDesigner.pas">
+        <DCCReference Include="Src\Compil32\CompRegistryDesigner.pas">
             <Form>RegistryDesignerForm</Form>
         </DCCReference>
         <DCCReference Include="Src\CompWizardRegistryHelper.pas"/>
         <DCCReference Include="Src\MD5.pas"/>
-        <DCCReference Include="Src\IsscintInt.pas"/>
+        <DCCReference Include="Src\Compil32\IsscintInt.pas"/>
         <DCCReference Include="Src\ScriptFunc.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>