diff --git a/Bitmaps/BannrBmp.bmp b/Bitmaps/BannrBmp.bmp
deleted file mode 100644
index 72f39e6..0000000
Binary files a/Bitmaps/BannrBmp.bmp and /dev/null differ
diff --git a/Bitmaps/DlgBmp.bmp b/Bitmaps/DlgBmp.bmp
deleted file mode 100644
index 24d4d6e..0000000
Binary files a/Bitmaps/DlgBmp.bmp and /dev/null differ
diff --git a/OMakefile b/OMakefile
index 25e1aff..c0bb285 100644
--- a/OMakefile
+++ b/OMakefile
@@ -32,7 +32,7 @@ USE_OCAMLFIND = true
 
 SUPPORT_CS = csharp/src/*.cs
 
-POWERSHELL_TMP=$(BINDINGS_TMP)/XenServerPSSnapIn
+POWERSHELL_TMP=$(BINDINGS_TMP)/XenServerPowerShell
 POWERSHELL_GEN=$(BINDINGS_TMP)/powershell_autogen
 CSHARP_GEN=$(BINDINGS_TMP)/csharp_gen
 CSHARP_SRC_TMP=$(BINDINGS_TMP)/XenServer.NET-src/XenServer.NET
diff --git a/mk/Makefile b/mk/Makefile
index ad1db71..e4f0d0e 100644
--- a/mk/Makefile
+++ b/mk/Makefile
@@ -41,8 +41,6 @@ REPONAME=xen-api-sdk
 REPO=$(call git_loc,$(REPONAME))
 BINDINGS_TMP=$(MY_OBJ_DIR)/tmp
 PS_TAR_TMP=$(BINDINGS_TMP)/powershell_tar
-INSTALLER_TMP=$(BINDINGS_TMP)/installer_tar
-WIX_TMP=$(BINDINGS_TMP)/wix_src
 AUTOMATION_DLL_V2=$(CARBON_DISTFILES)/powershell-v2/System.Management.Automation.dll
 CSHARP_SRC_TMP=$(BINDINGS_TMP)/XenServer.NET-src/XenServer.NET
 CSHARP_BIN_TMP=$(BINDINGS_TMP)/XenServer.NET-bin/XenServer.NET
@@ -51,13 +49,8 @@ CSHARP_XMLRPC_TMP=$(BINDINGS_TMP)/csharp_xmlrpc
 XMLRPC_DLL=CookComputing.XmlRpcV2.dll
 XMLRPCLICENSE = $(CARBON_DISTFILES)/csharp/XML-RPC.NET/LICENSE
 
-INSTALLER_DEFAULT_GUID=3285AFCC-B1FA-4D78-8F94-AF1F4C2C8027
-INSTALLER_DEFAULT_VERSION=1\.0\.0
-
 PRODUCT_GUID := $(shell uuidgen | tr a-z A-Z)
 
-PATCHES=$(REPO)/mk/patches
-
 OMAKE=DATAMODEL_DIR=$(PROJECT_OUTPUTDIR)/api/datamodel omake
 
 # sources
@@ -75,7 +68,7 @@ SDK_ZIP=XenServer-SDK-$(PRODUCT_VERSION).zip
 SDK_ZIP_LN=XenServer-SDK.zip
 SDK_FOLDER=$(MY_OUTPUT_DIR)/XenServer-SDK
 SDK_NET_FOLDER=$(SDK_FOLDER)/XenServer.NET
-SDK_PS_FOLDER=$(SDK_FOLDER)/XenServerPSSnapIn
+SDK_PS_FOLDER=$(SDK_FOLDER)/XenServerPowerShell
 SDK_PY_FOLDER=$(SDK_FOLDER)/XenServerPython
 SDK_PY_FOLDER_SAMPLES=$(SDK_PY_FOLDER)/samples
 
@@ -117,56 +110,38 @@ csharp-bin: $(MY_OBJ_DIR)/$(XMLRPC_DLL) $(MY_OBJ_DIR)/XenServer.dll
 	$(INSTALL) $^ $(CSHARP_BIN_TMP)
 	mkdir -p $(SDK_NET_FOLDER)/bin && cp -r $(CSHARP_BIN_TMP)/* $(SDK_NET_FOLDER)/bin
 
-$(MY_OBJ_DIR)/powershell.tar.gz: $(MY_OBJ_DIR)/XenServer.dll $(MY_OBJ_DIR)/$(XMLRPC_DLL) $(REPO)/mk/sign.bat
+$(MY_OBJ_DIR)/powershell.tar.gz: $(MY_OBJ_DIR)/XenServer.dll \
+                                 $(AUTOMATION_DLL_V2) $(MY_OBJ_DIR)/$(XMLRPC_DLL) \
+                                 $(REPO)/mk/sign.bat $(REPO)/mk/sign-ps.bat \
+                                 $(REPO)/powershell/*.ps1 \
+                                 $(REPO)/powershell/*.ps1xml $(REPO)/powershell/samples/*.ps1
 	mkdir -p $(PS_TAR_TMP)
-	cp -r $(BINDINGS_TMP)/XenServerPSSnapIn $(PS_TAR_TMP)
+	cp -r $(BINDINGS_TMP)/XenServerPowerShell $(PS_TAR_TMP)
 	cp $^ $(PS_TAR_TMP)
-	cp $(AUTOMATION_DLL_V2) $(PS_TAR_TMP)
 	tar -C $(PS_TAR_TMP) -zcf $@ .
 
-$(MY_OBJ_DIR)/XenServerPSSnapIn.dll: $(MY_OBJ_DIR)/powershell.tar.gz $(REPO)/mk/powershell.sh
+$(MY_OBJ_DIR)/XenServerPowerShell.dll: $(MY_OBJ_DIR)/powershell.tar.gz $(REPO)/mk/powershell.sh
 ifeq ($(SKIP_WINDOWS_BUILD), yes)
 	touch $@
 else
 	$(call win-build,$<,$@,$(REPO)/mk/powershell.sh)
 endif
 
-$(WIX_TMP)/src/ui/wixui:
-	mkdir -p $(WIX_TMP)
-	unzip -q -o $(CARBON_DISTFILES)/windows-build/wix-2.0.5805.0-sources.zip -d $(WIX_TMP)
-	cd $(WIX_TMP)/src/ui/wixui && patch -p1 --binary < $(PATCHES)/wix_src_patch
-
-$(MY_OBJ_DIR)/installer.tar.gz: $(WIX_TMP)/src/ui/wixui $(MY_OBJ_DIR)/XenServerPSSnapIn.dll \
-                                $(MY_OBJ_DIR)/XenServer.dll $(MY_OBJ_DIR)/$(XMLRPC_DLL) \
-                                $(REPO)/mk/sign.bat $(REPO)/mk/sign-ps.bat $(REPO)/powershell/*.ps1 \
-                                $(REPO)/powershell/*.ps1xml $(REPO)/powershell/samples/*.ps1
-	mkdir -p $(INSTALLER_TMP)
-	unzip -q -o $(CARBON_DISTFILES)/windows-build/wix-2.0.5805.0-binaries.zip -d $(INSTALLER_TMP)
-	rm $(INSTALLER_TMP)/Bitmaps/{bannrbmp,dlgbmp}.bmp
-	cp -r $(REPO)/powershell/installer/* $(INSTALLER_TMP)
-	cp $(REPO)/Bitmaps/* $(INSTALLER_TMP)/Bitmaps
-	cp -r $^ $(INSTALLER_TMP)
-	cp $(SDK_PS_FOLDER)/src/*.txt $(INSTALLER_TMP)
-	$(INSTALL) $(XMLRPCLICENSE) $(INSTALLER_TMP)/LICENSE.CookComputing.XmlRpcV2
-	chmod -R a=rwx $(INSTALLER_TMP)
-	sed -e 's/$(INSTALLER_DEFAULT_GUID)/$(PRODUCT_GUID)/g' \
-	    -e 's/$(INSTALLER_DEFAULT_VERSION)/$(PRODUCT_VERSION)/g' \
-	    $(REPO)/powershell/installer/XenServerPSSnapIn.wxs > $(INSTALLER_TMP)/XenServerPSSnapIn.wxs
-	tar -C $(INSTALLER_TMP) -zcf $@ .
-
-$(MY_OBJ_DIR)/XenServerPSSnapIn.msi: $(MY_OBJ_DIR)/installer.tar.gz $(REPO)/mk/installer.sh
-ifeq ($(SKIP_WINDOWS_BUILD), yes)
-	touch $@
-else
-	$(call win-build,$<,$@,$(REPO)/mk/installer.sh)
-endif
+.PHONY: powershell-module
+powershell-module: $(MY_OBJ_DIR)/XenServerPowerShell.dll
+	mkdir -p $(SDK_PS_FOLDER)/XenServerPSModule
+	cp $(MY_OBJ_DIR)/{*.dll,*.ps1,*.ps1xml}  $(SDK_PS_FOLDER)/XenServerPSModule
+	sed -e 's/@PRODUCT_VERSION@/$(PRODUCT_VERSION)/g' \
+		-e 's/@PRODUCT_GUID@/$(PRODUCT_GUID)/g' \
+		$(REPO)/powershell/XenServerPSModule.psd1 > $(SDK_PS_FOLDER)/XenServerPSModule/XenServerPSModule.psd1
+	cp $(SDK_PS_FOLDER)/src/*.txt $(SDK_PS_FOLDER)/XenServerPSModule
+	$(INSTALL) $(XMLRPCLICENSE) $(SDK_PS_FOLDER)/XenServerPSModule/LICENSE.CookComputing.XmlRpcV2
 
 .PHONY: bins
-bins: omake-phase $(MY_OBJ_DIR)/XenServerPSSnapIn.msi csharp-bin
+bins: omake-phase powershell-module csharp-bin
 	mkdir -p $(MY_OUTPUT_DIR)
 	cp $(BINDINGS_TMP)/XenCenterBindings.zip $(MY_OUTPUT_DIR)/XenCenterBindings-$(BUILD_NUMBER).zip
 	cp $(MY_OBJ_DIR)/FriendlyErrorNames.Designer.cs $(SDK_NET_FOLDER)/src
-	cp $(MY_OBJ_DIR)/XenServerPSSnapIn.msi $(SDK_PS_FOLDER)/XenServerPSSnapIn-$(PRODUCT_VERSION).msi
 
 .PHONY: python-module
 python-module:
diff --git a/mk/csharp.sh b/mk/csharp.sh
index b88bfe8..d5c3f46 100755
--- a/mk/csharp.sh
+++ b/mk/csharp.sh
@@ -50,4 +50,4 @@ then
     remote_cmd_passwd2 "cd ${TMPDIR} && ${CMD_EXEC} sign.bat XenServer.dll 'XenServer.NET'"
 fi
 
-EXTRA_FILES="XenServer.dll FriendlyErrorNames.Designer.cs"
+EXTRA_FILES="FriendlyErrorNames.Designer.cs"
diff --git a/mk/installer.sh b/mk/installer.sh
deleted file mode 100755
index e0df2c4..0000000
--- a/mk/installer.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (c) Citrix Systems, Inc.
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 
-#   1) Redistributions of source code must retain the above copyright
-#      notice, this list of conditions and the following disclaimer.
-# 
-#   2) Redistributions in binary form must reproduce the above
-#      copyright notice, this list of conditions and the following
-#      disclaimer in the documentation and/or other materials
-#      provided with the distribution.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-# OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-set -e
-
-# see http://www.interact-sw.co.uk/iangblog/2005/09/12/cmdspawnerror
-SYSPATHS="${ROOT}/WINDOWS/:${ROOT}/WINDOWS/System32:${ROOT}/WINDOWS/System32/wbem"
-
-if [ "$SKIP_SIGNING" != "yes" ]
-then
-    remote_cmd_passwd2 "cd ${TMPDIR} && ${CMD_EXEC} sign-ps.bat Initialize-Environment.ps1"
-    remote_cmd_passwd2 "cd ${TMPDIR} && ${CMD_EXEC} sign-ps.bat XenServer.format.ps1xml"
-    remote_cmd_passwd2 "cd ${TMPDIR} && ${CMD_EXEC} sign-ps.bat XenServer.types.ps1xml"
-fi
-
-remote_cmd_passwd2 "cd ${TMPDIR} && mkdir -p obj"
-remote_cmd_passwd2 "cd ${TMPDIR} && ${TMPDIR}/candle.exe -out obj/ wixui/installdir/WixUI_InstallDir.wxs wixui/BrowseDlg.wxs wixui/CancelDlg.wxs wixui/Common.wxs wixui/CustomizeDlg.wxs wixui/DiskCostDlg.wxs wixui/ErrorDlg.wxs wixui/ErrorProgressText.wxs wixui/ExitDialog.wxs wixui/FatalError.wxs wixui/FilesInUse.wxs wixui/InstallDirDlg.wxs wixui/LicenseAgreementDlg.wxs wixui/MaintenanceTypeDlg.wxs wixui/MaintenanceWelcomeDlg.wxs wixui/MsiRMFilesInUse.wxs wixui/OutOfDiskDlg.wxs wixui/OutOfRbDiskDlg.wxs wixui/PrepareDlg.wxs wixui/ProgressDlg.wxs wixui/ResumeDlg.wxs wixui/SetupTypeDlg.wxs wixui/UserExit.wxs wixui/VerifyReadyDlg.wxs wixui/WaitForCostingDlg.wxs wixui/WelcomeDlg.wxs wixui/WelcomeEulaDlg.wxs"
-
-remote_cmd_passwd2 "cd ${TMPDIR} && mkdir -p lib"
-remote_cmd_passwd2 "cd ${TMPDIR} && ${TMPDIR}/lit.exe -out lib/WixUI_InstallDir.wixlib obj/WixUI_InstallDir.wixobj obj/BrowseDlg.wixobj obj/CancelDlg.wixobj obj/Common.wixobj obj/CustomizeDlg.wixobj obj/DiskCostDlg.wixobj obj/ErrorDlg.wixobj obj/ErrorProgressText.wixobj obj/ExitDialog.wixobj obj/FatalError.wixobj obj/FilesInUse.wixobj obj/InstallDirDlg.wixobj obj/LicenseAgreementDlg.wixobj obj/MaintenanceTypeDlg.wixobj obj/MaintenanceWelcomeDlg.wixobj obj/MsiRMFilesInUse.wixobj obj/OutOfDiskDlg.wixobj obj/OutOfRbDiskDlg.wixobj obj/PrepareDlg.wixobj obj/ProgressDlg.wixobj obj/ResumeDlg.wixobj obj/SetupTypeDlg.wixobj obj/UserExit.wixobj obj/VerifyReadyDlg.wixobj obj/WaitForCostingDlg.wixobj obj/WelcomeDlg.wixobj obj/WelcomeEulaDlg.wixobj"
-
-remote_cmd_passwd2 "cd ${TMPDIR} && mkdir -p obj"
-remote_cmd_passwd2 "cd ${TMPDIR} && ${TMPDIR}/candle.exe -out obj/ XenServerPSSnapIn.wxs"
-remote_cmd_passwd2 "cd ${TMPDIR} && mkdir -p out"
-remote_cmd_passwd2 "cd ${TMPDIR} && ${TMPDIR}/light.exe -out XenServerPSSnapIn.msi obj/XenServerPSSnapIn.wixobj lib/WixUI_InstallDir.wixlib -loc wixui/wixui_en-us.wxl"
-
-if [ "$SKIP_SIGNING" != "yes" ]
-then
-    remote_cmd_passwd2 "cd ${TMPDIR} && chmod u+rwx XenServerPSSnapIn.msi"
-    remote_cmd_passwd2 "cd ${TMPDIR} && ${CMD_EXEC} sign.bat XenServerPSSnapIn.msi 'Citrix XenServer PowerShell SnapIn'"
-fi
diff --git a/mk/patches/wix_src_patch b/mk/patches/wix_src_patch
deleted file mode 100644
index 0bda370..0000000
--- a/mk/patches/wix_src_patch
+++ /dev/null
@@ -1,242 +0,0 @@
-#
-# Copyright (c) Citrix Systems, Inc.
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 
-#   1) Redistributions of source code must retain the above copyright
-#      notice, this list of conditions and the following disclaimer.
-# 
-#   2) Redistributions in binary form must reproduce the above
-#      copyright notice, this list of conditions and the following
-#      disclaimer in the documentation and/or other materials
-#      provided with the distribution.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-# OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-diff -ru wixui/CustomizeDlg.wxs wixui/CustomizeDlg.wxs
---- wixui/CustomizeDlg.wxs	2007-09-13 20:45:46.000000000 +0100
-+++ wixui/CustomizeDlg.wxs	2008-08-11 10:20:29.288469800 +0100
-@@ -4,26 +4,18 @@
-     <UI>
-       <Dialog Id="CustomizeDlg" Width="370" Height="270" Title="$(loc.CustomizeDlg_Title)" TrackDiskSpace="yes">
-         <Control Id="Tree" Type="SelectionTree" X="25" Y="85" Width="175" Height="115" Property="_BrowseProperty" Sunken="yes" TabSkip="no" Text="$(loc.CustomizeDlgTree)" />
--        <Control Id="Browse" Type="PushButton" X="304" Y="210" Width="56" Height="17" Text="$(loc.CustomizeDlgBrowse)">
--          <Publish Event="SelectionBrowse" Value="BrowseDlg">1</Publish>
--          <Condition Action="hide">Installed</Condition>
--          <Condition Action="disable">Installed</Condition>
--        </Control>
-         <Control Id="Reset" Type="PushButton" X="25" Y="243" Width="73" Height="17" Text="$(loc.CustomizeDlgReset)">
-           <Publish Event="Reset" Value="0">1</Publish>
-           <Subscribe Event="SelectionNoItems" Attribute="Enabled" />
-         </Control>
--        <Control Id="DiskCost" Type="PushButton" X="111" Y="243" Width="56" Height="17" Text="$(loc.CustomizeDlgDiskCost)">
--          <Publish Event="SpawnDialog" Value="DiskCostDlg">1</Publish>
--          <Subscribe Event="SelectionNoItems" Attribute="Enabled" />
--        </Control>
-         <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="$(loc.WixUIBack)">
-           <Publish Event="NewDialog" Value="[WixUI_CustomizeDlg_BackChange]">WixUI_InstallMode = "Change"</Publish>
--          <Publish Event="NewDialog" Value="[WixUI_CustomizeDlg_BackCustom]">WixUI_InstallMode = "InstallCustom"</Publish>
-+          <Publish Event="NewDialog" Value="[WixUI_CustomizeDlg_Back]">NOT WixUI_InstallMode = "Change"</Publish>
-           <Publish Event="NewDialog" Value="[WixUI_CustomizeDlg_BackFeatureTree]">NOT Installed AND WixUI_Mode = "FeatureTree"</Publish>
-         </Control>
-         <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="$(loc.WixUINext)">
--          <Publish Event="NewDialog" Value="[WixUI_CustomizeDlg_Next]">1</Publish>
-+          <Publish Event="NewDialog" Value="[WixUI_CustomizeDlg_NextChange]">WixUI_InstallMode = "Change"</Publish>
-+		  <Publish Event="NewDialog" Value="[WixUI_CustomizeDlg_Next]">NOT WixUI_InstallMode = "Change"</Publish>
-           <Subscribe Event="SelectionNoItems" Attribute="Enabled" />
-         </Control>
-         <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="$(loc.WixUICancel)">
-@@ -42,15 +34,6 @@
-         <Control Id="ItemSize" Type="Text" X="215" Y="140" Width="131" Height="50" Text="$(loc.CustomizeDlgItemSize)">
-           <Subscribe Event="SelectionSize" Attribute="Text" />
-         </Control>
--        <Control Id="Location" Type="Text" X="90" Y="210" Width="210" Height="20" Text="$(loc.CustomizeDlgLocation)">
--          <Subscribe Event="SelectionPath" Attribute="Text" />
--          <Subscribe Event="SelectionPathOn" Attribute="Visible" />
--          <Condition Action="hide">Installed</Condition>
--        </Control>
--        <Control Id="LocationLabel" Type="Text" X="25" Y="210" Width="65" Height="10" Text="$(loc.CustomizeDlgLocationLabel)">
--          <Subscribe Event="SelectionPathOn" Attribute="Visible" />
--          <Condition Action="hide">Installed</Condition>
--        </Control>
-       </Dialog>
-     </UI>
-   </Fragment>
-Only in wixui/: CustomizeDlg.wxs.rej
-diff -ru wixui/InstallDirDlg.wxs wixui/InstallDirDlg.wxs
---- wixui/InstallDirDlg.wxs	2007-09-13 20:45:46.000000000 +0100
-+++ wixui/InstallDirDlg.wxs	2008-08-11 10:11:59.766323000 +0100
-@@ -2,6 +2,7 @@
- <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-   <Fragment>
-     <PropertyRef Id="WIXUI_INSTALLDIR" />
-+	<PropertyRef Id="Install_All" />
-     <UI>
-       <Dialog Id="InstallDirDlg" Width="370" Height="270" Title="$(loc.InstallDirDlg_Title)">
-         <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="$(loc.WixUINext)">
-@@ -27,6 +28,13 @@
-           <Publish Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]">1</Publish>
-           <Publish Event="SpawnDialog" Value="[WixUI_InstallDirDlg_Browse]">1</Publish>
-         </Control>
-+		<Control Id="UsersLabel" Type="Text" X="20" Y="150" Width="290" Height="15" Text="$(loc.InstallDirDlgUsersLabel)" />
-+		<Control Id="UsersRadioButtonGroupControl" Type="RadioButtonGroup" X="20" Y="165" Width="290" Height="50" Property="Install_All">
-+		  <RadioButtonGroup Property="Install_All">
-+		    <RadioButton Value="1" X="20" Y="0" Width="260" Height="20" Text="$(loc.InstallDirDlgUsersAllRadioButton)" />
-+		    <RadioButton Value="0" X="20" Y="20" Width="260" Height="20" Text="$(loc.InstallDirDlgUsersOneRadioButton)" />
-+		  </RadioButtonGroup>
-+		</Control>
-       </Dialog>
-     </UI>
-   </Fragment>
-Only in wixui/: InstallDirDlg.wxs.rej
-diff -ru wixui/ProgressDlg.wxs wixui/ProgressDlg.wxs
---- wixui/ProgressDlg.wxs	2007-09-13 20:45:46.000000000 +0100
-+++ wixui/ProgressDlg.wxs	2008-08-11 10:11:59.766323000 +0100
-@@ -46,7 +46,7 @@
-       </Dialog>
- 
-       <InstallUISequence>
--        <Show Dialog="ProgressDlg" Before="ExecuteAction" />
-+        <Show Dialog="ProgressDlg" Before="FindRelatedProducts" />
-       </InstallUISequence>
-     </UI>
-   </Fragment>
-Only in wixui/: ProgressDlg.wxs.rej
-diff -ru wixui/VerifyReadyDlg.wxs wixui/VerifyReadyDlg.wxs
---- wixui/VerifyReadyDlg.wxs	2007-09-13 20:45:46.000000000 +0100
-+++ wixui/VerifyReadyDlg.wxs	2008-08-11 10:11:59.781948200 +0100
-@@ -1,11 +1,13 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-   <Fragment>
-+	<PropertyRef Id="Install_All" />
-     <UI>
-       <Dialog Id="VerifyReadyDlg" Width="370" Height="270" Title="$(loc.VerifyReadyDlg_Title)" TrackDiskSpace="yes">
-         <Control Id="Install" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Hidden="yes" Text="$(loc.VerifyReadyDlgInstall)">
-           <Condition Action="show">NOT Installed</Condition>
-           <Condition Action="default">NOT Installed</Condition>
-+		  <Publish Property="ALLUSERS" Value="1">Install_All = "1"</Publish>
-           <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-           <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
-           <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-Only in wixui/: VerifyReadyDlg.wxs.rej
-diff -ru wixui/WixUI_en-us.wxl wixui/WixUI_en-us.wxl
---- wixui/WixUI_en-us.wxl	2007-09-13 20:45:46.000000000 +0100
-+++ wixui/WixUI_en-us.wxl	2008-08-11 10:11:59.797573400 +0100
-@@ -554,4 +554,9 @@
-   <String Id="UITextVolumeCostRequired">Required</String>
-   <String Id="UITextVolumeCostSize">Disk Size</String>
-   <String Id="UITextVolumeCostVolume">Volume</String>
-+  
-+  <String Id="ErrorNewerProduct">A newer version of this product is already installed.</String>
-+  <String Id="InstallDirDlgUsersLabel">Install for:</String>
-+  <String Id="InstallDirDlgUsersAllRadioButton">All Users</String>
-+  <String Id="InstallDirDlgUsersOneRadioButton">Just Me</String>
- </WixLocalization>
-\ No newline at end of file
-Only in wixui/: WixUI_en-us.wxl.rej
-diff -ru wixui/installdir/WixUI_InstallDir.wxs wixui/installdir/WixUI_InstallDir.wxs
---- wixui/installdir/WixUI_InstallDir.wxs	2007-09-13 20:45:46.000000000 +0100
-+++ wixui/installdir/WixUI_InstallDir.wxs	2008-08-11 10:29:29.170380200 +0100
-@@ -8,17 +8,20 @@
-    - WixUI_VerifyReadyDlg                 - WixUI_VerifyReadyDlg
-    - WixUI_DiskCostDlg
- -->
--
- <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-   <Fragment>
--    <UI Id="WixUI_InstallDir">
-+    <UI Id="My_WixUI_InstallDir">
-       <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
-       <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
-       <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
-+	  <TextStyle Id="WixUI_Font_Normal_White" FaceName="Tahoma" Size="8" Red="255" Green="255" Blue="255" />
-+	  <TextStyle Id="WixUI_Font_Bigger_White" FaceName="Tahoma" Size="12" Red="255" Green="255" Blue="255" />
-+	  <TextStyle Id="WixUI_Font_Title_White" FaceName="Tahoma" Size="9" Bold="yes" Red="255" Green="255" Blue="255" />
- 
-       <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
-       <Property Id="WixUI_Mode" Value="InstallDir" />
--
-+	  
-+      <DialogRef Id="CustomizeDlg" />
-       <DialogRef Id="BrowseDlg" />
-       <DialogRef Id="DiskCostDlg" />
-       <DialogRef Id="InstallDirDlg" />
-@@ -37,16 +40,18 @@
-       <DialogRef Id="VerifyReadyDlg" />
-       <DialogRef Id="WelcomeDlg" />
- 
--      <Property Id="ARPNOMODIFY" Value="1" />
--
--      <Property Id="WixUI_WelcomeDlg_Next" Value="LicenseAgreementDlg" />
--
--      <Property Id="WixUI_LicenseAgreementDlg_Back" Value="WelcomeDlg" />
--      <Property Id="WixUI_LicenseAgreementDlg_Next" Value="InstallDirDlg" />
-+      <Property Id="WixUI_WelcomeDlg_Next" Value="CustomizeDlg" />
- 
--      <Property Id="WixUI_InstallDirDlg_Back" Value="LicenseAgreementDlg" />
-+      <Property Id="WixUI_InstallDirDlg_Back" Value="CustomizeDlg" />
-       <Property Id="WixUI_InstallDirDlg_Next" Value="VerifyReadyDlg" />
-       <Property Id="WixUI_InstallDirDlg_Browse" Value="BrowseDlg" />
-+	  
-+	  <Property Id="WixUI_CustomizeDlg_BackChange" Value="MaintenanceTypeDlg" />
-+      <Property Id="WixUI_CustomizeDlg_Back" Value="WelcomeDlg" />
-+	  <Property Id="WixUI_CustomizeDlg_BackFeatureTree" Value="**shouldnt_happen**" />
-+      <Property Id="WixUI_CustomizeDlg_Next" Value="InstallDirDlg" />
-+	  <Property Id="WixUI_CustomizeDlg_NextChange" Value="VerifyReadyDlg" />
-+      <Property Id="WixUI_VerifyReadyDlg_BackChange" Value="CustomizeDlg" />
- 
-       <Property Id="WixUI_VerifyReadyDlg_BackRepair" Value="MaintenanceTypeDlg" />
-       <Property Id="WixUI_VerifyReadyDlg_BackRemove" Value="MaintenanceTypeDlg" />
-@@ -56,6 +61,7 @@
- 
-       <Property Id="WixUI_MaintenanceTypeDlg_Repair" Value="VerifyReadyDlg" />
-       <Property Id="WixUI_MaintenanceTypeDlg_Remove" Value="VerifyReadyDlg" />
-+	  <Property Id="WixUI_MaintenanceTypeDlg_Change" Value="CustomizeDlg" />
-       <Property Id="WixUI_MaintenanceTypeDlg_Back" Value="MaintenanceWelcomeDlg" />
-     </UI>
- 
-Only in wixui/installdir: WixUI_InstallDir.wxs.rej
-diff -ru wixui/wixui_ja-jp.wxl wixui/wixui_ja-jp.wxl
---- wixui/wixui_ja-jp.wxl	2007-09-21 06:22:12.000000000 +0100
-+++ wixui/wixui_ja-jp.wxl	2008-08-11 10:11:59.828823800 +0100
-@@ -1,4 +1,4 @@
--<?xml version="1.0" encoding="UTF-8"?>
-+<?xml version="1.0" encoding="UTF-8"?>
- <!--
-     Copyright (c) Microsoft Corporation.  All rights reserved.
- 
-@@ -10,7 +10,7 @@
- 
-     You must not remove this notice, or any other, from this software.
- -->
--<WixLocalization>
-+<WixLocalization Codepage="65001">
-   <String Id="WixUIBack">戻る(&amp;B)</String>
-   <String Id="WixUINext">次へ(&amp;N)</String>
-   <String Id="WixUICancel">キャンセル</String>
-@@ -554,4 +554,9 @@
-   <String Id="UITextVolumeCostRequired">必要な領域</String>
-   <String Id="UITextVolumeCostSize">ディスク サイズ</String>
-   <String Id="UITextVolumeCostVolume">ボリューム</String>
-+  
-+  <String Id="ErrorNewerProduct">A newer version of this product is already installed.(ja)</String>
-+  <String Id="InstallDirDlgUsersLabel">Install for:(ja)</String>
-+  <String Id="InstallDirDlgUsersAllRadioButton">All Users(ja)</String>
-+  <String Id="InstallDirDlgUsersOneRadioButton">Just Me(ja)</String>
- </WixLocalization>
-Only in wixui/: wixui_ja-jp.wxl.rej
diff --git a/mk/powershell.sh b/mk/powershell.sh
index 1cd6312..09651ed 100755
--- a/mk/powershell.sh
+++ b/mk/powershell.sh
@@ -38,15 +38,21 @@ SYSPATHS="${ROOT}/WINDOWS/:${ROOT}/WINDOWS/System32:${ROOT}/WINDOWS/System32/wbe
 AUTOMATION_DLL="${TMPDIR}/System.Management.Automation.dll"
 XAPI_DLL="${TMPDIR}/XenServer.dll"
 XMLRPC_DLL="${TMPDIR}/CookComputing.XmlRpcV2.dll"
-PSDIR="$TMPDIR/XenServerPSSnapIn"
+PSDIR="$TMPDIR/XenServerPowerShell"
 
 remote_cmd_passwd2 "cp ${AUTOMATION_DLL} ${PSDIR}"
 remote_cmd_passwd2 "cp ${XMLRPC_DLL} ${PSDIR}"
 remote_cmd_passwd2 "cp ${XAPI_DLL} ${PSDIR}"
-remote_cmd_passwd2 "cd ${PSDIR} && ${CSC} /target:library /out:XenServerPSSnapIn.dll /r:System.Management.Automation.dll /R:XenServer.dll /R:CookComputing.XmlRpcV2.dll *.cs"
-remote_cmd_passwd2 "cp ${PSDIR}/XenServerPSSnapIn.dll ${TMPDIR}"
+remote_cmd_passwd2 "cd ${PSDIR} && ${CSC} /target:library /out:XenServerPowerShell.dll /r:System.Management.Automation.dll /R:XenServer.dll /R:CookComputing.XmlRpcV2.dll *.cs"
+remote_cmd_passwd2 "cp ${PSDIR}/XenServerPowerShell.dll ${TMPDIR}"
 
 if [ "$SKIP_SIGNING" != "yes" ]
 then
-    remote_cmd_passwd2 "cd ${TMPDIR} && ${CMD_EXEC} sign.bat XenServerPSSnapIn.dll 'Citrix XenServer PowerShell SnapIn'"
+    remote_cmd_passwd2 "cd ${TMPDIR} && ${CMD_EXEC} sign.bat XenServerPowerShell.dll 'Citrix XenServer PowerShell Module'"
+    remote_cmd_passwd2 "cd ${TMPDIR} && ${CMD_EXEC} sign-ps.bat Initialize-Environment.ps1"
+    remote_cmd_passwd2 "cd ${TMPDIR} && ${CMD_EXEC} sign-ps.bat AutomatedTestCore.ps1"
+    remote_cmd_passwd2 "cd ${TMPDIR} && ${CMD_EXEC} sign-ps.bat XenServer.format.ps1xml"
+    remote_cmd_passwd2 "cd ${TMPDIR} && ${CMD_EXEC} sign-ps.bat XenServer.types.ps1xml"
 fi
+
+EXTRA_FILES="AutomatedTestCore.ps1 Initialize-Environment.ps1 XenServer.format.ps1xml XenServer.types.ps1xml"
diff --git a/powershell/Initialize-Environment.ps1 b/powershell/Initialize-Environment.ps1
index 7c459d5..ee4fb7f 100644
--- a/powershell/Initialize-Environment.ps1
+++ b/powershell/Initialize-Environment.ps1
@@ -29,11 +29,10 @@
 #
 
 #
-# Don't customize this script -- your changes will be lost on upgrade.
+# Please do not customize this script; your changes will be lost on upgrade.
 #
-# Instead, create and customize XenServerProfile.ps1.
-# Put it in the same folder as this script for system-wide configuration, or
-# %AppData%\Citrix\XenServerPSSnapIn for per-user configuration.
+# Instead, create and customize the file XenServerProfile.ps1.
+# Put it in $env:windir\system32\WindowsPowerShell\v1.0 for system-wide
# configuration, or $env:UserProfile\Documents\WindowsPowerShell
# for per-user configuration.
 #
 
 if (Get-Variable XenServer_Environment_Initialized -ValueOnly -ErrorAction SilentlyContinue)
@@ -41,25 +40,20 @@ if (Get-Variable XenServer_Environment_Initialized -ValueOnly -ErrorAction Silen
     return
 }
 
-$XenServer_thisdir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
-$XenServer_appdata = [Environment]::GetFolderPath("ApplicationData") + "\Citrix\XenServerPSSnapIn"
+$systemWidePath = "$env:windir\system32\WindowsPowerShell\v1.0"
+$perUserPath = "$env:UserProfile\Documents\WindowsPowerShell"
 
-Update-TypeData "$XenServer_thisdir\XenServer.types.ps1xml"
-Update-FormatData "$XenServer_thisdir\XenServer.format.ps1xml"
-
-cd $Home
-
-if (Test-Path "$XenServer_thisdir\XenServerProfile.ps1")
+if (Test-Path "$systemWidePath\XenServerProfile.ps1")
 {
-    . "$XenServer_thisdir\XenServerProfile.ps1"
+    . "$systemWidePath\XenServerProfile.ps1"
 }
 
-if (Test-Path "$XenServer_appdata\XenServerProfile.ps1")
+if (Test-Path "$perUserPath\XenServerProfile.ps1")
 {
-    . "$XenServer_appdata\XenServerProfile.ps1"
+    . "$perUserPath\XenServerProfile.ps1"
 }
 
-Remove-Item variable:XenServer_thisdir
-Remove-Item variable:XenServer_appdata
+Remove-Item variable:systemWidePath
+Remove-Item variable:perUserPath
 
 $XenServer_Environment_Initialized = $true
diff --git a/powershell/README.txt.dist b/powershell/README.txt.dist
index 757c9b5..d569ac3 100644
--- a/powershell/README.txt.dist
+++ b/powershell/README.txt.dist
@@ -1,21 +1,21 @@
-Citrix XenServer PowerShell Snap-In
-===================================
+Citrix XenServer PowerShell Module
+==================================
 
 Version @PRODUCT_VERSION@
 
-The XenServer PowerShell Snap-In (XS-PS) is a complete SDK for Citrix XenServer,
+The XenServer PowerShell Module (XS-PS) is a complete SDK for Citrix XenServer,
 exposing the XenServer API as Windows PowerShell 2.0 cmdlets.
 
 For XenServer documentation, see http://docs.xensource.com.
 XS-PS includes a cmdlet for each XenServer API call, so API documentation
 and examples written for other languages will apply equally well to
 PowerShell. In particular, the SDK Guide and API Documentation are ideal
-for developers wishing to use this snap-in.
+for developers wishing to use this module.
 
 For community content, blogs, and downloads, visit the XenServer Developer
 Network at http://community.citrix.com/cdn/xs.
 
-This snap-in is free sofware. You can redistribute and modify it under the
+This module is free sofware. You can redistribute and modify it under the
 terms of the BSD license. See LICENSE.txt for details.
 
 This library may be accompanied by pedagogical examples. These do not form
@@ -36,9 +36,9 @@ LICENSE.CookComputing.XmlRpcV2 for details.
 Downloads
 ---------
 
-The XenServerPSSnapIn-@PRODUCT_VERSION@.msi installer
-is available in the XenServer-@PRODUCT_VERSION@-SDK.zip. The source code
-and sample code can be found in two separate folders in the same zip file.
+The XenServer PowerShell Module is available in the XenServer-@PRODUCT_VERSION@-SDK.zip.
+The source code and sample code can be found in two separate folders in the same
+zip file.
 
 The XenServer-@PRODUCT_VERSION@-SDK.zip is available from
 http://www.citrix.com/downloads/xenserver/.
@@ -49,35 +49,36 @@ XML-RPC.NET is available from http://www.xml-rpc.net.
 Getting Started
 ---------------
 
-1.  Install XenServerPSSnapIn-@PRODUCT_VERSION@.msi.
+1.  Unzip the XenServer PowerShell Module in your PowerShell modules directory.
 
 2.  Start > Windows PowerShell 2.0 > Right click Windows PowerShell >
     Run as administrator.
-	Note that in Vista you may need to "Run as administrator" even if your
-	current user is privileged.
+    Note that in Vista you may need to "Run as administrator" even if your
+    current user is privileged.
 
 3.  Determine the current execution policy, like this:
     PS> Get-ExecutionPolicy
 
-	If the current policy is Restricted, then you need to set it to
-	RemoteSigned, like this:
-	PS> Set-ExecutionPolicy RemoteSigned
-	
-	You should understand the security implications of this change. If you
-	are unsure, see Microsoft's documentation on the matter:
-	PS> Get-Help about_signing
-	
-	If the current policy is AllSigned, then this will work, but will be
-	very inconvenient. You probably want to change this to RemoteSigned,
-	as above.
-	
-	If the current policy is Unrestricted or RemoteSigned, then this is
-	compatible with XS-PS, so there is nothing to do.
+    If the current policy is Restricted, then you need to set it to
+    RemoteSigned, like this:
+    PS> Set-ExecutionPolicy RemoteSigned
+
+    You should understand the security implications of this change. If you
+    are unsure, see Microsoft's documentation on the matter:
+    PS> Get-Help about_signing
+
+    If the current policy is AllSigned, then this will work, but will be
+    very inconvenient. You probably want to change this to RemoteSigned,
+    as above.
+
+    If the current policy is Unrestricted or RemoteSigned, then this is
+    compatible with XS-PS, so there is nothing to do.
 
 4.  Exit the privileged instance of PowerShell.
 
-5.  Start > XenServer PowerShell SnapIn.
+5.  Start > Windows PowerShell 2.0
 
+    PS> Import-Module XenServerPSModule
     PS> Get-Help about_XenServer
     PS> Connect-XenServer -url https://<servername>
     PS> Get-XenVM
diff --git a/powershell/XenServerPSModule.psd1 b/powershell/XenServerPSModule.psd1
new file mode 100644
index 0000000..04bb123
--- /dev/null
+++ b/powershell/XenServerPSModule.psd1
@@ -0,0 +1,84 @@
+#
+# Copyright (c) Citrix Systems, Inc.
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+#   1) Redistributions of source code must retain the above copyright
+#      notice, this list of conditions and the following disclaimer.
+# 
+#   2) Redistributions in binary form must reproduce the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer in the documentation and/or other materials
+#      provided with the distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+@{
+
+#Module Info
+ModuleVersion = '@PRODUCT_VERSION@'
+Description = 'XenServer PowerShell Module'
+GUID = '@PRODUCT_GUID@'
+
+#Copyright
+Author = ''
+CompanyName = 'Citrix Systems, Inc'
+Copyright = 'Copyright (c) Citrix Systems, Inc. All rights reserved.'
+
+# Requirements
+PowerShellVersion = '2.0'
+PowerShellHostName = ''
+PowerShellHostVersion = ''
+DotNetFrameworkVersion = '3.5'
+CLRVersion = '2.0'
+ProcessorArchitecture = 'None'
+
+#Contents
+ModuleToProcess = 'XenServerPowerShell.dll'
+RequiredModules = @()
+NestedModules = @()
+ModuleList = @('XenServerPowerShell.dll')
+RequiredAssemblies = @('CookComputing.XmlRpcV2.dll','XenServer.dll')
+ScriptsToProcess = @('Initialize-Environment.ps1')
+TypesToProcess = @('XenServer.types.ps1xml')
+FormatsToProcess = @('XenServer.format.ps1xml')
+FileList = @('about_XenServer.help.txt',
+             'AutomatedTestCore.ps1',
+             'CookComputing.XmlRpcV2.dll',
+             'Initialize-Environment.ps1',
+             'LICENSE.CookComputing.XmlRpcV2',
+             'LICENSE.txt',
+             'README.txt',
+             'XenServer.dll',
+             'XenServer.format.ps1xml',
+             'XenServer.types.ps1xml',
+             'XenServerPowerShell.psd1',
+             'XenServerPowerShell.dll')
+
+#Public interface
+DefaultCommandPrefix = ''
+FunctionsToExport = ''
+CmdletsToExport = '*'
+VariablesToExport = @('Citrix.XenServer.Sessions','XenServer_Default_Session')
+AliasesToExport = '*'
+
+PrivateData = ''
+
+HelpInfoURI = ''
+
+}
diff --git a/powershell/about_XenServer.help.txt b/powershell/about_XenServer.help.txt
index 0c581da..45d8d95 100644
--- a/powershell/about_XenServer.help.txt
+++ b/powershell/about_XenServer.help.txt
@@ -1,6 +1,6 @@
 
-Welcome to the XenServer PowerShell SnapIn v@PRODUCT_VERSION@
----------------------------------------------------
+XenServer PowerShell Module v@PRODUCT_VERSION@
+----------------------------------
 
 For specific help with any command use:
 
@@ -8,7 +8,7 @@ Get-Help [CommandName]
 
 For a list of all possible commands type:
 
-Get-Command -PSSnapIn XenServerPSSnapIn
+Get-Command -Module XenServerPSModule
 
 
 Many XenServer cmdlets allow you to identify target objects in several
diff --git a/powershell/installer/AppIcon.ico b/powershell/installer/AppIcon.ico
deleted file mode 100644
index b19d475..0000000
Binary files a/powershell/installer/AppIcon.ico and /dev/null differ
diff --git a/powershell/installer/XenServerPSSnapIn.bat b/powershell/installer/XenServerPSSnapIn.bat
deleted file mode 100644
index 093e332..0000000
--- a/powershell/installer/XenServerPSSnapIn.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-@echo off
-rem Copyright (c) Citrix Systems, Inc.
-rem All rights reserved.
-rem 
-rem Redistribution and use in source and binary forms, with or without
-rem modification, are permitted provided that the following conditions
-rem are met:
-rem 
-rem   1) Redistributions of source code must retain the above copyright
-rem      notice, this list of conditions and the following disclaimer.
-rem 
-rem   2) Redistributions in binary form must reproduce the above
-rem      copyright notice, this list of conditions and the following
-rem      disclaimer in the documentation and/or other materials
-rem      provided with the distribution.
-rem 
-rem THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-rem "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-rem LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-rem FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-rem COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-rem INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-rem (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-rem SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-rem HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-rem STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-rem ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-rem OF THE POSSIBILITY OF SUCH DAMAGE.
-
-start "Citrix XenServer PowerShell SnapIn" /B C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -PSConsoleFile XenServerPSSnapIn.psc1 -Noexit -Nologo -command "if ($(Get-ExecutionPolicy) -ne \"Restricted\") { . .\Initialize-Environment.ps1 } else { Write-Warning \"ExecutionPolicy is set to Restricted.  Some XenServer commands are disabled.\" } ; %*"
-exit
diff --git a/powershell/installer/XenServerPSSnapIn.psc1 b/powershell/installer/XenServerPSSnapIn.psc1
deleted file mode 100644
index 22a71b5..0000000
--- a/powershell/installer/XenServerPSSnapIn.psc1
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (c) Citrix Systems Inc.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, 
- with or without modification, are permitted provided 
- that the following conditions are met: 
- 
- *   Redistributions of source code must retain the above 
-     copyright notice, this list of conditions and the 
-     following disclaimer. 
- *   Redistributions in binary form must reproduce the above 
-     copyright notice, this list of conditions and the 
-     following disclaimer in the documentation and/or other 
-     materials provided with the distribution. 
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR 
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
- SUCH DAMAGE. 
--->
-<PSConsoleFile ConsoleSchemaVersion="1.0">
-  <PSVersion>2.0</PSVersion>
-  <PSSnapIns>
-    <PSSnapIn Name="XenServerPSSnapIn" />
-  </PSSnapIns>
-</PSConsoleFile>
diff --git a/powershell/installer/XenServerPSSnapIn.wxs b/powershell/installer/XenServerPSSnapIn.wxs
deleted file mode 100644
index 7efc903..0000000
--- a/powershell/installer/XenServerPSSnapIn.wxs
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) Citrix Systems Inc.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, 
- with or without modification, are permitted provided 
- that the following conditions are met: 
- 
- *   Redistributions of source code must retain the above 
-     copyright notice, this list of conditions and the 
-     following disclaimer. 
- *   Redistributions in binary form must reproduce the above 
-     copyright notice, this list of conditions and the 
-     following disclaimer in the documentation and/or other 
-     materials provided with the distribution. 
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR 
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
- SUCH DAMAGE. 
--->
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-  <?define ProductVersion="1.0.0" ?>
-  <?define UpgradeCode="{70F3B7CA-E58D-49BC-8E82-4D3DA9D3141A}"?>
-  <?define ProductCode="{3285AFCC-B1FA-4D78-8F94-AF1F4C2C8027}"?>
-  <Product Id='$(var.ProductCode)' Name="Citrix XenServerPSSnapIn" Language="1033" Version='$(var.ProductVersion)' Manufacturer="Citrix Systems, Inc" UpgradeCode='$(var.UpgradeCode)'>
-    <Package Id="????????-????-????-????-????????????" Description="Citrix XenServer PowerShell SnapIn" InstallerVersion="200" Compressed="yes" />
-    <Media Id="1" Cabinet="XenServerPSSnapIn.cab" EmbedCab="yes" />
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="Citrix" Name="Citrix">
-          <Directory Id="INSTALLDIR" Name="XenSvrPS" LongName="XenServerPSSnapIn">
-            <Component Id='MainDll' Guid="FE32075C-D14A-4E36-8F6B-69E5525A9393">
-              <File Id='XenServerPSSnapInDLL' Name='XSSnapIn.dll' LongName='XenServerPSSnapIn.dll' DiskId='1' Source='XenServerPSSnapIn.dll' Vital='yes' />
-              <File Id='XmlRpcDLL' Name='ccXmlRpc.dll' LongName='CookComputing.XmlRpcV2.dll' DiskId='1' Source='CookComputing.XmlRpcV2.dll' Vital='yes' />
-              <File Id='XenServerDLL' Name='XenServe.dll' LongName='XenServer.dll' DiskId='1' Source='XenServer.dll' Vital='yes' />
-              <File Id='EnvironPS1' Name='environ.ps1' LongName='Initialize-Environment.ps1' DiskId='1' Source='Initialize-Environment.ps1' Vital='yes' />
-<!--              <File Id='XenServerPowerShellHelp' Name='XSHelp.xml' LongName='XenServerPSSnapIn.dll-Help.xml' DiskId='1' Source='XenServerPSSnapIn.dll-Help.xml' Vital='yes' />-->
-              <File Id='XenServerPowerShellPSC1' Name='XSPoshPC.psc' LongName='XenServerPSSnapIn.psc1' DiskId='1' Source='XenServerPSSnapIn.psc1' Vital='yes' />
-              <File Id='XenServerFormatPS1XML' Name='XSFormat.xml' LongName='XenServer.format.ps1xml' DiskId='1' Source='XenServer.format.ps1xml' Vital='yes' />
-              <File Id='XenServerTypesPS1XML' Name='XSTypes.xml' LongName='XenServer.types.ps1xml' DiskId='1' Source='XenServer.types.ps1xml' Vital='yes' />
-              <File Id='AutomatedTestCorePS1' Name='AutoTest.ps1' LongName='AutomatedTestCore.ps1' DiskId='1' Source='AutomatedTestCore.ps1' Vital='yes' />
-              <File Id='LICENSE' Name='LICENSE.txt' LongName='LICENSE.txt' DiskId='1' Source='LICENSE.txt' Vital='yes'/>
-              <File Id='XmlRpcLicense' Name='XmlRpcLS.txt' LongName='LICENSE.CookComputing.XmlRpcV2' DiskId='1' Source='LICENSE.CookComputing.XmlRpcV2' Vital='yes'/>
-              <File Id='README' Name='README.txt' LongName='README.txt' DiskId='1' Source='README.txt' Vital='yes'/>
-              <File Id='aboutXS' Name='aboutXS.txt' LongName='about_XenServer.help.txt' DiskId='1' Source='about_XenServer.help.txt' Vital='yes'/>
-              <File Id='XenServerPSSnapinBAT' Name='XSPSSnap.bat' LongName='XenServerPSSnapIn.bat' DiskId='1' Source='XenServerPSSnapIn.bat' Vital='yes'>		  
-                  <Shortcut Id="XenServerPowerShellShortcut" Directory="ProgramMenuFolder" Name="XSPosh" LongName="Citrix XenServer PowerShell SnapIn" WorkingDirectory='INSTALLDIR' Icon='XenCenterICO' />
-              </File>
-              <Registry Id='InstallLocationKEY' Root='HKMU' Key='Software\Citrix\XenServerPSSnapIn' Name='ConsoleFile' Action='write' Type='string' Value='[INSTALLDIR]XenServerPSSnapIn.psc1' />
-            </Component>
-            <Component Id='Supportx86' Guid="E617B3B1-93AC-4E07-A6AB-0f986710AD82">
-              <Condition>NOT <![CDATA[SYSTEMARCHITECTURE >< "x86"]]></Condition>
-              <File Id='XenServerPSSnapinBAT86' Name='XSSnap86.bat' LongName='XenServerPSSnapIn86.bat' DiskId='1' Source='XenServerPSSnapIn86.bat' Vital='yes'>		  
-                <Shortcut Id="XenServerPowerShellShortcut86" Directory="ProgramMenuFolder" Name="XSPosh86" LongName="Citrix XenServer PowerShell SnapIn (x86)" WorkingDirectory='INSTALLDIR' Icon='XenCenterICO' />
-              </File>
-            </Component>
-          </Directory>
-        </Directory>
-      </Directory>
-      <Directory Id='ProgramMenuFolder' />
-      <Directory Id='DesktopFolder' />
-    </Directory>
-    <Feature Id ='MainProgram' Title='XenServer PowerShell SnapIn' Description='Manage XenServer with PowerShell scripts.' Display ='expand' Level ='1' ConfigurableDirectory ='INSTALLDIR' AllowAdvertise ="no" InstallDefault="local" Absent ="disallow">
-      <ComponentRef Id="MainDll" />
-      <ComponentRef Id="Supportx86" />
-    </Feature>
-    <UIRef Id="My_WixUI_InstallDir" />
-    <UIRef Id="WixUI_ErrorProgressText" />
-    <Property Id="Install_All" Value="0" />
-    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
-    <Property Id="SYSTEMARCHITECTURE">
-      <!--See http://www/support.microsoft.com/kb/556009/en-gb-->
-      <RegistrySearch Id='ArchitectureRegistry' Type='raw' Root='HKLM' Key='Hardware\Description\System\CentralProcessor\0' Name='Identifier' />
-    </Property>
-    <Property Id='FRAMEWORK35'>
-      <RegistrySearch Id='Framework35Registry' Type='raw' Root='HKLM' Key='Software\Microsoft\NET Framework Setup\NDP\v3.5' Name='Install' />
-    </Property>
-    <Property Id='POWERSHELL20'>
-      <RegistrySearch Id='PowerShell20Registry' Type='raw' Root='HKLM' Key='Software\Microsoft\PowerShell\1\PowerShellEngine' Name='PowerShellVersion' />
-    </Property>
-    <Property Id="ARPPRODUCTICON" Value="XenCenterICO" />
-    <Upgrade Id='$(var.UpgradeCode)'>
-      <UpgradeVersion Property='UPGRADEFOUND' ExcludeLanguages='yes' Minimum='0.0.0' IncludeMinimum='yes' Maximum='$(var.ProductVersion)' IncludeMaximum='yes' />
-      <UpgradeVersion OnlyDetect='yes' ExcludeLanguages='yes' Property='NEWERPRODUCTFOUND' Minimum='$(var.ProductVersion)' IncludeMinimum='no' />
-    </Upgrade>
-    <CustomAction Id="PreventDowngrading" Error="There is a newer product already installed" />
-    <Condition Message='.NET Framework 3.5 is not present on the computer.'>
-      FRAMEWORK35 = "#1"
-    </Condition>
-    <Condition Message='Microsoft PowerShell 2.0 is not present on the computer.'>
-      POWERSHELL20 = "2.0"
-    </Condition>
-    <InstallExecuteSequence>
-      <AppSearch Sequence="50" />
-      <LaunchConditions Sequence="100" />
-      <ValidateProductID Sequence="700" />
-      <CostInitialize Sequence="800" />
-      <FileCost Sequence="900" />
-      <CostFinalize Sequence="1000" />
-      <FindRelatedProducts Sequence="1100" />
-      <Custom Action="PreventDowngrading" Sequence="1101">NEWERPRODUCTFOUND</Custom>
-      <MigrateFeatureStates Sequence="1200" />
-      <InstallValidate Sequence="1400" />
-      <InstallInitialize Sequence="1500" />
-      <Custom Action="RemoveInstallUtil" Sequence="1501">Installed</Custom>
-      <Custom Action="RemoveInstallUtil64" Sequence="1502">Installed AND (NOT <![CDATA[SYSTEMARCHITECTURE >< "x86"]]>)</Custom>
-      <RemoveExistingProducts Sequence="1503" />
-      <ProcessComponents Sequence="1600" />
-      <UnpublishFeatures Sequence="1800" />
-      <RemoveRegistryValues Sequence="2600" />
-      <RemoveShortcuts Sequence="3200" />
-      <RemoveFiles Sequence="3500" />
-      <InstallFiles Sequence="4000" />
-      <CreateShortcuts Sequence="4500" />
-      <WriteRegistryValues Sequence="5000" />
-      <RegisterUser Sequence="6000" />
-      <RegisterProduct Sequence="6100" />
-      <PublishFeatures Sequence="6300" />
-      <PublishProduct Sequence="6400" />
-      <Custom Action="InstallUtil" Sequence="6550">NOT WixUI_InstallMode = "Remove"</Custom>
-      <Custom Action="InstallUtil64" Sequence="6551">(NOT WixUI_InstallMode = "Remove")  AND (NOT <![CDATA[SYSTEMARCHITECTURE >< "x86"]]>)</Custom>
-      <InstallFinalize Sequence="6600" />
-    </InstallExecuteSequence>
-    <InstallUISequence>
-      <FindRelatedProducts Sequence="1100" />
-      <ExecuteAction Sequence="1102" />
-    </InstallUISequence>
-    <!--Note that 3.5 uses the 2.0 installUtil.exe-->
-    <CustomAction Id="InstallUtil"
-      Directory='INSTALLDIR'
-      ExeCommand='"[WindowsFolder]Microsoft.NET\Framework\v2.0.50727\installUtil.exe" /LogToConsole=false XenServerPSSnapIn.dll'
-      Return='ignore'
-      Impersonate='no'
-      Execute='deferred' />
-    <CustomAction Id="RemoveInstallUtil"
-      Directory='INSTALLDIR'
-      ExeCommand='"[WindowsFolder]Microsoft.NET\Framework\v2.0.50727\installUtil.exe" /u /LogToConsole=false XenServerPSSnapIn.dll'
-      Return='ignore'
-      Impersonate='no'
-      Execute='deferred' />
-    <CustomAction Id="InstallUtil64"
-      Directory='INSTALLDIR'
-      ExeCommand='"[WindowsFolder]Microsoft.NET\Framework64\v2.0.50727\installUtil.exe" /LogToConsole=false XenServerPSSnapIn.dll'
-      Return='ignore'
-      Impersonate='no'
-      Execute='deferred' />
-    <CustomAction Id="RemoveInstallUtil64"
-      Directory='INSTALLDIR'
-      ExeCommand='"[WindowsFolder]Microsoft.NET\Framework64\v2.0.50727\installUtil.exe" /u /LogToConsole=false XenServerPSSnapIn.dll'
-      Return='ignore'
-      Impersonate='no'
-      Execute='deferred' />
-    <Icon Id="XenCenterICO" SourceFile="AppIcon.ico" />
-  </Product>
-</Wix>
diff --git a/powershell/installer/XenServerPSSnapIn86.bat b/powershell/installer/XenServerPSSnapIn86.bat
deleted file mode 100644
index 7b93e22..0000000
--- a/powershell/installer/XenServerPSSnapIn86.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-@echo off
-rem Copyright (c) Citrix Systems, Inc.
-rem All rights reserved.
-rem 
-rem Redistribution and use in source and binary forms, with or without
-rem modification, are permitted provided that the following conditions
-rem are met:
-rem 
-rem   1) Redistributions of source code must retain the above copyright
-rem      notice, this list of conditions and the following disclaimer.
-rem 
-rem   2) Redistributions in binary form must reproduce the above
-rem      copyright notice, this list of conditions and the following
-rem      disclaimer in the documentation and/or other materials
-rem      provided with the distribution.
-rem 
-rem THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-rem "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-rem LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-rem FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-rem COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-rem INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-rem (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-rem SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-rem HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-rem STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-rem ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-rem OF THE POSSIBILITY OF SUCH DAMAGE.
-
-start "Citrix XenServer PowerShell SnapIn (x86)" /B C:\Windows\sysWOW64\WindowsPowerShell\v1.0\powershell.exe -PSConsoleFile XenServerPSSnapIn.psc1 -Noexit -Nologo -command "if ($(Get-ExecutionPolicy) -ne \"Restricted\") { . .\Initialize-Environment.ps1 } else { Write-Warning \"ExecutionPolicy is set to Restricted.  Some XenServer commands are disabled.\" } ; %*"
-exit
diff --git a/powershell/src/AssemblyInfo.cs b/powershell/src/AssemblyInfo.cs
index ce5978a..cdeafc6 100644
--- a/powershell/src/AssemblyInfo.cs
+++ b/powershell/src/AssemblyInfo.cs
@@ -35,11 +35,11 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("XenServerPSSnapIn")]
-[assembly: AssemblyDescription("Citrix XenServer PowerShell SnapIn")]
+[assembly: AssemblyTitle("XenServerPowerShell")]
+[assembly: AssemblyDescription("Citrix XenServer PowerShell Module")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Citrix")]
-[assembly: AssemblyProduct("XenServerPSSnapIn")]
+[assembly: AssemblyProduct("XenServerPowerShell")]
 [assembly: AssemblyCopyright("Copyright © Citrix Systems, Inc.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/powershell/src/XenServerPSSnapIn.cs b/powershell/src/XenServerPSSnapIn.cs
deleted file mode 100644
index 12fc4a1..0000000
--- a/powershell/src/XenServerPSSnapIn.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- *   1) Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- * 
- *   2) Redistributions in binary form must reproduce the above
- *      copyright notice, this list of conditions and the following
- *      disclaimer in the documentation and/or other materials
- *      provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Management.Automation;
-using System.Text;
-
-
-namespace Citrix.XenServer
-{
-    [RunInstaller(true)]
-    public class XenServerPSSnapIn : PSSnapIn
-    {
-        /// <summary>
-        /// Specify the name of the PowerShell snap-in.
-        /// </summary>
-        public override string Name
-        {
-            get
-            {
-                return "XenServerPSSnapIn";
-            }
-        }
-
-        /// <summary>
-        /// Specify the vendor for the PowerShell snap-in.
-        /// </summary>
-        public override string Vendor
-        {
-            get
-            {
-                return "Citrix Systems, Inc.";
-            }
-        }
-
-        /// <summary>
-        /// Specify the localization resource information for the vendor. 
-        /// Use the format: resourceBaseName,VendorName. 
-        /// </summary>
-        public override string VendorResource
-        {
-            get
-            {
-                return "XenServerPSSnapIn,Citrix Systems, Inc.";
-            }
-        }
-
-        /// <summary>
-        /// Specify a description of the PowerShell snap-in.
-        /// </summary>
-        public override string Description
-        {
-            get
-            {
-                return "Citrix XenServer PowerShell SnapIn";
-            }
-        }
-
-        /// <summary>
-        /// Specify the localization resource information for the description. 
-        /// Use the format: resourceBaseName,Description. 
-        /// </summary>
-        public override string DescriptionResource
-        {
-            get
-            {
-                return "XenServerPSSnapIn,Citrix XenServer PowerShell SnapIn";
-            }
-        }
-    }
-}