diff --git a/.gitignore b/.gitignore
index f645fe654..c8b4d9475 100644
--- a/.gitignore
+++ b/.gitignore
@@ -280,3 +280,5 @@ Installer/Fragments/FilesFragment.wxs
 Installer Projects/Installer/Resources/License.rtf
 Installer Projects/Installer/Fragments/FilesFragment.wxs
 Installer Projects/Installer/Fragments/HelpFilesFragment.wxs
+InstallerProjects/Installer/Fragments/FilesFragment.wxs
+InstallerProjects/Installer/Resources/License.rtf
diff --git a/Installer Projects/CustomActions/CustomAction.config b/InstallerProjects/CustomActions/CustomAction.config
similarity index 100%
rename from Installer Projects/CustomActions/CustomAction.config
rename to InstallerProjects/CustomActions/CustomAction.config
diff --git a/Installer Projects/CustomActions/CustomActions.cs b/InstallerProjects/CustomActions/CustomActions.cs
similarity index 100%
rename from Installer Projects/CustomActions/CustomActions.cs
rename to InstallerProjects/CustomActions/CustomActions.cs
diff --git a/Installer Projects/CustomActions/CustomActions.csproj b/InstallerProjects/CustomActions/CustomActions.csproj
similarity index 100%
rename from Installer Projects/CustomActions/CustomActions.csproj
rename to InstallerProjects/CustomActions/CustomActions.csproj
diff --git a/Installer Projects/CustomActions/InstalledWindowsUpdateGatherer.cs b/InstallerProjects/CustomActions/InstalledWindowsUpdateGatherer.cs
similarity index 100%
rename from Installer Projects/CustomActions/InstalledWindowsUpdateGatherer.cs
rename to InstallerProjects/CustomActions/InstalledWindowsUpdateGatherer.cs
diff --git a/Installer Projects/CustomActions/Properties/AssemblyInfo.cs b/InstallerProjects/CustomActions/Properties/AssemblyInfo.cs
similarity index 100%
rename from Installer Projects/CustomActions/Properties/AssemblyInfo.cs
rename to InstallerProjects/CustomActions/Properties/AssemblyInfo.cs
diff --git a/Installer Projects/CustomActions/UninstallNSISVersions.cs b/InstallerProjects/CustomActions/UninstallNSISVersions.cs
similarity index 100%
rename from Installer Projects/CustomActions/UninstallNSISVersions.cs
rename to InstallerProjects/CustomActions/UninstallNSISVersions.cs
diff --git a/Installer Projects/Installer/CustomActions/CheckForInstalledWindowsUpdates.wxs b/InstallerProjects/Installer/CustomActions/CheckForInstalledWindowsUpdates.wxs
similarity index 100%
rename from Installer Projects/Installer/CustomActions/CheckForInstalledWindowsUpdates.wxs
rename to InstallerProjects/Installer/CustomActions/CheckForInstalledWindowsUpdates.wxs
diff --git a/Installer Projects/Installer/CustomActions/UninstallLegacyVersions.wxs b/InstallerProjects/Installer/CustomActions/UninstallLegacyVersions.wxs
similarity index 100%
rename from Installer Projects/Installer/CustomActions/UninstallLegacyVersions.wxs
rename to InstallerProjects/Installer/CustomActions/UninstallLegacyVersions.wxs
diff --git a/Installer Projects/Installer/Dependencies/PuTTYNG.exe b/InstallerProjects/Installer/Dependencies/PuTTYNG.exe
similarity index 100%
rename from Installer Projects/Installer/Dependencies/PuTTYNG.exe
rename to InstallerProjects/Installer/Dependencies/PuTTYNG.exe
diff --git a/Installer Projects/Installer/Filters/Harvest_Filter.xslt b/InstallerProjects/Installer/Filters/Harvest_Filter.xslt
similarity index 100%
rename from Installer Projects/Installer/Filters/Harvest_Filter.xslt
rename to InstallerProjects/Installer/Filters/Harvest_Filter.xslt
diff --git a/Installer Projects/Installer/Fragments/DirectoriesFragment.wxs b/InstallerProjects/Installer/Fragments/DirectoriesFragment.wxs
similarity index 91%
rename from Installer Projects/Installer/Fragments/DirectoriesFragment.wxs
rename to InstallerProjects/Installer/Fragments/DirectoriesFragment.wxs
index 7a9a687a3..460625529 100644
--- a/Installer Projects/Installer/Fragments/DirectoriesFragment.wxs	
+++ b/InstallerProjects/Installer/Fragments/DirectoriesFragment.wxs
@@ -5,7 +5,6 @@
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="$(var.PlatformProgramFilesFolder)">
         <Directory Id="APPLICATIONROOTDIRECTORY" Name="$(var.ProductName)">
