diff --git a/src/HandyControl.sln b/src/HandyControl.sln
index 94a13bfa..e49211f0 100644
--- a/src/HandyControl.sln
+++ b/src/HandyControl.sln
@@ -32,11 +32,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Expression.Drawing", "Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.shproj", "{E5DC7C25-6293-4660-B5FB-186496386B90}"
 EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "System.Windows.Interactivity", "Shared\System.Windows.Interactivity\System.Windows.Interactivity.shproj", "{6F0C9CFF-2269-46A7-9664-478354C582A4}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		Shared\HandyControl_Shared\HandyControl_Shared.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5
 		Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5
 		Shared\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5
+		Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5
+		Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems*{6f0c9cff-2269-46a7-9664-478354c582a4}*SharedItemsImports = 13
 		Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{9a7b52e6-94bb-4e7e-bb6a-7cf6761b79a7}*SharedItemsImports = 5
 		Shared\HandyControl_Shared\HandyControl_Shared.projitems*{aac11083-faca-405d-9197-5c1212d65656}*SharedItemsImports = 13
 		Shared\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems*{bbe51380-8b21-49ff-9cfc-b29447a40999}*SharedItemsImports = 13
@@ -44,6 +48,7 @@ Global
 		Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{d8ae88f8-c36b-4d10-a7f9-22ffcfba5231}*SharedItemsImports = 5
 		Shared\HandyControl_Shared\HandyControl_Shared.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5
 		Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5
+		Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5
 		Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems*{e5dc7c25-6293-4660-b5fb-186496386b90}*SharedItemsImports = 13
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -99,6 +104,7 @@ Global
 		{D8A4748C-0500-4F63-BC47-3506658C68F7} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897}
 		{BBE51380-8B21-49FF-9CFC-B29447A40999} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897}
 		{E5DC7C25-6293-4660-B5FB-186496386B90} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897}
+		{6F0C9CFF-2269-46A7-9664-478354C582A4} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D4636382-1A18-4079-A3E7-054DD970F179}
diff --git a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
index 3117a430..042da097 100644
--- a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
+++ b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
@@ -81,6 +81,7 @@
   <Import Project="..\..\Shared\HandyControl_Shared\HandyControl_Shared.projitems" Label="Shared" />
   <Import Project="..\..\Shared\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems" Label="Shared" />
   <Import Project="..\..\Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems" Label="Shared" />
+  <Import Project="..\..\Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems" Label="Shared" />
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControl_Shared\Resources\dropper.cur">
       <Link>Resources\dropper.cur</Link>
diff --git a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
index 3f780096..c10442ca 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
@@ -81,6 +81,7 @@
   </ItemGroup>
   <Import Project="..\..\Shared\HandyControl_Shared\HandyControl_Shared.projitems" Label="Shared" />
   <Import Project="..\..\Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems" Label="Shared" />
+  <Import Project="..\..\Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems" Label="Shared" />
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControl_Shared\Resources\dropper.cur">
       <Link>Resources\dropper.cur</Link>
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index 85820b3a..ca7ddf4e 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -283,40 +283,20 @@
     <Compile Include="$(MSBuildThisFileDirectory)Data\Info\SystemVersionInfo.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\ValueBoxes.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\AdornerContainer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\AttachableCollection`1.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Behavior\Behavior`1.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Behavior\Behavior.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Behavior\BehaviorCollection.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Commands\ControlCommands.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\DefaultTriggerAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\EventToCommand.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\EventTrigger.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\EventTriggerBase`1.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\EventTriggerBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\ExceptionStringTable.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\ExtendedVisualStateManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Behavior\FluidMoveBehavior.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Behavior\FluidMoveBehaviorBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\FluidMoveScope.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\IAttachedObject.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\IEventArgsConverter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Interaction.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\InvokeCommandAction.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Behavior\MouseDragElementBehavior.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\NameResolvedEventArgs.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\NameResolver.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\PreviewInvokeEventArgs.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Commands\PushMainWindow2TopCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\RoutedEventTrigger.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Commands\ShutdownAppCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\TagType.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\TransitionEffect.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\TriggerAction`1.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\TriggerAction.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\TriggerActionCollection.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\TriggerBase.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\TriggerCollection.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\TypeConstraintAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\Boolean2BooleanReConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\Boolean2StrConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\Boolean2VisibilityReConverter.cs" />
