diff --git a/DiscImageChef.Core/ChangeLog b/DiscImageChef.Core/ChangeLog
index 58a1f0b8..32ccd08c 100644
--- a/DiscImageChef.Core/ChangeLog
+++ b/DiscImageChef.Core/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-27  Natalia Portillo  <claunia@claunia.com>
+
+	* PluginBase.cs:
+	* DiscImageChef.Core.csproj: Refactor: Moved PluginBase to
+	  Core.
+
 2017-05-27  Natalia Portillo  <claunia@claunia.com>
 
 	* DiscImageChef.Core.csproj:
diff --git a/DiscImageChef.Core/DiscImageChef.Core.csproj b/DiscImageChef.Core/DiscImageChef.Core.csproj
index 63c5682e..3d8d9d76 100644
--- a/DiscImageChef.Core/DiscImageChef.Core.csproj
+++ b/DiscImageChef.Core/DiscImageChef.Core.csproj
@@ -9,7 +9,6 @@
     <OutputType>Library</OutputType>
     <RootNamespace>DiscImageChef.Core</RootNamespace>
     <AssemblyName>DiscImageChef.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <ReleaseVersion>3.3.99.0</ReleaseVersion>
     <SynchReleaseVersion>false</SynchReleaseVersion>
   </PropertyGroup>
@@ -35,6 +34,25 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="PluginBase.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DiscImageChef.Console\DiscImageChef.Console.csproj">
+      <Project>{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}</Project>
+      <Name>DiscImageChef.Console</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\DiscImageChef.Filesystems\DiscImageChef.Filesystems.csproj">
+      <Project>{D7016DF2-5A5E-4524-B40D-BA2D59576688}</Project>
+      <Name>DiscImageChef.Filesystems</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\DiscImageChef.Partitions\DiscImageChef.Partitions.csproj">
+      <Project>{DA7AB65D-B5BA-4003-8893-A51BB071BA2F}</Project>
+      <Name>DiscImageChef.Partitions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\DiscImageChef.DiscImages\DiscImageChef.DiscImages.csproj">
+      <Project>{74032CBC-339B-42F3-AF6F-E96C261F3E6A}</Project>
+      <Name>DiscImageChef.DiscImages</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/DiscImageChef/Plugins.cs b/DiscImageChef.Core/PluginBase.cs
similarity index 99%
rename from DiscImageChef/Plugins.cs
rename to DiscImageChef.Core/PluginBase.cs
index 20ace32f..da3e26c2 100644
--- a/DiscImageChef/Plugins.cs
+++ b/DiscImageChef.Core/PluginBase.cs
@@ -38,7 +38,7 @@ using DiscImageChef.PartPlugins;
 using DiscImageChef.Filesystems;
 using DiscImageChef.Console;
 
