diff --git a/DiscImageChef.Core/ChangeLog b/DiscImageChef.Core/ChangeLog
index 157228d64..c2dab9d38 100644
--- a/DiscImageChef.Core/ChangeLog
+++ b/DiscImageChef.Core/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-27  Natalia Portillo  <claunia@claunia.com>
+
+	* Checksum.cs:
+	* DiscImageChef.Core.csproj: Refactor: Move Checksum to Core.
+
 2017-05-27  Natalia Portillo  <claunia@claunia.com>
 
 	* Statistics.cs:
diff --git a/DiscImageChef/Core/Checksum.cs b/DiscImageChef.Core/Checksum.cs
similarity index 98%
rename from DiscImageChef/Core/Checksum.cs
rename to DiscImageChef.Core/Checksum.cs
index 65948353e..e46bcc7dd 100644
--- a/DiscImageChef/Core/Checksum.cs
+++ b/DiscImageChef.Core/Checksum.cs
@@ -37,7 +37,7 @@ using System.Threading;
 
 namespace DiscImageChef.Core
 {
-    class Checksum
+    public class Checksum
     {
         Adler32Context adler32ctx;
         CRC16Context crc16ctx;
@@ -75,7 +75,7 @@ namespace DiscImageChef.Core
         sha512Packet sha512Pkt;
         spamsumPacket spamsumPkt;
 
-        internal Checksum()
+        public Checksum()
         {
             adler32ctx = new Adler32Context();
             crc16ctx = new CRC16Context();
@@ -137,7 +137,7 @@ namespace DiscImageChef.Core
             spamsumPkt.context = ssctx;
         }
 
-        internal void Update(byte[] data)
+        public void Update(byte[] data)
         {
             adlerPkt.data = data;
             adlerThread.Start(adlerPkt);
@@ -184,7 +184,7 @@ namespace DiscImageChef.Core
             spamsumThread = new Thread(updateSpamSum);
         }
 
-        internal List<ChecksumType> End()
+        public List<ChecksumType> End()
         {
             List<ChecksumType> chks = new List<ChecksumType>();
 
@@ -246,7 +246,7 @@ namespace DiscImageChef.Core
             return chks;
         }
 
-        internal static List<ChecksumType> GetChecksums(byte[] data)
+        public static List<ChecksumType> GetChecksums(byte[] data)
         {
             Adler32Context adler32ctxData = new Adler32Context();
             CRC16Context crc16ctxData = new CRC16Context();
diff --git a/DiscImageChef.Core/DiscImageChef.Core.csproj b/DiscImageChef.Core/DiscImageChef.Core.csproj
index 0153c64cd..f7b94a038 100644
--- a/DiscImageChef.Core/DiscImageChef.Core.csproj
+++ b/DiscImageChef.Core/DiscImageChef.Core.csproj
@@ -38,6 +38,7 @@
     <Compile Include="PluginBase.cs" />
     <Compile Include="ImageFormat.cs" />
     <Compile Include="Statistics.cs" />
+    <Compile Include="Checksum.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\DiscImageChef.Console\DiscImageChef.Console.csproj">
@@ -72,6 +73,14 @@
       <Project>{F2B84194-26EB-4227-B1C5-6602517E85AE}</Project>
       <Name>DiscImageChef.CommonTypes</Name>
     </ProjectReference>
+    <ProjectReference Include="..\DiscImageChef.Checksums\DiscImageChef.Checksums.csproj">
+      <Project>{CC48B324-A532-4A45-87A6-6F91F7141E8D}</Project>
+      <Name>DiscImageChef.Checksums</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\DiscImageChef.Metadata\DiscImageChef.Metadata.csproj">
+      <Project>{9F213318-5CB8-4066-A757-074489C9F818}</Project>
+      <Name>DiscImageChef.Metadata</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/DiscImageChef/ChangeLog b/DiscImageChef/ChangeLog
index d77932eb5..4f413aa26 100644
--- a/DiscImageChef/ChangeLog
+++ b/DiscImageChef/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-27  Natalia Portillo  <claunia@claunia.com>
+
+	* DiscImageChef.csproj:
+	  Refactor: Move Checksum to Core.
+
 2017-05-27  Natalia Portillo  <claunia@claunia.com>
 
 	* DiscImageChef.csproj:
diff --git a/DiscImageChef/DiscImageChef.csproj b/DiscImageChef/DiscImageChef.csproj
index 887026ded..4cf5c4605 100644
--- a/DiscImageChef/DiscImageChef.csproj
+++ b/DiscImageChef/DiscImageChef.csproj
@@ -62,7 +62,6 @@
     <Compile Include="Commands\CreateSidecar.cs" />
     <Compile Include="Commands\MediaScan.cs" />
     <Compile Include="Commands\DumpMedia.cs" />
-    <Compile Include="Core\Checksum.cs" />
     <Compile Include="Commands\DeviceReport.cs" />
     <Compile Include="Commands\Configure.cs" />
     <Compile Include="Commands\Statistics.cs" />