diff --git a/Build/build.targets b/Build/build.targets
index 233b6660..57c0d524 100644
--- a/Build/build.targets
+++ b/Build/build.targets
@@ -9,9 +9,9 @@
       PackageVersion: version of the package, according to myget
       nuget: path to nuget.exe
     -->
-    
+
     <!-- working directory of msbuild is root\build -->
-    <BuildOut>..\build.out</BuildOut>
+    <BuildOut>$(MSBuildProjectDirectory)\..\build.out</BuildOut>
   </PropertyGroup>
 
   <Target Name="main">
@@ -20,6 +20,8 @@
 
     <CallTarget Targets="buildSources"
                 ContinueOnError="false" />
+    <CallTarget Targets="setPowerShellModuleVersion"
+                ContinueOnError="false" />
     <CallTarget Targets="buildPackage"
                 ContinueOnError="false" />
   </Target>
@@ -28,7 +30,7 @@
     <Exec Command="$(nuget) restore ..\Sources\SqlDatabase.sln" />
 
     <MSBuild Projects="..\Sources\SqlDatabase.sln"
-             Properties="Configuration=$(config);OutDir=..\$(BuildOut)"/>
+             Properties="Configuration=$(config);OutDir=$(BuildOut)"/>
 
     <!--https://stackoverflow.com/questions/443188/msbuild-task-to-read-version-of-dll-->
     <GetAssemblyIdentity AssemblyFiles="$(BuildOut)\SqlDatabase.exe">
@@ -43,7 +45,48 @@
     </CreateProperty>
   </Target>
 
+  <Target Name="setPowerShellModuleVersion">
+    <ReplaceTextInFile Filename="$(BuildOut)\SqlDatabase.PowerShell.psd1"
+                       MatchText="{{ModuleVersion}}"
+                       ReplacementText="$(PackageVersion)" />
+  </Target>
+
   <Target Name="buildPackage">
-    <Exec Command="$(nuget) pack ..\package.nuspec -NoPackageAnalysis -verbosity detailed -OutputDirectory $(BuildOut) -Version $(PackageVersion) -p Configuration=$(config))" />
+    <Exec Command="$(nuget) pack ..\Sources\SqlDatabase.Package\package.nuspec -NoPackageAnalysis -verbosity detailed -OutputDirectory $(BuildOut) -Version $(PackageVersion) -p bin=$(BuildOut)" />
   </Target>
+
+  <UsingTask TaskName="ReplaceTextInFile"
+             TaskFactory="CodeTaskFactory"
+             AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+    <ParameterGroup>
+      <Filename ParameterType="System.String"
+                Required="true" />
+      <MatchText ParameterType="System.String"
+                 Required="true" />
+      <ReplacementText ParameterType="System.String"
+                       Required="true" />
+    </ParameterGroup>
+    <Task>
+      <Reference Include="System.Core" />
+      <Using Namespace="System" />
+      <Using Namespace="System.IO" />
+      <Using Namespace="System.Text" />
+      <Code Type="Fragment"
+            Language="cs">
+        <![CDATA[
+            var text = new StringBuilder();
+            Encoding fileEncoding;
+
+            using (var reader = new StreamReader(Filename))
+            {
+                text.Append(reader.ReadToEnd());
+                fileEncoding = reader.CurrentEncoding;
+            }
+
+            text.Replace(MatchText, ReplacementText);
+            File.WriteAllText(Filename, text.ToString(), fileEncoding);
+          ]]>
+      </Code>
+    </Task>
+  </UsingTask>
 </Project>
\ No newline at end of file
diff --git a/Sources/GlobalAssemblyInfo.cs b/Sources/GlobalAssemblyInfo.cs
index a6726f99..f26ee745 100644
--- a/Sources/GlobalAssemblyInfo.cs
+++ b/Sources/GlobalAssemblyInfo.cs
@@ -9,5 +9,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/Sources/SqlDatabase.Package/SqlDatabase.Package.csproj b/Sources/SqlDatabase.Package/SqlDatabase.Package.csproj
new file mode 100644
index 00000000..9b1808c4
--- /dev/null
+++ b/Sources/SqlDatabase.Package/SqlDatabase.Package.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+	<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningsAsErrors />
+    <CodeAnalysisRuleSet>..\StyleCope.ruleset</CodeAnalysisRuleSet>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\SqlDatabase.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
+  </ItemGroup>
+</Project>
diff --git a/package.nuspec b/Sources/SqlDatabase.Package/package.nuspec
similarity index 76%
rename from package.nuspec
rename to Sources/SqlDatabase.Package/package.nuspec
index 9da15d7e..7469b822 100644
--- a/package.nuspec
+++ b/Sources/SqlDatabase.Package/package.nuspec
@@ -17,15 +17,21 @@
   </metadata>
 
   <files>
