diff --git a/Rectify11Installer.Core/Rectify11Installer.Core.csproj b/Rectify11Installer.Core/Rectify11Installer.Core.csproj
new file mode 100644
index 000000000..fa71b7ae6
--- /dev/null
+++ b/Rectify11Installer.Core/Rectify11Installer.Core.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/Rectify11Installer.Resources/R11Res.cs b/Rectify11Installer.Resources/R11Res.cs
new file mode 100644
index 000000000..5d155cc2d
--- /dev/null
+++ b/Rectify11Installer.Resources/R11Res.cs
@@ -0,0 +1,7 @@
+namespace Rectify11Installer.Resources
+{
+    public class R11Res
+    {
+
+    }
+}
diff --git a/Rectify11Installer.Resources/Rectify11Installer.Resources.csproj b/Rectify11Installer.Resources/Rectify11Installer.Resources.csproj
new file mode 100644
index 000000000..fa71b7ae6
--- /dev/null
+++ b/Rectify11Installer.Resources/Rectify11Installer.Resources.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/Rectify11Installer.sln b/Rectify11Installer.sln
index d5dbabe57..0e490bd44 100644
--- a/Rectify11Installer.sln
+++ b/Rectify11Installer.sln
@@ -12,7 +12,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "libmsstyle", "libmsstyle\li
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rectify11.Phase2", "Rectify11.Phase2\Rectify11.Phase2.csproj", "{C05D28BB-5B6F-44C7-B3B8-037BD8D2D448}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rectify11Installer", "Rectify11Installer\Rectify11Installer.csproj", "{1185F3F2-81A7-419B-B93D-70ED0CA6869A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rectify11Installer.Legacy", "Rectify11Installer\Rectify11Installer.Legacy.csproj", "{1185F3F2-81A7-419B-B93D-70ED0CA6869A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0B7DE49A-33C6-41B1-A9CE-D353031F8454} = {0B7DE49A-33C6-41B1-A9CE-D353031F8454}
 		{29613B61-DD82-42A1-AB39-E4FD35EADF6B} = {29613B61-DD82-42A1-AB39-E4FD35EADF6B}
@@ -20,6 +20,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rectify11Installer", "Recti
 		{C05D28BB-5B6F-44C7-B3B8-037BD8D2D448} = {C05D28BB-5B6F-44C7-B3B8-037BD8D2D448}
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rectify11Installer.Core", "Rectify11Installer.Core\Rectify11Installer.Core.csproj", "{ED12A9D5-2A89-4E00-8CA1-A45F677302D2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rectify11Installer.Resources", "Rectify11Installer.Resources\Rectify11Installer.Resources.csproj", "{287A4168-B6EF-4E02-A6CB-2961FF44C2F5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -128,6 +132,38 @@ Global
 		{1185F3F2-81A7-419B-B93D-70ED0CA6869A}.Release|Win32.Build.0 = Release|Any CPU
 		{1185F3F2-81A7-419B-B93D-70ED0CA6869A}.Release|x64.ActiveCfg = Release|Any CPU
 		{1185F3F2-81A7-419B-B93D-70ED0CA6869A}.Release|x64.Build.0 = Release|Any CPU
+		{ED12A9D5-2A89-4E00-8CA1-A45F677302D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED12A9D5-2A89-4E00-8CA1-A45F677302D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED12A9D5-2A89-4E00-8CA1-A45F677302D2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ED12A9D5-2A89-4E00-8CA1-A45F677302D2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ED12A9D5-2A89-4E00-8CA1-A45F677302D2}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{ED12A9D5-2A89-4E00-8CA1-A45F677302D2}.Debug|Win32.Build.0 = Debug|Any CPU
+		{ED12A9D5-2A89-4E00-8CA1-A45F677302D2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ED12A9D5-2A89-4E00-8CA1-A45F677302D2}.Debug|x64.Build.0 = Debug|Any CPU
+		{ED12A9D5-2A89-4E00-8CA1-A45F677302D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ED12A9D5-2A89-4E00-8CA1-A45F677302D2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ED12A9D5-2A89-4E00-8CA1-A45F677302D2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{ED12A9D5-2A89-4E00-8CA1-A45F677302D2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{ED12A9D5-2A89-4E00-8CA1-A45F677302D2}.Release|Win32.ActiveCfg = Release|Any CPU
+		{ED12A9D5-2A89-4E00-8CA1-A45F677302D2}.Release|Win32.Build.0 = Release|Any CPU
+		{ED12A9D5-2A89-4E00-8CA1-A45F677302D2}.Release|x64.ActiveCfg = Release|Any CPU
+		{ED12A9D5-2A89-4E00-8CA1-A45F677302D2}.Release|x64.Build.0 = Release|Any CPU
+		{287A4168-B6EF-4E02-A6CB-2961FF44C2F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{287A4168-B6EF-4E02-A6CB-2961FF44C2F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{287A4168-B6EF-4E02-A6CB-2961FF44C2F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{287A4168-B6EF-4E02-A6CB-2961FF44C2F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{287A4168-B6EF-4E02-A6CB-2961FF44C2F5}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{287A4168-B6EF-4E02-A6CB-2961FF44C2F5}.Debug|Win32.Build.0 = Debug|Any CPU
+		{287A4168-B6EF-4E02-A6CB-2961FF44C2F5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{287A4168-B6EF-4E02-A6CB-2961FF44C2F5}.Debug|x64.Build.0 = Debug|Any CPU
+		{287A4168-B6EF-4E02-A6CB-2961FF44C2F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{287A4168-B6EF-4E02-A6CB-2961FF44C2F5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{287A4168-B6EF-4E02-A6CB-2961FF44C2F5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{287A4168-B6EF-4E02-A6CB-2961FF44C2F5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{287A4168-B6EF-4E02-A6CB-2961FF44C2F5}.Release|Win32.ActiveCfg = Release|Any CPU
+		{287A4168-B6EF-4E02-A6CB-2961FF44C2F5}.Release|Win32.Build.0 = Release|Any CPU
+		{287A4168-B6EF-4E02-A6CB-2961FF44C2F5}.Release|x64.ActiveCfg = Release|Any CPU
+		{287A4168-B6EF-4E02-A6CB-2961FF44C2F5}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Rectify11Installer/Pages/WizardPage.resx b/Rectify11Installer/Pages/WizardPage.resx
new file mode 100644
index 000000000..1af7de150
--- /dev/null
+++ b/Rectify11Installer/Pages/WizardPage.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Rectify11Installer/Rectify11Installer.csproj b/Rectify11Installer/Rectify11Installer.Legacy.csproj
similarity index 100%
rename from Rectify11Installer/Rectify11Installer.csproj
rename to Rectify11Installer/Rectify11Installer.Legacy.csproj