diff --git a/ComIOP/Common/OPC Key Pair.snk b/ComIOP/Common/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/ComIOP/Common/OPC Key Pair.snk and /dev/null differ
diff --git a/ComIOP/Common/UA COM Interop Library.csproj b/ComIOP/Common/UA COM Interop Library.csproj
index 3f87829a..dff20e04 100644
--- a/ComIOP/Common/UA COM Interop Library.csproj	
+++ b/ComIOP/Common/UA COM Interop Library.csproj	
@@ -11,7 +11,7 @@
     <RootNamespace>Opc.Ua.Com</RootNamespace>
     <AssemblyName>Opc.Ua.ComInterop</AssemblyName>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/ComIOP/Wrapper/Common/OPC Sample Utility Classes.vcxproj b/ComIOP/Wrapper/Common/OPC Sample Utility Classes.vcxproj
index 95446f4f..e74df499 100644
--- a/ComIOP/Wrapper/Common/OPC Sample Utility Classes.vcxproj	
+++ b/ComIOP/Wrapper/Common/OPC Sample Utility Classes.vcxproj	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -18,13 +18,13 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/ComIOP/Wrapper/ProxyServer/UA COM Proxy Server.vcxproj b/ComIOP/Wrapper/ProxyServer/UA COM Proxy Server.vcxproj
index 0cac8c32..36b8c48f 100644
--- a/ComIOP/Wrapper/ProxyServer/UA COM Proxy Server.vcxproj	
+++ b/ComIOP/Wrapper/ProxyServer/UA COM Proxy Server.vcxproj	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -18,19 +18,19 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <CLRSupport>true</CLRSupport>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <CLRSupport>true</CLRSupport>
   </PropertyGroup>
   <PropertyGroup Label="Globals">
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/ComIOP/Wrapper/ServerWrapper/OPC Key Pair.snk b/ComIOP/Wrapper/ServerWrapper/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/ComIOP/Wrapper/ServerWrapper/OPC Key Pair.snk and /dev/null differ
diff --git a/ComIOP/Wrapper/ServerWrapper/UA COM Server Wrapper.csproj b/ComIOP/Wrapper/ServerWrapper/UA COM Server Wrapper.csproj
index 1760b445..e1cb6c61 100644
--- a/ComIOP/Wrapper/ServerWrapper/UA COM Server Wrapper.csproj	
+++ b/ComIOP/Wrapper/ServerWrapper/UA COM Server Wrapper.csproj	
@@ -14,7 +14,7 @@
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>App.ico</ApplicationIcon>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -135,7 +135,6 @@
     <Compile Include="ServerForm.Designer.cs">
       <DependentUpon>ServerForm.cs</DependentUpon>
     </Compile>
-    <None Include="OPC Key Pair.snk" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="InstallConfig.xml" />
diff --git a/ConfigurationTool/Application/OPC Key Pair.snk b/ConfigurationTool/Application/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/ConfigurationTool/Application/OPC Key Pair.snk and /dev/null differ
diff --git a/ConfigurationTool/Application/UA Configuration Tool.csproj b/ConfigurationTool/Application/UA Configuration Tool.csproj
index 3b608a9d..2d121468 100644
--- a/ConfigurationTool/Application/UA Configuration Tool.csproj	
+++ b/ConfigurationTool/Application/UA Configuration Tool.csproj	
@@ -12,7 +12,7 @@
     <AssemblyName>Opc.Ua.ConfigurationTool</AssemblyName>
     <ApplicationIcon>App.ico</ApplicationIcon>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
@@ -437,9 +437,6 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="OPC Key Pair.snk" />
-  </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/ConfigurationTool/Bin/extern/Opc.Ua.ComInterop.dll b/ConfigurationTool/Bin/extern/Opc.Ua.ComInterop.dll
index f921fa44..9187729e 100644
Binary files a/ConfigurationTool/Bin/extern/Opc.Ua.ComInterop.dll and b/ConfigurationTool/Bin/extern/Opc.Ua.ComInterop.dll differ
diff --git a/ConfigurationTool/Console/OPC Key Pair.snk b/ConfigurationTool/Console/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/ConfigurationTool/Console/OPC Key Pair.snk and /dev/null differ
diff --git a/ConfigurationTool/Console/UA Configuration Console.csproj b/ConfigurationTool/Console/UA Configuration Console.csproj
index cfceab68..2aa3d55f 100644
--- a/ConfigurationTool/Console/UA Configuration Console.csproj	
+++ b/ConfigurationTool/Console/UA Configuration Console.csproj	
@@ -11,7 +11,7 @@
     <RootNamespace>Opc.Ua.Configuration</RootNamespace>
     <AssemblyName>Opc.Ua.ConfigurationConsole</AssemblyName>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
     <StartupObject>
     </StartupObject>
     <FileUpgradeFlags>
