Index: /trunk/src/VBox/Installer/win/VirtualBox.wxs
===================================================================
--- /trunk/src/VBox/Installer/win/VirtualBox.wxs	(revision 54118)
+++ /trunk/src/VBox/Installer/win/VirtualBox.wxs	(revision 54119)
@@ -199,5 +199,7 @@
 
     <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="INSTALLDIR">
+        <Directory Id="$(var.Property_ProgramFiles)" Name="PFiles">
+            <Directory Id="VENDOR" Name="$(env.VBOX_VENDOR_SHORT)">
+                <Directory Id="INSTALLDIR" Name="VirtualBox">
 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
                 <Merge Id="msm_VBoxApp" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeApp)" DiskId="1" />
@@ -323,6 +325,7 @@
                                    Type="string" Value="installed" KeyPath="yes" />
                 </Component>
-
+                </Directory>
             </Directory>
+        </Directory>
     </Directory> <!-- TARGETDIR -->
 
@@ -480,6 +483,6 @@
         <RemoveExistingProducts After="InstallValidate"><![CDATA[PREVIOUSVERSIONSINSTALLED OR NEWERVERSIONDETECTED]]></RemoveExistingProducts>
 
-        <Custom Action="ca_OriginalTargetDir" After="FileCost"><![CDATA[(NOT INSTALLDIR) AND (NOT EXISTINGINSTALLDIR)]]></Custom>
-        <Custom Action="ca_DefaultTargetDir" Before="FileCost" ><![CDATA[NOT Installed AND (NOT INSTALLDIR) AND EXISTINGINSTALLDIR]]></Custom>
+        <Custom Action="ca_OriginalTargetDir" After="FileCost"><![CDATA[(NOT INSTALLDIR)]]></Custom>
+        <Custom Action="ca_DefaultTargetDir" Before="FileCost" ><![CDATA[NOT INSTALLDIR AND EXISTINGINSTALLDIR]]></Custom>
 
         <!-- Check + unininstall old TAP instances - we  don't need them anymore -->