diff --git a/Sources/Libs/GraphSharp.Controls.dll b/Sources/Libs/GraphSharp.Controls.dll
deleted file mode 100644
index 5354f78..0000000
Binary files a/Sources/Libs/GraphSharp.Controls.dll and /dev/null differ
diff --git a/Sources/Libs/GraphSharp.dll b/Sources/Libs/GraphSharp.dll
deleted file mode 100644
index 5470228..0000000
Binary files a/Sources/Libs/GraphSharp.dll and /dev/null differ
diff --git a/Sources/Libs/MathNet.Numerics.dll b/Sources/Libs/MathNet.Numerics.dll
deleted file mode 100644
index e40fb26..0000000
Binary files a/Sources/Libs/MathNet.Numerics.dll and /dev/null differ
diff --git a/Sources/Libs/Microsoft.Cci.Analysis.ControlAndDataFlowGraph.dll b/Sources/Libs/Microsoft.Cci.Analysis.ControlAndDataFlowGraph.dll
new file mode 100644
index 0000000..c1e5c55
Binary files /dev/null and b/Sources/Libs/Microsoft.Cci.Analysis.ControlAndDataFlowGraph.dll differ
diff --git a/Sources/Libs/Microsoft.Cci.CodeModel.dll b/Sources/Libs/Microsoft.Cci.CodeModel.dll
index 0035df8..1ca1fb6 100644
Binary files a/Sources/Libs/Microsoft.Cci.CodeModel.dll and b/Sources/Libs/Microsoft.Cci.CodeModel.dll differ
diff --git a/Sources/Libs/Microsoft.Cci.CodeModelToIL.dll b/Sources/Libs/Microsoft.Cci.CodeModelToIL.dll
new file mode 100644
index 0000000..f0e1dc5
Binary files /dev/null and b/Sources/Libs/Microsoft.Cci.CodeModelToIL.dll differ
diff --git a/Sources/Libs/Microsoft.Cci.ILGenerator.dll b/Sources/Libs/Microsoft.Cci.ILGenerator.dll
new file mode 100644
index 0000000..2918cb4
Binary files /dev/null and b/Sources/Libs/Microsoft.Cci.ILGenerator.dll differ
diff --git a/Sources/Libs/Microsoft.Cci.ILToCodeModel.dll b/Sources/Libs/Microsoft.Cci.ILToCodeModel.dll
deleted file mode 100644
index 4899933..0000000
Binary files a/Sources/Libs/Microsoft.Cci.ILToCodeModel.dll and /dev/null differ
diff --git a/Sources/Libs/Microsoft.Cci.MetadataHelper.dll b/Sources/Libs/Microsoft.Cci.MetadataHelper.dll
index 41e2c06..1496280 100644
Binary files a/Sources/Libs/Microsoft.Cci.MetadataHelper.dll and b/Sources/Libs/Microsoft.Cci.MetadataHelper.dll differ
diff --git a/Sources/Libs/Microsoft.Cci.MetadataModel.dll b/Sources/Libs/Microsoft.Cci.MetadataModel.dll
index fdaece0..4e4b374 100644
Binary files a/Sources/Libs/Microsoft.Cci.MetadataModel.dll and b/Sources/Libs/Microsoft.Cci.MetadataModel.dll differ
diff --git a/Sources/Libs/Microsoft.Cci.MutableCodeModel.dll b/Sources/Libs/Microsoft.Cci.MutableCodeModel.dll
index 352d376..78743c4 100644
Binary files a/Sources/Libs/Microsoft.Cci.MutableCodeModel.dll and b/Sources/Libs/Microsoft.Cci.MutableCodeModel.dll differ
diff --git a/Sources/Libs/Microsoft.Cci.MutableMetadataModel.dll b/Sources/Libs/Microsoft.Cci.MutableMetadataModel.dll
index d8d02ef..b5cecfd 100644
Binary files a/Sources/Libs/Microsoft.Cci.MutableMetadataModel.dll and b/Sources/Libs/Microsoft.Cci.MutableMetadataModel.dll differ
diff --git a/Sources/Libs/Microsoft.Cci.NewILToCodeModel.dll b/Sources/Libs/Microsoft.Cci.NewILToCodeModel.dll
new file mode 100644
index 0000000..275472c
Binary files /dev/null and b/Sources/Libs/Microsoft.Cci.NewILToCodeModel.dll differ
diff --git a/Sources/Libs/Microsoft.Cci.PdbReader.dll b/Sources/Libs/Microsoft.Cci.PdbReader.dll
index f39a3aa..5dd5c9f 100644
Binary files a/Sources/Libs/Microsoft.Cci.PdbReader.dll and b/Sources/Libs/Microsoft.Cci.PdbReader.dll differ
diff --git a/Sources/Libs/Microsoft.Cci.PdbWriter.dll b/Sources/Libs/Microsoft.Cci.PdbWriter.dll
new file mode 100644
index 0000000..1c12fbe
Binary files /dev/null and b/Sources/Libs/Microsoft.Cci.PdbWriter.dll differ
diff --git a/Sources/Libs/Microsoft.Cci.PeReader.dll b/Sources/Libs/Microsoft.Cci.PeReader.dll
index 67359b7..7cc5547 100644
Binary files a/Sources/Libs/Microsoft.Cci.PeReader.dll and b/Sources/Libs/Microsoft.Cci.PeReader.dll differ
diff --git a/Sources/Libs/Microsoft.Cci.PeWriter.dll b/Sources/Libs/Microsoft.Cci.PeWriter.dll
new file mode 100644
index 0000000..094ca6b
Binary files /dev/null and b/Sources/Libs/Microsoft.Cci.PeWriter.dll differ
diff --git a/Sources/Libs/Microsoft.Cci.SourceModel.dll b/Sources/Libs/Microsoft.Cci.SourceModel.dll
index 8ec83c4..7a42a8f 100644
Binary files a/Sources/Libs/Microsoft.Cci.SourceModel.dll and b/Sources/Libs/Microsoft.Cci.SourceModel.dll differ
diff --git a/Sources/Libs/QuickGraph.dll b/Sources/Libs/QuickGraph.dll
deleted file mode 100644
index 1059051..0000000
Binary files a/Sources/Libs/QuickGraph.dll and /dev/null differ
diff --git a/Sources/Libs/System.Windows.Controls.DataVisualization.Toolkit.dll b/Sources/Libs/System.Windows.Controls.DataVisualization.Toolkit.dll
deleted file mode 100644
index 5f5f047..0000000
Binary files a/Sources/Libs/System.Windows.Controls.DataVisualization.Toolkit.dll and /dev/null differ
diff --git a/Sources/Libs/WPFExtensions.dll b/Sources/Libs/WPFExtensions.dll
deleted file mode 100644
index b617dc4..0000000
Binary files a/Sources/Libs/WPFExtensions.dll and /dev/null differ
diff --git a/Sources/Libs/WPFToolkit.dll b/Sources/Libs/WPFToolkit.dll
deleted file mode 100644
index 89b123c..0000000
Binary files a/Sources/Libs/WPFToolkit.dll and /dev/null differ
diff --git a/Sources/Usus.net.CleanCode/Resources.Designer.cs b/Sources/Usus.net.CleanCode/Resources.Designer.cs
index c78c835..b33ea5f 100644
--- a/Sources/Usus.net.CleanCode/Resources.Designer.cs
+++ b/Sources/Usus.net.CleanCode/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34003
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/Sources/Usus.net.CleanCode/Usus.net.CleanCode.csproj b/Sources/Usus.net.CleanCode/Usus.net.CleanCode.csproj
index a08c965..ba14b96 100644
--- a/Sources/Usus.net.CleanCode/Usus.net.CleanCode.csproj
+++ b/Sources/Usus.net.CleanCode/Usus.net.CleanCode.csproj
@@ -14,7 +14,7 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -162,6 +162,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
diff --git a/Sources/Usus.net.CleanCode/app.config b/Sources/Usus.net.CleanCode/app.config
new file mode 100644
index 0000000..001df9c
--- /dev/null
+++ b/Sources/Usus.net.CleanCode/app.config
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataHelper" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.SourceModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MutableMetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.PdbReader" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.ILGenerator" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Sources/Usus.net.Cockpit/Resources.Designer.cs b/Sources/Usus.net.Cockpit/Resources.Designer.cs
index b276952..a63def5 100644
--- a/Sources/Usus.net.Cockpit/Resources.Designer.cs
+++ b/Sources/Usus.net.Cockpit/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34003
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/Sources/Usus.net.Cockpit/Usus.net.Cockpit.csproj b/Sources/Usus.net.Cockpit/Usus.net.Cockpit.csproj
index 1cce52f..3275de4 100644
--- a/Sources/Usus.net.Cockpit/Usus.net.Cockpit.csproj
+++ b/Sources/Usus.net.Cockpit/Usus.net.Cockpit.csproj
@@ -14,7 +14,7 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -178,6 +178,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
diff --git a/Sources/Usus.net.Cockpit/app.config b/Sources/Usus.net.Cockpit/app.config
new file mode 100644
index 0000000..001df9c
--- /dev/null
+++ b/Sources/Usus.net.Cockpit/app.config
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataHelper" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.SourceModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MutableMetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.PdbReader" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.ILGenerator" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Sources/Usus.net.Console/Usus.net.Console.csproj b/Sources/Usus.net.Console/Usus.net.Console.csproj
index 18c02c2..b34c75b 100644
--- a/Sources/Usus.net.Console/Usus.net.Console.csproj
+++ b/Sources/Usus.net.Console/Usus.net.Console.csproj
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>andrena.Usus.net.Console</RootNamespace>
     <AssemblyName>Usus.net.Console</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -23,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -32,6 +34,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -55,6 +58,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="Key.snk" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Sources/Usus.net.Console/app.config b/Sources/Usus.net.Console/app.config
