From 1f18ea7b53eef2ec695e4b9835394ded89183c25 Mon Sep 17 00:00:00 2001
From: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Fri, 12 Dec 2008 00:59:29 +0000
Subject: [PATCH] [WinOF] trunk\WinOF\WIX\{wlh,wnet,wxp}\*\wof.wxs     Enable
 ia64 ConnectX (mlx4) HCA support in WinOF Installs.     Setup winverbs.sys
 filter driver in WinOF\IBcore\     Winverbs[ibverbs.dll] OFED verbs & OFED
 test pgms (ibv_read_bs & friends) installed by default.

trunk\WinOF\WIX\CustomActions.vbs
    Enable use of dpinst.exe for WLH variants; skip having to specify InfiniHost or ConnectX driver.
     Server 2003/XP/XP64 still need to specify 'which' HCA driver (see below).

    Support cmd-line msiexec installs:
      start/wait msiexec /I WOF.msi /passive NODRV=1 #install defaults except drivers (WDM support)

      (Server 2003/Xp64/XP ONLY - ignored for WLH)
      start/wait msiexec /I WOF.msi /passive HCA=cx  # Install ConnectX driver instead of InfiniHost.
      start/wait msiexec /I WOF.msi /passive HCA=+cx  # Install ConnectX and InfiniHost HCA drivers.

      start/wait msiexec /I WOF.msi /passive HCA=SRP  # add SRP driver to default install.
      start/wait msiexec /I WOF.msi /passive HCA=VNIC  # add SRP driver to default install.

trunk\winof\buildrelease.bat
    Rearrange varible set(s) so 'clean' can 'rmdir WinOF\WIX\{wlh,wnet,wxp}\bin'.

git-svn-id: svn://openib.tc.cornell.edu/gen1@1787 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---
 trunk/WinOF/BuildRelease.bat      |  61 ++++--
 trunk/WinOF/WIX/CustomActions.vbs |  14 +-
 trunk/WinOF/WIX/wlh/ia64/wof.wxs  | 240 ++++++++++++-----------
 trunk/WinOF/WIX/wlh/x64/wof.wxs   | 252 ++++++++++++------------
 trunk/WinOF/WIX/wlh/x86/wof.wxs   | 277 +++++++++++++-------------
 trunk/WinOF/WIX/wnet/ia64/wof.wxs | 251 ++++++++++++------------
 trunk/WinOF/WIX/wnet/x64/wof.wxs  | 204 ++++++++++----------
 trunk/WinOF/WIX/wnet/x86/wof.wxs  | 311 ++++++++++++++++--------------
 trunk/WinOF/WIX/wxp/x86/wof.wxs   | 280 ++++++++++++++-------------
 9 files changed, 1000 insertions(+), 890 deletions(-)

diff --git a/trunk/WinOF/BuildRelease.bat b/trunk/WinOF/BuildRelease.bat
index 69f78b4f..73cb5ff8 100644
--- a/trunk/WinOF/BuildRelease.bat
+++ b/trunk/WinOF/BuildRelease.bat
@@ -74,10 +74,34 @@ if not "%WDM_INC_PATH%" == "" (
     exit /B 1
 )
 
+rem assumes %CD% == '<...>\gen1\trunk'
+set BSE=%CD%
+set WIX=%CD%\WinOF\WIX
+
+rem Use Wix V2 binaries.
+rem set WIX_BIN=wix-2.0.5325.0-binaries
+set WIX_BIN=wix-2.0.5805.0-binaries
+
+set RBIN_WLH=%WIX%\wlh\bin%
+set RBIN_WNET=%WIX%\wnet\bin%
+set RBIN_WXP=%WIX%\wxp\bin%
+
 rem remove build artifacts
 if "%1" == "clean" (
     echo Removing build artifacts and folders...
     call %CD%\etc\clean-build.bat
+    if exist %WIX%\wlh\bin (
+		echo Removing %WIX%\wlh\bin
+		rmdir /Q /S %WIX%\wlh\bin
+    )
+    if exist %WIX%\wnet\bin (
+		echo Removing %WIX%\wnet\bin
+		rmdir /Q /S %WIX%\wnet\bin
+    )
+    if exist %WIX%\wxp\bin (
+		echo Removing %WIX%\wxp\bin
+		rmdir /Q /S %WIX%\wxp\bin
+    )
     exit /B 0
 )
 
@@ -120,8 +144,10 @@ rem Platform SDK path - watchout for missing LoadPerf.h (installsp.c)
 set _PSDK=%SystemDrive%\progra~1\mi2578~1
 
 rem set this to be the current svn commit number; overrides svn in path
