diff --git a/Greenshot/Greenshot.csproj b/Greenshot/Greenshot.csproj
index 3cffc8284..b213d8376 100644
--- a/Greenshot/Greenshot.csproj
+++ b/Greenshot/Greenshot.csproj
@@ -39,11 +39,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="log4net">
-      <HintPath>Lib\log4net.dll</HintPath>
+      <HintPath>..\GreenshotCore\Lib\log4net.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework">
-      <HintPath>Lib\nunit.framework.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\GreenshotCore\Lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -171,8 +170,6 @@
     <Compile Include="Test\Drawing\Properties\PropertyAggregatorTest.cs" />
     <Compile Include="Test\Drawing\Properties\SerializationTest.cs" />
     <Compile Include="Test\SaveImageFileDialogTest.cs" />
-    <Compile Include="UnmanagedHelpers\GDI32.cs" />
-    <Compile Include="UnmanagedHelpers\User32.cs" />
     <EmbeddedResource Include="Forms\AboutForm.resx">
       <DependentUpon>AboutForm.cs</DependentUpon>
     </EmbeddedResource>
@@ -225,8 +222,6 @@
     <None Include="Languages\language-zh-tw.xml">
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </None>
-    <None Include="Lib\log4net.dll" />
-    <None Include="Lib\nunit.framework.dll" />
     <None Include="log4net.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -254,8 +249,6 @@
       <DependentUpon>ColorDialog.cs</DependentUpon>
     </Compile>
     <Compile Include="Forms\ColorDialog.cs" />
-    <Compile Include="UnmanagedHelpers\Win32Errors.cs" />
-    <Compile Include="UnmanagedHelpers\WinMM.cs" />
     <EmbeddedResource Include="Forms\ColorDialog.resx">
       <DependentUpon>ColorDialog.cs</DependentUpon>
     </EmbeddedResource>
@@ -270,14 +263,20 @@
     <Folder Include="Helpers" />
     <Folder Include="Drawing" />
     <Folder Include="Controls" />
-    <Folder Include="Lib" />
     <Folder Include="Languages" />
     <Folder Include="Test" />
     <Folder Include="Test\Drawing" />
     <Folder Include="Test\Drawing\Filters" />
     <Folder Include="Test\Drawing\Properties" />
-    <Folder Include="UnmanagedHelpers" />
     <Folder Include="Help" />
+    <ProjectReference Include="..\GreenshotCore\GreenshotCore.csproj">
+      <Project>{BDC408EE-DEA1-4474-B59D-7F05757B12EC}</Project>
+      <Name>GreenshotCore</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\GreenshotEditor\GreenshotEditor.csproj">
+      <Project>{DAA9A7D9-E781-4B00-A3BE-221349BC98A0}</Project>
+      <Name>GreenshotEditor</Name>
+    </ProjectReference>
     <ProjectReference Include="..\GreenshotPlugin\GreenshotPlugin.csproj">
       <Project>{5B924697-4DCD-4F98-85F1-105CB84B7341}</Project>
       <Name>GreenshotPlugin</Name>
