diff --git a/ILSpy.AddIn/AssemblyFileFinder.cs b/ILSpy.AddIn.Shared/AssemblyFileFinder.cs
similarity index 100%
rename from ILSpy.AddIn/AssemblyFileFinder.cs
rename to ILSpy.AddIn.Shared/AssemblyFileFinder.cs
diff --git a/ILSpy.AddIn/Commands/AssemblyReferenceForILSpy.cs b/ILSpy.AddIn.Shared/Commands/AssemblyReferenceForILSpy.cs
similarity index 100%
rename from ILSpy.AddIn/Commands/AssemblyReferenceForILSpy.cs
rename to ILSpy.AddIn.Shared/Commands/AssemblyReferenceForILSpy.cs
diff --git a/ILSpy.AddIn/Commands/NuGetReferenceForILSpy.cs b/ILSpy.AddIn.Shared/Commands/NuGetReferenceForILSpy.cs
similarity index 100%
rename from ILSpy.AddIn/Commands/NuGetReferenceForILSpy.cs
rename to ILSpy.AddIn.Shared/Commands/NuGetReferenceForILSpy.cs
diff --git a/ILSpy.AddIn/Commands/OpenCodeItemCommand.cs b/ILSpy.AddIn.Shared/Commands/OpenCodeItemCommand.cs
similarity index 100%
rename from ILSpy.AddIn/Commands/OpenCodeItemCommand.cs
rename to ILSpy.AddIn.Shared/Commands/OpenCodeItemCommand.cs
diff --git a/ILSpy.AddIn/Commands/OpenILSpyCommand.cs b/ILSpy.AddIn.Shared/Commands/OpenILSpyCommand.cs
similarity index 100%
rename from ILSpy.AddIn/Commands/OpenILSpyCommand.cs
rename to ILSpy.AddIn.Shared/Commands/OpenILSpyCommand.cs
diff --git a/ILSpy.AddIn/Commands/OpenProjectOutputCommand.cs b/ILSpy.AddIn.Shared/Commands/OpenProjectOutputCommand.cs
similarity index 100%
rename from ILSpy.AddIn/Commands/OpenProjectOutputCommand.cs
rename to ILSpy.AddIn.Shared/Commands/OpenProjectOutputCommand.cs
diff --git a/ILSpy.AddIn/Commands/OpenReferenceCommand.cs b/ILSpy.AddIn.Shared/Commands/OpenReferenceCommand.cs
similarity index 100%
rename from ILSpy.AddIn/Commands/OpenReferenceCommand.cs
rename to ILSpy.AddIn.Shared/Commands/OpenReferenceCommand.cs
diff --git a/ILSpy.AddIn/Commands/ProjectItemForILSpy.cs b/ILSpy.AddIn.Shared/Commands/ProjectItemForILSpy.cs
similarity index 100%
rename from ILSpy.AddIn/Commands/ProjectItemForILSpy.cs
rename to ILSpy.AddIn.Shared/Commands/ProjectItemForILSpy.cs
diff --git a/ILSpy.AddIn/Commands/ProjectReferenceForILSpy.cs b/ILSpy.AddIn.Shared/Commands/ProjectReferenceForILSpy.cs
similarity index 100%
rename from ILSpy.AddIn/Commands/ProjectReferenceForILSpy.cs
rename to ILSpy.AddIn.Shared/Commands/ProjectReferenceForILSpy.cs
diff --git a/ILSpy.AddIn/GlobalSuppressions.cs b/ILSpy.AddIn.Shared/GlobalSuppressions.cs
similarity index 100%
rename from ILSpy.AddIn/GlobalSuppressions.cs
rename to ILSpy.AddIn.Shared/GlobalSuppressions.cs
diff --git a/ILSpy.AddIn/Guids.cs b/ILSpy.AddIn.Shared/Guids.cs
similarity index 100%
rename from ILSpy.AddIn/Guids.cs
rename to ILSpy.AddIn.Shared/Guids.cs
diff --git a/ILSpy.AddIn.Shared/ILSpy.AddIn.Shared.projitems b/ILSpy.AddIn.Shared/ILSpy.AddIn.Shared.projitems
new file mode 100644
index 000000000..4c01156b5
--- /dev/null
+++ b/ILSpy.AddIn.Shared/ILSpy.AddIn.Shared.projitems
@@ -0,0 +1,55 @@
+
+
+
+ $(MSBuildAllProjects);$(MSBuildThisFileFullPath)
+ true
+ acab1e5d-b3df-4092-aa72-692f8341e520
+
+
+ ILSpy.AddIn.Shared
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Resources.resx
+ True
+ True
+
+
+
+
+
+
+ Designer
+ Resources.Designer.cs
+ ResXFileCodeGenerator
+
+
+ VSPackage.resx
+ VSPackage.en-US.resources
+ true
+
+
+ true
+ VSPackage
+
+
+ VSPackage.resx
+ VSPackage.zh-Hans.resources
+ true
+
+
+
\ No newline at end of file
diff --git a/ILSpy.AddIn.Shared/ILSpy.AddIn.Shared.shproj b/ILSpy.AddIn.Shared/ILSpy.AddIn.Shared.shproj
new file mode 100644
index 000000000..80c9f2877
--- /dev/null
+++ b/ILSpy.AddIn.Shared/ILSpy.AddIn.Shared.shproj
@@ -0,0 +1,13 @@
+
+
+
+ acab1e5d-b3df-4092-aa72-692f8341e520
+ 14.0
+
+
+
+
+
+
+
+
diff --git a/ILSpy.AddIn/ILSpyAddInPackage.cs b/ILSpy.AddIn.Shared/ILSpyAddInPackage.cs
similarity index 100%
rename from ILSpy.AddIn/ILSpyAddInPackage.cs
rename to ILSpy.AddIn.Shared/ILSpyAddInPackage.cs
diff --git a/ILSpy.AddIn/ILSpyInstance.cs b/ILSpy.AddIn.Shared/ILSpyInstance.cs
similarity index 100%
rename from ILSpy.AddIn/ILSpyInstance.cs
rename to ILSpy.AddIn.Shared/ILSpyInstance.cs
diff --git a/ILSpy.AddIn/PkgCmdID.cs b/ILSpy.AddIn.Shared/PkgCmdID.cs
similarity index 100%
rename from ILSpy.AddIn/PkgCmdID.cs
rename to ILSpy.AddIn.Shared/PkgCmdID.cs
diff --git a/ILSpy.AddIn/Resources.Designer.cs b/ILSpy.AddIn.Shared/Resources.Designer.cs
similarity index 97%
rename from ILSpy.AddIn/Resources.Designer.cs
rename to ILSpy.AddIn.Shared/Resources.Designer.cs
index 7fd7fbc44..24622b11d 100644
--- a/ILSpy.AddIn/Resources.Designer.cs
+++ b/ILSpy.AddIn.Shared/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace ICSharpCode.ILSpy.AddIn {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
diff --git a/ILSpy.AddIn/Resources.resx b/ILSpy.AddIn.Shared/Resources.resx
similarity index 100%
rename from ILSpy.AddIn/Resources.resx
rename to ILSpy.AddIn.Shared/Resources.resx
diff --git a/ILSpy.AddIn/SyntaxNodeExtensions.cs b/ILSpy.AddIn.Shared/SyntaxNodeExtensions.cs
similarity index 100%
rename from ILSpy.AddIn/SyntaxNodeExtensions.cs
rename to ILSpy.AddIn.Shared/SyntaxNodeExtensions.cs
diff --git a/ILSpy.AddIn/Utils.cs b/ILSpy.AddIn.Shared/Utils.cs
similarity index 100%
rename from ILSpy.AddIn/Utils.cs
rename to ILSpy.AddIn.Shared/Utils.cs
diff --git a/ILSpy.AddIn/VSPackage.en-US.resx b/ILSpy.AddIn.Shared/VSPackage.en-US.resx
similarity index 100%
rename from ILSpy.AddIn/VSPackage.en-US.resx
rename to ILSpy.AddIn.Shared/VSPackage.en-US.resx
diff --git a/ILSpy.AddIn/VSPackage.resx b/ILSpy.AddIn.Shared/VSPackage.resx
similarity index 97%
rename from ILSpy.AddIn/VSPackage.resx
rename to ILSpy.AddIn.Shared/VSPackage.resx
index 345019f09..630c430e6 100644
--- a/ILSpy.AddIn/VSPackage.resx
+++ b/ILSpy.AddIn.Shared/VSPackage.resx
@@ -135,6 +135,6 @@
Integration of the ILSpy Decompiler into Visual Studio.
- Resources\Package.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\ILSpy.AddIn.SharedFiles\Resources\Package.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
\ No newline at end of file
diff --git a/ILSpy.AddIn/VSPackage.zh-Hans.resx b/ILSpy.AddIn.Shared/VSPackage.zh-Hans.resx
similarity index 100%
rename from ILSpy.AddIn/VSPackage.zh-Hans.resx
rename to ILSpy.AddIn.Shared/VSPackage.zh-Hans.resx
diff --git a/ILSpy.AddIn/ILSpy-Large.ico b/ILSpy.AddIn.SharedFiles/ILSpy-Large.ico
similarity index 100%
rename from ILSpy.AddIn/ILSpy-Large.ico
rename to ILSpy.AddIn.SharedFiles/ILSpy-Large.ico
diff --git a/ILSpy.AddIn/ILSpyAddIn.en-US.vsct b/ILSpy.AddIn.SharedFiles/ILSpyAddIn.en-US.vsct
similarity index 100%
rename from ILSpy.AddIn/ILSpyAddIn.en-US.vsct
rename to ILSpy.AddIn.SharedFiles/ILSpyAddIn.en-US.vsct
diff --git a/ILSpy.AddIn/ILSpyAddIn.vsct b/ILSpy.AddIn.SharedFiles/ILSpyAddIn.vsct
similarity index 100%
rename from ILSpy.AddIn/ILSpyAddIn.vsct
rename to ILSpy.AddIn.SharedFiles/ILSpyAddIn.vsct
diff --git a/ILSpy.AddIn/ILSpyAddIn.zh-Hans.vsct b/ILSpy.AddIn.SharedFiles/ILSpyAddIn.zh-Hans.vsct
similarity index 100%
rename from ILSpy.AddIn/ILSpyAddIn.zh-Hans.vsct
rename to ILSpy.AddIn.SharedFiles/ILSpyAddIn.zh-Hans.vsct
diff --git a/ILSpy.AddIn/Resources/Images.png b/ILSpy.AddIn.SharedFiles/Resources/Images.png
similarity index 100%
rename from ILSpy.AddIn/Resources/Images.png
rename to ILSpy.AddIn.SharedFiles/Resources/Images.png
diff --git a/ILSpy.AddIn/Resources/Package.ico b/ILSpy.AddIn.SharedFiles/Resources/Package.ico
similarity index 100%
rename from ILSpy.AddIn/Resources/Package.ico
rename to ILSpy.AddIn.SharedFiles/Resources/Package.ico
diff --git a/ILSpy.AddIn/ILSpy.AddIn.csproj b/ILSpy.AddIn/ILSpy.AddIn.csproj
index af12ddabc..9d96e9027 100644
--- a/ILSpy.AddIn/ILSpy.AddIn.csproj
+++ b/ILSpy.AddIn/ILSpy.AddIn.csproj
@@ -77,51 +77,8 @@
-
-
-
-
-
-
-
-
-
-
-
- True
- True
- Resources.resx
-
-
-
-
-
-
-
-
-
-
-
- ResXFileCodeGenerator
- Resources.Designer.cs
- Designer
-
-
- true
- VSPackage.en-US.resources
- VSPackage.resx
-
-
- true
- VSPackage
-
-
- true
- VSPackage.zh-Hans.resources
- VSPackage.resx
-