diff --git a/nanoFramework.Graphics.Core.nuspec b/nanoFramework.Graphics.Core.nuspec
index abad7cc..1c4d010 100644
--- a/nanoFramework.Graphics.Core.nuspec
+++ b/nanoFramework.Graphics.Core.nuspec
@@ -18,18 +18,16 @@
     <description>This package includes the nanoFramework.Graphics.Core assembly for .NET nanoFramework C# projects.</description>
     <tags>nanoFramework C# csharp netmf netnf nanoFramework.Graphics.Core</tags>
     <dependencies>
-      <dependency id="nanoFramework.CoreLibrary" version="2.0.0-preview.35" />
+      <group targetFramework=".NETnanoFramework1.0">
+        <dependency id="nanoFramework.CoreLibrary" version="2.0.0-preview.35" />
+      </group>
     </dependencies>
   </metadata>
   <files>
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.dll" target="lib\nanoFramework.Graphics.Core.dll" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pdb" target="lib\nanoFramework.Graphics.Core.pdb" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pdbx" target="lib\nanoFramework.Graphics.Core.pdbx" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pe" target="lib\nanoFramework.Graphics.Core.pe" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.xml" target="lib\nanoFramework.Graphics.Core.xml" />
-    <file src="assets\readme.txt" target="" />
     <file src="README.md" target="docs\" />
-    <file src="assets\nf-logo.png" target="images" />
+    <file src="assets\readme.txt" target="" />
     <file src="LICENSE.md" target="" />
+    <file src="assets\nf-logo.png" target="images" />
+    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.*" target="lib\netnano1.0" />
   </files>
 </package>
\ No newline at end of file
diff --git a/nanoFramework.Graphics.Gc9A01.nuspec b/nanoFramework.Graphics.Gc9A01.nuspec
index 545cfb2..49f133f 100644
--- a/nanoFramework.Graphics.Gc9A01.nuspec
+++ b/nanoFramework.Graphics.Gc9A01.nuspec
@@ -20,32 +20,20 @@ It does embed a managed driver Gc9A01. It is aimed to be used for images built w
 This package requires a target with nanoFramework.Graphics v$nativeVersion$ (checksum $checksum$).</description>
     <tags>nanoFramework C# csharp netmf netnf nanoFramework.Graphics Gc9A01</tags>
     <dependencies>
-      <dependency id="nanoFramework.CoreLibrary" version="2.0.0-preview.35" />
-      <dependency id="nanoFramework.ResourceManager" version="2.0.0-preview.1" />
-      <dependency id="nanoFramework.Runtime.Events" version="2.0.0-preview.5" />
-      <dependency id="nanoFramework.Runtime.Native" version="2.0.0-preview.17" />
-      <dependency id="nanoFramework.System.Collections" version="2.0.0-preview.5" />
+      <group targetFramework=".NETnanoFramework1.0">
+        <dependency id="nanoFramework.CoreLibrary" version="2.0.0-preview.35" />
+        <dependency id="nanoFramework.ResourceManager" version="2.0.0-preview.1" />
+        <dependency id="nanoFramework.Runtime.Events" version="2.0.0-preview.5" />
+        <dependency id="nanoFramework.Runtime.Native" version="2.0.0-preview.17" />
+        <dependency id="nanoFramework.System.Collections" version="2.0.0-preview.5" />
+      </group>
     </dependencies>
   </metadata>
   <files>
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.dll" target="lib\nanoFramework.Graphics.Core.dll" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pdb" target="lib\nanoFramework.Graphics.Core.pdb" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pdbx" target="lib\nanoFramework.Graphics.Core.pdbx" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pe" target="lib\nanoFramework.Graphics.Core.pe" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.xml" target="lib\nanoFramework.Graphics.Core.xml" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.dll" target="lib\nanoFramework.Graphics.dll" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pdb" target="lib\nanoFramework.Graphics.pdb" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pdbx" target="lib\nanoFramework.Graphics.pdbx" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pe" target="lib\nanoFramework.Graphics.pe" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.xml" target="lib\nanoFramework.Graphics.xml" />
-    <file src="ManagedDrivers\Gc9A01\bin\Release\nanoFramework.Graphics.Gc9A01.dll" target="lib\nanoFramework.Graphics.Gc9A01.dll" />
-    <file src="ManagedDrivers\Gc9A01\bin\Release\nanoFramework.Graphics.Gc9A01.pdb" target="lib\nanoFramework.Graphics.Gc9A01.pdb" />
-    <file src="ManagedDrivers\Gc9A01\bin\Release\nanoFramework.Graphics.Gc9A01.pdbx" target="lib\nanoFramework.Graphics.Gc9A01.pdbx" />
-    <file src="ManagedDrivers\Gc9A01\bin\Release\nanoFramework.Graphics.Gc9A01.pe" target="lib\nanoFramework.Graphics.Gc9A01.pe" />
-    <file src="ManagedDrivers\Gc9A01\bin\Release\nanoFramework.Graphics.Gc9A01.xml" target="lib\nanoFramework.Graphics.Gc9A01.xml" />
-    <file src="assets\readme.txt" target="" />
     <file src="README.md" target="docs\" />