@@ -95,9 +95,6 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="OPC Key Pair.snk" />
-  </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/Dashboard/OPC Key Pair.snk b/Dashboard/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/Dashboard/OPC Key Pair.snk and /dev/null differ
diff --git a/Dashboard/WelcomeApplication.csproj b/Dashboard/WelcomeApplication.csproj
index a2ad0efa..4ea15793 100644
--- a/Dashboard/WelcomeApplication.csproj
+++ b/Dashboard/WelcomeApplication.csproj
@@ -58,7 +58,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualBasic" />
@@ -110,7 +110,6 @@
       <DesignTime>True</DesignTime>
     </Compile>
     <None Include="app.config" />
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Bin/extern/Opc.Ua.ComInterop.dll b/SampleApplications/Bin/extern/Opc.Ua.ComInterop.dll
index f921fa44..9187729e 100644
Binary files a/SampleApplications/Bin/extern/Opc.Ua.ComInterop.dll and b/SampleApplications/Bin/extern/Opc.Ua.ComInterop.dll differ
diff --git a/SampleApplications/SampleLibraries/Client/OPC Key Pair.snk b/SampleApplications/SampleLibraries/Client/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/SampleLibraries/Client/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/SampleLibraries/Client/UA Client Library.csproj b/SampleApplications/SampleLibraries/Client/UA Client Library.csproj
index 3ad7f39d..2980d86e 100644
--- a/SampleApplications/SampleLibraries/Client/UA Client Library.csproj	
+++ b/SampleApplications/SampleLibraries/Client/UA Client Library.csproj	
@@ -11,7 +11,7 @@
     <RootNamespace>Opc.Ua.Client</RootNamespace>
     <AssemblyName>Opc.Ua.Client</AssemblyName>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
@@ -119,9 +119,6 @@
       <Name>UA Core Library</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="OPC Key Pair.snk" />
-  </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/SampleApplications/SampleLibraries/Configuration/OPC Key Pair.snk b/SampleApplications/SampleLibraries/Configuration/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/SampleLibraries/Configuration/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/SampleLibraries/Configuration/UA Configuration Library.csproj b/SampleApplications/SampleLibraries/Configuration/UA Configuration Library.csproj
index 12e590d5..b90e8f52 100644
--- a/SampleApplications/SampleLibraries/Configuration/UA Configuration Library.csproj	
+++ b/SampleApplications/SampleLibraries/Configuration/UA Configuration Library.csproj	
@@ -11,7 +11,7 @@
     <RootNamespace>Opc.Ua.Configuration</RootNamespace>
     <AssemblyName>Opc.Ua.Configuration</AssemblyName>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
@@ -153,9 +153,6 @@
       <Name>UA Core Library</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="OPC Key Pair.snk" />
-  </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/SampleApplications/SampleLibraries/Controls/OPC Key Pair.snk b/SampleApplications/SampleLibraries/Controls/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/SampleLibraries/Controls/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/SampleLibraries/Controls/UA Client Controls.csproj b/SampleApplications/SampleLibraries/Controls/UA Client Controls.csproj
index 0409f4be..8f43b538 100644
--- a/SampleApplications/SampleLibraries/Controls/UA Client Controls.csproj	
+++ b/SampleApplications/SampleLibraries/Controls/UA Client Controls.csproj	
@@ -11,7 +11,7 @@
     <RootNamespace>Opc.Ua.Client.Controls</RootNamespace>
     <AssemblyName>Opc.Ua.ClientControls</AssemblyName>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
@@ -1054,9 +1054,6 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="OPC Key Pair.snk" />
-  </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/SampleApplications/SampleLibraries/Server/OPC Key Pair.snk b/SampleApplications/SampleLibraries/Server/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/SampleLibraries/Server/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/SampleLibraries/Server/UA Server Library.csproj b/SampleApplications/SampleLibraries/Server/UA Server Library.csproj
index 6964d8f2..9addb718 100644
--- a/SampleApplications/SampleLibraries/Server/UA Server Library.csproj	
+++ b/SampleApplications/SampleLibraries/Server/UA Server Library.csproj	
@@ -12,7 +12,7 @@
     <AssemblyName>Opc.Ua.Server</AssemblyName>
     <MinFrameworkVersionRequired>3.0</MinFrameworkVersionRequired>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
@@ -178,9 +178,6 @@
       <Name>UA Core Library</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="OPC Key Pair.snk" />
-  </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/SampleApplications/SampleLibraries/ServerControls/OPC Key Pair.snk b/SampleApplications/SampleLibraries/ServerControls/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/SampleLibraries/ServerControls/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/SampleLibraries/ServerControls/UA Server Controls.csproj b/SampleApplications/SampleLibraries/ServerControls/UA Server Controls.csproj
index c4e04345..2209d5ef 100644
--- a/SampleApplications/SampleLibraries/ServerControls/UA Server Controls.csproj	
+++ b/SampleApplications/SampleLibraries/ServerControls/UA Server Controls.csproj	
@@ -13,7 +13,7 @@
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -145,9 +145,6 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="OPC Key Pair.snk" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\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/SampleApplications/Samples/Client/OPC Key Pair.snk b/SampleApplications/Samples/Client/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Samples/Client/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Samples/Client/UA Sample Client.csproj b/SampleApplications/Samples/Client/UA Sample Client.csproj
index 312aed6c..2be884c4 100644
--- a/SampleApplications/Samples/Client/UA Sample Client.csproj	
+++ b/SampleApplications/Samples/Client/UA Sample Client.csproj	
@@ -34,7 +34,7 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -182,9 +182,6 @@
   <ItemGroup>
     <Content Include="app.manifest" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="OPC Key Pair.snk" />
-  </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/SampleApplications/Samples/Common/OPC Key Pair.snk b/SampleApplications/Samples/Common/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Samples/Common/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Samples/Common/UA Sample Library.csproj b/SampleApplications/Samples/Common/UA Sample Library.csproj
index 4a2edc8f..45ff071d 100644
--- a/SampleApplications/Samples/Common/UA Sample Library.csproj	
+++ b/SampleApplications/Samples/Common/UA Sample Library.csproj	
@@ -32,7 +32,7 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -213,9 +213,6 @@
       <Name>UA Server Library</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="OPC Key Pair.snk" />
-  </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/SampleApplications/Samples/Controls/OPC Key Pair.snk b/SampleApplications/Samples/Controls/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Samples/Controls/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Samples/Controls/UA Sample Controls.csproj b/SampleApplications/Samples/Controls/UA Sample Controls.csproj
index d2143878..300f7cbb 100644
--- a/SampleApplications/Samples/Controls/UA Sample Controls.csproj	
+++ b/SampleApplications/Samples/Controls/UA Sample Controls.csproj	
@@ -11,7 +11,7 @@
     <RootNamespace>Opc.Ua.Sample</RootNamespace>
     <AssemblyName>Opc.Ua.SampleControls</AssemblyName>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
@@ -778,9 +778,6 @@
   <ItemGroup>
     <Folder Include="Images\" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="OPC Key Pair.snk" />
-  </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/SampleApplications/Samples/HistoryClient/OPC Key Pair.snk b/SampleApplications/Samples/HistoryClient/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Samples/HistoryClient/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Samples/HistoryClient/UA History Client.csproj b/SampleApplications/Samples/HistoryClient/UA History Client.csproj
index 82357523..6b9fa512 100644
--- a/SampleApplications/Samples/HistoryClient/UA History Client.csproj	
+++ b/SampleApplications/Samples/HistoryClient/UA History Client.csproj	
@@ -56,7 +56,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -109,9 +109,6 @@
       <Name>UA Client Library</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="OPC Key Pair.snk" />
-  </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/SampleApplications/Samples/NetworkTester/OPC Key Pair.snk b/SampleApplications/Samples/NetworkTester/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Samples/NetworkTester/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Samples/NetworkTester/UA Network Tester.csproj b/SampleApplications/Samples/NetworkTester/UA Network Tester.csproj
index e4549361..e9665baa 100644
--- a/SampleApplications/Samples/NetworkTester/UA Network Tester.csproj	
+++ b/SampleApplications/Samples/NetworkTester/UA Network Tester.csproj	
@@ -45,7 +45,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -101,9 +101,6 @@
       <Name>UA Client Controls</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="OPC Key Pair.snk" />
-  </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/SampleApplications/Samples/Publisher/OPC Key Pair.snk b/SampleApplications/Samples/Publisher/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Samples/Publisher/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Samples/Publisher/Opc.Ua.Publisher.csproj b/SampleApplications/Samples/Publisher/Opc.Ua.Publisher.csproj
index 414fa6fc..f48cdd3d 100644
--- a/SampleApplications/Samples/Publisher/Opc.Ua.Publisher.csproj
+++ b/SampleApplications/Samples/Publisher/Opc.Ua.Publisher.csproj
@@ -20,7 +20,7 @@
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <TargetFrameworkProfile />
     <PublishUrl>http://localhost/Opc.Ua.SampleClient/</PublishUrl>
@@ -202,7 +202,6 @@
     <Content Include="app.manifest" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="OPC Key Pair.snk" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/SampleApplications/Samples/Server/OPC Key Pair.snk b/SampleApplications/Samples/Server/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Samples/Server/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Samples/Server/UA Sample Server.csproj b/SampleApplications/Samples/Server/UA Sample Server.csproj
index 66a8a2ad..ea02320a 100644
--- a/SampleApplications/Samples/Server/UA Sample Server.csproj	
+++ b/SampleApplications/Samples/Server/UA Sample Server.csproj	
@@ -19,7 +19,7 @@
     </UpgradeBackupLocation>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -140,7 +140,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.manifest" />
-    <None Include="OPC Key Pair.snk" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/SampleApplications/Samples/ServerTest/OPC Key Pair.snk b/SampleApplications/Samples/ServerTest/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Samples/ServerTest/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Samples/ServerTest/UA Server Test Tool.csproj b/SampleApplications/Samples/ServerTest/UA Server Test Tool.csproj
index 368cc899..7a80d9c1 100644
--- a/SampleApplications/Samples/ServerTest/UA Server Test Tool.csproj	
+++ b/SampleApplications/Samples/ServerTest/UA Server Test Tool.csproj	
@@ -33,7 +33,7 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -190,9 +190,6 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="OPC Key Pair.snk" />
-  </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/SampleApplications/Stack Test/Client/OPC Key Pair.snk b/SampleApplications/Stack Test/Client/OPC Key Pair.snk
deleted file mode 100644
index 1f1d02b2..00000000
Binary files a/SampleApplications/Stack Test/Client/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Stack Test/Common/OPC Key Pair.snk b/SampleApplications/Stack Test/Common/OPC Key Pair.snk
deleted file mode 100644
index 1f1d02b2..00000000
Binary files a/SampleApplications/Stack Test/Common/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Stack Test/Controls/OPC Key Pair.snk b/SampleApplications/Stack Test/Controls/OPC Key Pair.snk
deleted file mode 100644
index 1f1d02b2..00000000
Binary files a/SampleApplications/Stack Test/Controls/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Stack Test/Server/OPC Key Pair.snk b/SampleApplications/Stack Test/Server/OPC Key Pair.snk
deleted file mode 100644
index 1f1d02b2..00000000
Binary files a/SampleApplications/Stack Test/Server/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/AlarmCondition/Client/AlarmCondition Client.csproj b/SampleApplications/Workshop/AlarmCondition/Client/AlarmCondition Client.csproj
index cda50f2e..2a13ebd7 100644
--- a/SampleApplications/Workshop/AlarmCondition/Client/AlarmCondition Client.csproj	
+++ b/SampleApplications/Workshop/AlarmCondition/Client/AlarmCondition Client.csproj	
@@ -64,7 +64,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -154,7 +154,6 @@
       <DesignTime>True</DesignTime>
     </Compile>
     <Content Include="App.config" />
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/AlarmCondition/Client/OPC Key Pair.snk b/SampleApplications/Workshop/AlarmCondition/Client/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/AlarmCondition/Client/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/AlarmCondition/Server/AlarmCondition Server.csproj b/SampleApplications/Workshop/AlarmCondition/Server/AlarmCondition Server.csproj
index 2953d5e8..47274e15 100644
--- a/SampleApplications/Workshop/AlarmCondition/Server/AlarmCondition Server.csproj	
+++ b/SampleApplications/Workshop/AlarmCondition/Server/AlarmCondition Server.csproj	
@@ -65,7 +65,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -121,7 +121,6 @@
     </Content>
     <EmbeddedResource Include="InstallConfig.xml" />
     <None Include="app.manifest" />
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/AlarmCondition/Server/OPC Key Pair.snk b/SampleApplications/Workshop/AlarmCondition/Server/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/AlarmCondition/Server/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/Boiler/Client/Boiler Client.csproj b/SampleApplications/Workshop/Boiler/Client/Boiler Client.csproj
index 93181584..2c373c75 100644
--- a/SampleApplications/Workshop/Boiler/Client/Boiler Client.csproj	
+++ b/SampleApplications/Workshop/Boiler/Client/Boiler Client.csproj	
@@ -60,7 +60,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -109,7 +109,6 @@
     <Content Include="Quickstarts.BoilerClient.Config.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/Boiler/Client/OPC Key Pair.snk b/SampleApplications/Workshop/Boiler/Client/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/Boiler/Client/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/Boiler/Server/Boiler Server.csproj b/SampleApplications/Workshop/Boiler/Server/Boiler Server.csproj
index 5f562292..34c2fd98 100644
--- a/SampleApplications/Workshop/Boiler/Server/Boiler Server.csproj	
+++ b/SampleApplications/Workshop/Boiler/Server/Boiler Server.csproj	
@@ -60,7 +60,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -104,7 +104,6 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="BuildDesign.bat" />
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/Boiler/Server/OPC Key Pair.snk b/SampleApplications/Workshop/Boiler/Server/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/Boiler/Server/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/ComDa/Client/COM UA Test Client.csproj b/SampleApplications/Workshop/ComDa/Client/COM UA Test Client.csproj
index af70ecdd..a1d5ec92 100644
--- a/SampleApplications/Workshop/ComDa/Client/COM UA Test Client.csproj	
+++ b/SampleApplications/Workshop/ComDa/Client/COM UA Test Client.csproj	
@@ -58,7 +58,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -102,7 +102,6 @@
     <Content Include="Quickstarts.UaTestClient.Config.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/ComDa/Client/OPC Key Pair.snk b/SampleApplications/Workshop/ComDa/Client/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/ComDa/Client/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/ComDa/Server/COM DataAccess Server Wrapper.csproj b/SampleApplications/Workshop/ComDa/Server/COM DataAccess Server Wrapper.csproj
index 8342e7f0..9df70f1d 100644
--- a/SampleApplications/Workshop/ComDa/Server/COM DataAccess Server Wrapper.csproj	
+++ b/SampleApplications/Workshop/ComDa/Server/COM DataAccess Server Wrapper.csproj	
@@ -66,7 +66,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Opc.Ua.ComInterop, Version=1.1.334.0, Culture=neutral, processorArchitecture=MSIL">
@@ -133,7 +133,6 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <EmbeddedResource Include="InstallConfig.xml" />
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/ComDa/Server/OPC Key Pair.snk b/SampleApplications/Workshop/ComDa/Server/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/ComDa/Server/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/Common/OPC Key Pair.snk b/SampleApplications/Workshop/Common/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/Common/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/Common/Quickstart Library.csproj b/SampleApplications/Workshop/Common/Quickstart Library.csproj
index 548b81f8..b3b2b89f 100644
--- a/SampleApplications/Workshop/Common/Quickstart Library.csproj	
+++ b/SampleApplications/Workshop/Common/Quickstart Library.csproj	
@@ -57,7 +57,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -148,9 +148,6 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="OPC Key Pair.snk" />
-  </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/SampleApplications/Workshop/DSATS/Client/DSATS Demo Client.csproj b/SampleApplications/Workshop/DSATS/Client/DSATS Demo Client.csproj
index 923a48e1..98d7657a 100644
--- a/SampleApplications/Workshop/DSATS/Client/DSATS Demo Client.csproj	
+++ b/SampleApplications/Workshop/DSATS/Client/DSATS Demo Client.csproj	
@@ -58,7 +58,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -106,7 +106,6 @@
     <Content Include="DsatsDemoClient.Config.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/DSATS/Client/OPC Key Pair.snk b/SampleApplications/Workshop/DSATS/Client/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/DSATS/Client/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/DSATS/Server/DSATS Demo Server.csproj b/SampleApplications/Workshop/DSATS/Server/DSATS Demo Server.csproj
index 14c5063b..15feb8f7 100644
--- a/SampleApplications/Workshop/DSATS/Server/DSATS Demo Server.csproj	
+++ b/SampleApplications/Workshop/DSATS/Server/DSATS Demo Server.csproj	
@@ -61,7 +61,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -120,7 +120,6 @@
     <Content Include="BuildDesign.bat" />
     <EmbeddedResource Include="Model\DsatsDemo.PredefinedNodes.uanodes" />
     <Content Include="Model\ModelDesign.csv" />
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/DSATS/Server/OPC Key Pair.snk b/SampleApplications/Workshop/DSATS/Server/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/DSATS/Server/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/DataAccess/Client/DataAccess Client.csproj b/SampleApplications/Workshop/DataAccess/Client/DataAccess Client.csproj
index beb39410..84434571 100644
--- a/SampleApplications/Workshop/DataAccess/Client/DataAccess Client.csproj	
+++ b/SampleApplications/Workshop/DataAccess/Client/DataAccess Client.csproj	
@@ -64,7 +64,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -124,7 +124,6 @@
     </Compile>
     <Content Include="App.config">
     </Content>
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/DataAccess/Client/OPC Key Pair.snk b/SampleApplications/Workshop/DataAccess/Client/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/DataAccess/Client/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/DataAccess/Server/DataAccess Server.csproj b/SampleApplications/Workshop/DataAccess/Server/DataAccess Server.csproj
index c8c38b77..3febaec6 100644
--- a/SampleApplications/Workshop/DataAccess/Server/DataAccess Server.csproj	
+++ b/SampleApplications/Workshop/DataAccess/Server/DataAccess Server.csproj	
@@ -65,7 +65,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -102,7 +102,6 @@
     <Content Include="App.config">
     </Content>
     <None Include="app.manifest" />
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/DataAccess/Server/OPC Key Pair.snk b/SampleApplications/Workshop/DataAccess/Server/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/DataAccess/Server/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/DataTypes/Client/DataTypes Client.csproj b/SampleApplications/Workshop/DataTypes/Client/DataTypes Client.csproj
index 03ff7825..ce8b1b07 100644
--- a/SampleApplications/Workshop/DataTypes/Client/DataTypes Client.csproj	
+++ b/SampleApplications/Workshop/DataTypes/Client/DataTypes Client.csproj	
@@ -60,7 +60,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -103,7 +103,6 @@
     <Content Include="Quickstarts.DataTypesClient.Config.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/DataTypes/Client/OPC Key Pair.snk b/SampleApplications/Workshop/DataTypes/Client/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/DataTypes/Client/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/DataTypes/Common/DataTypes Library.csproj b/SampleApplications/Workshop/DataTypes/Common/DataTypes Library.csproj
index 7114ba9f..448eca90 100644
--- a/SampleApplications/Workshop/DataTypes/Common/DataTypes Library.csproj	
+++ b/SampleApplications/Workshop/DataTypes/Common/DataTypes Library.csproj	
@@ -57,7 +57,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -110,9 +110,6 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="OPC Key Pair.snk" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\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/SampleApplications/Workshop/DataTypes/Common/OPC Key Pair.snk b/SampleApplications/Workshop/DataTypes/Common/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/DataTypes/Common/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/DataTypes/Server/DataTypes Server.csproj b/SampleApplications/Workshop/DataTypes/Server/DataTypes Server.csproj
index 6b972baf..88144fb8 100644
--- a/SampleApplications/Workshop/DataTypes/Server/DataTypes Server.csproj	
+++ b/SampleApplications/Workshop/DataTypes/Server/DataTypes Server.csproj	
@@ -65,7 +65,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Opc.Ua.ComInterop, Version=1.1.334.0, Culture=neutral, processorArchitecture=MSIL">
@@ -126,7 +126,6 @@
     <Content Include="Instances\Quickstarts.DataTypes.Instances.Types.bsd" />
     <Content Include="Instances\Quickstarts.DataTypes.Instances.Types.xsd" />
     <None Include="app.manifest" />
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/DataTypes/Server/OPC Key Pair.snk b/SampleApplications/Workshop/DataTypes/Server/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/DataTypes/Server/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/Empty/Client/Empty Client.csproj b/SampleApplications/Workshop/Empty/Client/Empty Client.csproj
index bee9be11..a1613113 100644
--- a/SampleApplications/Workshop/Empty/Client/Empty Client.csproj	
+++ b/SampleApplications/Workshop/Empty/Client/Empty Client.csproj	
@@ -60,7 +60,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -103,7 +103,6 @@
     <Content Include="Quickstarts.EmptyClient.Config.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/Empty/Client/OPC Key Pair.snk b/SampleApplications/Workshop/Empty/Client/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/Empty/Client/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/Empty/Server/Empty Server.csproj b/SampleApplications/Workshop/Empty/Server/Empty Server.csproj
index 4c002eb5..b9cff61b 100644
--- a/SampleApplications/Workshop/Empty/Server/Empty Server.csproj	
+++ b/SampleApplications/Workshop/Empty/Server/Empty Server.csproj	
@@ -60,7 +60,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -102,7 +102,6 @@
     <Content Include="Quickstarts.EmptyServer.Config.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/Empty/Server/OPC Key Pair.snk b/SampleApplications/Workshop/Empty/Server/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/Empty/Server/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/HistoricalAccess/Client/HistoricalAccess Client.csproj b/SampleApplications/Workshop/HistoricalAccess/Client/HistoricalAccess Client.csproj
index 39360452..759b9d77 100644
--- a/SampleApplications/Workshop/HistoricalAccess/Client/HistoricalAccess Client.csproj	
+++ b/SampleApplications/Workshop/HistoricalAccess/Client/HistoricalAccess Client.csproj	
@@ -64,7 +64,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -119,7 +119,6 @@
       <DesignTime>True</DesignTime>
     </Compile>
     <Content Include="App.config" />
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/HistoricalAccess/Client/OPC Key Pair.snk b/SampleApplications/Workshop/HistoricalAccess/Client/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/HistoricalAccess/Client/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/HistoricalAccess/Server/HistoricalAccess Server.csproj b/SampleApplications/Workshop/HistoricalAccess/Server/HistoricalAccess Server.csproj
index 9a9b1782..fb13ca16 100644
--- a/SampleApplications/Workshop/HistoricalAccess/Server/HistoricalAccess Server.csproj	
+++ b/SampleApplications/Workshop/HistoricalAccess/Server/HistoricalAccess Server.csproj	
@@ -65,7 +65,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -96,7 +96,6 @@
     </EmbeddedResource>
     <Content Include="App.config" />
     <None Include="app.manifest" />
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/HistoricalAccess/Server/OPC Key Pair.snk b/SampleApplications/Workshop/HistoricalAccess/Server/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/HistoricalAccess/Server/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/HistoricalAccess/Tester/Aggregate Tester.csproj b/SampleApplications/Workshop/HistoricalAccess/Tester/Aggregate Tester.csproj
index d6df7b80..c4f81bf4 100644
--- a/SampleApplications/Workshop/HistoricalAccess/Tester/Aggregate Tester.csproj	
+++ b/SampleApplications/Workshop/HistoricalAccess/Tester/Aggregate Tester.csproj	
@@ -59,7 +59,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -102,7 +102,6 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/HistoricalAccess/Tester/OPC Key Pair.snk b/SampleApplications/Workshop/HistoricalAccess/Tester/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/HistoricalAccess/Tester/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/HistoricalEvents/Client/HistoricalEvents Client.csproj b/SampleApplications/Workshop/HistoricalEvents/Client/HistoricalEvents Client.csproj
index c0dc2e88..f2f552a6 100644
--- a/SampleApplications/Workshop/HistoricalEvents/Client/HistoricalEvents Client.csproj	
+++ b/SampleApplications/Workshop/HistoricalEvents/Client/HistoricalEvents Client.csproj	
@@ -58,7 +58,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -152,7 +152,6 @@
     <Content Include="Quickstarts.HistoricalEventsClient.Config.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/HistoricalEvents/Client/OPC Key Pair.snk b/SampleApplications/Workshop/HistoricalEvents/Client/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/HistoricalEvents/Client/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/HistoricalEvents/Server/HistoricalEvents Server.csproj b/SampleApplications/Workshop/HistoricalEvents/Server/HistoricalEvents Server.csproj
index 625262fc..5d44a1da 100644
--- a/SampleApplications/Workshop/HistoricalEvents/Server/HistoricalEvents Server.csproj	
+++ b/SampleApplications/Workshop/HistoricalEvents/Server/HistoricalEvents Server.csproj	
@@ -61,7 +61,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -106,7 +106,6 @@
     </Content>
     <Content Include="BuildDesign.bat" />
     <None Include="app.manifest" />
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/HistoricalEvents/Server/OPC Key Pair.snk b/SampleApplications/Workshop/HistoricalEvents/Server/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/HistoricalEvents/Server/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/Methods/Client/Methods Client.csproj b/SampleApplications/Workshop/Methods/Client/Methods Client.csproj
index 8aaa7c5d..0f5fc0e3 100644
--- a/SampleApplications/Workshop/Methods/Client/Methods Client.csproj	
+++ b/SampleApplications/Workshop/Methods/Client/Methods Client.csproj	
@@ -60,7 +60,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -104,7 +104,6 @@
     <Content Include="Quickstarts.MethodsClient.Config.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/Methods/Client/OPC Key Pair.snk b/SampleApplications/Workshop/Methods/Client/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/Methods/Client/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/Methods/Server/Methods Server.csproj b/SampleApplications/Workshop/Methods/Server/Methods Server.csproj
index a476edf6..68f0eebe 100644
--- a/SampleApplications/Workshop/Methods/Server/Methods Server.csproj	
+++ b/SampleApplications/Workshop/Methods/Server/Methods Server.csproj	
@@ -61,7 +61,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -104,7 +104,6 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <None Include="app.manifest" />
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/Methods/Server/OPC Key Pair.snk b/SampleApplications/Workshop/Methods/Server/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/Methods/Server/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/PerfTest/Client/OPC Key Pair.snk b/SampleApplications/Workshop/PerfTest/Client/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/PerfTest/Client/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/PerfTest/Client/PerfTest Client.csproj b/SampleApplications/Workshop/PerfTest/Client/PerfTest Client.csproj
index 673b61ec..8beba57a 100644
--- a/SampleApplications/Workshop/PerfTest/Client/PerfTest Client.csproj	
+++ b/SampleApplications/Workshop/PerfTest/Client/PerfTest Client.csproj	
@@ -58,7 +58,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -101,7 +101,6 @@
     <Content Include="Quickstarts.PerfTestClient.Config.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/PerfTest/Server/OPC Key Pair.snk b/SampleApplications/Workshop/PerfTest/Server/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/PerfTest/Server/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/PerfTest/Server/PerfTest Server.csproj b/SampleApplications/Workshop/PerfTest/Server/PerfTest Server.csproj
index 2766eb4c..39cae335 100644
--- a/SampleApplications/Workshop/PerfTest/Server/PerfTest Server.csproj	
+++ b/SampleApplications/Workshop/PerfTest/Server/PerfTest Server.csproj	
@@ -60,7 +60,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -103,7 +103,6 @@
     <Content Include="Quickstarts.PerfTestServer.Config.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/Reference/Client/OPC Key Pair.snk b/SampleApplications/Workshop/Reference/Client/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/Reference/Client/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/Reference/Client/Reference Client.csproj b/SampleApplications/Workshop/Reference/Client/Reference Client.csproj
index 19fa9e85..5b478112 100644
--- a/SampleApplications/Workshop/Reference/Client/Reference Client.csproj	
+++ b/SampleApplications/Workshop/Reference/Client/Reference Client.csproj	
@@ -60,7 +60,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -103,7 +103,6 @@
     <Content Include="Quickstarts.ReferenceClient.Config.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/Reference/Server/OPC Key Pair.snk b/SampleApplications/Workshop/Reference/Server/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/Reference/Server/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/Reference/Server/Reference Server.csproj b/SampleApplications/Workshop/Reference/Server/Reference Server.csproj
index 5a4bc361..01d054de 100644
--- a/SampleApplications/Workshop/Reference/Server/Reference Server.csproj	
+++ b/SampleApplications/Workshop/Reference/Server/Reference Server.csproj	
@@ -61,7 +61,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -118,7 +118,6 @@
     </Content>
     <None Include="app.manifest">
     </None>
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/SimpleEvents/Client/OPC Key Pair.snk b/SampleApplications/Workshop/SimpleEvents/Client/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/SimpleEvents/Client/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/SimpleEvents/Client/SimpleEvents Client.csproj b/SampleApplications/Workshop/SimpleEvents/Client/SimpleEvents Client.csproj
index 6883fa98..c5aee922 100644
--- a/SampleApplications/Workshop/SimpleEvents/Client/SimpleEvents Client.csproj	
+++ b/SampleApplications/Workshop/SimpleEvents/Client/SimpleEvents Client.csproj	
@@ -60,7 +60,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -106,7 +106,6 @@
     <Content Include="Quickstarts.SimpleEventsClient.Config.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/SimpleEvents/Server/OPC Key Pair.snk b/SampleApplications/Workshop/SimpleEvents/Server/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/SimpleEvents/Server/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/SimpleEvents/Server/SimpleEvents Server.csproj b/SampleApplications/Workshop/SimpleEvents/Server/SimpleEvents Server.csproj