-          <Directory Id="HELPFILESDIRECTORY" Name="Help" />
         </Directory>
       </Directory>
 
diff --git a/Installer Projects/Installer/Fragments/MainExeFragment.wxs b/InstallerProjects/Installer/Fragments/MainExeFragment.wxs
similarity index 100%
rename from Installer Projects/Installer/Fragments/MainExeFragment.wxs
rename to InstallerProjects/Installer/Fragments/MainExeFragment.wxs
diff --git a/Installer Projects/Installer/Fragments/MiscTextFilesFragment.wxs b/InstallerProjects/Installer/Fragments/MiscTextFilesFragment.wxs
similarity index 100%
rename from Installer Projects/Installer/Fragments/MiscTextFilesFragment.wxs
rename to InstallerProjects/Installer/Fragments/MiscTextFilesFragment.wxs
diff --git a/Installer Projects/Installer/Fragments/PuTTYNGFragment.wxs b/InstallerProjects/Installer/Fragments/PuTTYNGFragment.wxs
similarity index 100%
rename from Installer Projects/Installer/Fragments/PuTTYNGFragment.wxs
rename to InstallerProjects/Installer/Fragments/PuTTYNGFragment.wxs
diff --git a/Installer Projects/Installer/Fragments/ShortcutFragment.wxs b/InstallerProjects/Installer/Fragments/ShortcutFragment.wxs
similarity index 100%
rename from Installer Projects/Installer/Fragments/ShortcutFragment.wxs
rename to InstallerProjects/Installer/Fragments/ShortcutFragment.wxs
diff --git a/Installer Projects/Installer/Includes/Config.wxi b/InstallerProjects/Installer/Includes/Config.wxi
similarity index 100%
rename from Installer Projects/Installer/Includes/Config.wxi
rename to InstallerProjects/Installer/Includes/Config.wxi
diff --git a/Installer Projects/Installer/Installer.wixproj b/InstallerProjects/Installer/Installer.wixproj
similarity index 93%
rename from Installer Projects/Installer/Installer.wixproj
rename to InstallerProjects/Installer/Installer.wixproj
index b7c573b6a..ddb28f30f 100644
--- a/Installer Projects/Installer/Installer.wixproj	
+++ b/InstallerProjects/Installer/Installer.wixproj
@@ -30,7 +30,6 @@
     <Compile Include="CustomActions\UninstallLegacyVersions.wxs" />
     <Compile Include="Fragments\FilesFragment.wxs" />
     <Compile Include="Fragments\DirectoriesFragment.wxs" />
-    <Compile Include="Fragments\HelpFilesFragment.wxs" />
     <Compile Include="Fragments\MainExeFragment.wxs" />
     <Compile Include="Fragments\MiscTextFilesFragment.wxs" />
     <Compile Include="Fragments\PuTTYNGFragment.wxs" />
@@ -100,6 +99,7 @@
     <LinkerAdditionalOptions>
     </LinkerAdditionalOptions>
     <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Release;HelpFilesHarvestPath=$(SolutionDir)mRemoteV1\Resources\Help</DefineConstants>
+    <Cultures>en-US</Cultures>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <Cultures>en-US</Cultures>
@@ -115,8 +115,10 @@
     <PreBuildEvent>REM Harvest bin directory of the mRemoteV1 project
 call "$(WIX)bin\heat.exe" dir "$(SolutionDir)mRemoteV1\bin\$(Configuration)" -ag -dr APPLICATIONROOTDIRECTORY -var var.HarvestPath -srd -cg MandatoryComponents -template fragment -out "$(ProjectDir)Fragments\FilesFragment.wxs" -t "$(ProjectDir)Filters\Harvest_Filter.xslt" -v
 REM Convert the license file "COPYING.TXT" to "License.rtf" to be shown in the installer GUI