-    <file src="assets\nf-logo.png" target="images" />
+    <file src="assets\readme.txt" target="" />
     <file src="LICENSE.md" target="" />
+    <file src="assets\nf-logo.png" target="images" />
+    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.*" target="lib\netnano1.0" />
   </files>
 </package>
\ No newline at end of file
diff --git a/nanoFramework.Graphics.Ili9341.nuspec b/nanoFramework.Graphics.Ili9341.nuspec
index 780bad4..7cb7c8c 100644
--- a/nanoFramework.Graphics.Ili9341.nuspec
+++ b/nanoFramework.Graphics.Ili9341.nuspec
@@ -20,32 +20,20 @@ It does embed a managed driver Ili9341. It is aimed to be used for images built
 This package requires a target with nanoFramework.Graphics v$nativeVersion$ (checksum $checksum$).</description>
     <tags>nanoFramework C# csharp netmf netnf nanoFramework.Graphics Ili9341</tags>
     <dependencies>
-      <dependency id="nanoFramework.CoreLibrary" version="2.0.0-preview.35" />
-      <dependency id="nanoFramework.ResourceManager" version="2.0.0-preview.1" />
-      <dependency id="nanoFramework.Runtime.Events" version="2.0.0-preview.5" />
-      <dependency id="nanoFramework.Runtime.Native" version="2.0.0-preview.17" />
-      <dependency id="nanoFramework.System.Collections" version="2.0.0-preview.5" />
+      <group targetFramework=".NETnanoFramework1.0">
+        <dependency id="nanoFramework.CoreLibrary" version="2.0.0-preview.35" />
+        <dependency id="nanoFramework.ResourceManager" version="2.0.0-preview.1" />
+        <dependency id="nanoFramework.Runtime.Events" version="2.0.0-preview.5" />
+        <dependency id="nanoFramework.Runtime.Native" version="2.0.0-preview.17" />
+        <dependency id="nanoFramework.System.Collections" version="2.0.0-preview.5" />
+      </group>
     </dependencies>
   </metadata>
   <files>
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.dll" target="lib\nanoFramework.Graphics.Core.dll" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pdb" target="lib\nanoFramework.Graphics.Core.pdb" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pdbx" target="lib\nanoFramework.Graphics.Core.pdbx" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pe" target="lib\nanoFramework.Graphics.Core.pe" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.xml" target="lib\nanoFramework.Graphics.Core.xml" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.dll" target="lib\nanoFramework.Graphics.dll" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pdb" target="lib\nanoFramework.Graphics.pdb" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pdbx" target="lib\nanoFramework.Graphics.pdbx" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pe" target="lib\nanoFramework.Graphics.pe" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.xml" target="lib\nanoFramework.Graphics.xml" />
-    <file src="ManagedDrivers\Ili9341\bin\Release\nanoFramework.Graphics.Ili9341.dll" target="lib\nanoFramework.Graphics.Ili9341.dll" />
-    <file src="ManagedDrivers\Ili9341\bin\Release\nanoFramework.Graphics.Ili9341.pdb" target="lib\nanoFramework.Graphics.Ili9341.pdb" />
-    <file src="ManagedDrivers\Ili9341\bin\Release\nanoFramework.Graphics.Ili9341.pdbx" target="lib\nanoFramework.Graphics.Ili9341.pdbx" />
-    <file src="ManagedDrivers\Ili9341\bin\Release\nanoFramework.Graphics.Ili9341.pe" target="lib\nanoFramework.Graphics.Ili9341.pe" />
-    <file src="ManagedDrivers\Ili9341\bin\Release\nanoFramework.Graphics.Ili9341.xml" target="lib\nanoFramework.Graphics.Ili9341.xml" />
-    <file src="assets\readme.txt" target="" />
     <file src="README.md" target="docs\" />