new file mode 100644
index 0000000..ac05457
--- /dev/null
+++ b/Sources/Usus.net.Console/app.config
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataHelper" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.SourceModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MutableMetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.PdbReader" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.ILGenerator" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/Sources/Usus.net.Core.IntegrationTests/Usus.net.Core.IntegrationTests.csproj b/Sources/Usus.net.Core.IntegrationTests/Usus.net.Core.IntegrationTests.csproj
index 97f3814..048a000 100644
--- a/Sources/Usus.net.Core.IntegrationTests/Usus.net.Core.IntegrationTests.csproj
+++ b/Sources/Usus.net.Core.IntegrationTests/Usus.net.Core.IntegrationTests.csproj
@@ -11,9 +11,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Usus.net.Core.IntegrationTests</RootNamespace>
     <AssemblyName>Usus.net.Core.IntegrationTests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -23,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,6 +33,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
@@ -68,6 +71,9 @@
       <Name>Usus.net.Core</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Sources/Usus.net.Core.IntegrationTests/app.config b/Sources/Usus.net.Core.IntegrationTests/app.config
new file mode 100644
index 0000000..ac05457
--- /dev/null
+++ b/Sources/Usus.net.Core.IntegrationTests/app.config
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataHelper" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.SourceModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MutableMetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.PdbReader" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.ILGenerator" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/Sources/Usus.net.Core.UnitTests/Usus.net.Core.UnitTests.csproj b/Sources/Usus.net.Core.UnitTests/Usus.net.Core.UnitTests.csproj
index fcf2df1..f9b118d 100644
--- a/Sources/Usus.net.Core.UnitTests/Usus.net.Core.UnitTests.csproj
+++ b/Sources/Usus.net.Core.UnitTests/Usus.net.Core.UnitTests.csproj
@@ -11,9 +11,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Usus.net.Core.UnitTests</RootNamespace>
     <AssemblyName>Usus.net.Core.UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -23,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,6 +33,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -93,6 +96,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="Key.snk" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/Sources/Usus.net.Core.UnitTests/app.config b/Sources/Usus.net.Core.UnitTests/app.config
