diff --git a/Fizzler.Systems.HtmlAgilityPack.nuspec b/Fizzler.Systems.HtmlAgilityPack.nuspec
index 2a5c2d6..2d99ca1 100644
--- a/Fizzler.Systems.HtmlAgilityPack.nuspec
+++ b/Fizzler.Systems.HtmlAgilityPack.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>Fizzler.Systems.HtmlAgilityPack</id>
-        <version>1.0.0-beta2</version>
+        <version>1.0.0</version>
         <title>Fizzler for HTML Agility Pack</title>
         <authors>Atif Aziz, Colin Ramsay</authors>
         <owners>Atif Aziz</owners>
@@ -16,21 +16,20 @@
         <dependencies>
             <group targetFramework=".NETFramework2.0">
                 <dependency id="HtmlAgilityPack" version="1.4.6" />
-                <dependency id="Fizzler" version="1.0.0-beta2" />
+                <dependency id="Fizzler" version="1.0.0" />
                 <dependency id="LinqBridge" version="1.3.0" />
             </group>
             <group targetFramework=".NETFramework3.5">
                 <dependency id="HtmlAgilityPack" version="1.4.6" />
-                <dependency id="Fizzler" version="1.0.0-beta2" />
+                <dependency id="Fizzler" version="1.0.0" />
             </group>
         </dependencies>
     </metadata>
     <files>
         <file src="COPYING.txt" target="COPYING.txt" />
         <file src="COPYING.LESSER.txt" target="COPYING.LESSER.txt" />
-        <file src="bin\NET-2.0\Release\Fizzler.Systems.HtmlAgilityPack.dll" target="lib\net20\Fizzler.Systems.HtmlAgilityPack.dll" />
-        <file src="bin\NET-2.0\Release\Fizzler.Systems.HtmlAgilityPack.xml" target="lib\net20\Fizzler.Systems.HtmlAgilityPack.xml" />
-        <file src="bin\Release\Fizzler.Systems.HtmlAgilityPack.dll" target="lib\net35\Fizzler.Systems.HtmlAgilityPack.dll" />
-        <file src="bin\Release\Fizzler.Systems.HtmlAgilityPack.xml" target="lib\net35\Fizzler.Systems.HtmlAgilityPack.xml" />
+        <file src="bin\NET-2.0\Release\Fizzler.Systems.HtmlAgilityPack.*" target="lib\net20" />
+        <file src="bin\Release\Fizzler.Systems.HtmlAgilityPack.*" target="lib\net35" />
+        <file src="src\**\*.cs" target="src" exclude="src\Fizzler.Tests\**;src\Fizzler.Sandbox\**"/>
     </files>
 </package>
\ No newline at end of file
diff --git a/Fizzler.Tools.nuspec b/Fizzler.Tools.nuspec
index 64e1e4e..a07b630 100644
--- a/Fizzler.Tools.nuspec
+++ b/Fizzler.Tools.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>Fizzler.Tools</id>
-        <version>1.0.0-beta2</version>
+        <version>1.0.0</version>
         <title>Fizzler Tools</title>
         <authors>Atif Aziz</authors>
         <owners>Atif Aziz</owners>
@@ -17,17 +17,11 @@
     <files>
         <file src="COPYING.txt" target="COPYING.txt" />
         <file src="COPYING.LESSER.txt" target="COPYING.LESSER.txt" />
