Index: src/Deltares.DSoilModel.Setup/Product.wxs
===================================================================
diff -u -r77 -r78
--- src/Deltares.DSoilModel.Setup/Product.wxs	(.../Product.wxs)	(revision 77)
+++ src/Deltares.DSoilModel.Setup/Product.wxs	(.../Product.wxs)	(revision 78)
@@ -35,6 +35,7 @@
       <ComponentGroupRef Id="DevExpressComponents" />
       <ComponentRef Id="ApplicationShortcut" />
       <ComponentRef Id="DesktopShortcut" />
+      <ComponentRef Id="RemoveApplicationLayoutFile" />
     </Feature>
 
     <!-- 
@@ -74,6 +75,10 @@
       </Directory>
       <!-- Desktop folder -->
       <Directory Id="DesktopFolder" />
+      <!-- Documents folder -->
+      <Directory Id="PersonalFolder">
+        <Directory Id="DocumentsDeltaresFolder" Name="Deltares" />
+      </Directory>
     </Directory>
   </Fragment>
 
@@ -103,4 +108,13 @@
     </Component>
   </Fragment>
 
+  <!-- Remove old layout file from documents folder to resolve backward compatibility -->
+  <Fragment>
+    <Component Id="RemoveApplicationLayoutFile" Directory="DocumentsDeltaresFolder" Guid="47F74D08-5194-4FEC-AC18-4DBAC8667C2B">
+      <RemoveFile Id="RemoveLayoutFile" Directory="DocumentsDeltaresFolder" Name="DSoilModel.layout" On="both"/>
+      <RemoveFolder Id="RemoveDocumentsDeltaresFolder" Directory="DocumentsDeltaresFolder" On="uninstall" />
+      <RegistryValue Root="HKCU" Key="Software\Deltares\$(var.ProductName)" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+    </Component>
+  </Fragment>
+  
 </Wix>