new file mode 100644
index 0000000..ac05457
--- /dev/null
+++ b/Sources/Usus.net.Core.UnitTests/app.config
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataHelper" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.SourceModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MutableMetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.PdbReader" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.ILGenerator" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/Sources/Usus.net.Core/Metrics/Methods/StatementCollector.cs b/Sources/Usus.net.Core/Metrics/Methods/StatementCollector.cs
index 0570efb..933b0ce 100644
--- a/Sources/Usus.net.Core/Metrics/Methods/StatementCollector.cs
+++ b/Sources/Usus.net.Core/Metrics/Methods/StatementCollector.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Cci;
+using Microsoft.Cci.Analysis;
 using Microsoft.Cci.ILToCodeModel;
 
 namespace andrena.Usus.net.Core.Metrics.Methods
@@ -52,7 +53,7 @@ private void RememberStatementWithoutLocation(IStatement statement)
 
         private bool IsNotBlock(IStatement statement)
         {
-            return !(statement is BasicBlock);
+            return !(statement is IBlockStatement);
         }
 
         private bool HasLocation(IStatement statement)
diff --git a/Sources/Usus.net.Core/Usus.net.Core.csproj b/Sources/Usus.net.Core/Usus.net.Core.csproj
index b4b3e4a..76f5de8 100644
--- a/Sources/Usus.net.Core/Usus.net.Core.csproj
+++ b/Sources/Usus.net.Core/Usus.net.Core.csproj
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>andrena.Usus.net.Core</RootNamespace>
     <AssemblyName>Usus.net.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -21,6 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,6 +31,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -37,38 +40,78 @@
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="MathNet.Numerics">
-      <HintPath>..\Libs\MathNet.Numerics.dll</HintPath>
+    <Reference Include="MathNet.Numerics, Version=3.13.1.0, Culture=neutral, PublicKeyToken=cd8b63ad3d691a37, processorArchitecture=MSIL">
+      <HintPath>..\packages\MathNet.Numerics.Signed.3.13.1\lib\net40\MathNet.Numerics.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Cci.CodeModel">
+    <Reference Include="Microsoft.Cci.Analysis.ControlAndDataFlowGraph">
+      <HintPath>..\Libs\Microsoft.Cci.Analysis.ControlAndDataFlowGraph.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Cci.CodeModel, Version=1.0.7.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Libs\Microsoft.Cci.CodeModel.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Cci.ILToCodeModel">
-      <HintPath>..\Libs\Microsoft.Cci.ILToCodeModel.dll</HintPath>
+    <Reference Include="Microsoft.Cci.CodeModelToIL">
+      <HintPath>..\Libs\Microsoft.Cci.CodeModelToIL.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Cci.ILGenerator, Version=1.0.65055.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Libs\Microsoft.Cci.ILGenerator.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Cci.MetadataHelper">
+    <Reference Include="Microsoft.Cci.MetadataHelper, Version=1.0.65055.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Libs\Microsoft.Cci.MetadataHelper.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Cci.MetadataModel">
+    <Reference Include="Microsoft.Cci.MetadataModel, Version=1.0.65055.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Libs\Microsoft.Cci.MetadataModel.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Cci.MutableCodeModel">
+    <Reference Include="Microsoft.Cci.MutableCodeModel, Version=1.0.7.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Libs\Microsoft.Cci.MutableCodeModel.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Cci.MutableMetadataModel">
+    <Reference Include="Microsoft.Cci.MutableMetadataModel, Version=1.0.65055.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Libs\Microsoft.Cci.MutableMetadataModel.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Cci.PdbReader">
+    <Reference Include="Microsoft.Cci.NewILToCodeModel">
+      <HintPath>..\Libs\Microsoft.Cci.NewILToCodeModel.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Cci.PdbReader, Version=1.0.65055.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Libs\Microsoft.Cci.PdbReader.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Cci.PeReader">
+    <Reference Include="Microsoft.Cci.PdbWriter, Version=1.0.65055.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Libs\Microsoft.Cci.PdbWriter.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Cci.PeReader, Version=1.0.65055.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Libs\Microsoft.Cci.PeReader.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Cci.SourceModel">
+    <Reference Include="Microsoft.Cci.PeWriter, Version=1.0.65055.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Libs\Microsoft.Cci.PeWriter.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Cci.SourceModel, Version=1.0.65055.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Libs\Microsoft.Cci.SourceModel.dll</HintPath>
     </Reference>
-    <Reference Include="QuickGraph">
-      <HintPath>..\Libs\QuickGraph.dll</HintPath>
+    <Reference Include="QuickGraph, Version=3.6.61114.0, Culture=neutral, PublicKeyToken=f3fb40175eec2af3, processorArchitecture=MSIL">
+      <HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="QuickGraph.Data, Version=3.6.61114.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Data.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="QuickGraph.Graphviz, Version=3.6.61114.0, Culture=neutral, PublicKeyToken=f3fb40175eec2af3, processorArchitecture=MSIL">
+      <HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Graphviz.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="QuickGraph.Serialization, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Serialization.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -198,7 +241,9 @@
     <Compile Include="Verification\VerifyTypes.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="Key.snk" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Sources/Usus.net.Core/app.config b/Sources/Usus.net.Core/app.config
new file mode 100644
index 0000000..ac05457
--- /dev/null
+++ b/Sources/Usus.net.Core/app.config
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataHelper" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.SourceModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MutableMetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.PdbReader" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.ILGenerator" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/Sources/Usus.net.Core/packages.config b/Sources/Usus.net.Core/packages.config
new file mode 100644
index 0000000..4337883
--- /dev/null
+++ b/Sources/Usus.net.Core/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MathNet.Numerics.Signed" version="3.13.1" targetFramework="net45" />
+  <package id="QuickGraph" version="3.6.61119.7" targetFramework="net45" />
+</packages>
\ No newline at end of file
diff --git a/Sources/Usus.net.Current/Resources.Designer.cs b/Sources/Usus.net.Current/Resources.Designer.cs
index 2156239..c7ed72d 100644
--- a/Sources/Usus.net.Current/Resources.Designer.cs
+++ b/Sources/Usus.net.Current/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34003
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/Sources/Usus.net.Current/Usus.net.Current.csproj b/Sources/Usus.net.Current/Usus.net.Current.csproj
index ff31b82..3d27070 100644
--- a/Sources/Usus.net.Current/Usus.net.Current.csproj
+++ b/Sources/Usus.net.Current/Usus.net.Current.csproj
@@ -14,7 +14,7 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -172,6 +172,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
diff --git a/Sources/Usus.net.Current/app.config b/Sources/Usus.net.Current/app.config
new file mode 100644
index 0000000..001df9c
--- /dev/null
+++ b/Sources/Usus.net.Current/app.config
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataHelper" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.SourceModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MutableMetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.PdbReader" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.ILGenerator" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Sources/Usus.net.Distributions/Resources.Designer.cs b/Sources/Usus.net.Distributions/Resources.Designer.cs
index d529f5e..0120872 100644
--- a/Sources/Usus.net.Distributions/Resources.Designer.cs
+++ b/Sources/Usus.net.Distributions/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34003
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/Sources/Usus.net.Distributions/Usus.net.Distributions.csproj b/Sources/Usus.net.Distributions/Usus.net.Distributions.csproj
index 37894d9..7af3b74 100644
--- a/Sources/Usus.net.Distributions/Usus.net.Distributions.csproj
+++ b/Sources/Usus.net.Distributions/Usus.net.Distributions.csproj
@@ -14,7 +14,7 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -84,9 +84,6 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Design" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Controls.DataVisualization.Toolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\Libs\System.Windows.Controls.DataVisualization.Toolkit.dll</HintPath>
-    </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="PresentationCore" />
@@ -175,6 +172,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
diff --git a/Sources/Usus.net.Distributions/app.config b/Sources/Usus.net.Distributions/app.config
new file mode 100644
index 0000000..001df9c
--- /dev/null
+++ b/Sources/Usus.net.Distributions/app.config
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataHelper" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.SourceModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MutableMetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.PdbReader" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.ILGenerator" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Sources/Usus.net.ExtensionHelper/BuildAwareToolWindowPane.cs b/Sources/Usus.net.ExtensionHelper/BuildAwareToolWindowPane.cs
index 05f687e..2225d03 100644
--- a/Sources/Usus.net.ExtensionHelper/BuildAwareToolWindowPane.cs
+++ b/Sources/Usus.net.ExtensionHelper/BuildAwareToolWindowPane.cs
@@ -37,8 +37,8 @@ protected CompilerErrors GetErrors()
 
         private void AnalyzeErrorItems(CompilerErrors errors)
         {
-            ErrorList list = MasterObjekt.ToolWindows.ErrorList;
-            for (long index = 1; index <= list.ErrorItems.Count; index++)
+            var list = MasterObjekt.ToolWindows.ErrorList;
+            for (var index = 1; index <= list.ErrorItems.Count; index++)
             {
                 AddUpErrors(errors, list.ErrorItems.Item(index));
             }
diff --git a/Sources/Usus.net.Graphs/Resources.Designer.cs b/Sources/Usus.net.Graphs/Resources.Designer.cs
index ffe35a8..58f057f 100644
--- a/Sources/Usus.net.Graphs/Resources.Designer.cs
+++ b/Sources/Usus.net.Graphs/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34003
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/Sources/Usus.net.Graphs/Usus.net.Graphs.csproj b/Sources/Usus.net.Graphs/Usus.net.Graphs.csproj
index 57bf78d..57e1d8f 100644
--- a/Sources/Usus.net.Graphs/Usus.net.Graphs.csproj
+++ b/Sources/Usus.net.Graphs/Usus.net.Graphs.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <FileUpgradeFlags>
@@ -150,6 +150,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
diff --git a/Sources/Usus.net.Graphs/app.config b/Sources/Usus.net.Graphs/app.config
new file mode 100644
index 0000000..001df9c
--- /dev/null
+++ b/Sources/Usus.net.Graphs/app.config
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataHelper" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.SourceModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MutableMetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.PdbReader" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.ILGenerator" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Sources/Usus.net.Hotspots/Resources.Designer.cs b/Sources/Usus.net.Hotspots/Resources.Designer.cs
index 1e65f95..84ff540 100644
--- a/Sources/Usus.net.Hotspots/Resources.Designer.cs
+++ b/Sources/Usus.net.Hotspots/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34003
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/Sources/Usus.net.Hotspots/Usus.net.Hotspots.csproj b/Sources/Usus.net.Hotspots/Usus.net.Hotspots.csproj
index 8028e2e..34b6305 100644
--- a/Sources/Usus.net.Hotspots/Usus.net.Hotspots.csproj
+++ b/Sources/Usus.net.Hotspots/Usus.net.Hotspots.csproj
@@ -14,7 +14,7 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -172,6 +172,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
diff --git a/Sources/Usus.net.Hotspots/app.config b/Sources/Usus.net.Hotspots/app.config
new file mode 100644
index 0000000..001df9c
--- /dev/null
+++ b/Sources/Usus.net.Hotspots/app.config
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataHelper" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.SourceModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MutableMetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.PdbReader" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.ILGenerator" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Sources/Usus.net.Menus/Resources.Designer.cs b/Sources/Usus.net.Menus/Resources.Designer.cs
index 78179f9..447484d 100644
--- a/Sources/Usus.net.Menus/Resources.Designer.cs
+++ b/Sources/Usus.net.Menus/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34003
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/Sources/Usus.net.Menus/Usus.net.Menus.csproj b/Sources/Usus.net.Menus/Usus.net.Menus.csproj
index 8544c6d..e4cf93f 100644
--- a/Sources/Usus.net.Menus/Usus.net.Menus.csproj
+++ b/Sources/Usus.net.Menus/Usus.net.Menus.csproj
@@ -14,7 +14,7 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
diff --git a/Sources/Usus.net.Shell/Properties/Resources.Designer.cs b/Sources/Usus.net.Shell/Properties/Resources.Designer.cs
index dfb5eee..61c2327 100644
--- a/Sources/Usus.net.Shell/Properties/Resources.Designer.cs
+++ b/Sources/Usus.net.Shell/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17626
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/Sources/Usus.net.Shell/Properties/Settings.Designer.cs b/Sources/Usus.net.Shell/Properties/Settings.Designer.cs
index 874a540..cd3a2b6 100644
--- a/Sources/Usus.net.Shell/Properties/Settings.Designer.cs
+++ b/Sources/Usus.net.Shell/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17626
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -12,7 +12,7 @@ namespace andrena.Usus.net.Shell.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/Sources/Usus.net.Shell/Usus.net.Shell.csproj b/Sources/Usus.net.Shell/Usus.net.Shell.csproj
index a900965..af93157 100644
--- a/Sources/Usus.net.Shell/Usus.net.Shell.csproj
+++ b/Sources/Usus.net.Shell/Usus.net.Shell.csproj
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>andrena.Usus.net.Shell</RootNamespace>
     <AssemblyName>Usus.net.Shell</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -25,6 +26,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -34,13 +36,11 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Windows.Controls.DataVisualization.Toolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\Libs\System.Windows.Controls.DataVisualization.Toolkit.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />
@@ -90,6 +90,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="app.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/Sources/Usus.net.Shell/app.config b/Sources/Usus.net.Shell/app.config
new file mode 100644
index 0000000..ac05457
--- /dev/null
+++ b/Sources/Usus.net.Shell/app.config
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataHelper" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.SourceModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MutableMetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.PdbReader" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.ILGenerator" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/Sources/Usus.net.Sqi/Resources.Designer.cs b/Sources/Usus.net.Sqi/Resources.Designer.cs
index 82824d1..da052bd 100644
--- a/Sources/Usus.net.Sqi/Resources.Designer.cs
+++ b/Sources/Usus.net.Sqi/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34003
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/Sources/Usus.net.Sqi/Usus.net.Sqi.csproj b/Sources/Usus.net.Sqi/Usus.net.Sqi.csproj
index c6c60e0..726614d 100644
--- a/Sources/Usus.net.Sqi/Usus.net.Sqi.csproj
+++ b/Sources/Usus.net.Sqi/Usus.net.Sqi.csproj
@@ -14,7 +14,7 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -172,6 +172,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
diff --git a/Sources/Usus.net.Sqi/app.config b/Sources/Usus.net.Sqi/app.config
new file mode 100644
index 0000000..001df9c
--- /dev/null
+++ b/Sources/Usus.net.Sqi/app.config
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataHelper" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.SourceModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MutableMetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.PdbReader" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.ILGenerator" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Sources/Usus.net.TypeCylces/Resources.Designer.cs b/Sources/Usus.net.TypeCylces/Resources.Designer.cs
index 72efba9..8477307 100644
--- a/Sources/Usus.net.TypeCylces/Resources.Designer.cs
+++ b/Sources/Usus.net.TypeCylces/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34003
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/Sources/Usus.net.TypeCylces/Usus.net.TypeCylces.csproj b/Sources/Usus.net.TypeCylces/Usus.net.TypeCylces.csproj
index 6d06142..5f399b8 100644
--- a/Sources/Usus.net.TypeCylces/Usus.net.TypeCylces.csproj
+++ b/Sources/Usus.net.TypeCylces/Usus.net.TypeCylces.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <FileUpgradeFlags>
@@ -150,6 +150,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
diff --git a/Sources/Usus.net.TypeCylces/app.config b/Sources/Usus.net.TypeCylces/app.config
new file mode 100644
index 0000000..001df9c
--- /dev/null
+++ b/Sources/Usus.net.TypeCylces/app.config
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataHelper" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.SourceModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MutableMetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.PdbReader" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.ILGenerator" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Sources/Usus.net.View.UnitTests/Usus.net.View.UnitTests.csproj b/Sources/Usus.net.View.UnitTests/Usus.net.View.UnitTests.csproj
index 8eb5d45..31edd7c 100644
--- a/Sources/Usus.net.View.UnitTests/Usus.net.View.UnitTests.csproj
+++ b/Sources/Usus.net.View.UnitTests/Usus.net.View.UnitTests.csproj
@@ -11,9 +11,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Usus.net.View.UnitTests</RootNamespace>
     <AssemblyName>Usus.net.View.UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -23,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,6 +33,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
@@ -54,6 +57,9 @@
       <Name>Usus.net.View</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Sources/Usus.net.View.UnitTests/app.config b/Sources/Usus.net.View.UnitTests/app.config
new file mode 100644
index 0000000..ac05457
--- /dev/null
+++ b/Sources/Usus.net.View.UnitTests/app.config
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataHelper" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.SourceModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MutableMetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.PdbReader" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.ILGenerator" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/Sources/Usus.net.View/Properties/Resources.Designer.cs b/Sources/Usus.net.View/Properties/Resources.Designer.cs
index 88aed34..654f439 100644
--- a/Sources/Usus.net.View/Properties/Resources.Designer.cs
+++ b/Sources/Usus.net.View/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17379
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/Sources/Usus.net.View/Properties/Settings.Designer.cs b/Sources/Usus.net.View/Properties/Settings.Designer.cs
index fe9651f..bd559ed 100644
--- a/Sources/Usus.net.View/Properties/Settings.Designer.cs
+++ b/Sources/Usus.net.View/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17379
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -12,7 +12,7 @@ namespace andrena.Usus.net.View.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/Sources/Usus.net.View/Usus.net.View.csproj b/Sources/Usus.net.View/Usus.net.View.csproj
index 72fde25..314a8f5 100644
--- a/Sources/Usus.net.View/Usus.net.View.csproj
+++ b/Sources/Usus.net.View/Usus.net.View.csproj
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>andrena.Usus.net.View</RootNamespace>
     <AssemblyName>Usus.net.View</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -24,6 +25,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -32,6 +34,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -40,21 +43,43 @@
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GraphSharp">
-      <HintPath>..\Libs\GraphSharp.dll</HintPath>
+    <Reference Include="GraphSharp, Version=1.0.2.0, Culture=neutral, PublicKeyToken=f9c24778325a6b82, processorArchitecture=MSIL">
+      <HintPath>..\packages\GraphSharp.1.1.0.0\lib\net40\GraphSharp.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="GraphSharp.Controls">
-      <HintPath>..\Libs\GraphSharp.Controls.dll</HintPath>
+    <Reference Include="GraphSharp.Controls, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f9c24778325a6b82, processorArchitecture=MSIL">
+      <HintPath>..\packages\GraphSharp.1.1.0.0\lib\net40\GraphSharp.Controls.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="QuickGraph, Version=3.6.61114.0, Culture=neutral, PublicKeyToken=f3fb40175eec2af3, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Libs\QuickGraph.dll</HintPath>
+      <HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="QuickGraph.Data, Version=3.6.61114.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Data.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="QuickGraph.Graphviz, Version=3.6.61114.0, Culture=neutral, PublicKeyToken=f3fb40175eec2af3, processorArchitecture=MSIL">
+      <HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Graphviz.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="QuickGraph.Serialization, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Serialization.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Windows.Controls.DataVisualization.Toolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\Libs\System.Windows.Controls.DataVisualization.Toolkit.dll</HintPath>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
+    <Reference Include="System.Windows.Controls.DataVisualization.Toolkit, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Windows.Controls.DataVisualization.Toolkit.4.0.0.0\lib\net40-Client\System.Windows.Controls.DataVisualization.Toolkit.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Windows.Controls.Input.Toolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\WPFToolkit.3.5.50211.1\lib\System.Windows.Controls.Input.Toolkit.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Windows.Controls.Layout.Toolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\WPFToolkit.3.5.50211.1\lib\System.Windows.Controls.Layout.Toolkit.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -67,11 +92,13 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="WPFExtensions">
-      <HintPath>..\Libs\WPFExtensions.dll</HintPath>
+    <Reference Include="WPFExtensions, Version=1.0.3437.34043, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\WPFExtensions.1.0.0\lib\WPFExtensions.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="WPFToolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\Libs\WPFToolkit.dll</HintPath>
+      <HintPath>..\packages\WPFToolkit.3.5.50211.1\lib\WPFToolkit.dll</HintPath>
+      <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -251,7 +278,9 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="app.config" />
     <None Include="Key.snk" />
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/Sources/Usus.net.View/ViewModels/SQI/SQI.cs b/Sources/Usus.net.View/ViewModels/SQI/SQI.cs
index cd03983..55511b9 100644
--- a/Sources/Usus.net.View/ViewModels/SQI/SQI.cs
+++ b/Sources/Usus.net.View/ViewModels/SQI/SQI.cs
@@ -50,7 +50,7 @@ private void SetupSqiParameters()
             Parameters.Add(_ComplicatedMethods = sqiParameters.Assign("Complicated Methods", 0, (p, v) => p.ComplicatedMethods = v));
             Parameters.Add(_AverageComponentDependency = sqiParameters.Assign("Average Component Dependency", 0.0, (p, v) => p.AverageComponentDependency = v));
             Parameters.Add(_BigClasses = sqiParameters.Assign("Big Classes", 0, (p, v) => p.BigClasses = v));
-            Parameters.Add(_BigMethods = sqiParameters.Assign("Bis Methods", 0, (p, v) => p.BigMethods = v));
+            Parameters.Add(_BigMethods = sqiParameters.Assign("Big Methods", 0, (p, v) => p.BigMethods = v));
             Parameters.Add(_CompilerWarnings = sqiParameters.Assign("Compiler Warnings", 0, (p, v) => p.CompilerWarnings = v));
         }
         #endregion
diff --git a/Sources/Usus.net.View/app.config b/Sources/Usus.net.View/app.config
new file mode 100644
index 0000000..ac05457
--- /dev/null
+++ b/Sources/Usus.net.View/app.config
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataHelper" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.SourceModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MutableMetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.PdbReader" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.ILGenerator" publicKeyToken="736440c9b414ea16" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/Sources/Usus.net.View/packages.config b/Sources/Usus.net.View/packages.config
new file mode 100644
index 0000000..bd8c3a8
--- /dev/null
+++ b/Sources/Usus.net.View/packages.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="GraphSharp" version="1.1.0.0" targetFramework="net45" />
+  <package id="QuickGraph" version="3.6.61119.7" targetFramework="net45" />
+  <package id="System.Windows.Controls.DataVisualization.Toolkit" version="4.0.0.0" targetFramework="net45" />
+  <package id="WPFExtensions" version="1.0.0" targetFramework="net45" />
+  <package id="WPFToolkit" version="3.5.50211.1" targetFramework="net45" />
+</packages>
\ No newline at end of file
diff --git a/Sources/Usus.net.sln b/Sources/Usus.net.sln
index f2ab3e7..ca255ff 100644
--- a/Sources/Usus.net.sln
+++ b/Sources/Usus.net.sln
@@ -1,13 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30110.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0ABCF40C-F425-45A2-A387-5513B7808FC0}"
 	ProjectSection(SolutionItems) = preProject
 		Local.testsettings = Local.testsettings
 		TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