diff --git a/src/Shared/HandyControl_Shared/Interactivity/AttachableCollection`1.cs b/src/Shared/System.Windows.Interactivity/AttachableCollection`1.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/AttachableCollection`1.cs
rename to src/Shared/System.Windows.Interactivity/AttachableCollection`1.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/Behavior.cs b/src/Shared/System.Windows.Interactivity/Behavior.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/Behavior/Behavior.cs
rename to src/Shared/System.Windows.Interactivity/Behavior.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/BehaviorCollection.cs b/src/Shared/System.Windows.Interactivity/BehaviorCollection.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/Behavior/BehaviorCollection.cs
rename to src/Shared/System.Windows.Interactivity/BehaviorCollection.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/Behavior`1.cs b/src/Shared/System.Windows.Interactivity/Behavior`1.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/Behavior/Behavior`1.cs
rename to src/Shared/System.Windows.Interactivity/Behavior`1.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/DefaultTriggerAttribute.cs b/src/Shared/System.Windows.Interactivity/DefaultTriggerAttribute.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/DefaultTriggerAttribute.cs
rename to src/Shared/System.Windows.Interactivity/DefaultTriggerAttribute.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/EventTrigger.cs b/src/Shared/System.Windows.Interactivity/EventTrigger.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/EventTrigger.cs
rename to src/Shared/System.Windows.Interactivity/EventTrigger.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/EventTriggerBase.cs b/src/Shared/System.Windows.Interactivity/EventTriggerBase.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/EventTriggerBase.cs
rename to src/Shared/System.Windows.Interactivity/EventTriggerBase.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/EventTriggerBase`1.cs b/src/Shared/System.Windows.Interactivity/EventTriggerBase`1.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/EventTriggerBase`1.cs
rename to src/Shared/System.Windows.Interactivity/EventTriggerBase`1.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/IAttachedObject.cs b/src/Shared/System.Windows.Interactivity/IAttachedObject.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/IAttachedObject.cs
rename to src/Shared/System.Windows.Interactivity/IAttachedObject.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Interaction.cs b/src/Shared/System.Windows.Interactivity/Interaction.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/Interaction.cs
rename to src/Shared/System.Windows.Interactivity/Interaction.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/InvokeCommandAction.cs b/src/Shared/System.Windows.Interactivity/InvokeCommandAction.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/InvokeCommandAction.cs
rename to src/Shared/System.Windows.Interactivity/InvokeCommandAction.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/NameResolvedEventArgs.cs b/src/Shared/System.Windows.Interactivity/NameResolvedEventArgs.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/NameResolvedEventArgs.cs
rename to src/Shared/System.Windows.Interactivity/NameResolvedEventArgs.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/NameResolver.cs b/src/Shared/System.Windows.Interactivity/NameResolver.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/NameResolver.cs
rename to src/Shared/System.Windows.Interactivity/NameResolver.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/PreviewInvokeEventArgs.cs b/src/Shared/System.Windows.Interactivity/PreviewInvokeEventArgs.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/PreviewInvokeEventArgs.cs
rename to src/Shared/System.Windows.Interactivity/PreviewInvokeEventArgs.cs
diff --git a/src/Shared/System.Windows.Interactivity/System.Windows.Interactivity.projitems b/src/Shared/System.Windows.Interactivity/System.Windows.Interactivity.projitems
new file mode 100644
index 00000000..3323238f
--- /dev/null
+++ b/src/Shared/System.Windows.Interactivity/System.Windows.Interactivity.projitems
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>6f0c9cff-2269-46a7-9664-478354c582a4</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>System.Windows.Interactivity</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)AttachableCollection`1.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Behavior.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)BehaviorCollection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Behavior`1.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)DefaultTriggerAttribute.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)EventTrigger.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)EventTriggerBase.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)EventTriggerBase`1.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)IAttachedObject.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Interaction.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)InvokeCommandAction.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)NameResolvedEventArgs.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)NameResolver.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)PreviewInvokeEventArgs.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)TriggerAction.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)TriggerActionCollection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)TriggerAction`1.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)TriggerBase.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)TriggerCollection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)TypeConstraintAttribute.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Shared/System.Windows.Interactivity/System.Windows.Interactivity.shproj b/src/Shared/System.Windows.Interactivity/System.Windows.Interactivity.shproj
new file mode 100644
index 00000000..a5a44c6e
--- /dev/null
+++ b/src/Shared/System.Windows.Interactivity/System.Windows.Interactivity.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>6f0c9cff-2269-46a7-9664-478354c582a4</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="System.Windows.Interactivity.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/src/Shared/HandyControl_Shared/Interactivity/TriggerAction.cs b/src/Shared/System.Windows.Interactivity/TriggerAction.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/TriggerAction.cs
rename to src/Shared/System.Windows.Interactivity/TriggerAction.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/TriggerActionCollection.cs b/src/Shared/System.Windows.Interactivity/TriggerActionCollection.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/TriggerActionCollection.cs
rename to src/Shared/System.Windows.Interactivity/TriggerActionCollection.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/TriggerAction`1.cs b/src/Shared/System.Windows.Interactivity/TriggerAction`1.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/TriggerAction`1.cs
rename to src/Shared/System.Windows.Interactivity/TriggerAction`1.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/TriggerBase.cs b/src/Shared/System.Windows.Interactivity/TriggerBase.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/TriggerBase.cs
rename to src/Shared/System.Windows.Interactivity/TriggerBase.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/TriggerCollection.cs b/src/Shared/System.Windows.Interactivity/TriggerCollection.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/TriggerCollection.cs
rename to src/Shared/System.Windows.Interactivity/TriggerCollection.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/TypeConstraintAttribute.cs b/src/Shared/System.Windows.Interactivity/TypeConstraintAttribute.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/TypeConstraintAttribute.cs
rename to src/Shared/System.Windows.Interactivity/TypeConstraintAttribute.cs