diff --git a/MakeDist/App.config b/MakeDistWF/App.config
similarity index 100%
rename from MakeDist/App.config
rename to MakeDistWF/App.config
diff --git a/MakeDist/CopyProgress.Designer.cs b/MakeDistWF/CopyProgress.Designer.cs
similarity index 99%
rename from MakeDist/CopyProgress.Designer.cs
rename to MakeDistWF/CopyProgress.Designer.cs
index 596ddc5..ebfd24a 100644
--- a/MakeDist/CopyProgress.Designer.cs
+++ b/MakeDistWF/CopyProgress.Designer.cs
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-namespace MakeDist {
+namespace MakeDistWF {
     partial class CopyProgress {
         /// <summary>
         /// Required designer variable.
diff --git a/MakeDist/CopyProgress.cs b/MakeDistWF/CopyProgress.cs
similarity index 99%
rename from MakeDist/CopyProgress.cs
rename to MakeDistWF/CopyProgress.cs
index 2b8842f..ab96308 100644
--- a/MakeDist/CopyProgress.cs
+++ b/MakeDistWF/CopyProgress.cs
@@ -21,7 +21,7 @@ using System.Windows.Forms;
 
 using CommonWinForms;
 
-namespace MakeDist {
+namespace MakeDistWF {
     public partial class CopyProgress : Form {
         /// <summary>
         /// Progress message, with colorful text.  This is generated by the worker thread and
diff --git a/MakeDist/CopyProgress.resx b/MakeDistWF/CopyProgress.resx
similarity index 100%
rename from MakeDist/CopyProgress.resx
rename to MakeDistWF/CopyProgress.resx
diff --git a/MakeDist/FileCopier.cs b/MakeDistWF/FileCopier.cs
similarity index 99%
rename from MakeDist/FileCopier.cs
rename to MakeDistWF/FileCopier.cs
index d33e09d..29d86d1 100644
--- a/MakeDist/FileCopier.cs
+++ b/MakeDistWF/FileCopier.cs
@@ -23,7 +23,7 @@ using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace MakeDist {
+namespace MakeDistWF {
     public class FileCopier {
         private const string SOURCEGEN_DIRNAME = "SourceGen";
 
diff --git a/MakeDist/MakeDist.Designer.cs b/MakeDistWF/MakeDist.Designer.cs
similarity index 99%
rename from MakeDist/MakeDist.Designer.cs
rename to MakeDistWF/MakeDist.Designer.cs
index 9284792..5bf3734 100644
--- a/MakeDist/MakeDist.Designer.cs
+++ b/MakeDistWF/MakeDist.Designer.cs
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-namespace MakeDist {
+namespace MakeDistWF {
     partial class MakeDist {
         /// <summary>
         /// Required designer variable.
diff --git a/MakeDist/MakeDist.cs b/MakeDistWF/MakeDist.cs
similarity index 98%
rename from MakeDist/MakeDist.cs
rename to MakeDistWF/MakeDist.cs
index b432ada..0b478cd 100644
--- a/MakeDist/MakeDist.cs
+++ b/MakeDistWF/MakeDist.cs
@@ -16,7 +16,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace MakeDist {
+namespace MakeDistWF {
     public partial class MakeDist : Form {
         public MakeDist() {
             InitializeComponent();
diff --git a/MakeDist/MakeDist.resx b/MakeDistWF/MakeDist.resx
similarity index 100%
rename from MakeDist/MakeDist.resx
rename to MakeDistWF/MakeDist.resx
diff --git a/MakeDist/MakeDist.csproj b/MakeDistWF/MakeDistWF.csproj
similarity index 96%
rename from MakeDist/MakeDist.csproj
rename to MakeDistWF/MakeDistWF.csproj
index f603182..aad43a5 100644
--- a/MakeDist/MakeDist.csproj
+++ b/MakeDistWF/MakeDistWF.csproj
@@ -6,8 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{2415F337-2CE2-42E0-A8A7-4127FEEC94C4}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>MakeDist</RootNamespace>
-    <AssemblyName>MakeDist</AssemblyName>
+    <RootNamespace>MakeDistWF</RootNamespace>
+    <AssemblyName>MakeDistWF</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -75,6 +75,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
diff --git a/MakeDist/Program.cs b/MakeDistWF/Program.cs
similarity index 97%
rename from MakeDist/Program.cs
rename to MakeDistWF/Program.cs
index 5e9668d..1190d86 100644
--- a/MakeDist/Program.cs
+++ b/MakeDistWF/Program.cs
@@ -16,7 +16,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace MakeDist {
+namespace MakeDistWF {
     static class Program {
         /// <summary>
         /// The main entry point for the application.
diff --git a/MakeDist/Properties/AssemblyInfo.cs b/MakeDistWF/Properties/AssemblyInfo.cs
similarity index 100%
rename from MakeDist/Properties/AssemblyInfo.cs
rename to MakeDistWF/Properties/AssemblyInfo.cs
diff --git a/MakeDist/Properties/Resources.Designer.cs b/MakeDistWF/Properties/Resources.Designer.cs
similarity index 87%
rename from MakeDist/Properties/Resources.Designer.cs
rename to MakeDistWF/Properties/Resources.Designer.cs
index 5b9b6ea..1dc3aac 100644
--- a/MakeDist/Properties/Resources.Designer.cs
+++ b/MakeDistWF/Properties/Resources.Designer.cs
@@ -8,9 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace MakeDist.Properties {
-
-
+namespace MakeDistWF.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -18,33 +19,33 @@ namespace MakeDist.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
-
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
-                if ((resourceMan == null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MakeDist.Properties.Resources", typeof(Resources).Assembly);
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MakeDistWF.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
diff --git a/MakeDist/Properties/Resources.resx b/MakeDistWF/Properties/Resources.resx
similarity index 100%
rename from MakeDist/Properties/Resources.resx
rename to MakeDistWF/Properties/Resources.resx
diff --git a/MakeDist/Properties/Settings.Designer.cs b/MakeDistWF/Properties/Settings.Designer.cs
similarity index 91%
rename from MakeDist/Properties/Settings.Designer.cs
rename to MakeDistWF/Properties/Settings.Designer.cs
index ac325e7..981076f 100644
--- a/MakeDist/Properties/Settings.Designer.cs
+++ b/MakeDistWF/Properties/Settings.Designer.cs
@@ -8,15 +8,15 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace MakeDist.Properties {
-
-
+namespace MakeDistWF.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-
+        
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
+        
         public static Settings Default {
             get {
                 return defaultInstance;
diff --git a/MakeDist/Properties/Settings.settings b/MakeDistWF/Properties/Settings.settings
similarity index 100%
rename from MakeDist/Properties/Settings.settings
rename to MakeDistWF/Properties/Settings.settings
diff --git a/WorkBench.sln b/WorkBench.sln
index ed4807f..0497e64 100644
--- a/WorkBench.sln
+++ b/WorkBench.sln
@@ -21,7 +21,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RuntimeData", "SourceGen\Ru
 		{70F04543-9E46-4AD3-875A-160FD198C0FF} = {70F04543-9E46-4AD3-875A-160FD198C0FF}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakeDist", "MakeDist\MakeDist.csproj", "{2415F337-2CE2-42E0-A8A7-4127FEEC94C4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakeDistWF", "MakeDistWF\MakeDistWF.csproj", "{2415F337-2CE2-42E0-A8A7-4127FEEC94C4}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonWinForms", "CommonWinForms\CommonWinForms.csproj", "{08EC328D-078E-4236-B574-BE6B3FD85915}"
 EndProject