Index: .gitignore
===================================================================
diff -u -r4f912574995f037e013aa9317615cb1308777786 -ra29005ef56f7766fc736458b518bf20d31a79186
--- .gitignore	(.../.gitignore)	(revision 4f912574995f037e013aa9317615cb1308777786)
+++ .gitignore	(.../.gitignore)	(revision a29005ef56f7766fc736458b518bf20d31a79186)
@@ -20,6 +20,8 @@
 # Custom
 Application/Riskeer/src/Application.Riskeer.Setup/Examples.wxs
 Application/Riskeer/src/Application.Riskeer.Setup/RiskeerPayload.wxs
+Application/Riskeer/src/Application.Riskeer.Setup/RiskeerExecutablePayload.wxs
+Application/Riskeer/src/Application.Riskeer.Setup/RiskeerExecutableConfigPayload.wxs
 Application/Riskeer/src/Application.Riskeer.Setup/ThirdPartyLicensesPayload.wxs
 Core/Common/src/Core.Common.Version/GlobalAssembly.cs
 *.ldb
Index: Application/Riskeer/src/Application.Riskeer.Setup/Application.Riskeer.Setup.wixproj
===================================================================
diff -u -r6fd32ffdeb8bab16febdefacd1fc9a0fa26e01c8 -ra29005ef56f7766fc736458b518bf20d31a79186
--- Application/Riskeer/src/Application.Riskeer.Setup/Application.Riskeer.Setup.wixproj	(.../Application.Riskeer.Setup.wixproj)	(revision 6fd32ffdeb8bab16febdefacd1fc9a0fa26e01c8)
+++ Application/Riskeer/src/Application.Riskeer.Setup/Application.Riskeer.Setup.wixproj	(.../Application.Riskeer.Setup.wixproj)	(revision a29005ef56f7766fc736458b518bf20d31a79186)
@@ -59,6 +59,8 @@
     <Compile Include="Product.wxs" />
     <Compile Include="RiskeerPayload.wxs" />
     <Compile Include="ThirdPartyLicensesPayload.wxs" />
+    <Compile Include="RiskeerExecutablePayload.wxs" />
+    <Compile Include="RiskeerExecutableConfigPayload.wxs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Banner_493x77.bmp" />
@@ -305,10 +307,12 @@
   <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
   <PropertyGroup>
-    <DefineConstants>$(DefineConstants);ReleaseVersion=$(ReleaseVersion);ApplicationBinFolder=..\..\..\..\bin\$(Configuration);InstallerLicensesFolder=licenses\;ExamplesFolder=Examples\;</DefineConstants>
+    <DefineConstants>$(DefineConstants);ReleaseVersion=$(ReleaseVersion);ApplicationBinFolder=..\..\..\..\bin\$(Configuration);ApplicationNestedBinFolder=..\..\..\..\bin\$(Configuration)\Application;InstallerLicensesFolder=licenses\;ExamplesFolder=Examples\;</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
-    <PreBuildEvent>"$(WIX)bin\heat.exe" dir $(ProjectDir)..\..\..\..\bin\$(Configuration) -cg RiskeerApplicationComponents -gg -dr INSTALLDIR -var var.ApplicationBinFolder -sfrag -sreg -srd -o "$(ProjectDir)RiskeerPayload.wxs"
+    <PreBuildEvent>"$(WIX)bin\heat.exe" file $(ProjectDir)..\..\..\..\bin\$(Configuration)\Riskeer.exe -cg RiskeerExecutable -gg -dr INSTALLDIR -var var.ApplicationBinFolder -sfrag -sreg -srd -o "$(ProjectDir)RiskeerExecutablePayload.wxs" 
+"$(WIX)bin\heat.exe" file $(ProjectDir)..\..\..\..\bin\$(Configuration)\Riskeer.exe.config -cg RiskeerExecutableConfig -gg -dr INSTALLDIR -var var.ApplicationBinFolder -sfrag -sreg -srd -o "$(ProjectDir)RiskeerExecutableConfigPayload.wxs"
+"$(WIX)bin\heat.exe" dir $(ProjectDir)..\..\..\..\bin\$(Configuration)\Application -cg RiskeerApplicationComponents -gg -dr INSTALLDIR -var var.ApplicationNestedBinFolder -sfrag -sreg -o "$(ProjectDir)RiskeerPayload.wxs"
 "$(WIX)bin\heat.exe" dir $(ProjectDir)licenses -cg ThirdPartyLicenseComponents -gg -dr INSTALLDIR -var var.InstallerLicensesFolder -sfrag -sreg -srd -o "$(ProjectDir)ThirdPartyLicensesPayload.wxs"
 "$(WIX)bin\heat.exe" dir $(ProjectDir)Examples -cg Examples -gg -dr CommonDocumentsExamples -var var.ExamplesFolder -sfrag -sreg -srd -o "$(ProjectDir)Examples.wxs"</PreBuildEvent>
   </PropertyGroup>