-    <file src="assets\nf-logo.png" target="images" />
+    <file src="assets\readme.txt" target="" />
     <file src="LICENSE.md" target="" />
+    <file src="assets\nf-logo.png" target="images" />
+    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.*" target="lib\netnano1.0" />
   </files>
 </package>
\ No newline at end of file
diff --git a/nanoFramework.Graphics.Ili9342.nuspec b/nanoFramework.Graphics.Ili9342.nuspec
index c7f1f19..45c1a73 100644
--- a/nanoFramework.Graphics.Ili9342.nuspec
+++ b/nanoFramework.Graphics.Ili9342.nuspec
@@ -20,32 +20,20 @@ It does embed a managed driver Ili9342. It is aimed to be used for images built
 This package requires a target with nanoFramework.Graphics v$nativeVersion$ (checksum $checksum$).</description>
     <tags>nanoFramework C# csharp netmf netnf nanoFramework.Graphics Ili9342</tags>
     <dependencies>
-      <dependency id="nanoFramework.CoreLibrary" version="2.0.0-preview.35" />
-      <dependency id="nanoFramework.ResourceManager" version="2.0.0-preview.1" />
-      <dependency id="nanoFramework.Runtime.Events" version="2.0.0-preview.5" />
-      <dependency id="nanoFramework.Runtime.Native" version="2.0.0-preview.17" />
-      <dependency id="nanoFramework.System.Collections" version="2.0.0-preview.5" />
+      <group targetFramework=".NETnanoFramework1.0">
+        <dependency id="nanoFramework.CoreLibrary" version="2.0.0-preview.35" />
+        <dependency id="nanoFramework.ResourceManager" version="2.0.0-preview.1" />
+        <dependency id="nanoFramework.Runtime.Events" version="2.0.0-preview.5" />
+        <dependency id="nanoFramework.Runtime.Native" version="2.0.0-preview.17" />
+        <dependency id="nanoFramework.System.Collections" version="2.0.0-preview.5" />
+      </group>
     </dependencies>
   </metadata>
   <files>
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.dll" target="lib\nanoFramework.Graphics.Core.dll" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pdb" target="lib\nanoFramework.Graphics.Core.pdb" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pdbx" target="lib\nanoFramework.Graphics.Core.pdbx" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pe" target="lib\nanoFramework.Graphics.Core.pe" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.xml" target="lib\nanoFramework.Graphics.Core.xml" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.dll" target="lib\nanoFramework.Graphics.dll" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pdb" target="lib\nanoFramework.Graphics.pdb" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pdbx" target="lib\nanoFramework.Graphics.pdbx" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pe" target="lib\nanoFramework.Graphics.pe" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.xml" target="lib\nanoFramework.Graphics.xml" />
-    <file src="ManagedDrivers\Ili9342\bin\Release\nanoFramework.Graphics.Ili9342.dll" target="lib\nanoFramework.Graphics.Ili9342.dll" />
-    <file src="ManagedDrivers\Ili9342\bin\Release\nanoFramework.Graphics.Ili9342.pdb" target="lib\nanoFramework.Graphics.Ili9342.pdb" />
-    <file src="ManagedDrivers\Ili9342\bin\Release\nanoFramework.Graphics.Ili9342.pdbx" target="lib\nanoFramework.Graphics.Ili9342.pdbx" />
-    <file src="ManagedDrivers\Ili9342\bin\Release\nanoFramework.Graphics.Ili9342.pe" target="lib\nanoFramework.Graphics.Ili9342.pe" />
-    <file src="ManagedDrivers\Ili9342\bin\Release\nanoFramework.Graphics.Ili9342.xml" target="lib\nanoFramework.Graphics.Ili9342.xml" />
-    <file src="assets\readme.txt" target="" />
     <file src="README.md" target="docs\" />
-    <file src="assets\nf-logo.png" target="images" />
+    <file src="assets\readme.txt" target="" />
     <file src="LICENSE.md" target="" />
+    <file src="assets\nf-logo.png" target="images" />
+    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.*" target="lib\netnano1.0" />
   </files>
 </package>
