Index: Application/Application.Ringtoets.Setup/Application.Ringtoets.Setup.wixproj
===================================================================
diff -u -r2afad189e942019ef3da47d72e134f3a4c6c7884 -r30e215f264ebf24dcfa7f66285db4e1ad9746d24
--- Application/Application.Ringtoets.Setup/Application.Ringtoets.Setup.wixproj	(.../Application.Ringtoets.Setup.wixproj)	(revision 2afad189e942019ef3da47d72e134f3a4c6c7884)
+++ Application/Application.Ringtoets.Setup/Application.Ringtoets.Setup.wixproj	(.../Application.Ringtoets.Setup.wixproj)	(revision 30e215f264ebf24dcfa7f66285db4e1ad9746d24)
@@ -99,10 +99,10 @@
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <PropertyGroup>
-    <DefineConstants>$(DefineConstants);ReleaseVersion=$(ReleaseVersion);ApplicationBinFolder=..\..\bin;</DefineConstants>
+    <DefineConstants>$(DefineConstants);ReleaseVersion=$(ReleaseVersion);ApplicationBinFolder=..\..\bin\$(Configuration);</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
-    <PreBuildEvent>"$(WIX)bin\heat.exe" dir $(ProjectDir)..\..\bin -cg RingtoetsApplicationComponents -gg -dr INSTALLDIR -var var.ApplicationBinFolder -sfrag -sreg -srd -o "$(ProjectDir)RingtoetsPayload.wxs"
+    <PreBuildEvent>"$(WIX)bin\heat.exe" dir $(ProjectDir)..\..\bin\$(Configuration) -cg RingtoetsApplicationComponents -gg -dr INSTALLDIR -var var.ApplicationBinFolder -sfrag -sreg -srd -o "$(ProjectDir)RingtoetsPayload.wxs"
 $(ProjectDir)..\..\build\svn_insert_version.cmd $(ProjectDir) GenerateVariables.wxi.svn GenerateVariables.wxi%3b</PreBuildEvent>
   </PropertyGroup>
   <!--
Index: Application/Application.Ringtoets.Setup/Product.wxs
===================================================================
diff -u -r4d688bb446eb4508ff3b54b06baefbb71f60237a -r30e215f264ebf24dcfa7f66285db4e1ad9746d24
--- Application/Application.Ringtoets.Setup/Product.wxs	(.../Product.wxs)	(revision 4d688bb446eb4508ff3b54b06baefbb71f60237a)
+++ Application/Application.Ringtoets.Setup/Product.wxs	(.../Product.wxs)	(revision 30e215f264ebf24dcfa7f66285db4e1ad9746d24)
@@ -33,7 +33,6 @@
       <Directory Id="ProgramFilesFolder" Name="PFiles">
         <Directory Id="Deltares" Name="!(loc.Manufacturer)">
           <Directory Id="INSTALLDIR" Name="$(var.ApplicationFullName)">
-            <Directory Id="APPLICATIONDIR" Name="application"/>
             
             <!--
             RingtoetsPayload.wxs defines all files going into this folder. 
@@ -44,8 +43,8 @@
               <Shortcut Id="ApplicationInstallDirShortcut"
                         Name="!(loc.ApplicationLongName)"
                         Description="!(loc.StartApplicationDescription)"
-                        Target="[APPLICATIONDIR]$(var.Application.Ringtoets.TargetFileName)"
-                        WorkingDirectory="APPLICATIONDIR"
+                        Target="[INSTALLDIR]$(var.Application.Ringtoets.TargetFileName)"
+                        WorkingDirectory="INSTALLDIR"
                         Icon="Ringtoets.ico"/>
 
               <RemoveFolder Id="RemoveINSTALLDIR" Directory="INSTALLDIR" On="uninstall" />
@@ -66,8 +65,8 @@
               <Shortcut Id="ApplicationStartMenuShortcut"
                         Name="!(loc.ApplicationLongName)"
                         Description="!(loc.StartApplicationDescription)"
-                        Target="[APPLICATIONDIR]$(var.Application.Ringtoets.TargetFileName)"
-                        WorkingDirectory="APPLICATIONDIR"
+                        Target="[INSTALLDIR]$(var.Application.Ringtoets.TargetFileName)"
+                        WorkingDirectory="INSTALLDIR"
                         Icon="Ringtoets.ico"/>
               
               <RemoveFolder Id="RemoveProgramMenuShortcut" Directory="ProgramMenuRingtoets" On="uninstall" />
@@ -87,8 +86,8 @@
           <Shortcut Id="ApplicationDesktopShortcut"
                     Name="!(loc.ApplicationLongName)"
                     Description="!(loc.StartApplicationDescription)"
-                    Target="[APPLICATIONDIR]$(var.Application.Ringtoets.TargetFileName)"
-                    WorkingDirectory="APPLICATIONDIR"
+                    Target="[INSTALLDIR]$(var.Application.Ringtoets.TargetFileName)"
+                    WorkingDirectory="INSTALLDIR"
                     Icon="Ringtoets.ico"/>
 
           <RegistryValue Root="HKCU" Key="Software\!(loc.Manufacturer)\!(loc.ApplicationShortName)" Name="RingtoetsDesktopShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>
Index: Application/Application.Ringtoets/Application.Ringtoets.csproj
===================================================================
diff -u -r14c27a699f328b3c1990e1f0b58e36dbcdca7166 -r30e215f264ebf24dcfa7f66285db4e1ad9746d24
--- Application/Application.Ringtoets/Application.Ringtoets.csproj	(.../Application.Ringtoets.csproj)	(revision 14c27a699f328b3c1990e1f0b58e36dbcdca7166)
+++ Application/Application.Ringtoets/Application.Ringtoets.csproj	(.../Application.Ringtoets.csproj)	(revision 30e215f264ebf24dcfa7f66285db4e1ad9746d24)
@@ -60,7 +60,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CreateInstaller|x86'">
-    <OutputPath>..\..\bin\application\</OutputPath>
+    <OutputPath>..\..\bin\Release\</OutputPath>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>