-rem processing.
-set USE_SVN=1748
+rem processing. Additionally if set to 'latest' code expects ..\..\..\latest.txt
+rem to contain the SVN number to use.
+rem set USE_SVN=1748
+set USE_SVN=latest
 
 rem setup value for OPENIB_REV assignment.
 if "%2" == "" (
@@ -134,7 +160,12 @@ if "%2" == "" (
     if "%USE_SVN%" == "" (
         set SVN=%CD:~22,4%
     ) else (
-        set SVN=%USE_SVN%
+    	if "%USE_SVN%" == "latest" (
+rem			set /P SVN=<F:\openIB-windows-svn\latest.txt
+			set /P SVN=< ..\..\..\latest.txt
+		) else (
+			set SVN=%USE_SVN%
+		)
     )
     set LBL=_svn.!SVN!
 ) else (
@@ -142,18 +173,6 @@ if "%2" == "" (
     set LBL=%2
 )
 
-rem assumes %CD% == '<...>\gen1\trunk'
-set BSE=%CD%
-set WIX=%CD%\WinOF\WIX
-
-rem Use Wix V2 binaries.
-rem set WIX_BIN=wix-2.0.5325.0-binaries
-set WIX_BIN=wix-2.0.5805.0-binaries
-
-set RBIN_WLH=%WIX%\wlh\bin%
-set RBIN_WNET=%WIX%\wnet\bin%
-set RBIN_WXP=%WIX%\wxp\bin%
-
 if NOT EXIST "%WIX%\build-all-MSI.bat" (
     echo %0 - Missing .msi installer build script
     echo    %WIX%\build-all-MSI.bat
@@ -287,6 +306,18 @@ if "%1" == "compilenoforce" (
 if "%1" == "all" (
     echo Removing build artifacts and folders...
     call %CD%\etc\clean-build.bat
+    if exist %WIX%\wlh\bin (
+		echo Removing %WIX%\wlh\bin
+		rmdir /Q /S %WIX%\wlh\bin
+    )
+    if exist %WIX%\wnet\bin (
+		echo Removing %WIX%\wnet\bin
+		rmdir /Q /S %WIX%\wnet\bin
+    )
+    if exist %WIX%\wxp\bin (
+		echo Removing %WIX%\wxp\bin
+		rmdir /Q /S %WIX%\wxp\bin
+    )
 )
 
 rem ************ Setup Env for Building 
diff --git a/trunk/WinOF/WIX/CustomActions.vbs b/trunk/WinOF/WIX/CustomActions.vbs
index 52fef31b..bb75a0b5 100644
--- a/trunk/WinOF/WIX/CustomActions.vbs
+++ b/trunk/WinOF/WIX/CustomActions.vbs
@@ -62,6 +62,10 @@ Sub WinOF_setup
 	If VersionNT < 600 Then
 		use_this_HCA = Session.Property("HCA")
 		If use_this_HCA <> "" Then
+			' down-case if required.
+			If Instr(use_this_HCA,"CX") <> 0 Then
+				use_this_HCA = Replace(use_this_HCA,"CX","cx")
+			End if
 			If Instr(use_this_HCA,"+cx") <> 0 Then
 				' Add ConnectX HCA drivers
 				AddLocal = AddLocal & ",hca_connectX"
@@ -1501,16 +1505,16 @@ Sub DriverUninstall()
 		sRemove = "ALL"
 	End If
 
-	if fso.FileExists(sInstalldir & "net\ndinstall.exe") Then
-	    Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & _
-	                           " & net\ndinstall.exe -r", 0, true)
-	End If
-	
 	If sVersionNT <> 501 AND fso.FileExists(sInstalldir & "installsp.exe") Then
 		Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & _
 	                           " & installsp.exe -r", 0, true)
 	End If
 
+	If fso.FileExists(sInstalldir & "net\ndinstall.exe") Then
+	    Return = WshShell.Run ("cmd.exe /c cd " & sInstalldir & _
+	                           " & net\ndinstall.exe -r", 0, true)
+	End If
+	
 	' stop the openSM service in case it was started.
 	Return = WshShell.Run ("cmd.exe /c sc.exe stop opensm", 0, true)
 
diff --git a/trunk/WinOF/WIX/wlh/ia64/wof.wxs b/trunk/WinOF/WIX/wlh/ia64/wof.wxs
index 6063e0e8..ad9c28bc 100644
--- a/trunk/WinOF/WIX/wlh/ia64/wof.wxs
+++ b/trunk/WinOF/WIX/wlh/ia64/wof.wxs
@@ -228,6 +228,9 @@
               <File Id="devman.exe" Compressed="yes" DiskId="1"
                      LongName="devman.exe" Name="devman.exe"
                      Source="..\..\ia64\devman.exe" />
+              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"
+                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"
+                     Source="..\bin\hca\ia64\WdfCoInstaller01007.dll" />
               <File Id="cl32.dll" Compressed="yes" DiskId="1"
                      LongName="cl32.dll" Name="CL32.DLL"
                      Source="..\bin\HCA\ia64\cl32.dll" />
@@ -310,7 +313,6 @@
                      Source="..\bin\HCA\ia64\mthcaud.dll" />
             </Component>
 
-<!-- Remove when ConnectX works on ia64
             <Component Id="cConnectXDriver"
                        Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">
               <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"
@@ -325,9 +327,6 @@
               <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"
                      Name="mlx4_bus.pdb"
                      Source="..\bin\hca\ia64\mlx4_bus.pdb" />
-              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"
-                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"
-                     Source="..\bin\hca\ia64\WdfCoInstaller01007.dll" />
               <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"
                      LongName="mlx4_hca.inf" Name="mlx4_hca.INF"
                      Source="..\bin\hca\ia64\mlx4_hca.inf" />
@@ -347,7 +346,7 @@
                      LongName="mlx4ud.dll" Name="mlx4ud.dll"
                      Source="..\bin\hca\ia64\mlx4ud.dll" />
 
-			  <!++ copy 32-bit binaries for 32b in ia64 ++> 
+			  <!-- copy 32-bit binaries --> 
               <File Id="mlx4u32d.dll" Compressed="yes" DiskId="1"
                      LongName="mlx4u32d.dll" Name="mlx4u32.dll"
                      Source="..\bin\hca\ia64\mlx4u32d.dll" />
@@ -355,8 +354,23 @@
                      LongName="mlx4u32.dll" Name="mlx4u32.dll"
                      Source="..\bin\hca\ia64\mlx4u32.dll" />
             </Component>
-End Remove -->
 
+            <Component Id="cWinVerbsDrivers"
+                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
+
+              <File Id="winverbs.sys" Compressed="yes" DiskId="1"
+                    LongName="winverbs.sys" Name="winverbs.sys"
+                    Source="..\bin\HCA\ia64\winverbs.sys" />
+              <File Id="winverbs.pdb" Compressed="yes" DiskId="1"
+                    LongName="winverbs.pdb" Name="winverbs.pdb"
+                    Source="..\bin\HCA\ia64\winverbs.pdb" />
+              <File Id="winverbs.dll" Compressed="yes" DiskId="1"
+                    LongName="winverbs.dll" Name="winvrbs.dll"
+                    Source="..\bin\HCA\ia64\winverbs.dll" />
+              <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
+                    LongName="winverbsd.dll" Name="winvrbsd.dll"
+                    Source="..\bin\HCA\ia64\winverbsd.dll" />
+            </Component>
           </Directory>
 
           <Directory Id="dir_0" Name="Checked">
@@ -365,48 +379,79 @@ End Remove -->
                          Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">
                 <CreateFolder />
 
-                <File Id="chk0" Name="README.txt" DiskId="1" Compressed="yes"
-                  Source="..\..\README_checked.txt" />
-                <File Id="chk1" Name="mthca.sys" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\HCA\ia64\mthca.sys" />
-                <File Id="cat1" Name="mthca.cat" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\HCA\ia64\mthca.cat" />
-                <File Id="sym1" Name="mthca.pdb" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\HCA\ia64\mthca.pdb" />
-
-                <File Id="chk2" Name="ibbus.sys" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\HCA\ia64\ibbus.sys" />
-                <File Id="sym2" Name="ibbus.pdb" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\HCA\ia64\ibbus.pdb" />
-
-                <File Id="chk3" Name="ibiou.sys" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\HCA\ia64\ibiou.sys" />
-                <File Id="cat3" Name="ib_iou.cat" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\HCA\ia64\ib_iou.cat" />
-                <File Id="sym3" Name="ibiou.pdb" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\HCA\ia64\ibiou.pdb" />
-
-                <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\net\ia64\ipoib.sys" />
-                <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\net\ia64\ipoib.cat" />
-                <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\net\ia64\ipoib.pdb" />
-
-                <File Id="chk5" Name="qlgcvnic.sys" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\net\ia64\qlgcvnic.sys" />
-                <File Id="cat5" Name="netvnic.cat" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\net\ia64\netvnic.cat" />
-                <File Id="sym5" Name="qlgcvnic.pdb" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\net\ia64\qlgcvnic.pdb" />
-
-                <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\storage\ia64\ibsrp.sys" />
-                <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\storage\ia64\ibsrp.cat" />
-                <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\storage\ia64\ibsrp.pdb" />
-
+                <File Id="chk0" DiskId="1" Compressed="yes"
+                      Name="README.txt"
+                      Source="..\..\README_checked.txt" />
+                <File Id="chk1" DiskId="1" Compressed="yes"
+                      Name="mthca.sys"
+                      Source="..\bin\Chk\HCA\ia64\mthca.sys" />
+                <File Id="cat1" DiskId="1" Compressed="yes"
+                      Name="mthca.cat"
+                      Source="..\bin\Chk\HCA\ia64\mthca.cat" />
+                <File Id="sym1" DiskId="1" Compressed="yes"
+                      Name="mthca.pdb"
+                      Source="..\bin\Chk\HCA\ia64\mthca.pdb" />
+
+                <File Id="chk2" DiskId="1" Compressed="yes"
+                      Name="ibbus.sys"
+                      Source="..\bin\Chk\HCA\ia64\ibbus.sys" />
+                <File Id="sym2" DiskId="1" Compressed="yes"
+                      Name="ibbus.pdb"
+                      Source="..\bin\Chk\HCA\ia64\ibbus.pdb" />
+
+                <File Id="chk3" DiskId="1" Compressed="yes"
+                      Name="ibiou.sys"
+                      Source="..\bin\Chk\HCA\ia64\ibiou.sys" />
+                <File Id="cat3" DiskId="1" Compressed="yes"
+                      Name="ib_iou.cat"
+                      Source="..\bin\Chk\HCA\ia64\ib_iou.cat" />
+                <File Id="sym3" DiskId="1" Compressed="yes"
+                      Name="ibiou.pdb"
+                      Source="..\bin\Chk\HCA\ia64\ibiou.pdb" />
+
+                <File Id="chk4" DiskId="1" Compressed="yes"
+                      Name="ipoib.sys"
+                      Source="..\bin\Chk\net\ia64\ipoib.sys" />
+                <File Id="cat4" DiskId="1" Compressed="yes"
+                      Name="ipoib.cat"
+                      Source="..\bin\Chk\net\ia64\ipoib.cat" />
+                <File Id="sym4" DiskId="1" Compressed="yes"
+                      Name="ipoib.pdb"
+                      Source="..\bin\Chk\net\ia64\ipoib.pdb" />
+
+                <File Id="chk5" DiskId="1" Compressed="yes"
+                      Name="qlgcvnic.sys"
+                      Source="..\bin\Chk\net\ia64\qlgcvnic.sys" />
+                <File Id="cat5" DiskId="1" Compressed="yes"
+                      Name="netvnic.cat"
+                      Source="..\bin\Chk\net\ia64\netvnic.cat" />
+                <File Id="sym5" DiskId="1" Compressed="yes"
+                      Name="qlgcvnic.pdb"
+                      Source="..\bin\Chk\net\ia64\qlgcvnic.pdb" />
+
+                <File Id="chk6" DiskId="1" Compressed="yes"
+                      Name="ibsrp.sys"
+                      Source="..\bin\Chk\storage\ia64\ibsrp.sys" />
+                <File Id="cat6" DiskId="1" Compressed="yes"
+                      Name="ibsrp.cat"
+                      Source="..\bin\Chk\storage\ia64\ibsrp.cat" />
+                <File Id="sym6" DiskId="1" Compressed="yes"
+                      Name="ibsrp.pdb"
+                      Source="..\bin\Chk\storage\ia64\ibsrp.pdb" />
+
+                <File Id="chk9" DiskId="1" Compressed="yes"
+                      Name="winverbs.sys"
+                      Source="..\bin\Chk\HCA\ia64\winverbs.sys" />
+                <File Id="sym9" DiskId="1" Compressed="yes"
+                      Name="winverbs.pdb"
+                      Source="..\bin\Chk\HCA\ia64\winverbs.pdb" />
+                <File Id="dll9" DiskId="1" Compressed="yes"
+                      Name="winverbs.dll"
+                      Source="..\bin\Chk\HCA\ia64\winverbs.dll" />
+                <File Id="dlld9" DiskId="1" Compressed="yes"
+                      Name="winverbd.dll"
+                      LongName="winverbsd.dll"
+                      Source="..\bin\Chk\HCA\ia64\winverbsd.dll" />
               </Component>
             </Directory>
       
@@ -458,70 +503,24 @@ End Remove -->
             </Directory>
           </Directory>
 
-          <Directory Id="wvDir" Name="WinVerbs">
-             <Component Id="cWinVerbsKernel"
-                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
-               <CreateFolder />
-
-               <File Id="winverbs.inf" Compressed="yes" DiskId="1"
-                     LongName="winverbs.inf" Name="winverbs.INF"
-                     Source="..\bin\HCA\ia64\winverbs.inf" />
-               <File Id="winverbs.sys" Compressed="yes" DiskId="1"
-                     LongName="winverbs.sys" Name="winverbs.sys"
-                     Source="..\bin\HCA\ia64\winverbs.sys" />
-               <File Id="winverbs.cat" Compressed="yes" DiskId="1"
-                     LongName="winverbs.cat" Name="winverbs.cat"
-                     Source="..\bin\HCA\ia64\winverbs.cat" />
-               <File Id="winverbs.dll" Compressed="yes" DiskId="1"
-                     LongName="winverbs.dll" Name="winvrbs.dll"
-                     Source="..\bin\HCA\ia64\winverbs.dll" />
-               <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
-                     LongName="winverbsd.dll" Name="winvrbsd.dll"
-                     Source="..\bin\HCA\ia64\winverbsd.dll" />
-               <File Id="wvWdfCoinstaller" Compressed="yes" DiskId="1"
-                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"
-                     Source="..\bin\HCA\ia64\WdfCoInstaller01007.dll" />
-             </Component>
-
-             <Component Id="cWinVerbsUser"
-                       Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">
+          <Component Id="cWinVerbsOFED"
+                     Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">
 
-               <File Id="winverbs.lib" Compressed="yes" DiskId="1"
-                     LongName="winverbs.lib" Name="winverbs.lib"
-                     Source="..\bin\HCA\ia64\winverbs.lib" />
-               <CopyFile Id="dupWverbs.lib" FileId="winverbs.lib"
-                     DestinationName="winverbs.lib"
-                     DestinationProperty="WindowsFolder" />
-
-               <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
-                     LongName="winverbsd.lib" Name="winvrbsd.lib"
-                     Source="..\bin\HCA\ia64\winverbsd.lib" />
-
-               <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
-                     LongName="libibverbs.dll" Name="ibverbs.dll"
-                     Source="..\bin\HCA\ia64\libibverbs.dll" />
-               <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"
+            <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
+                  LongName="libibverbs.dll" Name="ibverbs.dll"
+                  Source="..\bin\HCA\ia64\libibverbs.dll" />
+              <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"
                      DestinationName="ibverbs.dll"
                      DestinationLongName="libibverbs.dll"
                      DestinationProperty="WindowsFolder" />
-
-               <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
-                     LongName="libibverbs.lib" Name="ibverbs.lib"
-                     Source="..\bin\HCA\ia64\libibverbs.lib" />
-               <CopyFile Id="dupLibibv.lib" FileId="libibverbs.lib"
-                     DestinationName="ibverbs.lib"
-                     DestinationLongName="libibverbs.lib"
+            <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
+                  LongName="libibverbsd.dll" Name="ibverbsd.dll"
+                  Source="..\bin\HCA\ia64\libibverbsd.dll" />
+              <CopyFile Id="dupLibibvd.dll" FileId="libibverbsd.dll"
+                     DestinationName="ibverbsd.dll"
+                     DestinationLongName="libibverbsd.dll"
                      DestinationProperty="WindowsFolder" />
-
-               <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
-                     LongName="libibverbsd.dll" Name="ibverbsd.dll"
-                     Source="..\bin\HCA\ia64\libibverbsd.dll" />
-
-               <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
-                     LongName="libibverbsd.lib" Name="ibverbsd.lib"
-                     Source="..\bin\HCA\ia64\libibverbsd.lib" />
-             </Component>
-          </Directory>
+          </Component>
 
           <Component Id="cWinVerbsUApps"
                     Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">
@@ -1018,6 +1017,22 @@ End Remove -->
               <File Id="ibal32d.pdb" Compressed="yes" DiskId="1"
                     LongName="ibal32d.pdb" Name="ibal32d.pdb"
                     Source="..\bin\HCA\ia64\ibal32d.pdb" />
+
+              <File Id="winverbs.lib" Compressed="yes" DiskId="1"
+                    LongName="winverbs.lib" Name="winverbs.lib"
+                    Source="..\bin\HCA\ia64\winverbs.lib" />
+
+              <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
+                    LongName="winverbsd.lib" Name="winvrbsd.lib"
+                    Source="..\bin\HCA\ia64\winverbsd.lib" />
+
+              <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
+                    LongName="libibverbs.lib" Name="ibverbs.lib"
+                    Source="..\bin\HCA\ia64\libibverbs.lib" />
+
+              <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
+                    LongName="libibverbsd.lib" Name="ibverbsd.lib"
+                    Source="..\bin\HCA\ia64\libibverbsd.lib" />
               </Component>
             </Directory>
 
@@ -1281,10 +1296,7 @@ End Remove -->
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>
 
         <ComponentRef Id="cMthcaDriver" />
-
-<!-- remove when ConnectX works on ia64: i.e., ia64 platforms have PCIe
         <ComponentRef Id="cConnectXDriver" />
-End Remove -->
     </Feature>
 
     <Feature Id="IBcore" Title="InfiniBand Core" Level="1"
@@ -1292,6 +1304,7 @@ End Remove -->
          Display="expand" ConfigurableDirectory="INSTALLDIR"
          AllowAdvertise='no' InstallDefault='local' Absent='disallow'>
       <ComponentRef Id="cIBcore" />
+      <ComponentRef Id="cWinVerbsDrivers" />
       <ComponentRef Id="Docs" />
       <ComponentRef Id="Tools" />
       <ComponentRef Id="OpenSMservice" />
@@ -1300,11 +1313,10 @@ End Remove -->
     </Feature>
 
     <Feature Id="fWV" Title="WinVerbs"
-        Description="OFED verbs API for Windows"
-        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"
+        Description="OFED verbs - Libraries and utilities"
+        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"
         AllowAdvertise="no" InstallDefault="local" Absent="allow">
-        <ComponentRef Id="cWinVerbsKernel" />
-        <ComponentRef Id="cWinVerbsUser" />
+        <ComponentRef Id="cWinVerbsOFED" />
         <ComponentRef Id="cWinVerbsUApps" />
     </Feature>
 
diff --git a/trunk/WinOF/WIX/wlh/x64/wof.wxs b/trunk/WinOF/WIX/wlh/x64/wof.wxs
index f6d673ce..627df725 100644
--- a/trunk/WinOF/WIX/wlh/x64/wof.wxs
+++ b/trunk/WinOF/WIX/wlh/x64/wof.wxs
@@ -229,6 +229,9 @@
               <File Id="devman.exe" Compressed="yes" DiskId="1"
                      LongName="devman.exe" Name="devman.exe"
                      Source="..\..\x64\devman.exe" />
+              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"
+                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"
+                     Source="..\bin\hca\amd64\WdfCoInstaller01007.dll" />
               <File Id="cl32.dll" Compressed="yes" DiskId="1"
                      LongName="cl32.dll" Name="CL32.DLL"
                      Source="..\bin\HCA\amd64\cl32.dll" />
@@ -327,9 +330,6 @@
               <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"
                      Name="mlx4_bus.pdb"
                      Source="..\bin\hca\amd64\mlx4_bus.pdb" />
-              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"
-                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"
-                     Source="..\bin\hca\amd64\WdfCoInstaller01007.dll" />
               <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"
                      LongName="mlx4_hca.inf" Name="mlx4_hca.INF"
                      Source="..\bin\hca\amd64\mlx4_hca.inf" />
@@ -357,6 +357,24 @@
                      LongName="mlx4u32.dll" Name="mlx4u32.dll"
                      Source="..\bin\hca\amd64\mlx4u32.dll" />
             </Component>
+
+            <Component Id="cWinVerbsDrivers"
+                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
+
+              <File Id="winverbs.sys" Compressed="yes" DiskId="1"
+                    LongName="winverbs.sys" Name="winverbs.sys"
+                    Source="..\bin\HCA\amd64\winverbs.sys" />
+              <File Id="winverbs.pdb" Compressed="yes" DiskId="1"
+                    LongName="winverbs.pdb" Name="winverbs.pdb"
+                    Source="..\bin\HCA\amd64\winverbs.pdb" />
+              <File Id="winverbs.dll" Compressed="yes" DiskId="1"
+                    LongName="winverbs.dll" Name="winvrbs.dll"
+                    Source="..\bin\HCA\amd64\winverbs.dll" />
+              <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
+                    LongName="winverbsd.dll" Name="winvrbsd.dll"
+                    Source="..\bin\HCA\amd64\winverbsd.dll" />
+            </Component>
+
           </Directory>
 
           <Directory Id="dir_0" Name="Checked">
@@ -365,71 +383,99 @@
                            Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">
                   <CreateFolder />
 
-                  <File Id="chk0" Name="README.txt" DiskId="1" Compressed="yes"
-                    Source="..\..\README_checked.txt" />
-                  <File Id="chk1" Name="mthca.sys" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\amd64\mthca.sys" />
-                  <File Id="cat1" Name="mthca.cat" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\amd64\mthca.cat" />
-                  <File Id="sym1" Name="mthca.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\amd64\mthca.pdb" />
-
-                  <File Id="chk2" Name="ibbus.sys" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\amd64\ibbus.sys" />
-                  <File Id="sym2" Name="ibbus.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\amd64\ibbus.pdb" />
-
-                  <File Id="chk3" Name="ibiou.sys" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\amd64\ibiou.sys" />
-                  <File Id="cat3" Name="ib_iou.cat" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\amd64\ib_iou.cat" />
-                  <File Id="sym3" Name="ibiou.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\amd64\ibiou.pdb" />
-
-                  <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\net\amd64\ipoib.sys" />
-                  <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\net\amd64\ipoib.cat" />
-                  <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\net\amd64\ipoib.pdb" />
+                  <File Id="chk0" DiskId="1" Compressed="yes"
+                        Name="README.txt"
+                        Source="..\..\README_checked.txt" />
+                  <File Id="chk1" DiskId="1" Compressed="yes"
+                        Name="mthca.sys"
+                        Source="..\bin\Chk\HCA\amd64\mthca.sys" />
+                  <File Id="cat1" DiskId="1" Compressed="yes"
+                        Name="mthca.cat"
+                        Source="..\bin\Chk\HCA\amd64\mthca.cat" />
+                  <File Id="sym1" DiskId="1" Compressed="yes"
+                        Name="mthca.pdb"
+                        Source="..\bin\Chk\HCA\amd64\mthca.pdb" />
+
+                  <File Id="chk2" DiskId="1" Compressed="yes"
+                        Name="ibbus.sys"
+                        Source="..\bin\Chk\HCA\amd64\ibbus.sys" />
+                  <File Id="sym2" DiskId="1" Compressed="yes"
+                        Name="ibbus.pdb"
+                        Source="..\bin\Chk\HCA\amd64\ibbus.pdb" />
+
+                  <File Id="chk3" DiskId="1" Compressed="yes"
+                        Name="ibiou.sys"
+                        Source="..\bin\Chk\HCA\amd64\ibiou.sys" />
+                  <File Id="cat3" DiskId="1" Compressed="yes"
+                        Name="ib_iou.cat"
+                        Source="..\bin\Chk\HCA\amd64\ib_iou.cat" />
+                  <File Id="sym3" DiskId="1" Compressed="yes"
+                        Name="ibiou.pdb"
+                        Source="..\bin\Chk\HCA\amd64\ibiou.pdb" />
+
+                  <File Id="chk4" DiskId="1" Compressed="yes"
+                        Name="ipoib.sys"
+                        Source="..\bin\Chk\net\amd64\ipoib.sys" />
+                  <File Id="cat4" DiskId="1" Compressed="yes"
+                        Name="ipoib.cat"
+                        Source="..\bin\Chk\net\amd64\ipoib.cat" />
+                  <File Id="sym4" DiskId="1" Compressed="yes"
+                        Name="ipoib.pdb"
+                        Source="..\bin\Chk\net\amd64\ipoib.pdb" />
 
                   <File Id="chk5" DiskId="1" Compressed="yes"
-                    Name="qlgcvnic.sys"
-                    Source="..\bin\Chk\net\amd64\qlgcvnic.sys" />
+                        Name="qlgcvnic.sys"
+                        Source="..\bin\Chk\net\amd64\qlgcvnic.sys" />
                   <File Id="cat5" DiskId="1" Compressed="yes"
-                    Name="netvnic.cat"
-                    Source="..\bin\Chk\net\amd64\netvnic.cat" />
+                        Name="netvnic.cat"
+                        Source="..\bin\Chk\net\amd64\netvnic.cat" />
                   <File Id="sym5" DiskId="1" Compressed="yes"
-                    Name="qlgcvnic.pdb"
-                    Source="..\bin\Chk\net\amd64\qlgcvnic.pdb" />
-
-                  <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\storage\amd64\ibsrp.sys" />
-                  <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\storage\amd64\ibsrp.cat" />
-                  <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\storage\amd64\ibsrp.pdb" />
+                        Name="qlgcvnic.pdb"
+                        Source="..\bin\Chk\net\amd64\qlgcvnic.pdb" />
+
+                  <File Id="chk6" DiskId="1" Compressed="yes"
+                        Name="ibsrp.sys"
+                        Source="..\bin\Chk\storage\amd64\ibsrp.sys" />
+                  <File Id="cat6" DiskId="1" Compressed="yes"
+                        Name="ibsrp.cat"
+                        Source="..\bin\Chk\storage\amd64\ibsrp.cat" />
+                  <File Id="sym6" DiskId="1" Compressed="yes"
+                        Name="ibsrp.pdb"
+                        Source="..\bin\Chk\storage\amd64\ibsrp.pdb" />
 
                   <File Id="chk7" DiskId="1" Compressed="yes"
-                    Name="mlx4_bus.sys"
-                    Source="..\bin\Chk\HCA\amd64\mlx4_bus.sys" />
+                        Name="mlx4_bus.sys"
+                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.sys" />
                   <File Id="cat7" DiskId="1" Compressed="yes"
-                    Name="mlx4_bus.cat"
-                    Source="..\bin\Chk\HCA\amd64\mlx4_bus.cat" />
+                        Name="mlx4_bus.cat"
+                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.cat" />
                   <File Id="sym7" DiskId="1" Compressed="yes"
-                    Name="mlx4_bus.pdb"
-                    Source="..\bin\Chk\HCA\amd64\mlx4_bus.pdb" />
+                        Name="mlx4_bus.pdb"
+                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.pdb" />
 
                   <File Id="chk8" DiskId="1" Compressed="yes"
-                    Name="mlx4_hca.sys"
-                    Source="..\bin\Chk\HCA\amd64\mlx4_hca.sys" />
+                        Name="mlx4_hca.sys"
+                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.sys" />
                   <File Id="cat8" DiskId="1" Compressed="yes"
-                    Name="mlx4_hca.cat"
-                    Source="..\bin\Chk\HCA\amd64\mlx4_hca.cat" />
+                        Name="mlx4_hca.cat"
+                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.cat" />
                   <File Id="sym8" DiskId="1" Compressed="yes"
-                    Name="mlx4_hca.pdb"
-                    Source="..\bin\Chk\HCA\amd64\mlx4_hca.pdb" />
-
+                        Name="mlx4_hca.pdb"
+                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.pdb" />
+
+                  <File Id="chk9" DiskId="1" Compressed="yes"
+                        Name="winverbs.sys"
+                        Source="..\bin\Chk\HCA\amd64\winverbs.sys" />
+                  <File Id="sym9" DiskId="1" Compressed="yes"
+                        Name="winverbs.pdb"
+                        Source="..\bin\Chk\HCA\amd64\winverbs.pdb" />
+                  <File Id="dll9" DiskId="1" Compressed="yes"
+                        Name="winverbs.dll"
+                        Source="..\bin\Chk\HCA\amd64\winverbs.dll" />
+                  <File Id="dlld9" DiskId="1" Compressed="yes"
+                        Name="winverbd.dll"
+                        LongName="winverbsd.dll"
+                        Source="..\bin\Chk\HCA\amd64\winverbsd.dll" />
                 </Component>
             </Directory>
       
@@ -503,70 +549,24 @@
             </Directory>
           </Directory>
      
-          <Directory Id="wvDir" Name="WinVerbs">
-             <Component Id="cWinVerbsKernel"
-                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
-               <CreateFolder />
-
-               <File Id="winverbs.inf" Compressed="yes" DiskId="1"
-                     LongName="winverbs.inf" Name="winverbs.INF"
-                     Source="..\bin\HCA\amd64\winverbs.inf" />
-               <File Id="winverbs.sys" Compressed="yes" DiskId="1"
-                     LongName="winverbs.sys" Name="winverbs.sys"
-                     Source="..\bin\HCA\amd64\winverbs.sys" />
-               <File Id="winverbs.cat" Compressed="yes" DiskId="1"
-                     LongName="winverbs.cat" Name="winverbs.cat"
-                     Source="..\bin\HCA\amd64\winverbs.cat" />
-               <File Id="winverbs.dll" Compressed="yes" DiskId="1"
-                     LongName="winverbs.dll" Name="winvrbs.dll"
-                     Source="..\bin\HCA\amd64\winverbs.dll" />
-               <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
-                     LongName="winverbsd.dll" Name="winvrbsd.dll"
-                     Source="..\bin\HCA\amd64\winverbsd.dll" />
-               <File Id="wvWdfCoinstaller" Compressed="yes" DiskId="1"
-                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"
-                     Source="..\bin\hca\amd64\WdfCoInstaller01007.dll" />
-             </Component>
-
-             <Component Id="cWinVerbsUser"
-                       Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">
-
-               <File Id="winverbs.lib" Compressed="yes" DiskId="1"
-                     LongName="winverbs.lib" Name="winverbs.lib"
-                     Source="..\bin\HCA\amd64\winverbs.lib" />
-               <CopyFile Id="dupWverbs.lib" FileId="winverbs.lib"
-                     DestinationName="winverbs.lib"
-                     DestinationProperty="WindowsFolder" />
+          <Component Id="cWinVerbsOFED"
+                     Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">
 
-               <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
-                     LongName="winverbsd.lib" Name="winvrbsd.lib"
-                     Source="..\bin\HCA\amd64\winverbsd.lib" />
-
-               <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
-                     LongName="libibverbs.dll" Name="ibverbs.dll"
-                     Source="..\bin\HCA\amd64\libibverbs.dll" />
+            <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
+                  LongName="libibverbs.dll" Name="ibverbs.dll"
+                  Source="..\bin\HCA\amd64\libibverbs.dll" />
                <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"
                      DestinationName="ibverbs.dll"
                      DestinationLongName="libibverbs.dll"
                      DestinationProperty="WindowsFolder" />
-
-               <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
-                     LongName="libibverbs.lib" Name="ibverbs.lib"
-                     Source="..\bin\HCA\amd64\libibverbs.lib" />
-               <CopyFile Id="dupLibibv.lib" FileId="libibverbs.lib"
-                     DestinationName="ibverbs.lib"
-                     DestinationLongName="libibverbs.lib"
+            <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
+                  LongName="libibverbsd.dll" Name="ibverbsd.dll"
+                  Source="..\bin\HCA\amd64\libibverbsd.dll" />
+              <CopyFile Id="dupLibibvd.dll" FileId="libibverbsd.dll"
+                     DestinationName="ibverbsd.dll"
+                     DestinationLongName="libibverbsd.dll"
                      DestinationProperty="WindowsFolder" />
-
-               <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
-                     LongName="libibverbsd.dll" Name="ibverbsd.dll"
-                     Source="..\bin\HCA\amd64\libibverbsd.dll" />
-
-               <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
-                     LongName="libibverbsd.lib" Name="ibverbsd.lib"
-                     Source="..\bin\HCA\amd64\libibverbsd.lib" />
-             </Component>
-          </Directory>
+          </Component>
 
           <Component Id="cWinVerbsUApps"
                     Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">
@@ -1064,6 +1064,22 @@
               <File Id="ibal32d.pdb" Compressed="yes" DiskId="1"
                     LongName="ibal32d.pdb" Name="ibal32d.pdb"
                     Source="..\bin\HCA\amd64\ibal32d.pdb" />
+
+              <File Id="winverbs.lib" Compressed="yes" DiskId="1"
+                    LongName="winverbs.lib" Name="winverbs.lib"
+                    Source="..\bin\HCA\amd64\winverbs.lib" />
+
+              <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
+                    LongName="winverbsd.lib" Name="winvrbsd.lib"
+                    Source="..\bin\HCA\amd64\winverbsd.lib" />
+
+              <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
+                    LongName="libibverbs.lib" Name="ibverbs.lib"
+                    Source="..\bin\HCA\amd64\libibverbs.lib" />
+
+              <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
+                    LongName="libibverbsd.lib" Name="ibverbsd.lib"
+                    Source="..\bin\HCA\amd64\libibverbsd.lib" />
             </Component>
           </Directory>
 
@@ -1339,6 +1355,7 @@
          Display="expand" ConfigurableDirectory="INSTALLDIR"
          AllowAdvertise='no' InstallDefault='local' Absent='disallow'>
       <ComponentRef Id="cIBcore" />
+      <ComponentRef Id="cWinVerbsDrivers" />
       <ComponentRef Id="Docs" />
       <ComponentRef Id="Tools" />
       <ComponentRef Id="OpenSMservice" />
@@ -1347,11 +1364,10 @@
     </Feature>
 
     <Feature Id="fWV" Title="WinVerbs"
-        Description="OFED verbs API for Windows"
-        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"
+        Description="OFED verbs - Libraries + utilities"
+        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"
         AllowAdvertise="no" InstallDefault="local" Absent="allow">
-        <ComponentRef Id="cWinVerbsKernel" />
-        <ComponentRef Id="cWinVerbsUser" />
+        <ComponentRef Id="cWinVerbsOFED" />
         <ComponentRef Id="cWinVerbsUApps" />
     </Feature>
 
diff --git a/trunk/WinOF/WIX/wlh/x86/wof.wxs b/trunk/WinOF/WIX/wlh/x86/wof.wxs
index cf282a2f..06d334cd 100644
--- a/trunk/WinOF/WIX/wlh/x86/wof.wxs
+++ b/trunk/WinOF/WIX/wlh/x86/wof.wxs
@@ -223,6 +223,9 @@
                         <File Id="devman.exe" Compressed="yes" DiskId="1"
                               LongName="devman.exe" Name="devman.exe"
                               Source="..\..\x86\devman.exe" />
+                        <File Id="WdfCoinstaller" Compressed="yes" DiskId="1"
+                              LongName="WdfCoInstaller01007.dll" Name="WCO.dll"
+                              Source="..\bin\HCA\x86\WdfCoInstaller01007.dll" />
                         <File Id="complib.dll" Compressed="yes" DiskId="1"
                               LongName="complib.dll" Name="COMPLIB.DLL"
                               Source="..\bin\HCA\x86\complib.dll" />
@@ -291,9 +294,6 @@
                         <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"
                               Name="mlx4_bus.pdb"
                               Source="..\bin\hca\x86\mlx4_bus.pdb" />
-                        <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"
-                              LongName="WdfCoInstaller01007.dll" Name="WCO.dll"
-                              Source="..\bin\hca\x86\WdfCoInstaller01007.dll" />
                         <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"
                               LongName="mlx4_hca.inf" Name="mlx4_hca.INF"
                               Source="..\bin\hca\x86\mlx4_hca.inf" />
@@ -313,6 +313,23 @@
                               LongName="mlx4ud.dll" Name="mlx4ud.dll"
                               Source="..\bin\hca\x86\mlx4ud.dll" />
                     </Component>
+
+                    <Component Id="cWinVerbsDrivers"
+                             Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
+
+                        <File Id="winverbs.sys" Compressed="yes" DiskId="1"
+                              LongName="winverbs.sys" Name="winverbs.sys"
+                              Source="..\bin\HCA\x86\winverbs.sys" />
+                        <File Id="winverbs.pdb" Compressed="yes" DiskId="1"
+                              LongName="winverbs.pdb" Name="winverbs.pdb"
+                              Source="..\bin\HCA\x86\winverbs.pdb" />
+                        <File Id="winverbs.dll" Compressed="yes" DiskId="1"
+                              LongName="winverbs.dll" Name="winvrbs.dll"
+                              Source="..\bin\HCA\x86\winverbs.dll" />
+                        <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
+                              LongName="winverbsd.dll" Name="winvrbsd.dll"
+                              Source="..\bin\HCA\x86\winverbsd.dll" />
+                    </Component>
                 </Directory>
 
                 <Directory Id="dir_0" Name="Checked">
@@ -320,73 +337,100 @@
                     <Component Id="cCHK_kernel"
                                Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">
                       <CreateFolder />
-
-
-                  <File Id="chk0" Name="README.txt" DiskId="1" Compressed="yes"
-                    Source="..\..\README_checked.txt" />
-                  <File Id="chk1" Name="mthca.sys" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\mthca.sys" />
-                  <File Id="cat1" Name="mthca.cat" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\mthca.cat" />
-                  <File Id="sym1" Name="mthca.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\mthca.pdb" />
-
-                  <File Id="chk2" Name="ibbus.sys" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\ibbus.sys" />
-                  <File Id="sym2" Name="ibbus.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\ibbus.pdb" />
-
-                  <File Id="chk3" Name="ibiou.sys" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\ibiou.sys" />
-                  <File Id="cat3" Name="ib_iou.cat" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\ib_iou.cat" />
-                  <File Id="sym3" Name="ibiou.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\ibiou.pdb" />
-
-                  <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\net\x86\ipoib.sys" />
-                  <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\net\x86\ipoib.cat" />
-                  <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\net\x86\ipoib.pdb" />
-
-                  <File Id="chk5" DiskId="1" Compressed="yes"
-                    Name="qlgcvnic.sys"
-                    Source="..\bin\Chk\net\x86\qlgcvnic.sys" />
-                  <File Id="cat5" DiskId="1" Compressed="yes"
-                    Name="netvnic.cat"
-                    Source="..\bin\Chk\net\x86\netvnic.cat" />
-                  <File Id="sym5" DiskId="1" Compressed="yes"
-                    Name="qlgcvnic.pdb"
-                    Source="..\bin\Chk\net\x86\qlgcvnic.pdb" />
-
-                  <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\storage\x86\ibsrp.sys" />
-                  <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\storage\x86\ibsrp.cat" />
-                  <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\storage\x86\ibsrp.pdb" />
-
-                  <File Id="chk7" DiskId="1" Compressed="yes"
-                    Name="mlx4_bus.sys"
-                    Source="..\bin\Chk\HCA\x86\mlx4_bus.sys" />
-                  <File Id="cat7" DiskId="1" Compressed="yes"
-                    Name="mlx4_bus.cat"
-                    Source="..\bin\Chk\HCA\x86\mlx4_bus.cat" />
-                  <File Id="sym7" DiskId="1" Compressed="yes"
-                    Name="mlx4_bus.pdb"
-                    Source="..\bin\Chk\HCA\x86\mlx4_bus.pdb" />
-
-                  <File Id="chk8" DiskId="1" Compressed="yes"
-                    Name="mlx4_hca.sys"
-                    Source="..\bin\Chk\HCA\x86\mlx4_hca.sys" />
-                  <File Id="cat8" DiskId="1" Compressed="yes"
-                    Name="mlx4_hca.cat"
-                    Source="..\bin\Chk\HCA\x86\mlx4_hca.cat" />
-                  <File Id="sym8" DiskId="1" Compressed="yes"
-                    Name="mlx4_hca.pdb"
-                    Source="..\bin\Chk\HCA\x86\mlx4_hca.pdb" />
-
+     
+                      <File Id="chk0" DiskId="1" Compressed="yes"
+                            Name="README.txt"
+                            Source="..\..\README_checked.txt" />
+                      <File Id="chk1" DiskId="1" Compressed="yes"
+                            Name="mthca.sys"
+                            Source="..\bin\Chk\HCA\x86\mthca.sys" />
+                      <File Id="cat1" DiskId="1" Compressed="yes"
+                            Name="mthca.cat"
+                            Source="..\bin\Chk\HCA\x86\mthca.cat" />
+                      <File Id="sym1" DiskId="1" Compressed="yes"
+                            Name="mthca.pdb"
+                            Source="..\bin\Chk\HCA\x86\mthca.pdb" />
+     
+                      <File Id="chk2" DiskId="1" Compressed="yes"
+                            Name="ibbus.sys"
+                            Source="..\bin\Chk\HCA\x86\ibbus.sys" />
+                      <File Id="sym2" DiskId="1" Compressed="yes"
+                            Name="ibbus.pdb"
+                            Source="..\bin\Chk\HCA\x86\ibbus.pdb" />
+     
+                      <File Id="chk3" DiskId="1" Compressed="yes"
+                            Name="ibiou.sys"
+                            Source="..\bin\Chk\HCA\x86\ibiou.sys" />
+                      <File Id="cat3" DiskId="1" Compressed="yes"
+                            Name="ib_iou.cat"
+                            Source="..\bin\Chk\HCA\x86\ib_iou.cat" />
+                      <File Id="sym3" DiskId="1" Compressed="yes"
+                            Name="ibiou.pdb"
+                            Source="..\bin\Chk\HCA\x86\ibiou.pdb" />
+     
+                      <File Id="chk4" DiskId="1" Compressed="yes"
+                            Name="ipoib.sys"
+                          Source="..\bin\Chk\net\x86\ipoib.sys" />
+                      <File Id="cat4" DiskId="1" Compressed="yes"
+                            Name="ipoib.cat"
+                            Source="..\bin\Chk\net\x86\ipoib.cat" />
+                      <File Id="sym4" DiskId="1" Compressed="yes"
+                            Name="ipoib.pdb"
+                            Source="..\bin\Chk\net\x86\ipoib.pdb" />
+     
+                      <File Id="chk5" DiskId="1" Compressed="yes"
+                            Name="qlgcvnic.sys"
+                            Source="..\bin\Chk\net\x86\qlgcvnic.sys" />
+                      <File Id="cat5" DiskId="1" Compressed="yes"
+                            Name="netvnic.cat"
+                            Source="..\bin\Chk\net\x86\netvnic.cat" />
+                      <File Id="sym5" DiskId="1" Compressed="yes"
+                            Name="qlgcvnic.pdb"
+                            Source="..\bin\Chk\net\x86\qlgcvnic.pdb" />
+     
+                      <File Id="chk6" DiskId="1" Compressed="yes"
+                            Name="ibsrp.sys"
+                            Source="..\bin\Chk\storage\x86\ibsrp.sys" />
+                      <File Id="cat6" DiskId="1" Compressed="yes"
+                            Name="ibsrp.cat"
+                            Source="..\bin\Chk\storage\x86\ibsrp.cat" />
+                      <File Id="sym6" DiskId="1" Compressed="yes"
+                            Name="ibsrp.pdb"
+                            Source="..\bin\Chk\storage\x86\ibsrp.pdb" />
+     
+                      <File Id="chk7" DiskId="1" Compressed="yes"
+                            Name="mlx4_bus.sys"
+                            Source="..\bin\Chk\HCA\x86\mlx4_bus.sys" />
+                       <File Id="cat7" DiskId="1" Compressed="yes"
+                            Name="mlx4_bus.cat"
+                            Source="..\bin\Chk\HCA\x86\mlx4_bus.cat" />
+                      <File Id="sym7" DiskId="1" Compressed="yes"
+                            Name="mlx4_bus.pdb"
+                            Source="..\bin\Chk\HCA\x86\mlx4_bus.pdb" />
+     
+                      <File Id="chk8" DiskId="1" Compressed="yes"
+                            Name="mlx4_hca.sys"
+                            Source="..\bin\Chk\HCA\x86\mlx4_hca.sys" />
+                      <File Id="cat8" DiskId="1" Compressed="yes"
+                            Name="mlx4_hca.cat"
+                             Source="..\bin\Chk\HCA\x86\mlx4_hca.cat" />
+                      <File Id="sym8" DiskId="1" Compressed="yes"
+                            Name="mlx4_hca.pdb"
+                            Source="..\bin\Chk\HCA\x86\mlx4_hca.pdb" />
+
+                      <File Id="chk9" DiskId="1" Compressed="yes"
+                            Name="winverbs.sys"
+                            Source="..\bin\Chk\HCA\x86\winverbs.sys" />
+                      <File Id="sym9" DiskId="1" Compressed="yes"
+                            Name="winverbs.pdb"
+                            Source="..\bin\Chk\HCA\x86\winverbs.pdb" />
+                      <File Id="dll9" DiskId="1" Compressed="yes"
+                            Name="winverbs.dll"
+                            Source="..\bin\Chk\HCA\x86\winverbs.dll" />
+                      <File Id="dlld9" DiskId="1" Compressed="yes"
+                            Name="winverbd.dll"
+                            LongName="winverbsd.dll"
+                            Source="..\bin\Chk\HCA\x86\winverbsd.dll" />
                     </Component>
                   </Directory>
             
@@ -457,70 +501,25 @@
                   </Directory>
                 </Directory>
 
-                <Directory Id="wvDir" Name="WinVerbs">
-                   <Component Id="cWinVerbsKernel"
-                             Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
-                     <CreateFolder />
-
-                     <File Id="winverbs.inf" Compressed="yes" DiskId="1"
-                           LongName="winverbs.inf" Name="winverbs.INF"
-                           Source="..\bin\HCA\x86\winverbs.inf" />
-                     <File Id="winverbs.sys" Compressed="yes" DiskId="1"
-                           LongName="winverbs.sys" Name="winverbs.sys"
-                           Source="..\bin\HCA\x86\winverbs.sys" />
-                     <File Id="winverbs.cat" Compressed="yes" DiskId="1"
-                           LongName="winverbs.cat" Name="winverbs.cat"
-                           Source="..\bin\HCA\x86\winverbs.cat" />
-                     <File Id="winverbs.dll" Compressed="yes" DiskId="1"
-                           LongName="winverbs.dll" Name="winvrbs.dll"
-                           Source="..\bin\HCA\x86\winverbs.dll" />
-                     <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
-                           LongName="winverbsd.dll" Name="winvrbsd.dll"
-                           Source="..\bin\HCA\x86\winverbsd.dll" />
-                     <File Id="wvWdfCoinstaller" Compressed="yes" DiskId="1"
-                           LongName="WdfCoInstaller01007.dll" Name="WCO.dll"
-                           Source="..\bin\HCA\x86\WdfCoInstaller01007.dll" />
-                   </Component>
-
-                   <Component Id="cWinVerbsUser"
-                             Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">
-
-                     <File Id="winverbs.lib" Compressed="yes" DiskId="1"
-                           LongName="winverbs.lib" Name="winverbs.lib"
-                           Source="..\bin\HCA\x86\winverbs.lib" />
-                     <CopyFile Id="dupWverbs.lib" FileId="winverbs.lib"
-                           DestinationName="winverbs.lib"
-                           DestinationProperty="WindowsFolder" />
-
-                     <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
-                           LongName="winverbsd.lib" Name="winvrbsd.lib"
-                           Source="..\bin\HCA\x86\winverbsd.lib" />
+                <Component Id="cWinVerbsOFED"
+                           Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">
 
-                     <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
-                           LongName="libibverbs.dll" Name="ibverbs.dll"
-                           Source="..\bin\HCA\x86\libibverbs.dll" />
+                  <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
+                        LongName="libibverbs.dll" Name="ibverbs.dll"
+                        Source="..\bin\HCA\x86\libibverbs.dll" />
                      <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"
                            DestinationName="ibverbs.dll"
                            DestinationLongName="libibverbs.dll"
                            DestinationProperty="WindowsFolder" />
 
-                     <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
-                           LongName="libibverbs.lib" Name="ibverbs.lib"
-                           Source="..\bin\HCA\x86\libibverbs.lib" />
-                     <CopyFile Id="dupLibibv.lib" FileId="libibverbs.lib"
-                           DestinationName="ibverbs.lib"
-                           DestinationLongName="libibverbs.lib"
+                  <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
+                        LongName="libibverbsd.dll" Name="ibverbsd.dll"
+                        Source="..\bin\HCA\x86\libibverbsd.dll" />
+                     <CopyFile Id="dupLibibvd.dll" FileId="libibverbsd.dll"
+                           DestinationName="ibverbsd.dll"
+                           DestinationLongName="libibverbsd.dll"
                            DestinationProperty="WindowsFolder" />
-
-                     <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
-                           LongName="libibverbsd.dll" Name="ibverbsd.dll"
-                           Source="..\bin\HCA\x86\libibverbsd.dll" />
-
-                     <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
-                           LongName="libibverbsd.lib" Name="ibverbsd.lib"
-                           Source="..\bin\HCA\x86\libibverbsd.lib" />
-                   </Component>
-                </Directory>
+                </Component>
 
                 <Component Id="cWinVerbsUApps"
                           Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">
@@ -962,6 +961,22 @@
               <File Id="complibd.pdb" Compressed="yes" DiskId="1"
                     LongName="complibd.pdb" Name="complibd.pdb"
                     Source="..\bin\HCA\x86\complibd.pdb" />
+
+              <File Id="winverbs.lib" Compressed="yes" DiskId="1"
+                    LongName="winverbs.lib" Name="winverbs.lib"
+                    Source="..\bin\HCA\x86\winverbs.lib" />
+
+              <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
+                    LongName="winverbsd.lib" Name="winvrbsd.lib"
+                    Source="..\bin\HCA\x86\winverbsd.lib" />
+
+              <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
+                    LongName="libibverbs.lib" Name="ibverbs.lib"
+                    Source="..\bin\HCA\x86\libibverbs.lib" />
+
+              <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
+                    LongName="libibverbsd.lib" Name="ibverbsd.lib"
+                    Source="..\bin\HCA\x86\libibverbsd.lib" />
              </Component>
            </Directory>
 
@@ -1233,6 +1248,7 @@
         ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
         InstallDefault="local" Absent="disallow">
         <ComponentRef Id="cIBcore" />
+        <ComponentRef Id="cWinVerbsDrivers" />
         <ComponentRef Id="Docs" />
         <ComponentRef Id="Tools" />
         <ComponentRef Id="OpenSMservice" />
@@ -1241,11 +1257,10 @@
     </Feature>
 
     <Feature Id="fWV" Title="WinVerbs"
-        Description="OFED verbs API for Windows"
-        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"
+        Description="OFED verbs - Libraries + utilities"
+        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"
         AllowAdvertise="no" InstallDefault="local" Absent="allow">
-        <ComponentRef Id="cWinVerbsKernel" />
-        <ComponentRef Id="cWinVerbsUser" />
+        <ComponentRef Id="cWinVerbsOFED" />
         <ComponentRef Id="cWinVerbsUApps" />
     </Feature>
 
diff --git a/trunk/WinOF/WIX/wnet/ia64/wof.wxs b/trunk/WinOF/WIX/wnet/ia64/wof.wxs
index cbc41c4d..816ed583 100644
--- a/trunk/WinOF/WIX/wnet/ia64/wof.wxs
+++ b/trunk/WinOF/WIX/wnet/ia64/wof.wxs
@@ -228,6 +228,9 @@
               <File Id="devman.exe" Compressed="yes" DiskId="1"
                      LongName="devman.exe" Name="devman.exe"
                      Source="..\..\ia64\devman.exe" />
+              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"
+                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"
+                     Source="..\bin\hca\ia64\WdfCoInstaller01007.dll" />
               <File Id="cl32.dll" Compressed="yes" DiskId="1"
                      LongName="cl32.dll" Name="CL32.DLL"
                      Source="..\bin\HCA\ia64\cl32.dll" />
@@ -310,7 +313,6 @@
                      Source="..\bin\HCA\ia64\mthcaud.dll" />
             </Component>
 
-<!-- Remove when ConnectX works on ia64
             <Component Id="cConnectXDriver"
                        Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">
               <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"
@@ -322,15 +324,9 @@
               <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"
                      LongName="mlx4_bus.sys" Name="mlx4_bus.sys"
                      Source="..\bin\hca\ia64\mlx4_bus.sys" />
-              <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"
-                     LongName="mlx4_bus.pdb"
-                     Source="..\bin\hca\ia64\mlx4_bus.pdb" />
               <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"
                      LongName="mlx4_bus.pdb" Name="mlx4_bus.pdb"
                      Source="..\bin\hca\ia64\mlx4_bus.pdb" />
-              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"
-                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"
-                     Source="..\bin\hca\ia64\WdfCoInstaller01007.dll" />
               <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"
                      LongName="mlx4_hca.inf" Name="mlx4_hca.INF"
                      Source="..\bin\hca\ia64\mlx4_hca.inf" />
@@ -350,7 +346,7 @@
                      LongName="mlx4ud.dll" Name="mlx4ud.dll"
                      Source="..\bin\hca\ia64\mlx4ud.dll" />
 
-			  <!++ copy 32-bit binaries for 32b in ia64 ++> 
+			  <!-- copy 32-bit binaries --> 
               <File Id="mlx4u32d.dll" Compressed="yes" DiskId="1"
                      LongName="mlx4u32d.dll" Name="mlx4u32.dll"
                      Source="..\bin\hca\ia64\mlx4u32d.dll" />
@@ -358,8 +354,23 @@
                      LongName="mlx4u32.dll" Name="mlx4u32.dll"
                      Source="..\bin\hca\ia64\mlx4u32.dll" />
             </Component>
-End Remove -->
 
+            <Component Id="cWinVerbsDrivers"
+                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
+
+              <File Id="winverbs.sys" Compressed="yes" DiskId="1"
+                    LongName="winverbs.sys" Name="winverbs.sys"
+                    Source="..\bin\HCA\ia64\winverbs.sys" />
+              <File Id="winverbs.pdb" Compressed="yes" DiskId="1"
+                    LongName="winverbs.pdb" Name="winverbs.pdb"
+                    Source="..\bin\HCA\ia64\winverbs.pdb" />
+              <File Id="winverbs.dll" Compressed="yes" DiskId="1"
+                    LongName="winverbs.dll" Name="winvrbs.dll"
+                    Source="..\bin\HCA\ia64\winverbs.dll" />
+              <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
+                    LongName="winverbsd.dll" Name="winvrbsd.dll"
+                    Source="..\bin\HCA\ia64\winverbsd.dll" />
+             </Component>
           </Directory>
 
           <Directory Id="dir_0" Name="Checked">
@@ -369,70 +380,84 @@ End Remove -->
                 <CreateFolder />
 
                 <File Id="chk0" Name="README.txt" DiskId="1" Compressed="yes"
-                  Source="..\..\README_checked.txt" />
+                      Source="..\..\README_checked.txt" />
                 <File Id="chk1" Name="mthca.sys" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\HCA\ia64\mthca.sys" />
+                      Source="..\bin\Chk\HCA\ia64\mthca.sys" />
                 <File Id="cat1" Name="mthca.cat" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\HCA\ia64\mthca.cat" />
+                      Source="..\bin\Chk\HCA\ia64\mthca.cat" />
                 <File Id="sym1" Name="mthca.pdb" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\HCA\ia64\mthca.pdb" />
+                      Source="..\bin\Chk\HCA\ia64\mthca.pdb" />
 
                 <File Id="chk2" Name="ibbus.sys" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\HCA\ia64\ibbus.sys" />
+                      Source="..\bin\Chk\HCA\ia64\ibbus.sys" />
                 <File Id="sym2" Name="ibbus.pdb" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\HCA\ia64\ibbus.pdb" />
+                      Source="..\bin\Chk\HCA\ia64\ibbus.pdb" />
 
                 <File Id="chk3" Name="ibiou.sys" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\HCA\ia64\ibiou.sys" />
+                      Source="..\bin\Chk\HCA\ia64\ibiou.sys" />
                 <File Id="cat3" Name="ib_iou.cat" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\HCA\ia64\ib_iou.cat" />
+                      Source="..\bin\Chk\HCA\ia64\ib_iou.cat" />
                 <File Id="sym3" Name="ibiou.pdb" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\HCA\ia64\ibiou.pdb" />
-
-                  <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\net\ia64\ipoib.sys" />
-                  <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\net\ia64\ipoib.cat" />
-                  <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\net\ia64\ipoib.pdb" />
-
-                  <File Id="chk5" DiskId="1" Compressed="yes"
-                    Name="qlgcvnic.sys"
-                    Source="..\bin\Chk\net\ia64\qlgcvnic.sys" />
-                  <File Id="cat5" DiskId="1" Compressed="yes"
-                    Name="netvnic.cat"
-                    Source="..\bin\Chk\net\ia64\netvnic.cat" />
-                  <File Id="sym5" DiskId="1" Compressed="yes"
-                    Name="qlgcvnic.pdb"
-                    Source="..\bin\Chk\net\ia64\qlgcvnic.pdb" />
-
-                  <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\storage\ia64\ibsrp.sys" />
-                  <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\storage\ia64\ibsrp.cat" />
-                  <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\storage\ia64\ibsrp.pdb" />
+                      Source="..\bin\Chk\HCA\ia64\ibiou.pdb" />
+
+                <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"
+                      Source="..\bin\Chk\net\ia64\ipoib.sys" />
+                <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"
+                      Source="..\bin\Chk\net\ia64\ipoib.cat" />
+                <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"
+                      Source="..\bin\Chk\net\ia64\ipoib.pdb" />
+
+                <File Id="chk5" DiskId="1" Compressed="yes"
+                      Name="qlgcvnic.sys"
+                      Source="..\bin\Chk\net\ia64\qlgcvnic.sys" />
+                <File Id="cat5" DiskId="1" Compressed="yes"
+                      Name="netvnic.cat"
+                      Source="..\bin\Chk\net\ia64\netvnic.cat" />
+                <File Id="sym5" DiskId="1" Compressed="yes"
+                      Name="qlgcvnic.pdb"
+                      Source="..\bin\Chk\net\ia64\qlgcvnic.pdb" />
+
+                <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"
+                      Source="..\bin\Chk\storage\ia64\ibsrp.sys" />
+                <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"
+                      Source="..\bin\Chk\storage\ia64\ibsrp.cat" />
+                <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"
+                      Source="..\bin\Chk\storage\ia64\ibsrp.pdb" />
 <!-- when ConnectX works on ia64
-                  <File Id="chk7" DiskId="1" Compressed="yes"
-                    Name="mlx4_bus.sys"
-                    Source="..\bin\Chk\HCA\ia64\mlx4_bus.sys" />
-                  <File Id="cat7" DiskId="1" Compressed="yes"
-                    Name="mlx4_bus.cat"
-                    Source="..\bin\Chk\HCA\ia64\mlx4_bus.cat" />
-                  <File Id="sym7" DiskId="1" Compressed="yes"
-                    Name="mlx4_bus.pdb"
-                    Source="..\bin\Chk\HCA\ia64\mlx4_bus.pdb" />
-
-                  <File Id="chk8" DiskId="1" Compressed="yes"
-                    Name="mlx4_hca.sys"
-                    Source="..\bin\Chk\HCA\ia64\mlx4_hca.sys" />
-                  <File Id="cat8" DiskId="1" Compressed="yes"
-                    Name="mlx4_hca.cat"
-                    Source="..\bin\Chk\HCA\ia64\mlx4_hca.cat" />
-                  <File Id="sym8" DiskId="1" Compressed="yes"
-                    Name="mlx4_hca.pdb"
-                    Source="..\bin\Chk\HCA\ia64\mlx4_hca.pdb" />
+                <File Id="chk7" DiskId="1" Compressed="yes"
+                      Name="mlx4_bus.sys"
+                      Source="..\bin\Chk\HCA\ia64\mlx4_bus.sys" />
+                <File Id="cat7" DiskId="1" Compressed="yes"
+                      Name="mlx4_bus.cat"
+                      Source="..\bin\Chk\HCA\ia64\mlx4_bus.cat" />
+                <File Id="sym7" DiskId="1" Compressed="yes"
+                      Name="mlx4_bus.pdb"
+                      Source="..\bin\Chk\HCA\ia64\mlx4_bus.pdb" />
+
+                <File Id="chk8" DiskId="1" Compressed="yes"
+                      Name="mlx4_hca.sys"
+                      Source="..\bin\Chk\HCA\ia64\mlx4_hca.sys" />
+                <File Id="cat8" DiskId="1" Compressed="yes"
+                      Name="mlx4_hca.cat"
+                      Source="..\bin\Chk\HCA\ia64\mlx4_hca.cat" />
+                <File Id="sym8" DiskId="1" Compressed="yes"
+                      Name="mlx4_hca.pdb"
+                      Source="..\bin\Chk\HCA\ia64\mlx4_hca.pdb" />
 End ConnectX remove -->
+
+                <File Id="chk9" DiskId="1" Compressed="yes"
+                      Name="winverbs.sys"
+                      Source="..\bin\Chk\HCA\ia64\winverbs.sys" />
+                <File Id="sym9" DiskId="1" Compressed="yes"
+                      Name="winverbs.pdb"
+                      Source="..\bin\Chk\HCA\ia64\winverbs.pdb" />
+                <File Id="dll9" DiskId="1" Compressed="yes"
+                      Name="winverbs.dll"
+                      Source="..\bin\Chk\HCA\ia64\winverbs.dll" />
+                <File Id="dlld9" DiskId="1" Compressed="yes"
+                      Name="winverbd.dll"
+                      LongName="winverbsd.dll"
+                      Source="..\bin\Chk\HCA\ia64\winverbsd.dll" />
               </Component>
             </Directory>
       
@@ -484,70 +509,24 @@ End ConnectX remove -->
             </Directory>
           </Directory>
 
-          <Directory Id="wvDir" Name="WinVerbs">
-             <Component Id="cWinVerbsKernel"
-                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
-               <CreateFolder />
-
-               <File Id="winverbs.inf" Compressed="yes" DiskId="1"
-                     LongName="winverbs.inf" Name="winverbs.INF"
-                     Source="..\bin\HCA\ia64\winverbs.inf" />
-               <File Id="winverbs.sys" Compressed="yes" DiskId="1"
-                     LongName="winverbs.sys" Name="winverbs.sys"
-                     Source="..\bin\HCA\ia64\winverbs.sys" />
-               <File Id="winverbs.cat" Compressed="yes" DiskId="1"
-                     LongName="winverbs.cat" Name="winverbs.cat"
-                     Source="..\bin\HCA\ia64\winverbs.cat" />
-               <File Id="winverbs.dll" Compressed="yes" DiskId="1"
-                     LongName="winverbs.dll" Name="winvrbs.dll"
-                     Source="..\bin\HCA\ia64\winverbs.dll" />
-               <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
-                     LongName="winverbsd.dll" Name="winvrbsd.dll"
-                     Source="..\bin\HCA\ia64\winverbsd.dll" />
-               <File Id="wvWdfCoinstaller" Compressed="yes" DiskId="1"
-                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"
-                     Source="..\bin\HCA\ia64\WdfCoInstaller01007.dll" />
-             </Component>
-
-             <Component Id="cWinVerbsUser"
+          <Component Id="cWinVerbsOFED"
                        Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">
 
-               <File Id="winverbs.lib" Compressed="yes" DiskId="1"
-                     LongName="winverbs.lib" Name="winverbs.lib"
-                     Source="..\bin\HCA\ia64\winverbs.lib" />
-               <CopyFile Id="dupWverbs.lib" FileId="winverbs.lib"
-                     DestinationName="winverbs.lib"
-                     DestinationProperty="WindowsFolder" />
-
-               <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
-                     LongName="winverbsd.lib" Name="winvrbsd.lib"
-                     Source="..\bin\HCA\ia64\winverbsd.lib" />
-
-               <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
-                     LongName="libibverbs.dll" Name="ibverbs.dll"
-                     Source="..\bin\HCA\ia64\libibverbs.dll" />
-               <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"
-                     DestinationName="ibverbs.dll"
-                     DestinationLongName="libibverbs.dll"
-                     DestinationProperty="WindowsFolder" />
-
-               <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
-                     LongName="libibverbs.lib" Name="ibverbs.lib"
-                     Source="..\bin\HCA\ia64\libibverbs.lib" />
-               <CopyFile Id="dupLibibv.lib" FileId="libibverbs.lib"
-                     DestinationName="ibverbs.lib"
-                     DestinationLongName="libibverbs.lib"
-                     DestinationProperty="WindowsFolder" />
-
-               <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
-                     LongName="libibverbsd.dll" Name="ibverbsd.dll"
-                     Source="..\bin\HCA\ia64\libibverbsd.dll" />
-
-               <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
-                     LongName="libibverbsd.lib" Name="ibverbsd.lib"
-                     Source="..\bin\HCA\ia64\libibverbsd.lib" />
-             </Component>
-          </Directory>
+            <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
+                  LongName="libibverbs.dll" Name="ibverbs.dll"
+                  Source="..\bin\HCA\ia64\libibverbs.dll" />
+              <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"
+                      DestinationName="ibverbs.dll"
+                      DestinationLongName="libibverbs.dll"
+                      DestinationProperty="WindowsFolder" />
+            <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
+                  LongName="libibverbsd.dll" Name="ibverbsd.dll"
+                  Source="..\bin\HCA\ia64\libibverbsd.dll" />
+              <CopyFile Id="dupLibibvd.dll" FileId="libibverbsd.dll"
+                      DestinationName="ibverbsd.dll"
+                      DestinationLongName="libibverbsd.dll"
+                      DestinationProperty="WindowsFolder" />
+          </Component>
 
           <Component Id="cWinVerbsUApps"
                     Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">
@@ -1044,6 +1023,22 @@ End ConnectX remove -->
               <File Id="ibal32d.pdb" Compressed="yes" DiskId="1"
                     LongName="ibal32d.pdb" Name="ibal32d.pdb"
                     Source="..\bin\HCA\ia64\ibal32d.pdb" />
+
+              <File Id="winverbs.lib" Compressed="yes" DiskId="1"
+                    LongName="winverbs.lib" Name="winverbs.lib"
+                    Source="..\bin\HCA\ia64\winverbs.lib" />
+
+              <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
+                    LongName="winverbsd.lib" Name="winvrbsd.lib"
+                    Source="..\bin\HCA\ia64\winverbsd.lib" />
+
+              <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
+                    LongName="libibverbs.lib" Name="ibverbs.lib"
+                    Source="..\bin\HCA\ia64\libibverbs.lib" />
+
+              <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
+                    LongName="libibverbsd.lib" Name="ibverbsd.lib"
+                    Source="..\bin\HCA\ia64\libibverbsd.lib" />
               </Component>
             </Directory>
 
@@ -1313,14 +1308,12 @@ End ConnectX remove -->
         <ComponentRef Id="cMthcaDriver" />
       </Feature>
 
-<!-- remove until ConnectX works on ia64
       <Feature Id="hca_connectX" Title="ConnectX" Level="5"
            Description="ConnectX only - mlx4"
            Display="expand" ConfigurableDirectory="INSTALLDIR"
            AllowAdvertise='no' InstallDefault='local' Absent='allow'>
         <ComponentRef Id="cConnectXDriver" />
       </Feature>
-End Remove -->
     </Feature>
 
     <Feature Id="IBcore" Title="InfiniBand Core" Level="1"
@@ -1328,6 +1321,7 @@ End Remove -->
          Display="expand" ConfigurableDirectory="INSTALLDIR"
          AllowAdvertise='no' InstallDefault='local' Absent='disallow'>
       <ComponentRef Id="cIBcore" />
+      <ComponentRef Id="cWinVerbsDrivers" />
       <ComponentRef Id="Docs" />
       <ComponentRef Id="Tools" />
       <ComponentRef Id="OpenSMservice" />
@@ -1336,11 +1330,10 @@ End Remove -->
     </Feature>
 
     <Feature Id="fWV" Title="WinVerbs"
-        Description="OFED verbs API for Windows"
-        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"
+        Description="OFED verbs - Libraries + utilities"
+        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"
         AllowAdvertise="no" InstallDefault="local" Absent="allow">
-        <ComponentRef Id="cWinVerbsKernel" />
-        <ComponentRef Id="cWinVerbsUser" />
+        <ComponentRef Id="cWinVerbsOFED" />
         <ComponentRef Id="cWinVerbsUApps" />
     </Feature>
 
diff --git a/trunk/WinOF/WIX/wnet/x64/wof.wxs b/trunk/WinOF/WIX/wnet/x64/wof.wxs
index 93a0006a..c764a22d 100644
--- a/trunk/WinOF/WIX/wnet/x64/wof.wxs
+++ b/trunk/WinOF/WIX/wnet/x64/wof.wxs
@@ -229,6 +229,9 @@
               <File Id="devman.exe" Compressed="yes" DiskId="1"
                      LongName="devman.exe" Name="devman.exe"
                      Source="..\..\x64\devman.exe" />
+              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"
+                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"
+                     Source="..\bin\hca\amd64\WdfCoInstaller01007.dll" />
               <File Id="cl32.dll" Compressed="yes" DiskId="1"
                      LongName="cl32.dll" Name="CL32.DLL"
                      Source="..\bin\HCA\amd64\cl32.dll" />
@@ -327,9 +330,6 @@
               <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"
                      Name="mlx4_bus.pdb"
                      Source="..\bin\hca\amd64\mlx4_bus.pdb" />
-              <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"
-                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"
-                     Source="..\bin\hca\amd64\WdfCoInstaller01007.dll" />
               <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"
                      LongName="mlx4_hca.inf" Name="mlx4_hca.INF"
                      Source="..\bin\hca\amd64\mlx4_hca.inf" />
@@ -357,6 +357,23 @@
                      LongName="mlx4u32.dll" Name="mlx4u32.dll"
                      Source="..\bin\hca\amd64\mlx4u32.dll" />
             </Component>
+
+            <Component Id="cWinVerbsDrivers"
+                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
+
+               <File Id="winverbs.sys" Compressed="yes" DiskId="1"
+                     LongName="winverbs.sys" Name="winverbs.sys"
+                     Source="..\bin\HCA\amd64\winverbs.sys" />
+               <File Id="winverbs.pdb" Compressed="yes" DiskId="1"
+                     LongName="winverbs.pdb" Name="winverbs.pdb"
+                     Source="..\bin\HCA\amd64\winverbs.pdb" />
+               <File Id="winverbs.dll" Compressed="yes" DiskId="1"
+                     LongName="winverbs.dll" Name="winvrbs.dll"
+                     Source="..\bin\HCA\amd64\winverbs.dll" />
+               <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
+                     LongName="winverbsd.dll" Name="winvrbsd.dll"
+                     Source="..\bin\HCA\amd64\winverbsd.dll" />
+             </Component>
           </Directory>
 
           <Directory Id="dir_0" Name="Checked">
@@ -366,69 +383,83 @@
                   <CreateFolder />
 
                   <File Id="chk0" Name="README.txt" DiskId="1" Compressed="yes"
-                    Source="..\..\README_checked.txt" />
+                        Source="..\..\README_checked.txt" />
                   <File Id="chk1" Name="mthca.sys" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\amd64\mthca.sys" />
+                        Source="..\bin\Chk\HCA\amd64\mthca.sys" />
                   <File Id="cat1" Name="mthca.cat" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\amd64\mthca.cat" />
+                        Source="..\bin\Chk\HCA\amd64\mthca.cat" />
                   <File Id="sym1" Name="mthca.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\amd64\mthca.pdb" />
+                        Source="..\bin\Chk\HCA\amd64\mthca.pdb" />
 
                   <File Id="chk2" Name="ibbus.sys" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\amd64\ibbus.sys" />
+                        Source="..\bin\Chk\HCA\amd64\ibbus.sys" />
                   <File Id="sym2" Name="ibbus.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\amd64\ibbus.pdb" />
+                        Source="..\bin\Chk\HCA\amd64\ibbus.pdb" />
 
                   <File Id="chk3" Name="ibiou.sys" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\amd64\ibiou.sys" />
+                        Source="..\bin\Chk\HCA\amd64\ibiou.sys" />
                   <File Id="cat3" Name="ib_iou.cat" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\amd64\ib_iou.cat" />
+                        Source="..\bin\Chk\HCA\amd64\ib_iou.cat" />
                   <File Id="sym3" Name="ibiou.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\amd64\ibiou.pdb" />
+                        Source="..\bin\Chk\HCA\amd64\ibiou.pdb" />
 
                   <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\net\amd64\ipoib.sys" />
+                      Source="..\bin\Chk\net\amd64\ipoib.sys" />
                   <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\net\amd64\ipoib.cat" />
+                        Source="..\bin\Chk\net\amd64\ipoib.cat" />
                   <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\net\amd64\ipoib.pdb" />
+                        Source="..\bin\Chk\net\amd64\ipoib.pdb" />
 
                   <File Id="chk5" DiskId="1" Compressed="yes"
-                    Name="qlgcvnic.sys"
-                    Source="..\bin\Chk\net\amd64\qlgcvnic.sys" />
+                        Name="qlgcvnic.sys"
+                        Source="..\bin\Chk\net\amd64\qlgcvnic.sys" />
                   <File Id="cat5" DiskId="1" Compressed="yes"
-                    Name="netvnic.cat"
-                    Source="..\bin\Chk\net\amd64\netvnic.cat" />
+                        Name="netvnic.cat"
+                        Source="..\bin\Chk\net\amd64\netvnic.cat" />
                   <File Id="sym5" DiskId="1" Compressed="yes"
-                    Name="qlgcvnic.pdb"
-                    Source="..\bin\Chk\net\amd64\qlgcvnic.pdb" />
+                        Name="qlgcvnic.pdb"
+                        Source="..\bin\Chk\net\amd64\qlgcvnic.pdb" />
 
                   <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\storage\amd64\ibsrp.sys" />
+                        Source="..\bin\Chk\storage\amd64\ibsrp.sys" />
                   <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\storage\amd64\ibsrp.cat" />
+                        Source="..\bin\Chk\storage\amd64\ibsrp.cat" />
                   <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\storage\amd64\ibsrp.pdb" />
+                        Source="..\bin\Chk\storage\amd64\ibsrp.pdb" />
 
                   <File Id="chk7" DiskId="1" Compressed="yes"
-                    Name="mlx4_bus.sys"
-                    Source="..\bin\Chk\HCA\amd64\mlx4_bus.sys" />
+                        Name="mlx4_bus.sys"
+                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.sys" />
                   <File Id="cat7" DiskId="1" Compressed="yes"
-                    Name="mlx4_bus.cat"
-                    Source="..\bin\Chk\HCA\amd64\mlx4_bus.cat" />
+                        Name="mlx4_bus.cat"
+                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.cat" />
                   <File Id="sym7" DiskId="1" Compressed="yes"
-                    Name="mlx4_bus.pdb"
-                    Source="..\bin\Chk\HCA\amd64\mlx4_bus.pdb" />
+                        Name="mlx4_bus.pdb"
+                        Source="..\bin\Chk\HCA\amd64\mlx4_bus.pdb" />
 
                   <File Id="chk8" DiskId="1" Compressed="yes"
-                    Name="mlx4_hca.sys"
-                    Source="..\bin\Chk\HCA\amd64\mlx4_hca.sys" />
+                        Name="mlx4_hca.sys"
+                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.sys" />
                   <File Id="cat8" DiskId="1" Compressed="yes"
-                    Name="mlx4_hca.cat"
-                    Source="..\bin\Chk\HCA\amd64\mlx4_hca.cat" />
+                        Name="mlx4_hca.cat"
+                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.cat" />
                   <File Id="sym8" DiskId="1" Compressed="yes"
-                    Name="mlx4_hca.pdb"
-                    Source="..\bin\Chk\HCA\amd64\mlx4_hca.pdb" />
+                        Name="mlx4_hca.pdb"
+                        Source="..\bin\Chk\HCA\amd64\mlx4_hca.pdb" />
+
+                  <File Id="chk9" DiskId="1" Compressed="yes"
+                        Name="winverbs.sys"
+                        Source="..\bin\Chk\HCA\amd64\winverbs.sys" />
+                  <File Id="sym9" DiskId="1" Compressed="yes"
+                        Name="winverbs.pdb"
+                        Source="..\bin\Chk\HCA\amd64\winverbs.pdb" />
+                  <File Id="dll9" DiskId="1" Compressed="yes"
+                        Name="winverbs.dll"
+                        Source="..\bin\Chk\HCA\amd64\winverbs.dll" />
+                  <File Id="dlld9" DiskId="1" Compressed="yes"
+                        Name="winverbd.dll"
+                        LongName="winverbsd.dll"
+                        Source="..\bin\Chk\HCA\amd64\winverbsd.dll" />
 
                 </Component>
             </Directory>
@@ -503,70 +534,25 @@
             </Directory>
           </Directory>
      
-          <Directory Id="wvDir" Name="WinVerbs">
-             <Component Id="cWinVerbsKernel"
-                       Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
-               <CreateFolder />
-
-               <File Id="winverbs.inf" Compressed="yes" DiskId="1"
-                     LongName="winverbs.inf" Name="winverbs.INF"
-                     Source="..\bin\HCA\amd64\winverbs.inf" />
-               <File Id="winverbs.sys" Compressed="yes" DiskId="1"
-                     LongName="winverbs.sys" Name="winverbs.sys"
-                     Source="..\bin\HCA\amd64\winverbs.sys" />
-               <File Id="winverbs.cat" Compressed="yes" DiskId="1"
-                     LongName="winverbs.cat" Name="winverbs.cat"
-                     Source="..\bin\HCA\amd64\winverbs.cat" />
-               <File Id="winverbs.dll" Compressed="yes" DiskId="1"
-                     LongName="winverbs.dll" Name="winvrbs.dll"
-                     Source="..\bin\HCA\amd64\winverbs.dll" />
-               <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
-                     LongName="winverbsd.dll" Name="winvrbsd.dll"
-                     Source="..\bin\HCA\amd64\winverbsd.dll" />
-               <File Id="wvWdfCoinstaller" Compressed="yes" DiskId="1"
-                     LongName="WdfCoInstaller01007.dll" Name="WCO.dll"
-                     Source="..\bin\hca\amd64\WdfCoInstaller01007.dll" />
-             </Component>
-
-             <Component Id="cWinVerbsUser"
+          <Component Id="cWinVerbsOFED"
                        Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">
 
-               <File Id="winverbs.lib" Compressed="yes" DiskId="1"
-                     LongName="winverbs.lib" Name="winverbs.lib"
-                     Source="..\bin\HCA\amd64\winverbs.lib" />
-               <CopyFile Id="dupWverbs.lib" FileId="winverbs.lib"
-                     DestinationName="winverbs.lib"
-                     DestinationProperty="WindowsFolder" />
-
-               <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
-                     LongName="winverbsd.lib" Name="winvrbsd.lib"
-                     Source="..\bin\HCA\amd64\winverbsd.lib" />
-
-               <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
-                     LongName="libibverbs.dll" Name="ibverbs.dll"
-                     Source="..\bin\HCA\amd64\libibverbs.dll" />
+             <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
+                   LongName="libibverbs.dll" Name="ibverbs.dll"
+                   Source="..\bin\HCA\amd64\libibverbs.dll" />
                <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"
-                     DestinationName="ibverbs.dll"
-                     DestinationLongName="libibverbs.dll"
-                     DestinationProperty="WindowsFolder" />
-
-               <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
-                     LongName="libibverbs.lib" Name="ibverbs.lib"
-                     Source="..\bin\HCA\amd64\libibverbs.lib" />
-               <CopyFile Id="dupLibibv.lib" FileId="libibverbs.lib"
-                     DestinationName="ibverbs.lib"
-                     DestinationLongName="libibverbs.lib"
-                     DestinationProperty="WindowsFolder" />
-
-               <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
-                     LongName="libibverbsd.dll" Name="ibverbsd.dll"
-                     Source="..\bin\HCA\amd64\libibverbsd.dll" />
-
-               <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
-                     LongName="libibverbsd.lib" Name="ibverbsd.lib"
-                     Source="..\bin\HCA\amd64\libibverbsd.lib" />
-             </Component>
-          </Directory>
+                      DestinationName="ibverbs.dll"
+                      DestinationLongName="libibverbs.dll"
+                      DestinationProperty="WindowsFolder" />
+
+             <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
+                   LongName="libibverbsd.dll" Name="ibverbsd.dll"
+                   Source="..\bin\HCA\amd64\libibverbsd.dll" />
+               <CopyFile Id="dupLibibvd.dll" FileId="libibverbsd.dll"
+                      DestinationName="ibverbsd.dll"
+                      DestinationLongName="libibverbsd.dll"
+                      DestinationProperty="WindowsFolder" />
+          </Component>
 
           <Component Id="cWinVerbsUApps"
                     Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">
@@ -1064,6 +1050,22 @@
               <File Id="ibal32d.pdb" Compressed="yes" DiskId="1"
                     LongName="ibal32d.pdb" Name="ibal32d.pdb"
                     Source="..\bin\HCA\amd64\ibal32d.pdb" />
+
+              <File Id="winverbs.lib" Compressed="yes" DiskId="1"
+                    LongName="winverbs.lib" Name="winverbs.lib"
+                    Source="..\bin\HCA\amd64\winverbs.lib" />
+
+              <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
+                    LongName="winverbsd.lib" Name="winvrbsd.lib"
+                    Source="..\bin\HCA\amd64\winverbsd.lib" />
+
+              <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
+                    LongName="libibverbs.lib" Name="ibverbs.lib"
+                    Source="..\bin\HCA\amd64\libibverbs.lib" />
+
+              <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
+                    LongName="libibverbsd.lib" Name="ibverbsd.lib"
+                    Source="..\bin\HCA\amd64\libibverbsd.lib" />
             </Component>
           </Directory>
 
@@ -1352,6 +1354,7 @@
          Display="expand" ConfigurableDirectory="INSTALLDIR"
          AllowAdvertise='no' InstallDefault='local' Absent='disallow'>
       <ComponentRef Id="cIBcore" />
+      <ComponentRef Id="cWinVerbsDrivers" />
       <ComponentRef Id="Docs" />
       <ComponentRef Id="Tools" />
       <ComponentRef Id="OpenSMservice" />
@@ -1360,11 +1363,10 @@
     </Feature>
 
     <Feature Id="fWV" Title="WinVerbs"
-        Description="OFED verbs API for Windows"
-        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"
+        Description="OFED verbs - Libraries + utilities"
+        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"
         AllowAdvertise="no" InstallDefault="local" Absent="allow">
-        <ComponentRef Id="cWinVerbsKernel" />
-        <ComponentRef Id="cWinVerbsUser" />
+        <ComponentRef Id="cWinVerbsOFED" />
         <ComponentRef Id="cWinVerbsUApps" />
     </Feature>
 
diff --git a/trunk/WinOF/WIX/wnet/x86/wof.wxs b/trunk/WinOF/WIX/wnet/x86/wof.wxs
index 19a0e40e..93b2f435 100644
--- a/trunk/WinOF/WIX/wnet/x86/wof.wxs
+++ b/trunk/WinOF/WIX/wnet/x86/wof.wxs
@@ -223,6 +223,10 @@
                         <File Id="devman.exe" Compressed="yes" DiskId="1"
                               LongName="devman.exe" Name="devman.exe"
                               Source="..\..\x86\devman.exe" />
+                        <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"
+                              LongName="WdfCoInstaller01007.dll"
+                              Name="WCO.dll"
+                              Source="..\bin\HCA\x86\WdfCoInstaller01007.dll" />
                         <File Id="complib.dll" Compressed="yes" DiskId="1"
                               LongName="complib.dll" Name="COMPLIB.DLL"
                               Source="..\bin\HCA\x86\complib.dll" />
@@ -291,10 +295,6 @@
                         <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"
                               Name="mlx4_bus.pdb"
                               Source="..\bin\hca\x86\mlx4_bus.pdb" />
-                        <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"
-                              LongName="WdfCoInstaller01007.dll"
-                              Name="WCO.dll"
-                              Source="..\bin\hca\x86\WdfCoInstaller01007.dll" />
                         <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"
                               LongName="mlx4_hca.inf" Name="mlx4_hca.INF"
                               Source="..\bin\hca\x86\mlx4_hca.inf" />
@@ -314,6 +314,25 @@
                               LongName="mlx4ud.dll" Name="mlx4ud.dll"
                               Source="..\bin\hca\x86\mlx4ud.dll" />
                     </Component>
+
+                    <Component Id="cWinVerbsDrivers"
+                             Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
+
+                     <File Id="winverbs.sys" Compressed="yes" DiskId="1"
+                           LongName="winverbs.sys" Name="winverbs.sys"
+                           Source="..\bin\HCA\x86\winverbs.sys" />
+                     <File Id="winverbs.pdb" DiskId="1" Compressed="yes"
+                           LongName="winverbs.pdb" Name="winverbs.pdb"
+                           Source="..\bin\HCA\x86\winverbs.pdb" />
+                     <File Id="winverbs.dll" Compressed="yes" DiskId="1"
+                           LongName="winverbs.dll" Name="winvrbs.dll"
+                           Source="..\bin\HCA\x86\winverbs.dll" />
+                     <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
+                           LongName="winverbsd.dll" Name="winvrbsd.dll"
+                           Source="..\bin\HCA\x86\winverbsd.dll" />
+                   </Component>
+
+
                 </Directory>
 
                 <Directory Id="dir_0" Name="Checked">
@@ -322,75 +341,101 @@
                                Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">
                       <CreateFolder />
 
-
-                  <File Id="chk0" Name="README.txt" DiskId="1" Compressed="yes"
-                    Source="..\..\README_checked.txt" />
-                  <File Id="chk1" Name="mthca.sys" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\mthca.sys" />
-                  <File Id="cat1" Name="mthca.cat" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\mthca.cat" />
-                  <File Id="sym1" Name="mthca.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\mthca.pdb" />
-
-                  <File Id="chk2" Name="ibbus.sys" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\ibbus.sys" />
-                  <File Id="sym2" Name="ibbus.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\ibbus.pdb" />
-
-                  <File Id="chk3" Name="ibiou.sys" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\ibiou.sys" />
-                  <File Id="cat3" Name="ib_iou.cat" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\ib_iou.cat" />
-                  <File Id="sym3" Name="ibiou.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\ibiou.pdb" />
-
-                  <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\net\x86\ipoib.sys" />
-                  <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\net\x86\ipoib.cat" />
-                  <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\net\x86\ipoib.pdb" />
-
-                  <File Id="chk5" DiskId="1" Compressed="yes"
-                    Name="qlgcvnic.sys"
-                    Source="..\bin\Chk\net\x86\qlgcvnic.sys" />
-                  <File Id="cat5" DiskId="1" Compressed="yes"
-                    Name="netvnic.cat"
-                    Source="..\bin\Chk\net\x86\netvnic.cat" />
-                  <File Id="sym5" DiskId="1" Compressed="yes"
-                    Name="qlgcvnic.pdb"
-                    Source="..\bin\Chk\net\x86\qlgcvnic.pdb" />
-
-                  <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\storage\x86\ibsrp.sys" />
-                  <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\storage\x86\ibsrp.cat" />
-                  <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\storage\x86\ibsrp.pdb" />
-
-                  <File Id="chk7" DiskId="1" Compressed="yes"
-                    Name="mlx4_bus.sys"
-                    Source="..\bin\Chk\HCA\x86\mlx4_bus.sys" />
-                  <File Id="cat7" DiskId="1" Compressed="yes"
-                    Name="mlx4_bus.cat"
-                    Source="..\bin\Chk\HCA\x86\mlx4_bus.cat" />
-                  <File Id="sym7" DiskId="1" Compressed="yes"
-                    Name="mlx4_bus.pdb"
-                    Source="..\bin\Chk\HCA\x86\mlx4_bus.pdb" />
-
-                  <File Id="chk8" DiskId="1" Compressed="yes"
-                    Name="mlx4_hca.sys"
-                    Source="..\bin\Chk\HCA\x86\mlx4_hca.sys" />
-                  <File Id="cat8" DiskId="1" Compressed="yes"
-                    Name="mlx4_hca.cat"
-                    Source="..\bin\Chk\HCA\x86\mlx4_hca.cat" />
-                  <File Id="sym8" DiskId="1" Compressed="yes"
-                    Name="mlx4_hca.pdb"
-                    Source="..\bin\Chk\HCA\x86\mlx4_hca.pdb" />
-
+                          <File Id="chk0" DiskId="1" Compressed="yes"
+                            Name="README.txt"
+                            Source="..\..\README_checked.txt" />
+                      <File Id="chk1" DiskId="1" Compressed="yes"
+                            Name="mthca.sys"
+                            Source="..\bin\Chk\HCA\x86\mthca.sys" />
+                      <File Id="cat1" DiskId="1" Compressed="yes"
+                            Name="mthca.cat"
+                            Source="..\bin\Chk\HCA\x86\mthca.cat" />
+                      <File Id="sym1" DiskId="1" Compressed="yes"
+                            Name="mthca.pdb"
+                            Source="..\bin\Chk\HCA\x86\mthca.pdb" />
+
+                      <File Id="chk2" DiskId="1" Compressed="yes"
+                            Name="ibbus.sys"
+                            Source="..\bin\Chk\HCA\x86\ibbus.sys" />
+                      <File Id="sym2" DiskId="1" Compressed="yes"
+                            Name="ibbus.pdb"
+                            Source="..\bin\Chk\HCA\x86\ibbus.pdb" />
+                      <File Id="chk3" DiskId="1" Compressed="yes"
+                            Name="ibiou.sys"
+                            Source="..\bin\Chk\HCA\x86\ibiou.sys" />
+                      <File Id="cat3" DiskId="1" Compressed="yes"
+                            Name="ib_iou.cat"
+                            Source="..\bin\Chk\HCA\x86\ib_iou.cat" />
+                      <File Id="sym3" DiskId="1" Compressed="yes"
+                            Name="ibiou.pdb"
+                            Source="..\bin\Chk\HCA\x86\ibiou.pdb" />
+
+                      <File Id="chk4" DiskId="1" Compressed="yes"
+                            Name="ipoib.sys"
+                          Source="..\bin\Chk\net\x86\ipoib.sys" />
+                      <File Id="cat4" DiskId="1" Compressed="yes"
+                            Name="ipoib.cat"
+                            Source="..\bin\Chk\net\x86\ipoib.cat" />
+                      <File Id="sym4" DiskId="1" Compressed="yes"
+                            Name="ipoib.pdb"
+                            Source="..\bin\Chk\net\x86\ipoib.pdb" />
+
+                      <File Id="chk5" DiskId="1" Compressed="yes"
+                            Name="qlgcvnic.sys"
+                            Source="..\bin\Chk\net\x86\qlgcvnic.sys" />
+                      <File Id="cat5" DiskId="1" Compressed="yes"
+                            Name="netvnic.cat"
+                            Source="..\bin\Chk\net\x86\netvnic.cat" />
+                      <File Id="sym5" DiskId="1" Compressed="yes"
+                            Name="qlgcvnic.pdb"
+                            Source="..\bin\Chk\net\x86\qlgcvnic.pdb" />
+
+                      <File Id="chk6" DiskId="1" Compressed="yes"
+                            Name="ibsrp.sys"
+                            Source="..\bin\Chk\storage\x86\ibsrp.sys" />
+                      <File Id="cat6" DiskId="1" Compressed="yes"
+                            Name="ibsrp.cat"
+                            Source="..\bin\Chk\storage\x86\ibsrp.cat" />
+                      <File Id="sym6" DiskId="1" Compressed="yes"
+                            Name="ibsrp.pdb"
+                            Source="..\bin\Chk\storage\x86\ibsrp.pdb" />
+
+                      <File Id="chk7" DiskId="1" Compressed="yes"
+                            Name="mlx4_bus.sys"
+                            Source="..\bin\Chk\HCA\x86\mlx4_bus.sys" />
+                      <File Id="cat7" DiskId="1" Compressed="yes"
+                            Name="mlx4_bus.cat"
+                            Source="..\bin\Chk\HCA\x86\mlx4_bus.cat" />
+                      <File Id="sym7" DiskId="1" Compressed="yes"
+                            Name="mlx4_bus.pdb"
+                            Source="..\bin\Chk\HCA\x86\mlx4_bus.pdb" />
+
+                      <File Id="chk8" DiskId="1" Compressed="yes"
+                            Name="mlx4_hca.sys"
+                            Source="..\bin\Chk\HCA\x86\mlx4_hca.sys" />
+                      <File Id="cat8" DiskId="1" Compressed="yes"
+                            Name="mlx4_hca.cat"
+                            Source="..\bin\Chk\HCA\x86\mlx4_hca.cat" />
+                      <File Id="sym8" DiskId="1" Compressed="yes"
+                            Name="mlx4_hca.pdb"
+                            Source="..\bin\Chk\HCA\x86\mlx4_hca.pdb" />
+
+                      <File Id="chk9" DiskId="1" Compressed="yes"
+                            Name="winverbs.sys"
+                            Source="..\bin\Chk\HCA\x86\winverbs.sys" />
+                      <File Id="sym9" DiskId="1" Compressed="yes"
+                            Name="winverbs.pdb"
+                            Source="..\bin\Chk\HCA\x86\winverbs.pdb" />
+                      <File Id="dll9" DiskId="1" Compressed="yes"
+                            Name="winverbs.dll"
+                            Source="..\bin\Chk\HCA\x86\winverbs.dll" />
+                      <File Id="dlld9" DiskId="1" Compressed="yes"
+                            Name="winverbd.dll"
+                            LongName="winverbsd.dll"
+                            Source="..\bin\Chk\HCA\x86\winverbsd.dll" />
                     </Component>
                   </Directory>
-            
+
                   <Directory Id="dir_14" Name="user">
                     <Component Id="cCHK_user"
                                Guid="A4AC788B-6517-47b2-A898-0493ADC794D5">
@@ -458,70 +503,26 @@
                   </Directory>
                 </Directory>
 
-                <Directory Id="wvDir" Name="WinVerbs">
-                   <Component Id="cWinVerbsKernel"
-                             Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
-                     <CreateFolder />
-
-                     <File Id="winverbs.inf" Compressed="yes" DiskId="1"
-                           LongName="winverbs.inf" Name="winverbs.INF"
-                           Source="..\bin\HCA\x86\winverbs.inf" />
-                     <File Id="winverbs.sys" Compressed="yes" DiskId="1"
-                           LongName="winverbs.sys" Name="winverbs.sys"
-                           Source="..\bin\HCA\x86\winverbs.sys" />
-                     <File Id="winverbs.cat" Compressed="yes" DiskId="1"
-                           LongName="winverbs.cat" Name="winverbs.cat"
-                           Source="..\bin\HCA\x86\winverbs.cat" />
-                     <File Id="winverbs.dll" Compressed="yes" DiskId="1"
-                           LongName="winverbs.dll" Name="winvrbs.dll"
-                           Source="..\bin\HCA\x86\winverbs.dll" />
-                     <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
-                           LongName="winverbsd.dll" Name="winvrbsd.dll"
-                           Source="..\bin\HCA\x86\winverbsd.dll" />
-                     <File Id="wvWdfCoinstaller" Compressed="yes" DiskId="1"
-                           LongName="WdfCoInstaller01007.dll" Name="WCO.dll"
-                           Source="..\bin\HCA\x86\WdfCoInstaller01007.dll" />
-                   </Component>
+                <Component Id="cWinVerbsOFED"
+                           Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">
 
-                   <Component Id="cWinVerbsUser"
-                             Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">
-
-                     <File Id="winverbs.lib" Compressed="yes" DiskId="1"
-                           LongName="winverbs.lib" Name="winverbs.lib"
-                           Source="..\bin\HCA\x86\winverbs.lib" />
-                     <CopyFile Id="dupWverbs.lib" FileId="winverbs.lib"
-                           DestinationName="winverbs.lib"
-                           DestinationProperty="WindowsFolder" />
-
-                     <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
-                           LongName="winverbsd.lib" Name="winvrbsd.lib"
-                           Source="..\bin\HCA\x86\winverbsd.lib" />
-
-                     <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
-                           LongName="libibverbs.dll" Name="ibverbs.dll"
-                           Source="..\bin\HCA\x86\libibverbs.dll" />
-                     <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"
+                  <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
+                        LongName="libibverbs.dll" Name="ibverbs.dll"
+                        Source="..\bin\HCA\x86\libibverbs.dll" />
+                    <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"
                            DestinationName="ibverbs.dll"
                            DestinationLongName="libibverbs.dll"
                            DestinationProperty="WindowsFolder" />
 
-                     <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
-                           LongName="libibverbs.lib" Name="ibverbs.lib"
-                           Source="..\bin\HCA\x86\libibverbs.lib" />
-                     <CopyFile Id="dupLibibv.lib" FileId="libibverbs.lib"
-                           DestinationName="ibverbs.lib"
-                           DestinationLongName="libibverbs.lib"
+                  <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
+                        LongName="libibverbsd.dll" Name="ibverbsd.dll"
+                        Source="..\bin\HCA\x86\libibverbsd.dll" />
+                    <CopyFile Id="dupLibibvd.dll" FileId="libibverbsd.dll"
+                           DestinationName="ibverbsd.dll"
+                           DestinationLongName="libibverbsd.dll"
                            DestinationProperty="WindowsFolder" />
 
-                     <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
-                           LongName="libibverbsd.dll" Name="ibverbsd.dll"
-                           Source="..\bin\HCA\x86\libibverbsd.dll" />
-
-                     <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
-                           LongName="libibverbsd.lib" Name="ibverbsd.lib"
-                           Source="..\bin\HCA\x86\libibverbsd.lib" />
-                   </Component>
-                </Directory>
+                </Component>
 
                 <Component Id="cWinVerbsUApps"
                           Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">
@@ -951,18 +952,40 @@
                <File Id="complib.pdb" Compressed="yes" DiskId="1"
                      LongName="complib.pdb" Name="complib.pdb"
                      Source="..\bin\HCA\x86\complib.pdb" />
-              <File Id="ibald.lib" Compressed="yes" DiskId="1"
-                    LongName="ibald.lib" Name="ibald.lib"
-                    Source="..\bin\HCA\x86\ibald.lib" />
-              <File Id="ibald.pdb" Compressed="yes" DiskId="1"
-                    LongName="ibald.pdb" Name="ibald.pdb"
-                    Source="..\bin\HCA\x86\ibald.pdb" />
-              <File Id="complibd.lib" Compressed="yes" DiskId="1"
-                    LongName="complibd.lib" Name="complibd.lib"
-                    Source="..\bin\HCA\x86\complibd.lib" />
-              <File Id="complibd.pdb" Compressed="yes" DiskId="1"
-                    LongName="complibd.pdb" Name="complibd.pdb"
-                    Source="..\bin\HCA\x86\complibd.pdb" />
+               <File Id="ibald.lib" Compressed="yes" DiskId="1"
+                     LongName="ibald.lib" Name="ibald.lib"
+                     Source="..\bin\HCA\x86\ibald.lib" />
+               <File Id="ibald.pdb" Compressed="yes" DiskId="1"
+                     LongName="ibald.pdb" Name="ibald.pdb"
+                     Source="..\bin\HCA\x86\ibald.pdb" />
+               <File Id="complibd.lib" Compressed="yes" DiskId="1"
+                     LongName="complibd.lib" Name="complibd.lib"
+                     Source="..\bin\HCA\x86\complibd.lib" />
+               <File Id="complibd.pdb" Compressed="yes" DiskId="1"
+                     LongName="complibd.pdb" Name="complibd.pdb"
+                     Source="..\bin\HCA\x86\complibd.pdb" />
+
+               <File Id="winverbs.lib" Compressed="yes" DiskId="1"
+                     LongName="winverbs.lib" Name="winverbs.lib"
+                     Source="..\bin\HCA\x86\winverbs.lib" />
+
+               <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
+                     LongName="winverbsd.lib" Name="winvrbsd.lib"
+                     Source="..\bin\HCA\x86\winverbsd.lib" />
+
+               <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
+                     LongName="libibverbs.lib" Name="ibverbs.lib"
+                     Source="..\bin\HCA\x86\libibverbs.lib" />
+               <File Id="libibverbs.pdb" Compressed="yes" DiskId="1"
+                     LongName="libibverbs.pdb" Name="ibverbs.pdb"
+                     Source="..\bin\HCA\x86\libibverbs.pdb" />
+               <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
+                     LongName="libibverbsd.lib" Name="ibverbsd.lib"
+                     Source="..\bin\HCA\x86\libibverbsd.lib" />
+               <File Id="libibverbsd.pdb" Compressed="yes" DiskId="1"
+                     LongName="libibverbsd.pdb" Name="ibverbsd.pdb"
+                     Source="..\bin\HCA\x86\libibverbsd.pdb" />
+
              </Component>
            </Directory>
 
@@ -1246,6 +1269,7 @@
         ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
         InstallDefault="local" Absent="disallow">
         <ComponentRef Id="cIBcore" />
+        <ComponentRef Id="cWinVerbsDrivers" />
         <ComponentRef Id="Docs" />
         <ComponentRef Id="Tools" />
         <ComponentRef Id="OpenSMservice" />
@@ -1254,11 +1278,10 @@
     </Feature>
 
     <Feature Id="fWV" Title="WinVerbs"
-        Description="OFED verbs API for Windows"
-        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"
+        Description="OFED verbs - Libraries + utilities"
+        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"
         AllowAdvertise="no" InstallDefault="local" Absent="allow">
-        <ComponentRef Id="cWinVerbsKernel" />
-        <ComponentRef Id="cWinVerbsUser" />
+        <ComponentRef Id="cWinVerbsOFED" />
         <ComponentRef Id="cWinVerbsUApps" />
     </Feature>
 
diff --git a/trunk/WinOF/WIX/wxp/x86/wof.wxs b/trunk/WinOF/WIX/wxp/x86/wof.wxs
index 1a1fc85b..77415a1d 100644
--- a/trunk/WinOF/WIX/wxp/x86/wof.wxs
+++ b/trunk/WinOF/WIX/wxp/x86/wof.wxs
@@ -223,6 +223,10 @@
                         <File Id="devman.exe" Compressed="yes" DiskId="1"
                               LongName="devman.exe" Name="devman.exe"
                               Source="..\..\x86\devman.exe" />
+                        <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"
+                              LongName="WdfCoInstaller01007.dll"
+                              Name="WDFCOIN.dll"
+                              Source="..\bin\hca\x86\WdfCoInstaller01007.dll" />
                         <File Id="complib.dll" Compressed="yes" DiskId="1"
                               LongName="complib.dll" Name="COMPLIB.DLL"
                               Source="..\bin\HCA\x86\complib.dll" />
@@ -291,10 +295,6 @@
                         <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"
                               Name="mlx4_bus.pdb"
                               Source="..\bin\hca\x86\mlx4_bus.pdb" />
-                        <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"
-                              LongName="WdfCoInstaller01007.dll"
-                              Name="WCO.dll"
-                              Source="..\bin\hca\x86\WdfCoInstaller01007.dll" />
                         <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"
                               LongName="mlx4_hca.inf" Name="mlx4_hca.INF"
                               Source="..\bin\hca\x86\mlx4_hca.inf" />
@@ -314,6 +314,23 @@
                               LongName="mlx4ud.dll" Name="mlx4ud.dll"
                               Source="..\bin\hca\x86\mlx4ud.dll" />
                     </Component>
+
+                    <Component Id="cWinVerbsDrivers"
+                             Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
+
+                        <File Id="winverbs.sys" Compressed="yes" DiskId="1"
+                              LongName="winverbs.sys" Name="winverbs.sys"
+                              Source="..\bin\HCA\x86\winverbs.sys" />
+                        <File Id="winverbs.pdb" Compressed="yes" DiskId="1"
+                              LongName="winverbs.pdb" Name="winverbs.pdb"
+                              Source="..\bin\HCA\x86\winverbs.pdb" />
+                        <File Id="winverbs.dll" Compressed="yes" DiskId="1"
+                              LongName="winverbs.dll" Name="winvrbs.dll"
+                              Source="..\bin\HCA\x86\winverbs.dll" />
+                        <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
+                              LongName="winverbsd.dll" Name="winvrbsd.dll"
+                              Source="..\bin\HCA\x86\winverbsd.dll" />
+                    </Component>
                 </Directory>
 
                 <Directory Id="dir_0" Name="Checked">
@@ -321,73 +338,99 @@
                     <Component Id="cCHK_kernel"
                                Guid="D96F299E-EEAA-44a5-BBC4-A862A158BA6B">
                       <CreateFolder />
-
-
-                  <File Id="chk0" Name="README.txt" DiskId="1" Compressed="yes"
-                    Source="..\..\README_checked.txt" />
-                  <File Id="chk1" Name="mthca.sys" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\mthca.sys" />
-                  <File Id="cat1" Name="mthca.cat" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\mthca.cat" />
-                  <File Id="sym1" Name="mthca.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\mthca.pdb" />
-
-                  <File Id="chk2" Name="ibbus.sys" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\ibbus.sys" />
-                  <File Id="sym2" Name="ibbus.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\ibbus.pdb" />
-
-                  <File Id="chk3" Name="ibiou.sys" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\ibiou.sys" />
-                  <File Id="cat3" Name="ib_iou.cat" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\ib_iou.cat" />
-                  <File Id="sym3" Name="ibiou.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\HCA\x86\ibiou.pdb" />
-
-                  <File Id="chk4" Name="ipoib.sys" DiskId="1" Compressed="yes"
-                  Source="..\bin\Chk\net\x86\ipoib.sys" />
-                  <File Id="cat4" Name="ipoib.cat" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\net\x86\ipoib.cat" />
-                  <File Id="sym4" Name="ipoib.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\net\x86\ipoib.pdb" />
-
-                  <File Id="chk5" DiskId="1" Compressed="yes"
-                    Name="qlgcvnic.sys"
-                    Source="..\bin\Chk\net\x86\qlgcvnic.sys" />
-                  <File Id="cat5" DiskId="1" Compressed="yes"
-                    Name="netvnic.cat"
-                    Source="..\bin\Chk\net\x86\netvnic.cat" />
-                  <File Id="sym5" DiskId="1" Compressed="yes"
-                    Name="qlgcvnic.pdb"
-                    Source="..\bin\Chk\net\x86\qlgcvnic.pdb" />
-
-                  <File Id="chk6" Name="ibsrp.sys" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\storage\x86\ibsrp.sys" />
-                  <File Id="cat6" Name="ibsrp.cat" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\storage\x86\ibsrp.cat" />
-                  <File Id="sym6" Name="ibsrp.pdb" DiskId="1" Compressed="yes"
-                    Source="..\bin\Chk\storage\x86\ibsrp.pdb" />
-
-                  <File Id="chk7" DiskId="1" Compressed="yes"
-                    Name="mlx4_bus.sys"
-                    Source="..\bin\Chk\HCA\x86\mlx4_bus.sys" />
-                  <File Id="cat7" DiskId="1" Compressed="yes"
-                    Name="mlx4_bus.cat"
-                    Source="..\bin\Chk\HCA\x86\mlx4_bus.cat" />
-                  <File Id="sym7" DiskId="1" Compressed="yes"
-                    Name="mlx4_bus.pdb"
-                    Source="..\bin\Chk\HCA\x86\mlx4_bus.pdb" />
-
-                  <File Id="chk8" DiskId="1" Compressed="yes"
-                    Name="mlx4_hca.sys"
-                    Source="..\bin\Chk\HCA\x86\mlx4_hca.sys" />
-                  <File Id="cat8" DiskId="1" Compressed="yes"
-                    Name="mlx4_hca.cat"
-                    Source="..\bin\Chk\HCA\x86\mlx4_hca.cat" />
-                  <File Id="sym8" DiskId="1" Compressed="yes"
-                    Name="mlx4_hca.pdb"
-                    Source="..\bin\Chk\HCA\x86\mlx4_hca.pdb" />
-
+                        <File Id="chk0" DiskId="1" Compressed="yes"
+                              Name="README.txt"
+                              Source="..\..\README_checked.txt" />
+                        <File Id="chk1" DiskId="1" Compressed="yes"
+                              Name="mthca.sys"
+                              Source="..\bin\Chk\HCA\x86\mthca.sys" />
+                        <File Id="cat1" DiskId="1" Compressed="yes"
+                              Name="mthca.cat"
+                              Source="..\bin\Chk\HCA\x86\mthca.cat" />
+                        <File Id="sym1" DiskId="1" Compressed="yes"
+                              Name="mthca.pdb"
+                              Source="..\bin\Chk\HCA\x86\mthca.pdb" />
+  
+                        <File Id="chk2" DiskId="1" Compressed="yes"
+                              Name="ibbus.sys"
+                              Source="..\bin\Chk\HCA\x86\ibbus.sys" />
+                        <File Id="sym2" DiskId="1" Compressed="yes"
+                              Name="ibbus.pdb"
+                              Source="..\bin\Chk\HCA\x86\ibbus.pdb" />
+  
+                        <File Id="chk3" DiskId="1" Compressed="yes"
+                              Name="ibiou.sys"
+                              Source="..\bin\Chk\HCA\x86\ibiou.sys" />
+                        <File Id="cat3"
+                              Name="ib_iou.cat" DiskId="1" Compressed="yes"
+                              Source="..\bin\Chk\HCA\x86\ib_iou.cat" />
+                        <File Id="sym3" DiskId="1" Compressed="yes"
+                              Name="ibiou.pdb"
+                              Source="..\bin\Chk\HCA\x86\ibiou.pdb" />
+  
+                        <File Id="chk4" DiskId="1" Compressed="yes"
+                              Name="ipoib.sys"
+                              Source="..\bin\Chk\net\x86\ipoib.sys" />
+                        <File Id="cat4" DiskId="1" Compressed="yes"
+                              Name="ipoib.cat"
+                              Source="..\bin\Chk\net\x86\ipoib.cat" />
+                        <File Id="sym4" DiskId="1" Compressed="yes"
+                              Name="ipoib.pdb"
+                              Source="..\bin\Chk\net\x86\ipoib.pdb" />
+  
+                        <File Id="chk5" DiskId="1" Compressed="yes"
+                              Name="qlgcvnic.sys"
+                              Source="..\bin\Chk\net\x86\qlgcvnic.sys" />
+                        <File Id="cat5" DiskId="1" Compressed="yes"
+                              Name="netvnic.cat"
+                              Source="..\bin\Chk\net\x86\netvnic.cat" />
+                        <File Id="sym5" DiskId="1" Compressed="yes"
+                              Name="qlgcvnic.pdb"
+                              Source="..\bin\Chk\net\x86\qlgcvnic.pdb" />
+  
+                        <File Id="chk6" DiskId="1" Compressed="yes"
+                              Name="ibsrp.sys"
+                              Source="..\bin\Chk\storage\x86\ibsrp.sys" />
+                        <File Id="cat6" DiskId="1" Compressed="yes"
+                              Name="ibsrp.cat"
+                              Source="..\bin\Chk\storage\x86\ibsrp.cat" />
+                        <File Id="sym6" DiskId="1" Compressed="yes"
+                              Name="ibsrp.pdb"
+                              Source="..\bin\Chk\storage\x86\ibsrp.pdb" />
+  
+                        <File Id="chk7" DiskId="1" Compressed="yes"
+                              Name="mlx4_bus.sys"
+                              Source="..\bin\Chk\HCA\x86\mlx4_bus.sys" />
+                        <File Id="cat7" DiskId="1" Compressed="yes"
+                              Name="mlx4_bus.cat"
+                              Source="..\bin\Chk\HCA\x86\mlx4_bus.cat" />
+                        <File Id="sym7" DiskId="1" Compressed="yes"
+                              Name="mlx4_bus.pdb"
+                              Source="..\bin\Chk\HCA\x86\mlx4_bus.pdb" />
+  
+                        <File Id="chk8" DiskId="1" Compressed="yes"
+                              Name="mlx4_hca.sys"
+                              Source="..\bin\Chk\HCA\x86\mlx4_hca.sys" />
+                        <File Id="cat8" DiskId="1" Compressed="yes"
+                              Name="mlx4_hca.cat"
+                              Source="..\bin\Chk\HCA\x86\mlx4_hca.cat" />
+                        <File Id="sym8" DiskId="1" Compressed="yes"
+                              Name="mlx4_hca.pdb"
+                              Source="..\bin\Chk\HCA\x86\mlx4_hca.pdb" />
+  
+                        <File Id="chk9" DiskId="1" Compressed="yes"
+                              Name="winverbs.sys"
+                              Source="..\bin\Chk\HCA\x86\winverbs.sys" />
+                        <File Id="sym9" DiskId="1" Compressed="yes"
+                              Name="winverbs.pdb"
+                              Source="..\bin\Chk\HCA\x86\winverbs.pdb" />
+                        <File Id="dll9" DiskId="1" Compressed="yes"
+                              Name="winverbs.dll"
+                              Source="..\bin\Chk\HCA\x86\winverbs.dll" />
+                        <File Id="dlld9" DiskId="1" Compressed="yes"
+                              Name="winverbd.dll"
+                              LongName="winverbsd.dll"
+                              Source="..\bin\Chk\HCA\x86\winverbsd.dll" />
                     </Component>
                   </Directory>
             
@@ -451,70 +494,25 @@
                   </Directory>
                 </Directory>
 
-                <Directory Id="wvDir" Name="WinVerbs">
-                   <Component Id="cWinVerbsKernel"
-                             Guid="F5FA1491-E2D2-4f22-9549-07C61F86BFEB">
-                     <CreateFolder />
-
-                     <File Id="winverbs.inf" Compressed="yes" DiskId="1"
-                           LongName="winverbs.inf" Name="winverbs.INF"
-                           Source="..\bin\HCA\x86\winverbs.inf" />
-                     <File Id="winverbs.sys" Compressed="yes" DiskId="1"
-                           LongName="winverbs.sys" Name="winverbs.sys"
-                           Source="..\bin\HCA\x86\winverbs.sys" />
-                     <File Id="winverbs.cat" Compressed="yes" DiskId="1"
-                           LongName="winverbs.cat" Name="winverbs.cat"
-                           Source="..\bin\HCA\x86\winverbs.cat" />
-                     <File Id="winverbs.dll" Compressed="yes" DiskId="1"
-                           LongName="winverbs.dll" Name="winvrbs.dll"
-                           Source="..\bin\HCA\x86\winverbs.dll" />
-                     <File Id="winverbsd.dll" Compressed="yes" DiskId="1"
-                           LongName="winverbsd.dll" Name="winvrbsd.dll"
-                           Source="..\bin\HCA\x86\winverbsd.dll" />
-                     <File Id="wvWdfCoinstaller" Compressed="yes" DiskId="1"
-                           LongName="WdfCoInstaller01007.dll" Name="WCO.dll"
-                           Source="..\bin\HCA\x86\WdfCoInstaller01007.dll" />
-                   </Component>
-
-                   <Component Id="cWinVerbsUser"
-                             Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">
-
-                     <File Id="winverbs.lib" Compressed="yes" DiskId="1"
-                           LongName="winverbs.lib" Name="winverbs.lib"
-                           Source="..\bin\HCA\x86\winverbs.lib" />
-                     <CopyFile Id="dupWverbs.lib" FileId="winverbs.lib"
-                           DestinationName="winverbs.lib"
-                           DestinationProperty="WindowsFolder" />
-
-                     <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
-                           LongName="winverbsd.lib" Name="winvrbsd.lib"
-                           Source="..\bin\HCA\x86\winverbsd.lib" />
+                <Component Id="cWinVerbsOFED"
+                           Guid="20916BB0-5E16-49bb-BE9F-3A202D760E72">
 
-                     <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
-                           LongName="libibverbs.dll" Name="ibverbs.dll"
-                           Source="..\bin\HCA\x86\libibverbs.dll" />
-                     <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"
+                  <File Id="libibverbs.dll" Compressed="yes" DiskId="1"
+                        LongName="libibverbs.dll" Name="ibverbs.dll"
+                        Source="..\bin\HCA\x86\libibverbs.dll" />
+                    <CopyFile Id="dupLibibv.dll" FileId="libibverbs.dll"
                            DestinationName="ibverbs.dll"
                            DestinationLongName="libibverbs.dll"
                            DestinationProperty="WindowsFolder" />
 
-                     <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
-                           LongName="libibverbs.lib" Name="ibverbs.lib"
-                           Source="..\bin\HCA\x86\libibverbs.lib" />
-                     <CopyFile Id="dupLibibv.lib" FileId="libibverbs.lib"
-                           DestinationName="ibverbs.lib"
-                           DestinationLongName="libibverbs.lib"
+                  <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
+                        LongName="libibverbsd.dll" Name="ibverbsd.dll"
+                        Source="..\bin\HCA\x86\libibverbsd.dll" />
+                    <CopyFile Id="dupLibibvd.dll" FileId="libibverbsd.dll"
+                           DestinationName="ibverbsd.dll"
+                           DestinationLongName="libibverbsd.dll"
                            DestinationProperty="WindowsFolder" />
-
-                     <File Id="libibverbsd.dll" Compressed="yes" DiskId="1"
-                           LongName="libibverbsd.dll" Name="ibverbsd.dll"
-                           Source="..\bin\HCA\x86\libibverbsd.dll" />
-
-                     <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
-                           LongName="libibverbsd.lib" Name="ibverbsd.lib"
-                           Source="..\bin\HCA\x86\libibverbsd.lib" />
-                   </Component>
-                </Directory>
+                </Component>
 
                 <Component Id="cWinVerbsUApps"
                           Guid="ECAB2829-AE65-4ef8-8214-9A89E5BBDB9A">
@@ -958,6 +956,22 @@
               <File Id="complibd.pdb" Compressed="yes" DiskId="1"
                     LongName="complibd.pdb" Name="complibd.pdb"
                     Source="..\bin\HCA\x86\complibd.pdb" />
+
+              <File Id="winverbs.lib" Compressed="yes" DiskId="1"
+                    LongName="winverbs.lib" Name="winverbs.lib"
+                    Source="..\bin\HCA\x86\winverbs.lib" />
+
+              <File Id="winverbsd.lib" Compressed="yes" DiskId="1"
+                    LongName="winverbsd.lib" Name="winvrbsd.lib"
+                    Source="..\bin\HCA\x86\winverbsd.lib" />
+
+              <File Id="libibverbs.lib" Compressed="yes" DiskId="1"
+                    LongName="libibverbs.lib" Name="ibverbs.lib"
+                    Source="..\bin\HCA\x86\libibverbs.lib" />
+
+              <File Id="libibverbsd.lib" Compressed="yes" DiskId="1"
+                    LongName="libibverbsd.lib" Name="ibverbsd.lib"
+                    Source="..\bin\HCA\x86\libibverbsd.lib" />
              </Component>
            </Directory>
 
@@ -1241,6 +1255,7 @@
         ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"
         InstallDefault="local" Absent="disallow">
         <ComponentRef Id="cIBcore" />
+        <ComponentRef Id="cWinVerbsDrivers" />
         <ComponentRef Id="Docs" />
         <ComponentRef Id="Tools" />
         <ComponentRef Id="OpenSMservice" />
@@ -1248,11 +1263,10 @@
     </Feature>
 
     <Feature Id="fWV" Title="WinVerbs"
-        Description="OFED verbs API for Windows"
-        Display="expand" Level="2" ConfigurableDirectory="INSTALLDIR"
+        Description="OFED verbs - Libraries + applications"
+        Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"
         AllowAdvertise="no" InstallDefault="local" Absent="allow">
-        <ComponentRef Id="cWinVerbsKernel" />
-        <ComponentRef Id="cWinVerbsUser" />
+        <ComponentRef Id="cWinVerbsOFED" />
         <ComponentRef Id="cWinVerbsUApps" />
     </Feature>
 
-- 
2.41.0