Index: Application/Riskeer/src/Application.Riskeer.Setup/Application.Riskeer.Setup.wixproj
===================================================================
diff -u -r27b7e4e63c92be6efd0b899c072566f64693117f -r6fd32ffdeb8bab16febdefacd1fc9a0fa26e01c8
--- Application/Riskeer/src/Application.Riskeer.Setup/Application.Riskeer.Setup.wixproj	(.../Application.Riskeer.Setup.wixproj)	(revision 27b7e4e63c92be6efd0b899c072566f64693117f)
+++ Application/Riskeer/src/Application.Riskeer.Setup/Application.Riskeer.Setup.wixproj	(.../Application.Riskeer.Setup.wixproj)	(revision 6fd32ffdeb8bab16febdefacd1fc9a0fa26e01c8)
@@ -308,8 +308,8 @@
     <DefineConstants>$(DefineConstants);ReleaseVersion=$(ReleaseVersion);ApplicationBinFolder=..\..\..\..\bin\$(Configuration);InstallerLicensesFolder=licenses\;ExamplesFolder=Examples\;</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
-    <PreBuildEvent>"$(WIX)bin\heat.exe" dir $(ProjectDir)..\..\..\..\bin\$(Configuration) -cg RiskeerApplicationComponents -gg -dr BINDIR -var var.ApplicationBinFolder -sfrag -sreg -srd -o "$(ProjectDir)RiskeerPayload.wxs"
-"$(WIX)bin\heat.exe" dir $(ProjectDir)licenses -cg ThirdPartyLicenseComponents -gg -dr BINDIR -var var.InstallerLicensesFolder -sfrag -sreg -srd -o "$(ProjectDir)ThirdPartyLicensesPayload.wxs"
+    <PreBuildEvent>"$(WIX)bin\heat.exe" dir $(ProjectDir)..\..\..\..\bin\$(Configuration) -cg RiskeerApplicationComponents -gg -dr INSTALLDIR -var var.ApplicationBinFolder -sfrag -sreg -srd -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 -r29f403310694d8f3fc902666e88a3542b0f1df96 -r6fd32ffdeb8bab16febdefacd1fc9a0fa26e01c8
--- Application/Riskeer/src/Application.Riskeer.Setup/Product.wxs	(.../Product.wxs)	(revision 29f403310694d8f3fc902666e88a3542b0f1df96)
+++ Application/Riskeer/src/Application.Riskeer.Setup/Product.wxs	(.../Product.wxs)	(revision 6fd32ffdeb8bab16febdefacd1fc9a0fa26e01c8)
@@ -33,7 +33,6 @@
       <Directory Id="ProgramFilesFolder" Name="PFiles">
         <Directory Id="BOIDIR" Name="!(loc.ApplicationGroupShortName)">
           <Directory Id="INSTALLDIR" Name="$(var.ApplicationFullName)">
-            <Directory Id="BINDIR" Name="bin">
             
               <!--
               RiskeerPayload.wxs defines all files going into this folder. 
@@ -42,15 +41,14 @@
               RiskeerPayload.wxs and ThirdPartyLicensesPayload.wxs will be generated on pre-build. Ensure you clean first before building the installer!
               -->
 
-            </Directory>
             
             <Component Id="FileAssociation" Guid="1117D79E-521C-48C3-9E23-549833F7BA09">
               <File Source="Riskeer.ico" KeyPath="yes"></File>
               
               <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="fil91CB09E13AB30875601EC5267FEE0EB4" Command="Open" Argument="&quot;%1&quot;"/>
+                  <Verb Id="open" TargetFile="fil1FB73FD18EC148C2C143258B3CCD8055" Command="Open" Argument="&quot;%1&quot;"/>
                   <MIME ContentType="application/risk" Default="yes" />
                 </Extension>
                 <Extension Id="rtd" ContentType="application/rtd">
@@ -60,20 +58,6 @@
               
             </Component>
             
-            <Component Id="InstalledShortcut" Guid="333E96FE-1B51-485C-8801-A57CE65C62D1">
-              <Shortcut Id="ApplicationInstallDirShortcut"
-                        Name="!(loc.ApplicationLongName)"
-                        Description="!(loc.StartApplicationDescription)"
-                        Target="[BINDIR]!(loc.ApplicationLongName).exe"
-                        WorkingDirectory="INSTALLDIR"
-                        Icon="Riskeer.ico"/>
-              
-              <RemoveFolder Id="RemoveBINDIR" Directory="BINDIR" On="uninstall"/>
-              <RemoveFolder Id="RemoveINSTALLDIR" Directory="INSTALLDIR" On="uninstall" />
-              <RemoveFolder Id="RemoveBOIDIR" Directory="BOIDIR" On="uninstall" />
-              <RegistryValue Root="HKCU" Key="Software\!(loc.Manufacturer)\!(loc.ApplicationShortName)" Name="RiskeerAppShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>
-            </Component>
-            
             <Component Id="LicenseFile" Guid="7A302FAD-4BEF-4C0F-805E-406DB172D530">
               <File Id="RiskeerLicense" Name="Licentie.rtf" Source="Licentie.rtf" KeyPath="yes"/>  
             </Component>
@@ -177,7 +161,6 @@
       <ComponentGroupRef Id="Examples"/>
       <ComponentGroupRef Id="InstallationVerificationFiles"/>
       <ComponentGroupRef Id="CalculationConfigurationFiles"/>
-      <ComponentRef Id="InstalledShortcut"/>
       <ComponentRef Id="ProgramMenuShortcut"/>
       <ComponentRef Id="DesktopShortcut"/>
       <ComponentRef Id="LicenseFile"/>