-call "$(ProjectDir)Resources\Pandoc\pandoc.exe" -s -t rtf -o "$(ProjectDir)\Resources\License.rtf" "$(SolutionDir)COPYING.TXT"
-REM Harvest the help files for inclusion in a custom directory
-call "$(WIX)bin\heat.exe" dir "$(SolutionDir)mRemoteV1\Resources\Help" -ag -dr HELPFILESDIRECTORY -var var.HelpFilesHarvestPath -srd -cg HelpFiles -template fragment -out "$(ProjectDir)Fragments\HelpFilesFragment.wxs" -v</PreBuildEvent>
+call "$(ProjectDir)Resources\Pandoc\pandoc.exe" -s -t rtf -o "$(ProjectDir)\Resources\License.rtf" "$(SolutionDir)COPYING.TXT"</PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>REM Sign MSI
+IF EXIST C:\mRemoteNG_code_signing_cert.pfx (powershell "&amp;""$(SolutionDir)signfiles.ps1""" "%25cd%25")</PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Installer Projects/Installer/Localizations/cs-CZ.wxl b/InstallerProjects/Installer/Localizations/cs-CZ.wxl
similarity index 100%
rename from Installer Projects/Installer/Localizations/cs-CZ.wxl
rename to InstallerProjects/Installer/Localizations/cs-CZ.wxl
diff --git a/Installer Projects/Installer/Localizations/de-DE.wxl b/InstallerProjects/Installer/Localizations/de-DE.wxl
similarity index 100%
rename from Installer Projects/Installer/Localizations/de-DE.wxl
rename to InstallerProjects/Installer/Localizations/de-DE.wxl
diff --git a/Installer Projects/Installer/Localizations/en-US.wxl b/InstallerProjects/Installer/Localizations/en-US.wxl
similarity index 100%
rename from Installer Projects/Installer/Localizations/en-US.wxl
rename to InstallerProjects/Installer/Localizations/en-US.wxl
diff --git a/Installer Projects/Installer/Localizations/ja-JP.wxl b/InstallerProjects/Installer/Localizations/ja-JP.wxl
similarity index 100%
rename from Installer Projects/Installer/Localizations/ja-JP.wxl
rename to InstallerProjects/Installer/Localizations/ja-JP.wxl
diff --git a/Installer Projects/Installer/Localizations/ru-RU.wxl b/InstallerProjects/Installer/Localizations/ru-RU.wxl
similarity index 100%
rename from Installer Projects/Installer/Localizations/ru-RU.wxl
rename to InstallerProjects/Installer/Localizations/ru-RU.wxl
diff --git a/Installer Projects/Installer/Resources/Pandoc/COPYING.rtf b/InstallerProjects/Installer/Resources/Pandoc/COPYING.rtf
similarity index 100%
rename from Installer Projects/Installer/Resources/Pandoc/COPYING.rtf
rename to InstallerProjects/Installer/Resources/Pandoc/COPYING.rtf
diff --git a/Installer Projects/Installer/Resources/Pandoc/COPYRIGHT.txt b/InstallerProjects/Installer/Resources/Pandoc/COPYRIGHT.txt
similarity index 100%
rename from Installer Projects/Installer/Resources/Pandoc/COPYRIGHT.txt
rename to InstallerProjects/Installer/Resources/Pandoc/COPYRIGHT.txt
diff --git a/Installer Projects/Installer/Resources/Pandoc/pandoc.exe b/InstallerProjects/Installer/Resources/Pandoc/pandoc.exe
similarity index 100%
rename from Installer Projects/Installer/Resources/Pandoc/pandoc.exe
rename to InstallerProjects/Installer/Resources/Pandoc/pandoc.exe
diff --git a/Installer Projects/Installer/Resources/header.bmp b/InstallerProjects/Installer/Resources/header.bmp
similarity index 100%
rename from Installer Projects/Installer/Resources/header.bmp
rename to InstallerProjects/Installer/Resources/header.bmp
diff --git a/Installer Projects/Installer/Resources/mRemoteNG.ico b/InstallerProjects/Installer/Resources/mRemoteNG.ico
similarity index 100%
rename from Installer Projects/Installer/Resources/mRemoteNG.ico
rename to InstallerProjects/Installer/Resources/mRemoteNG.ico
diff --git a/Installer Projects/Installer/Resources/welcome.bmp b/InstallerProjects/Installer/Resources/welcome.bmp
similarity index 100%
rename from Installer Projects/Installer/Resources/welcome.bmp
rename to InstallerProjects/Installer/Resources/welcome.bmp
diff --git a/Installer Projects/Installer/mRemoteNGV1.wxs b/InstallerProjects/Installer/mRemoteNGV1.wxs
similarity index 96%
rename from Installer Projects/Installer/mRemoteNGV1.wxs
rename to InstallerProjects/Installer/mRemoteNGV1.wxs
index d8174fd6b..b3d155979 100644
--- a/Installer Projects/Installer/mRemoteNGV1.wxs	
+++ b/InstallerProjects/Installer/mRemoteNGV1.wxs
@@ -9,7 +9,7 @@
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
     <MajorUpgrade DowngradeErrorMessage="!(loc.Upgrade_NewerVersionInstalled)" Schedule="afterInstallExecute" />
     <MediaTemplate EmbedCab="yes" />
