diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 00000000..da2e4efd
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,6 @@
+2015-10-05  Natalia Portillo  <claunia@claunia.com>
+
+	* DiscImageChef.sln:
+	  Move helpers to a separate library.
+	Move checksums to a separate library.
+
diff --git a/DiscImageChef/Checksums/Adler32Context.cs b/DiscImageChef.Checksums/Adler32Context.cs
similarity index 100%
rename from DiscImageChef/Checksums/Adler32Context.cs
rename to DiscImageChef.Checksums/Adler32Context.cs
diff --git a/DiscImageChef/Checksums/CDChecksums.cs b/DiscImageChef.Checksums/CDChecksums.cs
similarity index 96%
rename from DiscImageChef/Checksums/CDChecksums.cs
rename to DiscImageChef.Checksums/CDChecksums.cs
index a5711b83..110e7bf1 100644
--- a/DiscImageChef/Checksums/CDChecksums.cs
+++ b/DiscImageChef.Checksums/CDChecksums.cs
@@ -163,18 +163,18 @@ namespace DiscImageChef.Checksums
                 channel[0x00A] == 0xFF &&
                 channel[0x00B] == 0x00)
             {
-                if (MainClass.isDebug)
+                //if (MainClass.isDebug)
                     Console.WriteLine("DEBUG (CDChecksums): Data sector, address {0:X2}:{1:X2}:{2:X2}", channel[0x00C], channel[0x00D], channel[0x00E]);
 
                 if (channel[0x00F] == 0x00) // mode (1 byte)
                 {
-                    if (MainClass.isDebug)
+                    //if (MainClass.isDebug)
                         Console.WriteLine("DEBUG (CDChecksums): Mode 0 sector at address {0:X2}:{1:X2}:{2:X2}", channel[0x00C], channel[0x00D], channel[0x00E]);
                     for (int i = 0x010; i < 0x930; i++)
                     {
                         if (channel[i] != 0x00)
                         {
-                            if (MainClass.isDebug)
+                            //if (MainClass.isDebug)
                                 Console.WriteLine("DEBUG (CDChecksums): Mode 0 sector with error at address: {0:X2}:{1:X2}:{2:X2}", channel[0x00C], channel[0x00D], channel[0x00E]);
                             return false;
                         }
@@ -183,7 +183,7 @@ namespace DiscImageChef.Checksums
                 }
                 else if (channel[0x00F] == 0x01) // mode (1 byte)
                 {
-                    if (MainClass.isDebug)
+                    //if (MainClass.isDebug)
                         Console.WriteLine("DEBUG (CDChecksums): Mode 1 sector at address {0:X2}:{1:X2}:{2:X2}", channel[0x00C], channel[0x00D], channel[0x00E]);
 
                     if (channel[0x814] != 0x00 || // reserved (8 bytes)
@@ -195,7 +195,7 @@ namespace DiscImageChef.Checksums
                         channel[0x81A] != 0x00 ||
                         channel[0x81B] != 0x00)
                     {
-                        if (MainClass.isDebug)
+                        //if (MainClass.isDebug)
                             Console.WriteLine("DEBUG (CDChecksums): Mode 1 sector with data in reserved bytes at address: {0:X2}:{1:X2}:{2:X2}", channel[0x00C], channel[0x00D], channel[0x00E]);
                         return false;
                     }
@@ -216,10 +216,10 @@ namespace DiscImageChef.Checksums
                     bool FailedECC_Q = CheckECC(address, data2, 52, 43, 86, 88, ecc_q);
 
                     if (FailedECC_P)
-                    if (MainClass.isDebug)
+                    //if (MainClass.isDebug)
                         Console.WriteLine("DEBUG (CDChecksums): Mode 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC P check", channel[0x00C], channel[0x00D], channel[0x00E]);
                     if (FailedECC_Q)
-                    if (MainClass.isDebug)
+                    //if (MainClass.isDebug)
                         Console.WriteLine("DEBUG (CDChecksums): Mode 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC Q check", channel[0x00C], channel[0x00D], channel[0x00E]);
 
                     if (FailedECC_P || FailedECC_Q)
@@ -234,7 +234,7 @@ namespace DiscImageChef.Checksums
 
                     if (CalculatedEDC != StoredEDC)
                     {
-                        if (MainClass.isDebug)
+                        //if (MainClass.isDebug)
                             Console.WriteLine("DEBUG (CDChecksums): Mode 1 sector at address: {0:X2}:{1:X2}:{2:X2}, got CRC 0x{3:X8} expected 0x{4:X8}", channel[0x00C], channel[0x00D], channel[0x00E], CalculatedEDC, StoredEDC);
                         return false;
                     }
@@ -243,14 +243,14 @@ namespace DiscImageChef.Checksums
                 }
                 else if (channel[0x00F] == 0x02) // mode (1 byte)
                 {
-                    if (MainClass.isDebug)
+                    //if (MainClass.isDebug)
                         Console.WriteLine("DEBUG (CDChecksums): Mode 2 sector at address {0:X2}:{1:X2}:{2:X2}", channel[0x00C], channel[0x00D], channel[0x00E]);
 
                     if ((channel[0x012] & 0x20) == 0x20) // mode 2 form 2
                     {
                         if (channel[0x010] != channel[0x014] || channel[0x011] != channel[0x015] || channel[0x012] != channel[0x016] || channel[0x013] != channel[0x017])
                         {
-                            if (MainClass.isDebug)
+                            //if (MainClass.isDebug)
                                 Console.WriteLine("DEBUG (CDChecksums): Subheader copies differ in mode 2 form 2 sector at address: {0:X2}:{1:X2}:{2:X2}", channel[0x00C], channel[0x00D], channel[0x00E]);
                         }
 
@@ -263,7 +263,7 @@ namespace DiscImageChef.Checksums
 
                         if (CalculatedEDC != StoredEDC && StoredEDC != 0x00000000)
                         {
-                            if (MainClass.isDebug)
+                            //if (MainClass.isDebug)
                                 Console.WriteLine("DEBUG (CDChecksums): Mode 2 form 2 sector at address: {0:X2}:{1:X2}:{2:X2}, got CRC 0x{3:X8} expected 0x{4:X8}", channel[0x00C], channel[0x00D], channel[0x00E], CalculatedEDC, StoredEDC);
                             return false;
                         }
@@ -272,7 +272,7 @@ namespace DiscImageChef.Checksums
                     {
                         if (channel[0x010] != channel[0x014] || channel[0x011] != channel[0x015] || channel[0x012] != channel[0x016] || channel[0x013] != channel[0x017])
                         {
-                            if (MainClass.isDebug)
+                            //if (MainClass.isDebug)
                                 Console.WriteLine("DEBUG (CDChecksums): Subheader copies differ in mode 2 form 1 sector at address: {0:X2}:{1:X2}:{2:X2}", channel[0x00C], channel[0x00D], channel[0x00E]);
                         }
 
@@ -295,10 +295,10 @@ namespace DiscImageChef.Checksums
                         bool FailedECC_Q = CheckECC(address, data2, 52, 43, 86, 88, ecc_q);
 
                         if (FailedECC_P)
-                        if (MainClass.isDebug)
+                        //if (MainClass.isDebug)
                             Console.WriteLine("DEBUG (CDChecksums): Mode 2 form 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC P check", channel[0x00C], channel[0x00D], channel[0x00E]);
                         if (FailedECC_Q)
-                        if (MainClass.isDebug)
+                        //if (MainClass.isDebug)
                             Console.WriteLine("DEBUG (CDChecksums): Mode 2 form 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC Q check", channel[0x00F], channel[0x00C], channel[0x00D], channel[0x00E]);
 
                         if (FailedECC_P || FailedECC_Q)
@@ -313,7 +313,7 @@ namespace DiscImageChef.Checksums
 
                         if (CalculatedEDC != StoredEDC)
                         {
-                            if (MainClass.isDebug)
+                            //if (MainClass.isDebug)
                                 Console.WriteLine("DEBUG (CDChecksums): Mode 2 form 1 sector at address: {0:X2}:{1:X2}:{2:X2}, got CRC 0x{3:X8} expected 0x{4:X8}", channel[0x00C], channel[0x00D], channel[0x00E], CalculatedEDC, StoredEDC);
                             return false;
                         }
@@ -323,7 +323,7 @@ namespace DiscImageChef.Checksums
                 }
                 else
                 {
-                    if (MainClass.isDebug)
+                    //if (MainClass.isDebug)
                         Console.WriteLine("DEBUG (CDChecksums): Unknown mode {0} sector at address: {1:X2}:{2:X2}:{3:X2}", channel[0x00F], channel[0x00C], channel[0x00D], channel[0x00E]);
                     return null;
                 }
@@ -454,8 +454,8 @@ namespace DiscImageChef.Checksums
                 CDSubRWPack4[j] = (byte)(subchannel[i++] & 0x3F);
             }
 
-            if(MainClass.isDebug)
-            {
+            //if(MainClass.isDebug)
+            //{
                 switch(CDSubRWPack1[0])
                 {
                     case 0x00:
@@ -483,7 +483,7 @@ namespace DiscImageChef.Checksums
                         Console.WriteLine("Detected unknown Pack type in subchannel: mode {0}, item {1}", Convert.ToString(CDSubRWPack1[0] & 0x38, 2), Convert.ToString(CDSubRWPack1[0] & 0x07, 2));
                         break;
                 }
-            }
+            //}
 
             BigEndianBitConverter.IsLittleEndian = true;
 
@@ -494,7 +494,7 @@ namespace DiscImageChef.Checksums
 
             if (QSubChannelCRC != CalculatedQCRC)
             {
-                if (MainClass.isDebug)
+                //if (MainClass.isDebug)
                     Console.WriteLine("DEBUG (CDChecksums): Q subchannel CRC 0x{0:X4}, expected 0x{1:X4}", CalculatedQCRC, QSubChannelCRC);
                 status = false;
             }
@@ -508,7 +508,7 @@ namespace DiscImageChef.Checksums
 
                 if (CDTextPack1CRC != CalculatedCDTP1CRC && CDTextPack1CRC != 0)
                 {
-                    if (MainClass.isDebug)
+                    //if (MainClass.isDebug)
                     Console.WriteLine("DEBUG (CDChecksums): CD-Text Pack 1 CRC 0x{0:X4}, expected 0x{1:X4}", CDTextPack1CRC, CalculatedCDTP1CRC);
                 status = false;
                 }
@@ -524,7 +524,7 @@ namespace DiscImageChef.Checksums
 
                 if (CDTextPack2CRC != CalculatedCDTP2CRC && CDTextPack2CRC != 0)
                 {
-                    if (MainClass.isDebug)
+                    //if (MainClass.isDebug)
                         Console.WriteLine("DEBUG (CDChecksums): CD-Text Pack 2 CRC 0x{0:X4}, expected 0x{1:X4}", CDTextPack2CRC, CalculatedCDTP2CRC);
                     status = false;
                 }
@@ -540,7 +540,7 @@ namespace DiscImageChef.Checksums
 
                 if (CDTextPack3CRC != CalculatedCDTP3CRC && CDTextPack3CRC != 0)
                 {
-                    if (MainClass.isDebug)
+                    //if (MainClass.isDebug)
                         Console.WriteLine("DEBUG (CDChecksums): CD-Text Pack 3 CRC 0x{0:X4}, expected 0x{1:X4}", CDTextPack3CRC, CalculatedCDTP3CRC);
                     status = false;
                 }
@@ -556,7 +556,7 @@ namespace DiscImageChef.Checksums
 
                 if (CDTextPack4CRC != CalculatedCDTP4CRC && CDTextPack4CRC != 0)
                 {
-                    if (MainClass.isDebug)
+                    //if (MainClass.isDebug)
                         Console.WriteLine("DEBUG (CDChecksums): CD-Text Pack 4 CRC 0x{0:X4}, expected 0x{1:X4}", CDTextPack4CRC, CalculatedCDTP4CRC);
                     status = false;
                 }
diff --git a/DiscImageChef/Checksums/CRC16Context.cs b/DiscImageChef.Checksums/CRC16Context.cs
similarity index 100%
rename from DiscImageChef/Checksums/CRC16Context.cs
rename to DiscImageChef.Checksums/CRC16Context.cs
diff --git a/DiscImageChef/Checksums/CRC32Context.cs b/DiscImageChef.Checksums/CRC32Context.cs
similarity index 100%
rename from DiscImageChef/Checksums/CRC32Context.cs
rename to DiscImageChef.Checksums/CRC32Context.cs
diff --git a/DiscImageChef/Checksums/CRC64Context.cs b/DiscImageChef.Checksums/CRC64Context.cs
similarity index 100%
rename from DiscImageChef/Checksums/CRC64Context.cs
rename to DiscImageChef.Checksums/CRC64Context.cs
diff --git a/DiscImageChef.Checksums/ChangeLog b/DiscImageChef.Checksums/ChangeLog
new file mode 100644
index 00000000..40ed9581
--- /dev/null
+++ b/DiscImageChef.Checksums/ChangeLog
@@ -0,0 +1,20 @@
+2015-10-05  Natalia Portillo  <claunia@claunia.com>
+
+	* MD5Context.cs:
+	* SHA1Context.cs:
+	* ReedSolomon.cs:
+	* CDChecksums.cs:
+	* CRC64Context.cs:
+	* CRC16Context.cs:
+	* CRC32Context.cs:
+	* SHA256Context.cs:
+	* SHA512Context.cs:
+	* SHA384Context.cs:
+	* SpamSumContext.cs:
+	* Adler32Context.cs:
+	* FletcherContext.cs:
+	* RIPEMD160Context.cs:
+	* Properties/AssemblyInfo.cs:
+	* DiscImageChef.Checksums.csproj:
+	  Move checksums to a separate library.
+
diff --git a/DiscImageChef.Checksums/DiscImageChef.Checksums.csproj b/DiscImageChef.Checksums/DiscImageChef.Checksums.csproj
new file mode 100644
index 00000000..61ed63bb
--- /dev/null
+++ b/DiscImageChef.Checksums/DiscImageChef.Checksums.csproj
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{CC48B324-A532-4A45-87A6-6F91F7141E8D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>DiscImageChef.Checksums</RootNamespace>
+    <AssemblyName>DiscImageChef.Checksums</AssemblyName>
+    <ReleaseVersion>2.2</ReleaseVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SpamSumContext.cs" />
+    <Compile Include="Adler32Context.cs" />
+    <Compile Include="CDChecksums.cs" />
+    <Compile Include="CRC16Context.cs" />
+    <Compile Include="CRC32Context.cs" />
+    <Compile Include="CRC64Context.cs" />
+    <Compile Include="FletcherContext.cs" />
+    <Compile Include="MD5Context.cs" />
+    <Compile Include="ReedSolomon.cs" />
+    <Compile Include="RIPEMD160Context.cs" />
+    <Compile Include="SHA1Context.cs" />
+    <Compile Include="SHA256Context.cs" />
+    <Compile Include="SHA384Context.cs" />
+    <Compile Include="SHA512Context.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\DiscImageChef.Helpers\DiscImageChef.Helpers.csproj">
+      <Project>{F8BDF57B-1571-4CD0-84B3-B422088D359A}</Project>
+      <Name>DiscImageChef.Helpers</Name>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/DiscImageChef/Checksums/FletcherContext.cs b/DiscImageChef.Checksums/FletcherContext.cs
similarity index 100%
rename from DiscImageChef/Checksums/FletcherContext.cs
rename to DiscImageChef.Checksums/FletcherContext.cs
diff --git a/DiscImageChef/Checksums/MD5Context.cs b/DiscImageChef.Checksums/MD5Context.cs
similarity index 100%
rename from DiscImageChef/Checksums/MD5Context.cs
rename to DiscImageChef.Checksums/MD5Context.cs
diff --git a/DiscImageChef.Checksums/Properties/AssemblyInfo.cs b/DiscImageChef.Checksums/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..20fb93d6
--- /dev/null
+++ b/DiscImageChef.Checksums/Properties/AssemblyInfo.cs
@@ -0,0 +1,27 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following attributes.
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle("DiscImageChef.Checksums")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Claunia.com")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("© Claunia.com")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion("1.0.*")]
+
+// The following attributes are used to specify the signing key for the assembly,
+// if desired. See the Mono documentation for more information about signing.
+
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]
+
diff --git a/DiscImageChef/Checksums/RIPEMD160Context.cs b/DiscImageChef.Checksums/RIPEMD160Context.cs
similarity index 100%
rename from DiscImageChef/Checksums/RIPEMD160Context.cs
rename to DiscImageChef.Checksums/RIPEMD160Context.cs
diff --git a/DiscImageChef/Checksums/ReedSolomon.cs b/DiscImageChef.Checksums/ReedSolomon.cs
similarity index 99%
rename from DiscImageChef/Checksums/ReedSolomon.cs
rename to DiscImageChef.Checksums/ReedSolomon.cs
index 0f9166b6..f10e4346 100644
--- a/DiscImageChef/Checksums/ReedSolomon.cs
+++ b/DiscImageChef.Checksums/ReedSolomon.cs
@@ -443,7 +443,7 @@ namespace DiscImageChef.Checksums
                                 lambda[j] ^= Alpha_to[modnn(u + tmp)];
                         }
                     }
-                    if (MainClass.isDebug)
+                    //if (MainClass.isDebug)
                     {
                         /* find roots of the erasure location polynomial */
                         for (i = 1; i <= no_eras; i++)
@@ -572,7 +572,7 @@ namespace DiscImageChef.Checksums
                     }
                 }
 