-        <file src="bin\Release\fizz.exe" target="tools\fizz.exe" />
-        <file src="bin\Release\fizz.exe.config" target="tools\fizz.exe.config" />
-        <file src="bin\Release\fizz.pdb" target="tools\fizz.pdb" />
-        <file src="bin\Release\Fizzler.dll" target="tools\Fizzler.dll" />
-        <file src="bin\Release\Fizzler.pdb" target="tools\Fizzler.pdb" />
-        <file src="bin\Release\Fizzler.Systems.HtmlAgilityPack.dll" target="tools\Fizzler.Systems.HtmlAgilityPack.dll" />
-        <file src="bin\Release\Fizzler.Systems.HtmlAgilityPack.pdb" target="tools\Fizzler.Systems.HtmlAgilityPack.pdb" />
-        <file src="bin\Release\HtmlAgilityPack.dll" target="tools\HtmlAgilityPack.dll" />
-        <file src="bin\Release\HtmlAgilityPack.pdb" target="tools\HtmlAgilityPack.pdb" />
-        <file src="bin\Release\Mannex.dll" target="tools\Mannex.dll" />
-        <file src="bin\Release\VisualFizzler.exe" target="tools\VisualFizzler.exe" />
-        <file src="bin\Release\VisualFizzler.pdb" target="tools\VisualFizzler.pdb" />
+        <file target="tools"  src="bin\Release\fizz.*"                            exclude="bin\Release\*.xml" />
+        <file target="tools"  src="bin\Release\Fizzler.*"                         exclude="bin\Release\*.xml;bin\Release\Fizzler.Sandbox.*" />
+        <file target="tools"  src="bin\Release\Fizzler.Systems.HtmlAgilityPack.*" exclude="bin\Release\*.xml" />
+        <file target="tools"  src="bin\Release\HtmlAgilityPack.*"                 exclude="bin\Release\*.xml" />
+        <file target="tools"  src="bin\Release\VisualFizzler.*"                   exclude="bin\Release\*.xml" />
+        <file target="tools"  src="bin\Release\Mannex.dll" />
     </files>
 </package>
\ No newline at end of file
diff --git a/Fizzler.nuspec b/Fizzler.nuspec
index 601287a..b57969e 100644
--- a/Fizzler.nuspec
+++ b/Fizzler.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>Fizzler</id>
-        <version>1.0.0-beta2</version>
+        <version>1.0.0</version>
         <title>Fizzler</title>
         <authors>Atif Aziz, Colin Ramsay</authors>
         <owners>Atif Aziz</owners>
@@ -23,9 +23,12 @@
     <files>
         <file src="COPYING.txt" target="COPYING.txt" />
         <file src="COPYING.LESSER.txt" target="COPYING.LESSER.txt" />
-        <file src="bin\NET-2.0\Release\Fizzler.dll" target="lib\net20\Fizzler.dll" />
-        <file src="bin\NET-2.0\Release\Fizzler.xml" target="lib\net20\Fizzler.xml" />
-        <file src="bin\Release\Fizzler.dll" target="lib\net35\Fizzler.dll" />
-        <file src="bin\Release\Fizzler.xml" target="lib\net35\Fizzler.xml" />
+        <file src="bin\NET-2.0\Release\Fizzler.dll" target="lib\net20" />
+        <file src="bin\NET-2.0\Release\Fizzler.xml" target="lib\net20" />
+        <file src="bin\NET-2.0\Release\Fizzler.pdb" target="lib\net20" />
+        <file src="bin\Release\Fizzler.dll" target="lib\net35" />
+        <file src="bin\Release\Fizzler.xml" target="lib\net35" />
+        <file src="bin\Release\Fizzler.pdb" target="lib\net35" />
+        <file src="src\**\*.cs" target="src" exclude="src\Fizzler.Tests\**;src\Fizzler.Sandbox\**"/>
     </files>
 </package>
\ No newline at end of file
diff --git a/pack.cmd b/pack.cmd
index e9826a6..079016c 100644
--- a/pack.cmd
+++ b/pack.cmd
@@ -10,7 +10,7 @@ if not exist dist md dist
 if not %errorlevel%==0 exit /b %errorlevel%
 set nupack=.nuget\NuGet pack -OutputDirectory dist
 call build /v:m ^
-  && %nupack% Fizzler.nuspec ^
-  && %nupack% Fizzler.Systems.HtmlAgilityPack.nuspec ^
+  && %nupack% -Symbols Fizzler.nuspec ^
+  && %nupack% -Symbols Fizzler.Systems.HtmlAgilityPack.nuspec ^
   && %nupack% -NoPackageAnalysis Fizzler.Tools.nuspec
 goto :EOF