diff --git a/Build b/Build
index 32dbf5497..7dd819a36 160000
--- a/Build
+++ b/Build
@@ -1 +1 @@
-Subproject commit 32dbf549725ca7bdb61a59f9728c27a4a0960249
+Subproject commit 7dd819a3612d055fb2f263073b0c2bbc58deae2c
diff --git a/Src/Install/Product.wxs b/Src/Install/Product.wxs
index b7be9cebe..db66ab1eb 100644
--- a/Src/Install/Product.wxs
+++ b/Src/Install/Product.wxs
@@ -124,7 +124,7 @@
               </Component>
               
               <Component Id="SwisSnapInComponent" Guid="D229051F-C183-4D52-99CD-8C171031086D">
-                <File Id="SwisPowerShell" Source="$(var.OutputDir)\SwisPowerShell.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="SwisPowerShell">
+                <File Id="SwisPowerShell" Source="..\SwisPowerShell\bin\Release\SwisPowerShell.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="SwisPowerShell">
                   <ps:SnapIn Id="SwisSnapIn" />                  
                 </File>
               </Component>
diff --git a/Src/SwisPowerShell/SwisPowerShell.csproj b/Src/SwisPowerShell/SwisPowerShell.csproj
index f021df0d3..9c99e2d91 100644
--- a/Src/SwisPowerShell/SwisPowerShell.csproj
+++ b/Src/SwisPowerShell/SwisPowerShell.csproj
@@ -40,7 +40,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\bin\Debug\</OutputPath>
+    <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -49,7 +49,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\bin\Release\</OutputPath>
+    <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -106,6 +106,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <SubType>Designer</SubType>
     </None>
+    <None Include="SwisPowerShell.psd1">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
diff --git a/Src/SwisPowerShell/SwisPowerShell.psd1 b/Src/SwisPowerShell/SwisPowerShell.psd1
new file mode 100644
index 000000000..c41238e93
--- /dev/null
+++ b/Src/SwisPowerShell/SwisPowerShell.psd1
@@ -0,0 +1,96 @@
+#
+# Module manifest for module 'SwisPowerShell'
+#
+# Generated by: SolarWinds, Inc.
+#
+# Generated on: 10/28/2016
+#
+
+@{
+
+# Script module or binary module file associated with this manifest.
+RootModule = 'SwisPowerShell.dll'
+
+# Version number of this module.
+ModuleVersion = '0.0.0.1'
+
+# ID used to uniquely identify this module
+GUID = '337323ce-c5a9-4fed-b23c-452af922434d'
+
+# Author of this module
+Author = 'SolarWinds, Inc.'
+
+# Company or vendor of this module
+CompanyName = 'SolarWinds, Inc.'
+
+# Copyright statement for this module
+Copyright = '(c) 2016 SolarWinds, Inc.. All rights reserved.'
+
+# Description of the functionality provided by this module
+# Description = ''
+
+# Minimum version of the Windows PowerShell engine required by this module
+# PowerShellVersion = ''
+
+# Name of the Windows PowerShell host required by this module
+# PowerShellHostName = ''
+
+# Minimum version of the Windows PowerShell host required by this module
+# PowerShellHostVersion = ''
+
+# Minimum version of Microsoft .NET Framework required by this module
+# DotNetFrameworkVersion = ''
+
+# Minimum version of the common language runtime (CLR) required by this module
+# CLRVersion = ''
+
+# Processor architecture (None, X86, Amd64) required by this module
+# ProcessorArchitecture = ''
+
+# Modules that must be imported into the global environment prior to importing this module
+# RequiredModules = @()
+
+# Assemblies that must be loaded prior to importing this module
+# RequiredAssemblies = @()
+
+# Script files (.ps1) that are run in the caller's environment prior to importing this module.
+# ScriptsToProcess = @()
+
+# Type files (.ps1xml) to be loaded when importing this module
+# TypesToProcess = @()
+
+# Format files (.ps1xml) to be loaded when importing this module
+# FormatsToProcess = @()
+
+# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
+# NestedModules = @()
+
+# Functions to export from this module
+FunctionsToExport = '*'
+
+# Cmdlets to export from this module
+CmdletsToExport = '*'
+
+# Variables to export from this module
+VariablesToExport = '*'
+
+# Aliases to export from this module
+AliasesToExport = '*'
+
+# List of all modules packaged with this module
+# ModuleList = @()
+
+# List of all files packaged with this module
+# FileList = @()
+
+# Private data to pass to the module specified in RootModule/ModuleToProcess
+# PrivateData = ''
+
+# HelpInfo URI of this module
+# HelpInfoURI = ''
+
+# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
+# DefaultCommandPrefix = ''
+
+}
+