-                if (MainClass.isDebug)
+                //if (MainClass.isDebug)
                 {
                     Console.WriteLine("\n Final error positions:\t");
                     for (i = 0; i < count; i++)
@@ -630,7 +630,7 @@ namespace DiscImageChef.Checksums
                     }
                     if (den == 0)
                     {
-                        if (MainClass.isDebug)
+                        //if (MainClass.isDebug)
                         {
                             Console.WriteLine("\n ERROR: denominator = 0\n");
                         }
diff --git a/DiscImageChef/Checksums/SHA1Context.cs b/DiscImageChef.Checksums/SHA1Context.cs
similarity index 100%
rename from DiscImageChef/Checksums/SHA1Context.cs
rename to DiscImageChef.Checksums/SHA1Context.cs
diff --git a/DiscImageChef/Checksums/SHA256Context.cs b/DiscImageChef.Checksums/SHA256Context.cs
similarity index 100%
rename from DiscImageChef/Checksums/SHA256Context.cs
rename to DiscImageChef.Checksums/SHA256Context.cs
diff --git a/DiscImageChef/Checksums/SHA384Context.cs b/DiscImageChef.Checksums/SHA384Context.cs
similarity index 100%
rename from DiscImageChef/Checksums/SHA384Context.cs
rename to DiscImageChef.Checksums/SHA384Context.cs
diff --git a/DiscImageChef/Checksums/SHA512Context.cs b/DiscImageChef.Checksums/SHA512Context.cs
similarity index 100%
rename from DiscImageChef/Checksums/SHA512Context.cs
rename to DiscImageChef.Checksums/SHA512Context.cs
diff --git a/DiscImageChef/Checksums/SpamSumContext.cs b/DiscImageChef.Checksums/SpamSumContext.cs
similarity index 100%
rename from DiscImageChef/Checksums/SpamSumContext.cs
rename to DiscImageChef.Checksums/SpamSumContext.cs
diff --git a/DiscImageChef/ArrayFill.cs b/DiscImageChef.Helpers/ArrayFill.cs
similarity index 100%
rename from DiscImageChef/ArrayFill.cs
rename to DiscImageChef.Helpers/ArrayFill.cs
diff --git a/DiscImageChef/BigEndianBitConverter.cs b/DiscImageChef.Helpers/BigEndianBitConverter.cs
similarity index 100%
rename from DiscImageChef/BigEndianBitConverter.cs
rename to DiscImageChef.Helpers/BigEndianBitConverter.cs
diff --git a/DiscImageChef.Helpers/ChangeLog b/DiscImageChef.Helpers/ChangeLog
new file mode 100644
index 00000000..cbde71e5
--- /dev/null
+++ b/DiscImageChef.Helpers/ChangeLog
@@ -0,0 +1,13 @@
+2015-10-05  Natalia Portillo  <claunia@claunia.com>
+
+	* PrintHex.cs:
+	* Swapping.cs:
+	* ArrayFill.cs:
+	* DateHandlers.cs:
+	* StringHandlers.cs:
+	* BigEndianBitConverter.cs:
+	* EndianAwareBinaryReader.cs:
+	* Properties/AssemblyInfo.cs:
+	* DiscImageChef.Helpers.csproj:
+	  Move helpers to a separate library.
+
diff --git a/DiscImageChef/DateHandlers.cs b/DiscImageChef.Helpers/DateHandlers.cs
similarity index 95%
rename from DiscImageChef/DateHandlers.cs
rename to DiscImageChef.Helpers/DateHandlers.cs
index b186b9d3..2382044c 100644
--- a/DiscImageChef/DateHandlers.cs
+++ b/DiscImageChef.Helpers/DateHandlers.cs
@@ -79,7 +79,7 @@ namespace DiscImageChef
             fourcharvalue[1] = VDDateTime[1];
             fourcharvalue[2] = VDDateTime[2];
             fourcharvalue[3] = VDDateTime[3];
-            if (MainClass.isDebug)
+            //if (MainClass.isDebug)
                 Console.WriteLine("DEBUG (ISO9600ToDateTime handler): year = \"{0}\"", StringHandlers.CToString(fourcharvalue));
             if (!Int32.TryParse(StringHandlers.CToString(fourcharvalue), out year))
                 year = 0;
@@ -87,7 +87,7 @@ namespace DiscImageChef
 			
             twocharvalue[0] = VDDateTime[4];
             twocharvalue[1] = VDDateTime[5];
-            if (MainClass.isDebug)
+            //if (MainClass.isDebug)
                 Console.WriteLine("DEBUG (ISO9600ToDateTime handler): month = \"{0}\"", StringHandlers.CToString(twocharvalue));
             if (!Int32.TryParse(StringHandlers.CToString(twocharvalue), out month))
                 month = 0;
@@ -95,7 +95,7 @@ namespace DiscImageChef
 			
             twocharvalue[0] = VDDateTime[6];
             twocharvalue[1] = VDDateTime[7];
-            if (MainClass.isDebug)
+            //if (MainClass.isDebug)
                 Console.WriteLine("DEBUG (ISO9600ToDateTime handler): day = \"{0}\"", StringHandlers.CToString(twocharvalue));
             if (!Int32.TryParse(StringHandlers.CToString(twocharvalue), out day))
                 day = 0;
@@ -103,7 +103,7 @@ namespace DiscImageChef
 			
             twocharvalue[0] = VDDateTime[8];
             twocharvalue[1] = VDDateTime[9];
-            if (MainClass.isDebug)
+            //if (MainClass.isDebug)
                 Console.WriteLine("DEBUG (ISO9600ToDateTime handler): hour = \"{0}\"", StringHandlers.CToString(twocharvalue));
             if (!Int32.TryParse(StringHandlers.CToString(twocharvalue), out hour))
                 hour = 0;
@@ -111,7 +111,7 @@ namespace DiscImageChef
 			
             twocharvalue[0] = VDDateTime[10];
             twocharvalue[1] = VDDateTime[11];
-            if (MainClass.isDebug)
+            //if (MainClass.isDebug)
                 Console.WriteLine("DEBUG (ISO9600ToDateTime handler): minute = \"{0}\"", StringHandlers.CToString(twocharvalue));
             if (!Int32.TryParse(StringHandlers.CToString(twocharvalue), out minute))
                 minute = 0;
@@ -119,7 +119,7 @@ namespace DiscImageChef
 			
             twocharvalue[0] = VDDateTime[12];
             twocharvalue[1] = VDDateTime[13];
-            if (MainClass.isDebug)
+            //if (MainClass.isDebug)
                 Console.WriteLine("DEBUG (ISO9600ToDateTime handler): second = \"{0}\"", StringHandlers.CToString(twocharvalue));
             if (!Int32.TryParse(StringHandlers.CToString(twocharvalue), out second))
                 second = 0;
@@ -127,13 +127,13 @@ namespace DiscImageChef
 			
             twocharvalue[0] = VDDateTime[14];
             twocharvalue[1] = VDDateTime[15];
-            if (MainClass.isDebug)
+            //if (MainClass.isDebug)
                 Console.WriteLine("DEBUG (ISO9600ToDateTime handler): hundredths = \"{0}\"", StringHandlers.CToString(twocharvalue));
             if (!Int32.TryParse(StringHandlers.CToString(twocharvalue), out hundredths))
                 hundredths = 0;
 //			hundredths = Convert.ToInt32(StringHandlers.CToString(twocharvalue));
 
-            if (MainClass.isDebug)
+            //if (MainClass.isDebug)
                 Console.WriteLine("DEBUG (ISO9600ToDateTime handler): decodedDT = new DateTime({0}, {1}, {2}, {3}, {4}, {5}, {6}, DateTimeKind.Unspecified);", year, month, day, hour, minute, second, hundredths * 10);
             DateTime decodedDT = new DateTime(year, month, day, hour, minute, second, hundredths * 10, DateTimeKind.Unspecified);
 			
diff --git a/DiscImageChef.Helpers/DiscImageChef.Helpers.csproj b/DiscImageChef.Helpers/DiscImageChef.Helpers.csproj
new file mode 100644
index 00000000..e424bb92
--- /dev/null
+++ b/DiscImageChef.Helpers/DiscImageChef.Helpers.csproj
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{F8BDF57B-1571-4CD0-84B3-B422088D359A}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>DiscImageChef.Helpers</RootNamespace>
+    <AssemblyName>DiscImageChef.Helpers</AssemblyName>
+    <ReleaseVersion>2.2</ReleaseVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ArrayFill.cs" />
+    <Compile Include="BigEndianBitConverter.cs" />
+    <Compile Include="DateHandlers.cs" />
+    <Compile Include="EndianAwareBinaryReader.cs" />
+    <Compile Include="PrintHex.cs" />
+    <Compile Include="StringHandlers.cs" />
+    <Compile Include="Swapping.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/DiscImageChef/EndianAwareBinaryReader.cs b/DiscImageChef.Helpers/EndianAwareBinaryReader.cs
similarity index 100%
rename from DiscImageChef/EndianAwareBinaryReader.cs
rename to DiscImageChef.Helpers/EndianAwareBinaryReader.cs
diff --git a/DiscImageChef/PrintHex.cs b/DiscImageChef.Helpers/PrintHex.cs
similarity index 100%
rename from DiscImageChef/PrintHex.cs
rename to DiscImageChef.Helpers/PrintHex.cs
diff --git a/DiscImageChef.Helpers/Properties/AssemblyInfo.cs b/DiscImageChef.Helpers/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..0b068549
--- /dev/null
+++ b/DiscImageChef.Helpers/Properties/AssemblyInfo.cs
@@ -0,0 +1,27 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following attributes.
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle("DiscImageChef.Helpers")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Claunia.com")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("© Claunia.com")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion("1.0.*")]
+
+// The following attributes are used to specify the signing key for the assembly,
+// if desired. See the Mono documentation for more information about signing.
+
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]
+
diff --git a/DiscImageChef/StringHandlers.cs b/DiscImageChef.Helpers/StringHandlers.cs
similarity index 100%
rename from DiscImageChef/StringHandlers.cs
rename to DiscImageChef.Helpers/StringHandlers.cs
diff --git a/DiscImageChef/Swapping.cs b/DiscImageChef.Helpers/Swapping.cs
similarity index 99%
rename from DiscImageChef/Swapping.cs
rename to DiscImageChef.Helpers/Swapping.cs
index 2487cd36..17767310 100644
--- a/DiscImageChef/Swapping.cs
+++ b/DiscImageChef.Helpers/Swapping.cs
@@ -40,7 +40,7 @@ using System;
 
 namespace DiscImageChef
 {
-    static class Swapping
+    public static class Swapping
     {
         public static byte[] SwapTenBytes(byte[] source)
         {
diff --git a/DiscImageChef.sln b/DiscImageChef.sln
index 2df4c38e..f84ba01c 100644
--- a/DiscImageChef.sln
+++ b/DiscImageChef.sln
@@ -7,6 +7,10 @@ Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Packages", "Packages.mdproj
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandLine35", "commandline\src\libcmdline\CommandLine35.csproj", "{5DEA2811-2FFA-4959-830B-CAD3ACACABEB}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Checksums", "DiscImageChef.Checksums\DiscImageChef.Checksums.csproj", "{CC48B324-A532-4A45-87A6-6F91F7141E8D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Helpers", "DiscImageChef.Helpers\DiscImageChef.Helpers.csproj", "{F8BDF57B-1571-4CD0-84B3-B422088D359A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
@@ -23,9 +27,16 @@ Global
 		{7A4B05BE-73C9-4F34-87FE-E80CCF1F732D}.Release|x86.Build.0 = Release|x86
 		{8996EF59-09B9-4920-A3DE-2F8EA2EBBCFF}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{8996EF59-09B9-4920-A3DE-2F8EA2EBBCFF}.Release|x86.ActiveCfg = Release|Any CPU
+		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Debug|x86.Build.0 = Debug|Any CPU
+		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Release|x86.ActiveCfg = Release|Any CPU
+		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Release|x86.Build.0 = Release|Any CPU
+		{F8BDF57B-1571-4CD0-84B3-B422088D359A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F8BDF57B-1571-4CD0-84B3-B422088D359A}.Debug|x86.Build.0 = Debug|Any CPU
+		{F8BDF57B-1571-4CD0-84B3-B422088D359A}.Release|x86.ActiveCfg = Release|Any CPU
+		{F8BDF57B-1571-4CD0-84B3-B422088D359A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = DiscImageChef\DiscImageChef.csproj
 		description = The Disc Image Chef.
 		version = 2.2
 	EndGlobalSection
diff --git a/DiscImageChef/ChangeLog b/DiscImageChef/ChangeLog
index 8e5d4850..7df451da 100644
--- a/DiscImageChef/ChangeLog
+++ b/DiscImageChef/ChangeLog
@@ -1,3 +1,31 @@
+2015-10-05  Natalia Portillo  <claunia@claunia.com>
+
+	* Swapping.cs:
+	* PrintHex.cs:
+	* ArrayFill.cs:
+	* DateHandlers.cs:
+	* StringHandlers.cs:
+	* DiscImageChef.csproj:
+	* BigEndianBitConverter.cs:
+	* EndianAwareBinaryReader.cs:
+	  Move helpers to a separate library.
+
+	* Checksums/MD5Context.cs:
+	* Checksums/ReedSolomon.cs:
+	* Checksums/SHA1Context.cs:
+	* Checksums/CDChecksums.cs:
+	* Checksums/CRC32Context.cs:
+	* Checksums/CRC16Context.cs:
+	* Checksums/CRC64Context.cs:
+	* Checksums/SHA512Context.cs:
+	* Checksums/SHA384Context.cs:
+	* Checksums/SHA256Context.cs:
+	* Checksums/Adler32Context.cs:
+	* Checksums/SpamSumContext.cs:
+	* Checksums/FletcherContext.cs:
+	* Checksums/RIPEMD160Context.cs:
+	  Move checksums to a separate library.
+
 2015-08-25  Natalia Portillo  <claunia@claunia.com>
 
 	* Decoders/Floppy.cs:
diff --git a/DiscImageChef/DiscImageChef.csproj b/DiscImageChef/DiscImageChef.csproj
index fd5bf046..ed24ec73 100644
--- a/DiscImageChef/DiscImageChef.csproj
+++ b/DiscImageChef/DiscImageChef.csproj
@@ -40,7 +40,6 @@
     <Compile Include="Main.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="Plugins\AppleMFS.cs" />
-    <Compile Include="Swapping.cs" />
     <Compile Include="Plugins\Plugin.cs" />
     <Compile Include="Plugins.cs" />
     <Compile Include="Plugins\ISO9660.cs" />
@@ -61,21 +60,15 @@
     <Compile Include="Plugins\Symbian.cs" />
     <Compile Include="Plugins\extFS.cs" />
     <Compile Include="Plugins\ext2FS.cs" />
-    <Compile Include="DateHandlers.cs" />
-    <Compile Include="EndianAwareBinaryReader.cs" />
-    <Compile Include="StringHandlers.cs" />
     <Compile Include="Plugins\MinixFS.cs" />
     <Compile Include="Plugins\SolarFS.cs" />
     <Compile Include="Plugins\UNIXBFS.cs" />
     <Compile Include="Plugins\SysV.cs" />
     <Compile Include="ImagePlugins\ImagePlugin.cs" />
     <Compile Include="ImagePlugins\CDRWin.cs" />
-    <Compile Include="BigEndianBitConverter.cs" />
     <Compile Include="ImagePlugins\DiskCopy42.cs" />
     <Compile Include="Plugins\LisaFS.cs" />
     <Compile Include="ImagePlugins\TeleDisk.cs" />
-    <Compile Include="ArrayFill.cs" />
-    <Compile Include="PrintHex.cs" />
     <Compile Include="ImagePlugins\ZZZRawImage.cs" />
     <Compile Include="Options.cs" />
     <Compile Include="Commands\Formats.cs" />
@@ -86,18 +79,7 @@
     <Compile Include="Commands\Commands.cs" />
     <Compile Include="ImagePlugins\DetectImageFormat.cs" />
     <Compile Include="ImagePlugins\ImageInfo.cs" />
-    <Compile Include="Checksums\MD5Context.cs" />
-    <Compile Include="Checksums\RIPEMD160Context.cs" />
-    <Compile Include="Checksums\SHA1Context.cs" />
-    <Compile Include="Checksums\SHA256Context.cs" />
-    <Compile Include="Checksums\SHA384Context.cs" />
-    <Compile Include="Checksums\SHA512Context.cs" />
-    <Compile Include="Checksums\CRC32Context.cs" />
-    <Compile Include="Checksums\CRC64Context.cs" />
     <Compile Include="ImagePlugins\Nero.cs" />
-    <Compile Include="Checksums\CRC16Context.cs" />
-    <Compile Include="Checksums\CDChecksums.cs" />
-    <Compile Include="Checksums\ReedSolomon.cs" />
     <Compile Include="Commands\PrintHex.cs" />
     <Compile Include="Commands\Decode.cs" />
     <Compile Include="Decoders\SCSI.cs" />
@@ -106,9 +88,6 @@
     <Compile Include="Decoders\BD.cs" />
     <Compile Include="Decoders\DVD.cs" />
     <Compile Include="Plugins\ProDOS.cs" />
-    <Compile Include="Checksums\Adler32Context.cs" />
-    <Compile Include="Checksums\FletcherContext.cs" />
-    <Compile Include="Checksums\SpamSumContext.cs" />
     <Compile Include="ImagePlugins\Apple2MG.cs" />
     <Compile Include="PartPlugins\RDB.cs" />
     <Compile Include="Plugins\AmigaDOS.cs" />
@@ -213,5 +192,13 @@
       <Project>{5DEA2811-2FFA-4959-830B-CAD3ACACABEB}</Project>
       <Name>CommandLine35</Name>
     </ProjectReference>
+    <ProjectReference Include="..\DiscImageChef.Checksums\DiscImageChef.Checksums.csproj">
+      <Project>{CC48B324-A532-4A45-87A6-6F91F7141E8D}</Project>
+      <Name>DiscImageChef.Checksums</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\DiscImageChef.Helpers\DiscImageChef.Helpers.csproj">
+      <Project>{F8BDF57B-1571-4CD0-84B3-B422088D359A}</Project>
+      <Name>DiscImageChef.Helpers</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>
\ No newline at end of file