\ No newline at end of file
diff --git a/nanoFramework.Graphics.Otm8009A.nuspec b/nanoFramework.Graphics.Otm8009A.nuspec
index dd0dfa8..f46cd22 100644
--- a/nanoFramework.Graphics.Otm8009A.nuspec
+++ b/nanoFramework.Graphics.Otm8009A.nuspec
@@ -20,32 +20,20 @@ It does embed a managed driver Otm8009A. It is aimed to be used for images built
 This package requires a target with nanoFramework.Graphics v$nativeVersion$ (checksum $checksum$).</description>
     <tags>nanoFramework C# csharp netmf netnf nanoFramework.Graphics Otm8009A</tags>
     <dependencies>
-      <dependency id="nanoFramework.CoreLibrary" version="2.0.0-preview.35" />
-      <dependency id="nanoFramework.ResourceManager" version="2.0.0-preview.1" />
-      <dependency id="nanoFramework.Runtime.Events" version="2.0.0-preview.5" />
-      <dependency id="nanoFramework.Runtime.Native" version="2.0.0-preview.17" />
-      <dependency id="nanoFramework.System.Collections" version="2.0.0-preview.5" />
+      <group targetFramework=".NETnanoFramework1.0">
+        <dependency id="nanoFramework.CoreLibrary" version="2.0.0-preview.35" />
+        <dependency id="nanoFramework.ResourceManager" version="2.0.0-preview.1" />
+        <dependency id="nanoFramework.Runtime.Events" version="2.0.0-preview.5" />
+        <dependency id="nanoFramework.Runtime.Native" version="2.0.0-preview.17" />
+        <dependency id="nanoFramework.System.Collections" version="2.0.0-preview.5" />
+      </group>
     </dependencies>
   </metadata>
   <files>
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.dll" target="lib\nanoFramework.Graphics.Core.dll" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pdb" target="lib\nanoFramework.Graphics.Core.pdb" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pdbx" target="lib\nanoFramework.Graphics.Core.pdbx" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pe" target="lib\nanoFramework.Graphics.Core.pe" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.xml" target="lib\nanoFramework.Graphics.Core.xml" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.dll" target="lib\nanoFramework.Graphics.dll" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pdb" target="lib\nanoFramework.Graphics.pdb" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pdbx" target="lib\nanoFramework.Graphics.pdbx" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pe" target="lib\nanoFramework.Graphics.pe" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.xml" target="lib\nanoFramework.Graphics.xml" />
-    <file src="ManagedDrivers\Otm8009A\bin\Release\nanoFramework.Graphics.Otm8009A.dll" target="lib\nanoFramework.Graphics.Otm8009A.dll" />
-    <file src="ManagedDrivers\Otm8009A\bin\Release\nanoFramework.Graphics.Otm8009A.pdb" target="lib\nanoFramework.Graphics.Otm8009A.pdb" />
-    <file src="ManagedDrivers\Otm8009A\bin\Release\nanoFramework.Graphics.Otm8009A.pdbx" target="lib\nanoFramework.Graphics.Otm8009A.pdbx" />
-    <file src="ManagedDrivers\Otm8009A\bin\Release\nanoFramework.Graphics.Otm8009A.pe" target="lib\nanoFramework.Graphics.Otm8009A.pe" />
-    <file src="ManagedDrivers\Otm8009A\bin\Release\nanoFramework.Graphics.Otm8009A.xml" target="lib\nanoFramework.Graphics.Otm8009A.xml" />
-    <file src="assets\readme.txt" target="" />
     <file src="README.md" target="docs\" />
-    <file src="assets\nf-logo.png" target="images" />
+    <file src="assets\readme.txt" target="" />
     <file src="LICENSE.md" target="" />
+    <file src="assets\nf-logo.png" target="images" />
+    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.*" target="lib\netnano1.0" />
   </files>
 </package>
\ No newline at end of file
diff --git a/nanoFramework.Graphics.Ssd1306.nuspec b/nanoFramework.Graphics.Ssd1306.nuspec
index 96d7569..3e060c6 100644
--- a/nanoFramework.Graphics.Ssd1306.nuspec
+++ b/nanoFramework.Graphics.Ssd1306.nuspec
@@ -20,32 +20,20 @@ It does embed a managed driver Ssd1306. It is aimed to be used for images built
 This package requires a target with nanoFramework.Graphics v$nativeVersion$ (checksum $checksum$).</description>
     <tags>nanoFramework C# csharp netmf netnf nanoFramework.Graphics Ssd1306</tags>
     <dependencies>
-      <dependency id="nanoFramework.CoreLibrary" version="2.0.0-preview.35" />
-      <dependency id="nanoFramework.ResourceManager" version="2.0.0-preview.1" />
-      <dependency id="nanoFramework.Runtime.Events" version="2.0.0-preview.5" />
-      <dependency id="nanoFramework.Runtime.Native" version="2.0.0-preview.17" />
-      <dependency id="nanoFramework.System.Collections" version="2.0.0-preview.5" />
+      <group targetFramework=".NETnanoFramework1.0">
+        <dependency id="nanoFramework.CoreLibrary" version="2.0.0-preview.35" />
+        <dependency id="nanoFramework.ResourceManager" version="2.0.0-preview.1" />
+        <dependency id="nanoFramework.Runtime.Events" version="2.0.0-preview.5" />
+        <dependency id="nanoFramework.Runtime.Native" version="2.0.0-preview.17" />
+        <dependency id="nanoFramework.System.Collections" version="2.0.0-preview.5" />
+      </group>
     </dependencies>
   </metadata>
   <files>
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.dll" target="lib\nanoFramework.Graphics.Core.dll" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pdb" target="lib\nanoFramework.Graphics.Core.pdb" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pdbx" target="lib\nanoFramework.Graphics.Core.pdbx" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pe" target="lib\nanoFramework.Graphics.Core.pe" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.xml" target="lib\nanoFramework.Graphics.Core.xml" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.dll" target="lib\nanoFramework.Graphics.dll" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pdb" target="lib\nanoFramework.Graphics.pdb" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pdbx" target="lib\nanoFramework.Graphics.pdbx" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pe" target="lib\nanoFramework.Graphics.pe" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.xml" target="lib\nanoFramework.Graphics.xml" />
-    <file src="ManagedDrivers\Ssd1306\bin\Release\nanoFramework.Graphics.Ssd1306.dll" target="lib\nanoFramework.Graphics.Ssd1306.dll" />
-    <file src="ManagedDrivers\Ssd1306\bin\Release\nanoFramework.Graphics.Ssd1306.pdb" target="lib\nanoFramework.Graphics.Ssd1306.pdb" />
-    <file src="ManagedDrivers\Ssd1306\bin\Release\nanoFramework.Graphics.Ssd1306.pdbx" target="lib\nanoFramework.Graphics.Ssd1306.pdbx" />
-    <file src="ManagedDrivers\Ssd1306\bin\Release\nanoFramework.Graphics.Ssd1306.pe" target="lib\nanoFramework.Graphics.Ssd1306.pe" />
-    <file src="ManagedDrivers\Ssd1306\bin\Release\nanoFramework.Graphics.Ssd1306.xml" target="lib\nanoFramework.Graphics.Ssd1306.xml" />
-    <file src="assets\readme.txt" target="" />
     <file src="README.md" target="docs\" />
-    <file src="assets\nf-logo.png" target="images" />
+    <file src="assets\readme.txt" target="" />
     <file src="LICENSE.md" target="" />
+    <file src="assets\nf-logo.png" target="images" />
+    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.*" target="lib\netnano1.0" />
   </files>
 </package>
\ No newline at end of file
diff --git a/nanoFramework.Graphics.Ssd1331.nuspec b/nanoFramework.Graphics.Ssd1331.nuspec
index 500e1d9..2f54e91 100644
--- a/nanoFramework.Graphics.Ssd1331.nuspec
+++ b/nanoFramework.Graphics.Ssd1331.nuspec
@@ -20,32 +20,20 @@ It does embed a managed driver Ssd1331. It is aimed to be used for images built
 This package requires a target with nanoFramework.Graphics v$nativeVersion$ (checksum $checksum$).</description>
     <tags>nanoFramework C# csharp netmf netnf nanoFramework.Graphics Ssd1331</tags>
     <dependencies>
-      <dependency id="nanoFramework.CoreLibrary" version="2.0.0-preview.35" />
-      <dependency id="nanoFramework.ResourceManager" version="2.0.0-preview.1" />
-      <dependency id="nanoFramework.Runtime.Events" version="2.0.0-preview.5" />
-      <dependency id="nanoFramework.Runtime.Native" version="2.0.0-preview.17" />
-      <dependency id="nanoFramework.System.Collections" version="2.0.0-preview.5" />
+      <group targetFramework=".NETnanoFramework1.0">
+        <dependency id="nanoFramework.CoreLibrary" version="2.0.0-preview.35" />
+        <dependency id="nanoFramework.ResourceManager" version="2.0.0-preview.1" />
+        <dependency id="nanoFramework.Runtime.Events" version="2.0.0-preview.5" />
+        <dependency id="nanoFramework.Runtime.Native" version="2.0.0-preview.17" />
+        <dependency id="nanoFramework.System.Collections" version="2.0.0-preview.5" />
+      </group>
     </dependencies>
   </metadata>
   <files>
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.dll" target="lib\nanoFramework.Graphics.Core.dll" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pdb" target="lib\nanoFramework.Graphics.Core.pdb" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pdbx" target="lib\nanoFramework.Graphics.Core.pdbx" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pe" target="lib\nanoFramework.Graphics.Core.pe" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.xml" target="lib\nanoFramework.Graphics.Core.xml" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.dll" target="lib\nanoFramework.Graphics.dll" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pdb" target="lib\nanoFramework.Graphics.pdb" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pdbx" target="lib\nanoFramework.Graphics.pdbx" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pe" target="lib\nanoFramework.Graphics.pe" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.xml" target="lib\nanoFramework.Graphics.xml" />
-    <file src="ManagedDrivers\Ssd1331\bin\Release\nanoFramework.Graphics.Ssd1331.dll" target="lib\nanoFramework.Graphics.Ssd1331.dll" />
-    <file src="ManagedDrivers\Ssd1331\bin\Release\nanoFramework.Graphics.Ssd1331.pdb" target="lib\nanoFramework.Graphics.Ssd1331.pdb" />
-    <file src="ManagedDrivers\Ssd1331\bin\Release\nanoFramework.Graphics.Ssd1331.pdbx" target="lib\nanoFramework.Graphics.Ssd1331.pdbx" />
-    <file src="ManagedDrivers\Ssd1331\bin\Release\nanoFramework.Graphics.Ssd1331.pe" target="lib\nanoFramework.Graphics.Ssd1331.pe" />
-    <file src="ManagedDrivers\Ssd1331\bin\Release\nanoFramework.Graphics.Ssd1331.xml" target="lib\nanoFramework.Graphics.Ssd1331.xml" />
-    <file src="assets\readme.txt" target="" />
     <file src="README.md" target="docs\" />
-    <file src="assets\nf-logo.png" target="images" />
+    <file src="assets\readme.txt" target="" />
     <file src="LICENSE.md" target="" />
+    <file src="assets\nf-logo.png" target="images" />
+    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.*" target="lib\netnano1.0" />
   </files>
 </package>
\ No newline at end of file
diff --git a/nanoFramework.Graphics.St7735.nuspec b/nanoFramework.Graphics.St7735.nuspec
index bd3fef5..80ecc87 100644
--- a/nanoFramework.Graphics.St7735.nuspec
+++ b/nanoFramework.Graphics.St7735.nuspec
@@ -20,32 +20,20 @@ It does embed a managed driver St7735. It is aimed to be used for images built w
 This package requires a target with nanoFramework.Graphics v$nativeVersion$ (checksum $checksum$).</description>
     <tags>nanoFramework C# csharp netmf netnf nanoFramework.Graphics St7735</tags>
     <dependencies>
-      <dependency id="nanoFramework.CoreLibrary" version="2.0.0-preview.35" />
-      <dependency id="nanoFramework.ResourceManager" version="2.0.0-preview.1" />
-      <dependency id="nanoFramework.Runtime.Events" version="2.0.0-preview.5" />
-      <dependency id="nanoFramework.Runtime.Native" version="2.0.0-preview.17" />
-      <dependency id="nanoFramework.System.Collections" version="2.0.0-preview.5" />
+      <group targetFramework=".NETnanoFramework1.0">
+        <dependency id="nanoFramework.CoreLibrary" version="2.0.0-preview.35" />
+        <dependency id="nanoFramework.ResourceManager" version="2.0.0-preview.1" />
+        <dependency id="nanoFramework.Runtime.Events" version="2.0.0-preview.5" />
+        <dependency id="nanoFramework.Runtime.Native" version="2.0.0-preview.17" />
+        <dependency id="nanoFramework.System.Collections" version="2.0.0-preview.5" />
+      </group>
     </dependencies>
   </metadata>
   <files>
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.dll" target="lib\nanoFramework.Graphics.Core.dll" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pdb" target="lib\nanoFramework.Graphics.Core.pdb" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pdbx" target="lib\nanoFramework.Graphics.Core.pdbx" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pe" target="lib\nanoFramework.Graphics.Core.pe" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.xml" target="lib\nanoFramework.Graphics.Core.xml" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.dll" target="lib\nanoFramework.Graphics.dll" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pdb" target="lib\nanoFramework.Graphics.pdb" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pdbx" target="lib\nanoFramework.Graphics.pdbx" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pe" target="lib\nanoFramework.Graphics.pe" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.xml" target="lib\nanoFramework.Graphics.xml" />
-    <file src="ManagedDrivers\St7735\bin\Release\nanoFramework.Graphics.St7735.dll" target="lib\nanoFramework.Graphics.St7735.dll" />
-    <file src="ManagedDrivers\St7735\bin\Release\nanoFramework.Graphics.St7735.pdb" target="lib\nanoFramework.Graphics.St7735.pdb" />
-    <file src="ManagedDrivers\St7735\bin\Release\nanoFramework.Graphics.St7735.pdbx" target="lib\nanoFramework.Graphics.St7735.pdbx" />
-    <file src="ManagedDrivers\St7735\bin\Release\nanoFramework.Graphics.St7735.pe" target="lib\nanoFramework.Graphics.St7735.pe" />
-    <file src="ManagedDrivers\St7735\bin\Release\nanoFramework.Graphics.St7735.xml" target="lib\nanoFramework.Graphics.St7735.xml" />
-    <file src="assets\readme.txt" target="" />
     <file src="README.md" target="docs\" />
-    <file src="assets\nf-logo.png" target="images" />
+    <file src="assets\readme.txt" target="" />
     <file src="LICENSE.md" target="" />
+    <file src="assets\nf-logo.png" target="images" />
+    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.*" target="lib\netnano1.0" />
   </files>
 </package>
\ No newline at end of file
diff --git a/nanoFramework.Graphics.St7789.nuspec b/nanoFramework.Graphics.St7789.nuspec
index 874895a..ac4166e 100644
--- a/nanoFramework.Graphics.St7789.nuspec
+++ b/nanoFramework.Graphics.St7789.nuspec
@@ -20,32 +20,20 @@ It does embed a managed driver St7789. It is aimed to be used for images built w
 This package requires a target with nanoFramework.Graphics v$nativeVersion$ (checksum $checksum$).</description>
     <tags>nanoFramework C# csharp netmf netnf nanoFramework.Graphics St7789</tags>
     <dependencies>
-      <dependency id="nanoFramework.CoreLibrary" version="2.0.0-preview.35" />
-      <dependency id="nanoFramework.ResourceManager" version="2.0.0-preview.1" />
-      <dependency id="nanoFramework.Runtime.Events" version="2.0.0-preview.5" />
-      <dependency id="nanoFramework.Runtime.Native" version="2.0.0-preview.17" />
-      <dependency id="nanoFramework.System.Collections" version="2.0.0-preview.5" />
+      <group targetFramework=".NETnanoFramework1.0">
+        <dependency id="nanoFramework.CoreLibrary" version="2.0.0-preview.35" />
+        <dependency id="nanoFramework.ResourceManager" version="2.0.0-preview.1" />
+        <dependency id="nanoFramework.Runtime.Events" version="2.0.0-preview.5" />
+        <dependency id="nanoFramework.Runtime.Native" version="2.0.0-preview.17" />
+        <dependency id="nanoFramework.System.Collections" version="2.0.0-preview.5" />
+      </group>
     </dependencies>
   </metadata>
   <files>
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.dll" target="lib\nanoFramework.Graphics.Core.dll" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pdb" target="lib\nanoFramework.Graphics.Core.pdb" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pdbx" target="lib\nanoFramework.Graphics.Core.pdbx" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pe" target="lib\nanoFramework.Graphics.Core.pe" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.xml" target="lib\nanoFramework.Graphics.Core.xml" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.dll" target="lib\nanoFramework.Graphics.dll" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pdb" target="lib\nanoFramework.Graphics.pdb" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pdbx" target="lib\nanoFramework.Graphics.pdbx" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pe" target="lib\nanoFramework.Graphics.pe" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.xml" target="lib\nanoFramework.Graphics.xml" />
-    <file src="ManagedDrivers\St7789\bin\Release\nanoFramework.Graphics.St7789.dll" target="lib\nanoFramework.Graphics.St7789.dll" />
-    <file src="ManagedDrivers\St7789\bin\Release\nanoFramework.Graphics.St7789.pdb" target="lib\nanoFramework.Graphics.St7789.pdb" />
-    <file src="ManagedDrivers\St7789\bin\Release\nanoFramework.Graphics.St7789.pdbx" target="lib\nanoFramework.Graphics.St7789.pdbx" />
-    <file src="ManagedDrivers\St7789\bin\Release\nanoFramework.Graphics.St7789.pe" target="lib\nanoFramework.Graphics.St7789.pe" />
-    <file src="ManagedDrivers\St7789\bin\Release\nanoFramework.Graphics.St7789.xml" target="lib\nanoFramework.Graphics.St7789.xml" />
-    <file src="assets\readme.txt" target="" />
     <file src="README.md" target="docs\" />
