Index: Application/Riskeer/src/Application.Riskeer.Setup/Installer UI/BrowseDlgDeltares.wxs
===================================================================
diff -u -rf938029e0b96b5c927bf0bc9d13a9c6fb4fd10f9 -re51e6945b7788ae6968c8312f05729ea5aa089ab
--- Application/Riskeer/src/Application.Riskeer.Setup/Installer UI/BrowseDlgDeltares.wxs	(.../BrowseDlgDeltares.wxs)	(revision f938029e0b96b5c927bf0bc9d13a9c6fb4fd10f9)
+++ Application/Riskeer/src/Application.Riskeer.Setup/Installer UI/BrowseDlgDeltares.wxs	(.../BrowseDlgDeltares.wxs)	(revision e51e6945b7788ae6968c8312f05729ea5aa089ab)
@@ -10,7 +10,7 @@
     You must not remove this notice, or any other, from this software.
 -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?include UIVariables.wxi ?>
+    <?include UIVariables.wxi ?>
     <Fragment>
         <UI>
             <Dialog Id="BrowseDlgDeltares" Width="370" Height="270" Title="!(loc.Dlg_Title)">
Index: Application/Riskeer/src/Application.Riskeer.Setup/Installer UI/MaintenanceTypeDlgDeltares.wxs
===================================================================
diff -u -rf938029e0b96b5c927bf0bc9d13a9c6fb4fd10f9 -re51e6945b7788ae6968c8312f05729ea5aa089ab
--- Application/Riskeer/src/Application.Riskeer.Setup/Installer UI/MaintenanceTypeDlgDeltares.wxs	(.../MaintenanceTypeDlgDeltares.wxs)	(revision f938029e0b96b5c927bf0bc9d13a9c6fb4fd10f9)
+++ Application/Riskeer/src/Application.Riskeer.Setup/Installer UI/MaintenanceTypeDlgDeltares.wxs	(.../MaintenanceTypeDlgDeltares.wxs)	(revision e51e6945b7788ae6968c8312f05729ea5aa089ab)
@@ -10,10 +10,10 @@
     You must not remove this notice, or any other, from this software.
 -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?include UIVariables.wxi ?>
-  <Fragment>
-        <UI>
-	     <Dialog Id="MaintenanceTypeDlgDeltares" Width="370" Height="270" Title="!(loc.Dlg_Title)">
+    <?include UIVariables.wxi ?>
+    <Fragment>
+       <UI>
+	         <Dialog Id="MaintenanceTypeDlgDeltares" Width="370" Height="270" Title="!(loc.Dlg_Title)">
                 <Control Id="RepairButton" Type="PushButton" X="40" Y="65" Width="80" Height="17" ToolTip="!(loc.MaintenanceTypeDlgRepairButtonTooltip)" Text="!(loc.MaintenanceTypeRepairButtonText)" DisableCondition="ARPNOREPAIR">
                     <Publish Property="WixUI_InstallMode" Value="Repair" />
                     
Index: Application/Riskeer/src/Application.Riskeer.Setup/Installer UI/PrepareDlgDeltares.wxs
===================================================================
diff -u -rf938029e0b96b5c927bf0bc9d13a9c6fb4fd10f9 -re51e6945b7788ae6968c8312f05729ea5aa089ab
--- Application/Riskeer/src/Application.Riskeer.Setup/Installer UI/PrepareDlgDeltares.wxs	(.../PrepareDlgDeltares.wxs)	(revision f938029e0b96b5c927bf0bc9d13a9c6fb4fd10f9)
+++ Application/Riskeer/src/Application.Riskeer.Setup/Installer UI/PrepareDlgDeltares.wxs	(.../PrepareDlgDeltares.wxs)	(revision e51e6945b7788ae6968c8312f05729ea5aa089ab)
@@ -10,8 +10,8 @@
     You must not remove this notice, or any other, from this software.
 -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?include UIVariables.wxi ?>
-  <Fragment>
+    <?include UIVariables.wxi ?>
+    <Fragment>
         <UI>
             <Dialog Id="PrepareDlgDeltares" Width="370" Height="270" Title="!(loc.Dlg_Title)" Modeless="yes">
                 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUICancel)">
Index: Application/Riskeer/src/Application.Riskeer.Setup/Product.wxs
===================================================================
diff -u -r9d077377cb14c9133d3a9e510198866287c1dc8f -re51e6945b7788ae6968c8312f05729ea5aa089ab
--- Application/Riskeer/src/Application.Riskeer.Setup/Product.wxs	(.../Product.wxs)	(revision 9d077377cb14c9133d3a9e510198866287c1dc8f)
+++ Application/Riskeer/src/Application.Riskeer.Setup/Product.wxs	(.../Product.wxs)	(revision e51e6945b7788ae6968c8312f05729ea5aa089ab)
@@ -25,10 +25,7 @@
 
     <!-- Request the common documents folder path -->
     <util:QueryWindowsDirectories />
-
-    <!-- File System hierarchy -->
-    
-    
+   
     <Feature Id="CompleteInstallation" Title="$(var.ApplicationFullName)" Level="1" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no" AllowAbsent="no">
       <ComponentGroupRef Id="RiskeerExecutable" />
       <ComponentGroupRef Id="RiskeerExecutableConfig" />
@@ -54,17 +51,6 @@
         <Directory Id="BOIDIR" Name="!(loc.ApplicationGroupShortName)">
           <Directory Id="INSTALLDIR" Name="$(var.ApplicationFullName)">
             
-              <!--
-              RiskeerExecutablePayload.wxs defines the executable going into this folder.
-              RiskeerExecutableConfigPayload.wxs defines the executable config going into this folder.
-              MigrationExecutablePayload.wxs defines the 'Migratiehulpprogramma' executable going into this folder.
-              MigrationExecutableConfigPayload.wxs defines the 'Migratiehulpprogramma' executable config going into this folder.
-              RiskeerPayload.wxs defines the Application folder (which contains all files) going into this folder.
-              
-              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 Id="Riskeer.ico" Source="Riskeer.ico" KeyPath="yes" />
               
@@ -138,22 +124,13 @@
             </Directory>
             
             <!-- Examples folder -->
-            <Directory Id="CommonDocumentsExamples" Name="!(loc.Examples)">
-              <!-- 
-              Examples.wxs defines all files going into this folder.
-              Examples.wxs will be generated on pre-build. Ensure you clean first before building the installer!
-              -->
-            </Directory>
+            <Directory Id="CommonDocumentsExamples" Name="!(loc.Examples)" />
           
             <!-- Installation verification -->
-            <Directory Id="CommonDocumentsInstallationVerification" Name="!(loc.InstallationVerification)">
-              <!-- InstallationVerification.wxs defines all files going into this folder. -->
-            </Directory>
+            <Directory Id="CommonDocumentsInstallationVerification" Name="!(loc.InstallationVerification)" />
             
             <!-- Calculation configuration -->
-            <Directory Id="CommonDocumentsCalculationConfiguration" Name="!(loc.CalculationConfigurationXSD)">
-              <!-- CalculationConfiguration.wxs defines all files going into this folder. -->
-            </Directory>
+            <Directory Id="CommonDocumentsCalculationConfiguration" Name="!(loc.CalculationConfigurationXSD)" />
           
           </Directory>
         </Directory>