diff --git a/Source/SharpDX/SharpDX.csproj b/Source/SharpDX/SharpDX.csproj
index 43a0bcb3a..0064c8747 100644
--- a/Source/SharpDX/SharpDX.csproj
+++ b/Source/SharpDX/SharpDX.csproj
@@ -54,7 +54,6 @@
     <Compile Include="Reflection\ObfuscationAttributes.cs" />
     <Compile Include="ComArray.cs" />
     <Compile Include="AssemblyDoc.cs" />
-    <Compile Include="IO\PathUtility.cs" />
     <Compile Include="IInspectable.cs" />
     <Compile Include="InspectableShadow.cs" />
     <Compile Include="ServiceEventArgs.cs" />
@@ -122,7 +121,6 @@
     <Compile Include="TagAttribute.cs" />
     <Compile Include="Text\ASCIIEncoding.cs" />
     <Compile Include="Text\NamespaceDoc.cs" />
-    <Compile Include="TimerTick.cs" />
     <Compile Include="Mathematics\Vector2.cs" />
     <Compile Include="Mathematics\Vector3.cs" />
     <Compile Include="Mathematics\Vector4.cs" />
@@ -155,7 +153,9 @@
     <Compile Include="Win32\VariantType.cs" />
     <Compile Include="Windows\NamespaceDoc.cs" />
     <Compile Include="Windows\RenderControl.cs" />
-    <Compile Include="Windows\RenderForm.cs" />
+    <Compile Include="Windows\RenderForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Windows\RenderLoop.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Source/SharpDX/Win32/NativeMessage.cs b/Source/SharpDX/Win32/NativeMessage.cs
index 7229b1a2a..57dda8428 100644
--- a/Source/SharpDX/Win32/NativeMessage.cs
+++ b/Source/SharpDX/Win32/NativeMessage.cs
@@ -31,8 +31,7 @@ public struct NativeMessage
 		public IntPtr wParam;
 		public IntPtr lParam;
 		public uint time;
-	    public int px;
-	    public int py;
+		public Point p;
 	}
 }
 #endif
\ No newline at end of file
diff --git a/Source/SharpDX/Win32Native.cs b/Source/SharpDX/Win32Native.cs
index cc5966308..fe0f1067d 100644
--- a/Source/SharpDX/Win32Native.cs
+++ b/Source/SharpDX/Win32Native.cs
@@ -151,6 +151,9 @@ public static bool ShowWindow(HandleRef hWnd, bool windowVisible)
         [DllImport("user32.dll", EntryPoint = "CallWindowProc", CharSet = CharSet.Unicode)]
         public static extern IntPtr CallWindowProc(IntPtr wndProc, IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam);
 
+        [DllImport("user32.dll", EntryPoint = "GetClientRect")]
+        public static extern bool GetClientRect(IntPtr hWnd, out Rectangle lpRect);
+
         [DllImport("kernel32.dll", EntryPoint = "GetModuleHandle", CharSet = CharSet.Unicode)]
         public static extern IntPtr GetModuleHandle(string lpModuleName);
 #endif
diff --git a/Source/Toolkit/SharpDX.Toolkit/IDataSerializer.cs b/Source/Toolkit/SharpDX.Toolkit/IDataSerializer.cs
new file mode 100644
index 000000000..c40bf41f8
--- /dev/null
+++ b/Source/Toolkit/SharpDX.Toolkit/IDataSerializer.cs
@@ -0,0 +1,36 @@
+// Copyright (c) 2010-2013 SharpDX - Alexandre Mutel
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using SharpDX.Toolkit.Serialization;
+
+namespace SharpDX.Toolkit
+{
+    /// <summary>
+    /// Implement this interface to serialize datas with <see cref="BinarySerializer"/>.
+    /// </summary>
+    public interface IDataSerializer
+    {
+        /// <summary>
+        /// Reads or writes datas from/to the given binary serializer.
+        /// </summary>
+        /// <param name="serializer">The binary serializer.</param>
+        void Serialize(BinarySerializer serializer);
+    }
+}
\ No newline at end of file
diff --git a/Source/SharpDX/IO/PathUtility.cs b/Source/Toolkit/SharpDX.Toolkit/PathUtility.cs
similarity index 97%
rename from Source/SharpDX/IO/PathUtility.cs
rename to Source/Toolkit/SharpDX.Toolkit/PathUtility.cs
index e5b756229..802eb6c7a 100644
--- a/Source/SharpDX/IO/PathUtility.cs
+++ b/Source/Toolkit/SharpDX.Toolkit/PathUtility.cs
@@ -21,12 +21,12 @@
 using System;
 using System.Collections.Generic;
 
-namespace SharpDX.IO
+namespace SharpDX.Toolkit
 {
     /// <summary>
     /// Path utility methods.
     /// </summary>
-    public class PathUtility
+    internal class PathUtility
     {
         /// <summary>
         /// Transform a path by replacing '/' by '\' and transforming relative '..' or current path '.' to an absolute path. See remarks.
diff --git a/Source/Toolkit/SharpDX.Toolkit/SharpDX.Toolkit.csproj b/Source/Toolkit/SharpDX.Toolkit/SharpDX.Toolkit.csproj
index 5c8ebb3ef..844ef1e66 100644
--- a/Source/Toolkit/SharpDX.Toolkit/SharpDX.Toolkit.csproj
+++ b/Source/Toolkit/SharpDX.Toolkit/SharpDX.Toolkit.csproj
@@ -42,6 +42,7 @@
     <Compile Include="IComponent.cs" />
     <Compile Include="IdentityEqualityComparer.cs" />
     <Compile Include="IServiceRegistry.cs" />
+    <Compile Include="PathUtility.cs" />
     <Compile Include="PropertyKey.cs" />
     <Compile Include="PropertyCollection.cs" />
     <Compile Include="Graphics\MaterialShadingMode.cs" />
@@ -105,6 +106,7 @@
     <Compile Include="Serialization\SerializerMode.cs" />
     <Compile Include="SingletonString.cs" />
     <Compile Include="Threading\TaskUtil.cs" />
+    <Compile Include="TimerTick.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\SharpDX.Direct3D11\SharpDX.Direct3D11.csproj">
diff --git a/Source/SharpDX/TimerTick.cs b/Source/Toolkit/SharpDX.Toolkit/TimerTick.cs
similarity index 100%
rename from Source/SharpDX/TimerTick.cs
rename to Source/Toolkit/SharpDX.Toolkit/TimerTick.cs