-    <file src="build.out\SqlDatabase.exe"
+    <file src="tools\**\*"
+          target="tools/"/>
+
+    <file src="$bin$\SqlDatabase.exe"
+          target="tools" />
+    <file src="$bin$\SqlDatabase.pdb"
           target="tools" />
-    <file src="build.out\SqlDatabase.pdb"
+    <file src="$bin$\SqlDatabase.exe.config"
           target="tools" />
-    <file src="build.out\SqlDatabase.exe.config"
+
+    <file src="$bin$\SqlDatabase.PowerShell.dll"
           target="tools" />
-    <file src="build.out\SqlDatabase.PowerShell.dll"
+    <file src="$bin$\SqlDatabase.PowerShell.pdb"
           target="tools" />
-    <file src="build.out\SqlDatabase.PowerShell.pdb"
+    <file src="$bin$\SqlDatabase.PowerShell.psd1"
           target="tools" />
   </files>
 </package>
\ No newline at end of file
diff --git a/Sources/SqlDatabase.Package/tools/init.ps1 b/Sources/SqlDatabase.Package/tools/init.ps1
new file mode 100644
index 00000000..47ad4d47
--- /dev/null
+++ b/Sources/SqlDatabase.Package/tools/init.ps1
@@ -0,0 +1,23 @@
+param($installPath, $toolsPath, $package, $project)
+
+$activeModule = Get-Module "SqlDatabase.PowerShell"
+$thisModule = Join-Path $PSScriptRoot "SqlDatabase.PowerShell.dll"
+
+$import = $true
+if ($activeModule)
+{
+	$thisModuleVersion = New-Object -TypeName System.Version (Get-Item $thisModule).VersionInfo.FileVersion
+    if ($activeModule.Version -le $thisModuleVersion)
+    {
+        Remove-Module "SqlDatabase.PowerShell"
+    }
+    else
+    {
+        $import = $false
+    }
+}
+
+if ($import)
+{
+    Import-Module $thisModule -DisableNameChecking
+}
diff --git a/Sources/SqlDatabase.sln b/Sources/SqlDatabase.sln
index 243fb40c..6b1e883c 100644
--- a/Sources/SqlDatabase.sln
+++ b/Sources/SqlDatabase.sln
@@ -18,7 +18,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharpMirationStep", "..\Ex
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SqlDatabase.PowerShell", "SqlDatabase.PowerShell\SqlDatabase.PowerShell.csproj", "{47A4BE25-2B58-484C-956D-F1DF53A9269D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlDatabase.PowerShell.Test", "SqlDatabase.PowerShell.Test\SqlDatabase.PowerShell.Test.csproj", "{4F35E6D2-99FB-4B7B-90A5-3BFA936FB8CF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SqlDatabase.PowerShell.Test", "SqlDatabase.PowerShell.Test\SqlDatabase.PowerShell.Test.csproj", "{4F35E6D2-99FB-4B7B-90A5-3BFA936FB8CF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlDatabase.Package", "SqlDatabase.Package\SqlDatabase.Package.csproj", "{F986789D-F9B3-42B4-AA4B-4C0A63011F5D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -46,6 +48,10 @@ Global
 		{4F35E6D2-99FB-4B7B-90A5-3BFA936FB8CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4F35E6D2-99FB-4B7B-90A5-3BFA936FB8CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4F35E6D2-99FB-4B7B-90A5-3BFA936FB8CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F986789D-F9B3-42B4-AA4B-4C0A63011F5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F986789D-F9B3-42B4-AA4B-4C0A63011F5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F986789D-F9B3-42B4-AA4B-4C0A63011F5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F986789D-F9B3-42B4-AA4B-4C0A63011F5D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE