diff --git a/DiscImageChef.Core/ChangeLog b/DiscImageChef.Core/ChangeLog
index 32ccd08c..488d6b6d 100644
--- a/DiscImageChef.Core/ChangeLog
+++ b/DiscImageChef.Core/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-27  Natalia Portillo  <claunia@claunia.com>
+
+	* ImageFormat.cs:
+	* DiscImageChef.Core.csproj: Refactor: Move ImageFormat to
+	  Core.
+
 2017-05-27  Natalia Portillo  <claunia@claunia.com>
 
 	* PluginBase.cs:
diff --git a/DiscImageChef.Core/DiscImageChef.Core.csproj b/DiscImageChef.Core/DiscImageChef.Core.csproj
index 3d8d9d76..f220a5eb 100644
--- a/DiscImageChef.Core/DiscImageChef.Core.csproj
+++ b/DiscImageChef.Core/DiscImageChef.Core.csproj
@@ -35,6 +35,7 @@
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PluginBase.cs" />
+    <Compile Include="ImageFormat.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\DiscImageChef.Console\DiscImageChef.Console.csproj">
@@ -53,6 +54,10 @@
       <Project>{74032CBC-339B-42F3-AF6F-E96C261F3E6A}</Project>
       <Name>DiscImageChef.DiscImages</Name>
     </ProjectReference>
+    <ProjectReference Include="..\DiscImageChef.Filters\DiscImageChef.Filters.csproj">
+      <Project>{D571B8EF-903D-4353-BDD5-B834F9F029EF}</Project>
+      <Name>DiscImageChef.Filters</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/DiscImageChef/DetectImageFormat.cs b/DiscImageChef.Core/ImageFormat.cs
similarity index 98%
rename from DiscImageChef/DetectImageFormat.cs
rename to DiscImageChef.Core/ImageFormat.cs
index d2d99a11..c161074b 100644
--- a/DiscImageChef/DetectImageFormat.cs
+++ b/DiscImageChef.Core/ImageFormat.cs
@@ -34,8 +34,9 @@ using System;
 using DiscImageChef.Filters;
 using DiscImageChef.Console;
 using DiscImageChef.Core;
+using DiscImageChef.ImagePlugins;
 
-namespace DiscImageChef.ImagePlugins
+namespace DiscImageChef.Core
 {
     public static class ImageFormat
     {
diff --git a/DiscImageChef/ChangeLog b/DiscImageChef/ChangeLog
index 007f977c..586ec21a 100644
--- a/DiscImageChef/ChangeLog
+++ b/DiscImageChef/ChangeLog
@@ -1,3 +1,14 @@
+2017-05-27  Natalia Portillo  <claunia@claunia.com>
+
+	* Commands/Decode.cs:
+	* Commands/Verify.cs:
+	* Commands/Compare.cs:
+	* Commands/Entropy.cs:
+	* Commands/Checksum.cs:
+	* Commands/PrintHex.cs:
+	* DiscImageChef.csproj:
+	  Refactor: Move ImageFormat to Core.
+
 2017-05-27  Natalia Portillo  <claunia@claunia.com>
 
 	* Commands/Ls.cs:
diff --git a/DiscImageChef/Commands/Checksum.cs b/DiscImageChef/Commands/Checksum.cs
index aa5b8bc4..30c3508d 100644
--- a/DiscImageChef/Commands/Checksum.cs
+++ b/DiscImageChef/Commands/Checksum.cs
@@ -37,6 +37,7 @@ using System.Collections.Generic;
 using DiscImageChef.Console;
 using System.Threading;
 using DiscImageChef.Filters;
+using DiscImageChef.Core;
 
 namespace DiscImageChef.Commands
 {
diff --git a/DiscImageChef/Commands/Compare.cs b/DiscImageChef/Commands/Compare.cs
index 23b87272..5627586f 100644
--- a/DiscImageChef/Commands/Compare.cs
+++ b/DiscImageChef/Commands/Compare.cs
@@ -36,6 +36,7 @@ using System.Text;
 using System.Collections.Generic;
 using DiscImageChef.Console;
 using DiscImageChef.Filters;
+using DiscImageChef.Core;
 
 namespace DiscImageChef.Commands
 {
diff --git a/DiscImageChef/Commands/Decode.cs b/DiscImageChef/Commands/Decode.cs
index 446f24b4..7dbf11c0 100644
--- a/DiscImageChef/Commands/Decode.cs
+++ b/DiscImageChef/Commands/Decode.cs
@@ -33,6 +33,7 @@
 using DiscImageChef.ImagePlugins;
 using DiscImageChef.Console;
 using DiscImageChef.Filters;
+using DiscImageChef.Core;
 
 namespace DiscImageChef.Commands
 {
diff --git a/DiscImageChef/Commands/Entropy.cs b/DiscImageChef/Commands/Entropy.cs
index 60586395..e07512a2 100644
--- a/DiscImageChef/Commands/Entropy.cs
+++ b/DiscImageChef/Commands/Entropy.cs
@@ -36,6 +36,7 @@ using DiscImageChef.Checksums;
 using System.Collections.Generic;
 using DiscImageChef.Console;
 using DiscImageChef.Filters;
+using DiscImageChef.Core;
 
 namespace DiscImageChef.Commands
 {
diff --git a/DiscImageChef/Commands/PrintHex.cs b/DiscImageChef/Commands/PrintHex.cs
index 376daf8f..ad3c2239 100644
--- a/DiscImageChef/Commands/PrintHex.cs
+++ b/DiscImageChef/Commands/PrintHex.cs
@@ -33,6 +33,7 @@
 using DiscImageChef.ImagePlugins;
 using DiscImageChef.Console;
 using DiscImageChef.Filters;
+using DiscImageChef.Core;
 
 namespace DiscImageChef.Commands
 {
diff --git a/DiscImageChef/Commands/Verify.cs b/DiscImageChef/Commands/Verify.cs
index d0eba398..1df2fb14 100644
--- a/DiscImageChef/Commands/Verify.cs
+++ b/DiscImageChef/Commands/Verify.cs
@@ -35,6 +35,7 @@ using DiscImageChef.ImagePlugins;
 using System.Collections.Generic;
 using DiscImageChef.Console;
 using DiscImageChef.Filters;
+using DiscImageChef.Core;
 
 namespace DiscImageChef.Commands
 {
diff --git a/DiscImageChef/DiscImageChef.csproj b/DiscImageChef/DiscImageChef.csproj
index dd6f1582..61c68e16 100644
--- a/DiscImageChef/DiscImageChef.csproj
+++ b/DiscImageChef/DiscImageChef.csproj
@@ -54,7 +54,6 @@
     <Compile Include="Commands\PrintHex.cs" />
     <Compile Include="Commands\Decode.cs" />
     <Compile Include="Commands\Entropy.cs" />
-    <Compile Include="DetectImageFormat.cs" />
     <Compile Include="Commands\DeviceInfo.cs" />
     <Compile Include="Commands\MediaInfo.cs" />
     <Compile Include="Commands\Benchmark.cs">