diff --git a/build/NuGet/.gitignore b/build/NuGet/.gitignore
index 7f036cee..6319ac19 100644
--- a/build/NuGet/.gitignore
+++ b/build/NuGet/.gitignore
@@ -1,3 +1,2 @@
 lib
-content
-samples
\ No newline at end of file
+content
\ No newline at end of file
diff --git a/build/NuGet/FSharp.Sample/MathNet.Numerics.FSharp.Sample.nuspec b/build/NuGet/FSharp.Sample/MathNet.Numerics.FSharp.Sample.nuspec
index 9cddfac2..072faff1 100644
--- a/build/NuGet/FSharp.Sample/MathNet.Numerics.FSharp.Sample.nuspec
+++ b/build/NuGet/FSharp.Sample/MathNet.Numerics.FSharp.Sample.nuspec
@@ -4,8 +4,8 @@
     <id>MathNet.Numerics.FSharp.Sample</id>
     <version>1.0</version>
     <title>Math.NET Numerics F# Module Code Samples</title>
-    <summary>F# Modules for Math.NET Numerics, providing methods and algorithms for numerical computations in science, engineering and every day use.</summary>
-    <description>F# Modules for Math.NET Numerics, the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use. Numerics is the result of merging dnAnalytics with Math.NET Iridium and is intended to replace both.</description>
+    <summary>This package contains samples that demonstrate the use of the F# Modules for the Math.NET Numerics library.</summary>
+    <description>This package contains samples that demonstrate the use of the F# Modules for the Math.NET Numerics library. Math.NET Numerics is the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use. Numerics is the result of merging dnAnalytics with Math.NET Iridium and is intended to replace both.</description>
     <authors>Marcus Cuda, Christoph Ruegg, Jurgen Van Gael</authors>
     <owners>Christoph Ruegg</owners>
     <projectUrl>http://numerics.mathdotnet.com/</projectUrl>
diff --git a/build/NuGet/Numerics.Sample/MathNet.Numerics.Sample.nuspec b/build/NuGet/Numerics.Sample/MathNet.Numerics.Sample.nuspec
index 64456ead..eb024ab7 100644
--- a/build/NuGet/Numerics.Sample/MathNet.Numerics.Sample.nuspec
+++ b/build/NuGet/Numerics.Sample/MathNet.Numerics.Sample.nuspec
@@ -4,8 +4,8 @@
     <id>MathNet.Numerics.Sample</id>
     <version>1.0</version>
     <title>Math.NET Numerics Code Samples</title>
-    <summary>Math.NET Numerics, providing methods and algorithms for numerical computations in science, engineering and every day use.</summary>
-    <description>Math.NET Numerics is the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use. Numerics is the result of merging dnAnalytics with Math.NET Iridium and is intended to replace both.</description>
+    <summary>This package contains samples that demonstrate the use of the Math.NET Numerics library.</summary>
+    <description>This package contains samples that demonstrate the use of the Math.NET Numerics library. Math.NET Numerics is the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use. Numerics is the result of merging dnAnalytics with Math.NET Iridium and is intended to replace both.</description>
     <authors>Marcus Cuda, Christoph Ruegg, Jurgen Van Gael</authors>
     <owners>Christoph Ruegg</owners>
     <projectUrl>http://numerics.mathdotnet.com/</projectUrl>
diff --git a/build/NuGet/nuget.proj b/build/NuGet/nuget.proj
index e9ec4ecc..0fdeac47 100644
--- a/build/NuGet/nuget.proj
+++ b/build/NuGet/nuget.proj
@@ -37,10 +37,10 @@
 		<Copy SourceFiles="@(FSharpNet40)" DestinationFolder="$(FSharpPack)/lib/Net40" />
 		
 		<RemoveDir Directories="$(NumericsSamplePack)/Samples" />
-		<Copy SourceFiles="@(NumericsSample)" DestinationFiles="$(NumericsSamplePack)/Samples/MathNet.Numerics/%(RecursiveDir)%(Filename).cs.pp" />
+		<Copy SourceFiles="@(NumericsSample)" DestinationFiles="$(NumericsSamplePack)/content/Samples/MathNet.Numerics/%(RecursiveDir)%(Filename).cs.pp" />
 		
 		<RemoveDir Directories="$(FSharpSamplePack)/Samples" />
-		<Copy SourceFiles="@(FSharpSample)" DestinationFiles="$(FSharpSamplePack)/Samples/MathNet.Numerics.FSharp/%(RecursiveDir)%(Filename).fs.pp" />
+		<Copy SourceFiles="@(FSharpSample)" DestinationFiles="$(FSharpSamplePack)/content/Samples/MathNet.Numerics.FSharp/%(RecursiveDir)%(Filename).fs.pp" />
 	</Target>
 
 	<Target Name="UpdateNuspec" DependsOnTargets="CopyContentFiles">
@@ -78,7 +78,7 @@
 			XPath="//package/n:metadata/n:dependencies/n:dependency[@id='MathNet.Numerics']/@version"
 			Value="%(NumericsAssemblyInfo.Version)"/>
 		<ItemGroup>
-			<NumericsSamplePreprocessingFiles Include="$(NumericsSamplePack)/Samples/MathNet.Numerics/**/*.pp" />
+			<NumericsSamplePreprocessingFiles Include="$(NumericsSamplePack)/content/Samples/MathNet.Numerics/**/*.pp" />
 		</ItemGroup>
 		<FileUpdate
 			Files="@(NumericsSamplePreprocessingFiles)"
@@ -96,7 +96,7 @@
 			XPath="//package/n:metadata/n:dependencies/n:dependency[@id='MathNet.Numerics.FSharp']/@version"
 			Value="%(FSharpAssemblyInfo.Version)"/>
 		<ItemGroup>
-			<FSharpSamplePreprocessingFiles Include="$(FSharpSamplePack)/Samples/MathNet.Numerics.FSharp/**/*.pp" />
+			<FSharpSamplePreprocessingFiles Include="$(FSharpSamplePack)/content/Samples/MathNet.Numerics.FSharp/**/*.pp" />
 		</ItemGroup>
 		<FileUpdate
 			Files="@(FSharpSamplePreprocessingFiles)"