diff --git a/Greenshot/Greenshot.sln b/Greenshot/Greenshot.sln
index 153d3bee2..86786dd49 100644
--- a/Greenshot/Greenshot.sln
+++ b/Greenshot/Greenshot.sln
@@ -8,6 +8,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot", "Greenshot.cspr
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreenshotCore", "..\GreenshotCore\GreenshotCore.csproj", "{BDC408EE-DEA1-4474-B59D-7F05757B12EC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreenshotEditor", "..\GreenshotEditor\GreenshotEditor.csproj", "{DAA9A7D9-E781-4B00-A3BE-221349BC98A0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -22,5 +26,13 @@ Global
 		{5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|Any CPU.Build.0 = Release|x86
 		{5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|Any CPU.ActiveCfg = Release|x86
+		{BDC408EE-DEA1-4474-B59D-7F05757B12EC}.Debug|Any CPU.Build.0 = Debug|x86
+		{BDC408EE-DEA1-4474-B59D-7F05757B12EC}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{BDC408EE-DEA1-4474-B59D-7F05757B12EC}.Release|Any CPU.Build.0 = Release|x86
+		{BDC408EE-DEA1-4474-B59D-7F05757B12EC}.Release|Any CPU.ActiveCfg = Release|x86
+		{DAA9A7D9-E781-4B00-A3BE-221349BC98A0}.Debug|Any CPU.Build.0 = Debug|x86
+		{DAA9A7D9-E781-4B00-A3BE-221349BC98A0}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{DAA9A7D9-E781-4B00-A3BE-221349BC98A0}.Release|Any CPU.Build.0 = Release|x86
+		{DAA9A7D9-E781-4B00-A3BE-221349BC98A0}.Release|Any CPU.ActiveCfg = Release|x86
 	EndGlobalSection
 EndGlobal
diff --git a/GreenshotCore/GreenshotCore.csproj b/GreenshotCore/GreenshotCore.csproj
new file mode 100644
index 000000000..c1ddc2506
--- /dev/null
+++ b/GreenshotCore/GreenshotCore.csproj
@@ -0,0 +1,56 @@
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{BDC408EE-DEA1-4474-B59D-7F05757B12EC}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <OutputType>Library</OutputType>
+    <RootNamespace>GreenshotCore</RootNamespace>
+    <AssemblyName>GreenshotCore</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <SourceAnalysisOverrideSettingsFile>C:\Dokumente und Einstellungen\jens\Anwendungsdaten\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <NoStdLib>False</NoStdLib>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>4194304</BaseAddress>
+    <FileAlignment>4096</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>Full</DebugType>
+    <Optimize>False</Optimize>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DebugSymbols>False</DebugSymbols>
+    <DebugType>None</DebugType>
+    <Optimize>True</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>TRACE</DefineConstants>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Lib" />
+    <Folder Include="UnmanagedHelpers" />
+    <Compile Include="UnmanagedHelpers\GDI32.cs" />
+    <Compile Include="UnmanagedHelpers\User32.cs" />
+    <Compile Include="UnmanagedHelpers\Win32Errors.cs" />
+    <Compile Include="UnmanagedHelpers\WinMM.cs" />
+    <None Include="Lib\log4net.dll" />
+    <None Include="Lib\nunit.framework.dll" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Greenshot/Lib/log4net.dll b/GreenshotCore/Lib/log4net.dll
similarity index 100%
rename from Greenshot/Lib/log4net.dll
rename to GreenshotCore/Lib/log4net.dll
diff --git a/Greenshot/Lib/nunit.framework.dll b/GreenshotCore/Lib/nunit.framework.dll
similarity index 100%
rename from Greenshot/Lib/nunit.framework.dll
rename to GreenshotCore/Lib/nunit.framework.dll
diff --git a/Greenshot/UnmanagedHelpers/GDI32.cs b/GreenshotCore/UnmanagedHelpers/GDI32.cs
similarity index 100%
rename from Greenshot/UnmanagedHelpers/GDI32.cs
rename to GreenshotCore/UnmanagedHelpers/GDI32.cs
diff --git a/Greenshot/UnmanagedHelpers/User32.cs b/GreenshotCore/UnmanagedHelpers/User32.cs
similarity index 100%
rename from Greenshot/UnmanagedHelpers/User32.cs
rename to GreenshotCore/UnmanagedHelpers/User32.cs
diff --git a/Greenshot/UnmanagedHelpers/Win32Errors.cs b/GreenshotCore/UnmanagedHelpers/Win32Errors.cs
similarity index 100%
rename from Greenshot/UnmanagedHelpers/Win32Errors.cs
rename to GreenshotCore/UnmanagedHelpers/Win32Errors.cs
diff --git a/Greenshot/UnmanagedHelpers/WinMM.cs b/GreenshotCore/UnmanagedHelpers/WinMM.cs
similarity index 100%
rename from Greenshot/UnmanagedHelpers/WinMM.cs
rename to GreenshotCore/UnmanagedHelpers/WinMM.cs
diff --git a/GreenshotEditor/GreenshotEditor.csproj b/GreenshotEditor/GreenshotEditor.csproj
new file mode 100644
index 000000000..038e83a0b
--- /dev/null
+++ b/GreenshotEditor/GreenshotEditor.csproj
@@ -0,0 +1,59 @@
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{DAA9A7D9-E781-4B00-A3BE-221349BC98A0}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <OutputType>Library</OutputType>
+    <RootNamespace>GreenshotEditor</RootNamespace>
+    <AssemblyName>GreenshotEditor</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <SourceAnalysisOverrideSettingsFile>C:\Dokumente und Einstellungen\jens\Anwendungsdaten\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
+    <NoWin32Manifest>True</NoWin32Manifest>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <DebugSymbols>True</DebugSymbols>
+    <DebugType>Full</DebugType>
+    <Optimize>False</Optimize>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DebugSymbols>False</DebugSymbols>
+    <DebugType>None</DebugType>
+    <Optimize>True</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>TRACE</DefineConstants>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\GreenshotCore\GreenshotCore.csproj">
+      <Project>{BDC408EE-DEA1-4474-B59D-7F05757B12EC}</Project>
+      <Name>GreenshotCore</Name>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/GreenshotEditor/Properties/AssemblyInfo.cs b/GreenshotEditor/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..0f1a5dac5
--- /dev/null
+++ b/GreenshotEditor/Properties/AssemblyInfo.cs
@@ -0,0 +1,31 @@
+#region Using directives
+
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+#endregion
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("GreenshotEditor")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("GreenshotEditor")]
+[assembly: AssemblyCopyright("Copyright 2010")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+[assembly: ComVisible(false)]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all the values or you can use the default the Revision and 
+// Build Numbers by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.*")]