-    <file src="assets\nf-logo.png" target="images" />
+    <file src="assets\readme.txt" target="" />
     <file src="LICENSE.md" target="" />
+    <file src="assets\nf-logo.png" target="images" />
+    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.*" target="lib\netnano1.0" />
   </files>
 </package>
\ No newline at end of file
diff --git a/nanoFramework.Graphics.nuspec b/nanoFramework.Graphics.nuspec
index 18ecdbc..ca2cd04 100644
--- a/nanoFramework.Graphics.nuspec
+++ b/nanoFramework.Graphics.nuspec
@@ -19,27 +19,20 @@
 This package requires a target with System.Graphics v$nativeVersion$ (checksum $checksum$).</description>
     <tags>nanoFramework C# csharp netmf netnf nanoFramework.Graphics</tags>
     <dependencies>
-      <dependency id="nanoFramework.CoreLibrary" version="2.0.0-preview.35" />
-      <dependency id="nanoFramework.ResourceManager" version="2.0.0-preview.5" />
-      <dependency id="nanoFramework.Runtime.Events" version="2.0.0-preview.8" />
-      <dependency id="nanoFramework.Runtime.Native" version="2.0.0-preview.20" />
-      <dependency id="nanoFramework.System.Collections" version="2.0.0-preview.8" />
+      <group targetFramework=".NETnanoFramework1.0">
+        <dependency id="nanoFramework.CoreLibrary" version="2.0.0-preview.35" />
+        <dependency id="nanoFramework.ResourceManager" version="2.0.0-preview.5" />
+        <dependency id="nanoFramework.Runtime.Events" version="2.0.0-preview.8" />
+        <dependency id="nanoFramework.Runtime.Native" version="2.0.0-preview.20" />
+        <dependency id="nanoFramework.System.Collections" version="2.0.0-preview.8" />
+      </group>
     </dependencies>
   </metadata>
   <files>
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.dll" target="lib\nanoFramework.Graphics.Core.dll" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pdb" target="lib\nanoFramework.Graphics.Core.pdb" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pdbx" target="lib\nanoFramework.Graphics.Core.pdbx" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.pe" target="lib\nanoFramework.Graphics.Core.pe" />
-    <file src="nanoFramework.Graphics.Core\bin\Release\nanoFramework.Graphics.Core.xml" target="lib\nanoFramework.Graphics.Core.xml" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.dll" target="lib\nanoFramework.Graphics.dll" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pdb" target="lib\nanoFramework.Graphics.pdb" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pdbx" target="lib\nanoFramework.Graphics.pdbx" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.pe" target="lib\nanoFramework.Graphics.pe" />
-    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.xml" target="lib\nanoFramework.Graphics.xml" />
-    <file src="assets\readme.txt" target="" />
     <file src="README.md" target="docs\" />
-    <file src="assets\nf-logo.png" target="images" />
+    <file src="assets\readme.txt" target="" />
     <file src="LICENSE.md" target="" />
+    <file src="assets\nf-logo.png" target="images" />
+    <file src="nanoFramework.Graphics\bin\Release\nanoFramework.Graphics.*" target="lib\netnano1.0" />
   </files>
 </package>
\ No newline at end of file