-		Usus.net.vsmdi = Usus.net.vsmdi
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Usus.net.View", "Usus.net.View\Usus.net.View.csproj", "{08D9B61E-6197-4775-B90E-9F685C731BFB}"
diff --git a/Sources/Usus.net/Usus.net.csproj b/Sources/Usus.net/Usus.net.csproj
index fdb0e1b..c98f2d9 100644
--- a/Sources/Usus.net/Usus.net.csproj
+++ b/Sources/Usus.net/Usus.net.csproj
@@ -18,7 +18,7 @@
     <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
     <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
     <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -64,6 +64,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
@@ -136,11 +137,6 @@
       <Name>Usus.net.View</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Windows.Controls.DataVisualization.Toolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\Libs\System.Windows.Controls.DataVisualization.Toolkit.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="license.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
diff --git a/Sources/Usus.net/app.config b/Sources/Usus.net/app.config
new file mode 100644
index 0000000..001df9c
--- /dev/null
+++ b/Sources/Usus.net/app.config
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MetadataHelper" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.SourceModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.MutableMetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.PdbReader" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Cci.ILGenerator" publicKeyToken="736440c9b414ea16" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Sources/Usus.net/source.extension.vsixmanifest b/Sources/Usus.net/source.extension.vsixmanifest
index 1d51ca7..70ab750 100644
--- a/Sources/Usus.net/source.extension.vsixmanifest
+++ b/Sources/Usus.net/source.extension.vsixmanifest
@@ -12,6 +12,9 @@
       <VisualStudio Version="12.0">
         <Edition>Pro</Edition>
       </VisualStudio>
+      <VisualStudio Version="14.0">
+        <Edition>Pro</Edition>
+      </VisualStudio>
     </SupportedProducts>
     <SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.0" />
   </Identifier>