Index: Application/Riskeer/src/Application.Riskeer.Setup/Product.wxs
===================================================================
diff -u -r6fd32ffdeb8bab16febdefacd1fc9a0fa26e01c8 -ra29005ef56f7766fc736458b518bf20d31a79186
--- Application/Riskeer/src/Application.Riskeer.Setup/Product.wxs	(.../Product.wxs)	(revision 6fd32ffdeb8bab16febdefacd1fc9a0fa26e01c8)
+++ Application/Riskeer/src/Application.Riskeer.Setup/Product.wxs	(.../Product.wxs)	(revision a29005ef56f7766fc736458b518bf20d31a79186)
@@ -35,20 +35,22 @@
           <Directory Id="INSTALLDIR" Name="$(var.ApplicationFullName)">
             
               <!--
-              RiskeerPayload.wxs defines all files going into this folder. 
+              RiskeerExecutablePayload.wxs defines the executable going into this folder.
+              RiskeerExecutableConfigPayload.wxs defines the executable config going into this folder.
+              RiskeerPayload.wxs defines the Application folder (which contains all files) going into this folder. 
               ThirdPartyLicensesPayload.wxs defines all license files for all used 3rd party libraries.
               
-              RiskeerPayload.wxs and ThirdPartyLicensesPayload.wxs will be generated on pre-build. Ensure you clean first before building the installer!
+              All the stated .wxs files will be generated on pre-build. Ensure you have build the solution before building the installer!
               -->
 
             
             <Component Id="FileAssociation" Guid="1117D79E-521C-48C3-9E23-549833F7BA09">
-              <File Source="Riskeer.ico" KeyPath="yes"></File>
+              <File Source="Riskeer.ico" KeyPath="yes" />
               
               <RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Riskeer.risk" Name="FriendlyTypeName" Value="!(loc.RiskDescription)" Type="string" />
               <ProgId Id="Riskeer.risk" Description="!(loc.RiskDescription)" Icon="Riskeer.ico">
                 <Extension Id="risk" ContentType="application/risk">
-                  <Verb Id="open" TargetFile="fil1FB73FD18EC148C2C143258B3CCD8055" Command="Open" Argument="&quot;%1&quot;"/>
+                  <Verb Id="open" TargetFile="filCAE939C4E7E14EA47DA59FCBAD2F0F57" Command="Open" Argument="&quot;%1&quot;"/>
                   <MIME ContentType="application/risk" Default="yes" />
                 </Extension>
                 <Extension Id="rtd" ContentType="application/rtd">
@@ -156,6 +158,8 @@
     </Directory>
     
     <Feature Id="CompleteInstallation" Title="!(loc.ApplicationLongName)" Level="1" Absent="disallow" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no">
+      <ComponentGroupRef Id="RiskeerExecutable"/>
+      <ComponentGroupRef Id="RiskeerExecutableConfig"/>
       <ComponentGroupRef Id="RiskeerApplicationComponents"/>
       <ComponentGroupRef Id="ThirdPartyLicenseComponents"/>
       <ComponentGroupRef Id="Examples"/>