-    <Binary Id="CustomActions.CA.dll" SourceFile="$(var.SolutionDir)Installer Projects\CustomActions\bin\$(var.Configuration)\CustomActions.CA.dll" />
+    <Binary Id="CustomActions.CA.dll" SourceFile="$(var.SolutionDir)InstallerProjects\CustomActions\bin\$(var.Configuration)\CustomActions.CA.dll" />
     <Property Id="ARPPRODUCTICON" Value="mRemoteNG.ico" />
     <Property Id="ARPHELPLINK" Value="http://www.mremoteng.org" />
     <Property Id="MAINEXE" Value="$(var.ExeProcessName)" />
@@ -59,7 +59,6 @@
       <Feature Id="F.MinimalFeature" Title="$(var.ProductName)" Absent="disallow" ConfigurableDirectory="APPLICATIONROOTDIRECTORY" Level="1">
         <ComponentGroupRef Id="MandatoryComponents" Primary="yes" />
         <ComponentRef Id="C.MainExe" Primary="yes" />
-        <ComponentGroupRef Id="HelpFiles" Primary="yes" />
         <ComponentGroupRef Id="CG.ProjectInfoFiles" Primary="yes" />
       </Feature>
 
diff --git a/mRemoteV1.sln b/mRemoteV1.sln
index 17d99b4fd..939b54efe 100644
--- a/mRemoteV1.sln
+++ b/mRemoteV1.sln
@@ -7,11 +7,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteV1", "mRemoteV1\mRem
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteNGTests", "mRemoteNGTests\mRemoteNGTests.csproj", "{1453B37F-8621-499E-B0B2-6091F76DC0BB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installer Projects", "Installer Projects", "{4FE795BE-646E-4F1B-BAD0-A68EA26394DD}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "InstallerProjects", "InstallerProjects", "{4FE795BE-646E-4F1B-BAD0-A68EA26394DD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomActions", "Installer Projects\CustomActions\CustomActions.csproj", "{5423D985-CB48-4344-B47F-E8C6D60C8B04}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomActions", "InstallerProjects\CustomActions\CustomActions.csproj", "{5423D985-CB48-4344-B47F-E8C6D60C8B04}"
 EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer Projects\Installer\Installer.wixproj", "{F0168B9F-6815-40DF-BA53-46CEE7683B68}"
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "InstallerProjects\Installer\Installer.wixproj", "{F0168B9F-6815-40DF-BA53-46CEE7683B68}"
 	ProjectSection(ProjectDependencies) = postProject
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04} = {5423D985-CB48-4344-B47F-E8C6D60C8B04}
 	EndProjectSection
diff --git a/signfiles.ps1 b/signfiles.ps1
index 8dd7daddf..49c60c728 100644
--- a/signfiles.ps1
+++ b/signfiles.ps1
@@ -1,12 +1,12 @@
 $timeserver = "http://timestamp.verisign.com/scripts/timstamp.dll"
 $certPath = "C:\mRemoteNG_code_signing_cert.pfx"
-$certPassword = (Get-Credential -Message "a" -UserName "a").Password
+$certPassword = (Get-Credential -Message "Enter the password for the certificate" -UserName "USERNAME NOT NEEDED").Password
 $cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2($certPath, $certPassword)
 $targetPath = $args[0]
 
 
 Write-Output "Getting files from path: $targetPath"
-$signableFiles = Get-ChildItem -Path $targetPath | ?{$_.Extension -match "dll|exe"}
+$signableFiles = Get-ChildItem -Path $targetPath -Recurse | ?{$_.Extension -match "dll|exe|msi"}
 Write-Output "Signable files count: $($signableFiles.Count)"
 foreach ($file in $signableFiles) {
     Set-AuthenticodeSignature -Certificate $cert -TimestampServer $timeserver -IncludeChain all -FilePath $file.FullName