index 9301af65..fc787c1d 100644
--- a/SampleApplications/Workshop/SimpleEvents/Server/SimpleEvents Server.csproj	
+++ b/SampleApplications/Workshop/SimpleEvents/Server/SimpleEvents Server.csproj	
@@ -61,7 +61,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -106,7 +106,6 @@
     </Content>
     <Content Include="BuildDesign.bat" />
     <None Include="app.manifest" />
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/UserAuthentication/Client/OPC Key Pair.snk b/SampleApplications/Workshop/UserAuthentication/Client/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/UserAuthentication/Client/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/UserAuthentication/Client/UserAuthentication Client.csproj b/SampleApplications/Workshop/UserAuthentication/Client/UserAuthentication Client.csproj
index ce698314..efd2397c 100644
--- a/SampleApplications/Workshop/UserAuthentication/Client/UserAuthentication Client.csproj	
+++ b/SampleApplications/Workshop/UserAuthentication/Client/UserAuthentication Client.csproj	
@@ -58,7 +58,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -105,7 +105,6 @@
     <Content Include="Quickstarts.UserAuthenticationClient.Config.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/UserAuthentication/Server/OPC Key Pair.snk b/SampleApplications/Workshop/UserAuthentication/Server/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/UserAuthentication/Server/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/UserAuthentication/Server/UserAuthentication Server.csproj b/SampleApplications/Workshop/UserAuthentication/Server/UserAuthentication Server.csproj
index e74bfcb1..ebc59528 100644
--- a/SampleApplications/Workshop/UserAuthentication/Server/UserAuthentication Server.csproj	
+++ b/SampleApplications/Workshop/UserAuthentication/Server/UserAuthentication Server.csproj	
@@ -61,7 +61,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -107,7 +107,6 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="app.manifest" />
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/Views/Client/OPC Key Pair.snk b/SampleApplications/Workshop/Views/Client/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/Views/Client/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/Views/Client/Views Client.csproj b/SampleApplications/Workshop/Views/Client/Views Client.csproj
index d0c43b67..f6f6ac63 100644
--- a/SampleApplications/Workshop/Views/Client/Views Client.csproj	
+++ b/SampleApplications/Workshop/Views/Client/Views Client.csproj	
@@ -60,7 +60,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -103,7 +103,6 @@
     <Content Include="Quickstarts.ViewsClient.Config.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Workshop/Views/Server/OPC Key Pair.snk b/SampleApplications/Workshop/Views/Server/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/SampleApplications/Workshop/Views/Server/OPC Key Pair.snk and /dev/null differ
diff --git a/SampleApplications/Workshop/Views/Server/Views Server.csproj b/SampleApplications/Workshop/Views/Server/Views Server.csproj
index 30c92c76..f0ef4d27 100644
--- a/SampleApplications/Workshop/Views/Server/Views Server.csproj	
+++ b/SampleApplications/Workshop/Views/Server/Views Server.csproj	
@@ -61,7 +61,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -118,7 +118,6 @@
     <EmbeddedResource Include="Model\Quickstarts.Engineering.PredefinedNodes.uanodes" />
     <EmbeddedResource Include="Model\Quickstarts.Operations.PredefinedNodes.uanodes" />
     <None Include="app.manifest" />
-    <None Include="OPC Key Pair.snk" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/Stack/Core/OPC Key Pair.snk b/Stack/Core/OPC Key Pair.snk
deleted file mode 100644
index 4526ec3a..00000000
Binary files a/Stack/Core/OPC Key Pair.snk and /dev/null differ
diff --git a/Stack/Core/UA Core Library.csproj b/Stack/Core/UA Core Library.csproj
index 5c7ec647..42a1da40 100644
--- a/Stack/Core/UA Core Library.csproj	
+++ b/Stack/Core/UA Core Library.csproj	
@@ -13,7 +13,7 @@
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\Key\OPC Key Pair.snk</AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -344,7 +344,6 @@
     <EmbeddedResource Include="Types\Schemas\BuiltInTypes.xml" />
     <EmbeddedResource Include="Types\Schemas\BuiltInTypes.bsd" />
     <EmbeddedResource Include="Stack\Generated\Opc.Ua.PredefinedNodes.uanodes" />
-    <None Include="OPC Key Pair.snk" />
     <None Include="Types\Schemas\OPCBinarySchema.xsd">
       <SubType>
       </SubType>
diff --git a/UA Quickstart Applications.sln b/UA Quickstart Applications.sln
index 3f0ba262..22b1e5b4 100644
--- a/UA Quickstart Applications.sln	
+++ b/UA Quickstart Applications.sln	
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SampleLibraries", "SampleLibraries", "{5465661E-783E-4350-98D8-DDE8AB935E21}"
 EndProject