-namespace DiscImageChef
+namespace DiscImageChef.Core
 {
     public class PluginBase
     {
diff --git a/DiscImageChef/ChangeLog b/DiscImageChef/ChangeLog
index 96bab230..007f977c 100644
--- a/DiscImageChef/ChangeLog
+++ b/DiscImageChef/ChangeLog
@@ -1,3 +1,15 @@
+2017-05-27  Natalia Portillo  <claunia@claunia.com>
+
+	* Commands/Ls.cs:
+	* Commands/Analyze.cs:
+	* Commands/Formats.cs:
+	* DetectImageFormat.cs:
+	* DiscImageChef.csproj:
+	* Commands/DumpMedia.cs:
+	* Commands/ExtractFiles.cs:
+	* Commands/CreateSidecar.cs:
+	  Refactor: Moved PluginBase to Core.
+
 2017-05-23  Natalia Portillo  <claunia@claunia.com>
 
 	* Commands/MediaInfo.cs:
diff --git a/DiscImageChef/Commands/Analyze.cs b/DiscImageChef/Commands/Analyze.cs
index 618ba8ee..75036f5f 100644
--- a/DiscImageChef/Commands/Analyze.cs
+++ b/DiscImageChef/Commands/Analyze.cs
@@ -37,6 +37,7 @@ using DiscImageChef.ImagePlugins;
 using DiscImageChef.PartPlugins;
 using DiscImageChef.Console;
 using DiscImageChef.Filters;
+using DiscImageChef.Core;
 
 namespace DiscImageChef.Commands
 {
diff --git a/DiscImageChef/Commands/CreateSidecar.cs b/DiscImageChef/Commands/CreateSidecar.cs
index b818e98f..2d821365 100644
--- a/DiscImageChef/Commands/CreateSidecar.cs
+++ b/DiscImageChef/Commands/CreateSidecar.cs
@@ -41,6 +41,7 @@ using DiscImageChef.CommonTypes;
 using DiscImageChef.PartPlugins;
 using DiscImageChef.Filters;
 using DiscImageChef.Decoders.PCMCIA;
+using DiscImageChef.Core;
 
 namespace DiscImageChef.Commands
 {
diff --git a/DiscImageChef/Commands/DumpMedia.cs b/DiscImageChef/Commands/DumpMedia.cs
index 63dc175d..3d993119 100644
--- a/DiscImageChef/Commands/DumpMedia.cs
+++ b/DiscImageChef/Commands/DumpMedia.cs
@@ -35,6 +35,7 @@ using System.Collections.Generic;
 using System.IO;
 using DiscImageChef.CommonTypes;
 using DiscImageChef.Console;
+using DiscImageChef.Core;
 using DiscImageChef.Decoders.PCMCIA;
 using DiscImageChef.Devices;
 using DiscImageChef.Filesystems;
diff --git a/DiscImageChef/Commands/ExtractFiles.cs b/DiscImageChef/Commands/ExtractFiles.cs
index 2c247783..003fe5ad 100644
--- a/DiscImageChef/Commands/ExtractFiles.cs
+++ b/DiscImageChef/Commands/ExtractFiles.cs
@@ -38,6 +38,7 @@ using DiscImageChef.ImagePlugins;
 using DiscImageChef.PartPlugins;
 using System.IO;
 using DiscImageChef.Filters;
+using DiscImageChef.Core;
 
 namespace DiscImageChef.Commands
 {
diff --git a/DiscImageChef/Commands/Formats.cs b/DiscImageChef/Commands/Formats.cs
index b5da5b81..d122e395 100644
--- a/DiscImageChef/Commands/Formats.cs
+++ b/DiscImageChef/Commands/Formats.cs
@@ -36,6 +36,7 @@ using DiscImageChef.PartPlugins;
 using DiscImageChef.Filesystems;
 using DiscImageChef.Console;
 using DiscImageChef.Filters;
+using DiscImageChef.Core;
 
 namespace DiscImageChef.Commands
 {
diff --git a/DiscImageChef/Commands/Ls.cs b/DiscImageChef/Commands/Ls.cs
index f8ff1b08..7fe113e0 100644
--- a/DiscImageChef/Commands/Ls.cs
+++ b/DiscImageChef/Commands/Ls.cs
@@ -33,6 +33,7 @@
 using System;
 using System.Collections.Generic;
 using DiscImageChef.Console;
+using DiscImageChef.Core;
 using DiscImageChef.Filesystems;
 using DiscImageChef.Filters;
 using DiscImageChef.ImagePlugins;
diff --git a/DiscImageChef/DetectImageFormat.cs b/DiscImageChef/DetectImageFormat.cs
index 8643c453..d2d99a11 100644
--- a/DiscImageChef/DetectImageFormat.cs
+++ b/DiscImageChef/DetectImageFormat.cs
@@ -33,6 +33,7 @@
 using System;
 using DiscImageChef.Filters;
 using DiscImageChef.Console;
+using DiscImageChef.Core;
 
 namespace DiscImageChef.ImagePlugins
 {
diff --git a/DiscImageChef/DiscImageChef.csproj b/DiscImageChef/DiscImageChef.csproj
index d1053ea5..dd6f1582 100644
--- a/DiscImageChef/DiscImageChef.csproj
+++ b/DiscImageChef/DiscImageChef.csproj
@@ -44,7 +44,6 @@
   <ItemGroup>
     <Compile Include="Main.cs" />
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Plugins.cs" />
     <Compile Include="Options.cs" />
     <Compile Include="Commands\Formats.cs" />
     <Compile Include="Commands\Analyze.cs" />
@@ -241,6 +240,10 @@
       <Project>{D571B8EF-903D-4353-BDD5-B834F9F029EF}</Project>
       <Name>DiscImageChef.Filters</Name>
     </ProjectReference>
+    <ProjectReference Include="..\DiscImageChef.Core\DiscImageChef.Core.csproj">
+      <Project>{679659B8-25D0-4279-B632-56EF8F94ADC0}</Project>
+      <Name>DiscImageChef.Core</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\LICENSE.MIT">