diff --git a/SharpCompress/Common/SevenZip/ArchiveReader.cs b/SharpCompress/Common/SevenZip/ArchiveReader.cs
index 630cb876..630a2b2b 100644
--- a/SharpCompress/Common/SevenZip/ArchiveReader.cs
+++ b/SharpCompress/Common/SevenZip/ArchiveReader.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using SharpCompress.Compressor.LZMA;
 using SharpCompress.Compressor.LZMA.Utilites;
 using SharpCompress.IO;
-using CRC = ManagedLzma.LZMA.Master.SevenZip.CRC;
+using CRC = SharpCompress.Compressor.LZMA.CRC;
 
 namespace SharpCompress.Common.SevenZip
 {
diff --git a/SharpCompress/Common/SevenZip/CFolder.cs b/SharpCompress/Common/SevenZip/CFolder.cs
index 3394a755..8613a750 100644
--- a/SharpCompress/Common/SevenZip/CFolder.cs
+++ b/SharpCompress/Common/SevenZip/CFolder.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using ManagedLzma.LZMA.Master.SevenZip;
 using SharpCompress.Compressor.LZMA;
 
 namespace SharpCompress.Common.SevenZip
diff --git a/SharpCompress/Compressor/LZMA/CRC.cs b/SharpCompress/Compressor/LZMA/CRC.cs
index 4b4f9f11..20f74024 100644
--- a/SharpCompress/Compressor/LZMA/CRC.cs
+++ b/SharpCompress/Compressor/LZMA/CRC.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace ManagedLzma.LZMA.Master.SevenZip
+namespace SharpCompress.Compressor.LZMA
 {
     internal static class CRC
     {
diff --git a/SharpCompress/Compressor/LZMA/CRC2.cs b/SharpCompress/Compressor/LZMA/LZ/CRC.cs
similarity index 93%
rename from SharpCompress/Compressor/LZMA/CRC2.cs
rename to SharpCompress/Compressor/LZMA/LZ/CRC.cs
index d7bac3c2..1ab52e13 100644
--- a/SharpCompress/Compressor/LZMA/CRC2.cs
+++ b/SharpCompress/Compressor/LZMA/LZ/CRC.cs
@@ -1,4 +1,4 @@
-namespace SharpCompress.Compressor.LZMA
+namespace SharpCompress.Compressor.LZMA.LZ
 {
     internal class CRC
     {
diff --git a/SharpCompress/Compressor/LZMA/Utilites/CrcBuilderStream.cs b/SharpCompress/Compressor/LZMA/Utilites/CrcBuilderStream.cs
index 97f0f882..b4b44483 100644
--- a/SharpCompress/Compressor/LZMA/Utilites/CrcBuilderStream.cs
+++ b/SharpCompress/Compressor/LZMA/Utilites/CrcBuilderStream.cs
@@ -13,7 +13,7 @@ namespace SharpCompress.Compressor.LZMA.Utilites
         public CrcBuilderStream(Stream target)
         {
             mTarget = target;
-            mCRC = ManagedLzma.LZMA.Master.SevenZip.CRC.kInitCRC;
+            mCRC = CRC.kInitCRC;
         }
 
         public long Processed
@@ -26,7 +26,7 @@ namespace SharpCompress.Compressor.LZMA.Utilites
             if(!mFinished)
             {
                 mFinished = true;
-                mCRC = ManagedLzma.LZMA.Master.SevenZip.CRC.Finish(mCRC);
+                mCRC = CRC.Finish(mCRC);
             }
 
             return mCRC;
@@ -83,7 +83,7 @@ namespace SharpCompress.Compressor.LZMA.Utilites
                 throw new InvalidOperationException("CRC calculation has been finished.");
 
             mProcessed += count;
-            mCRC = ManagedLzma.LZMA.Master.SevenZip.CRC.Update(mCRC, buffer, offset, count);
+            mCRC = CRC.Update(mCRC, buffer, offset, count);
             mTarget.Write(buffer, offset, count);
         }
     }
@@ -98,7 +98,7 @@ namespace SharpCompress.Compressor.LZMA.Utilites
         public ReadingCrcBuilderStream(Stream source)
         {
             mSource = source;
-            mCRC = ManagedLzma.LZMA.Master.SevenZip.CRC.kInitCRC;
+            mCRC = CRC.kInitCRC;
         }
 
         protected override void Dispose(bool disposing)
@@ -124,7 +124,7 @@ namespace SharpCompress.Compressor.LZMA.Utilites
             if(!mFinished)
             {
                 mFinished = true;
-                mCRC = ManagedLzma.LZMA.Master.SevenZip.CRC.Finish(mCRC);
+                mCRC = CRC.Finish(mCRC);
             }
 
             return mCRC;
@@ -169,7 +169,7 @@ namespace SharpCompress.Compressor.LZMA.Utilites
                 if(read > 0)
                 {
                     mProcessed += read;
-                    mCRC = ManagedLzma.LZMA.Master.SevenZip.CRC.Update(mCRC, buffer, offset, read);
+                    mCRC = CRC.Update(mCRC, buffer, offset, read);
                     return read;
                 }
 
diff --git a/SharpCompress/Compressor/LZMA/Utilites/CrcCheckStream.cs b/SharpCompress/Compressor/LZMA/Utilites/CrcCheckStream.cs
index 32ca0913..1c9b09f9 100644
--- a/SharpCompress/Compressor/LZMA/Utilites/CrcCheckStream.cs
+++ b/SharpCompress/Compressor/LZMA/Utilites/CrcCheckStream.cs
@@ -15,7 +15,7 @@ namespace SharpCompress.Compressor.LZMA.Utilites
         public CrcCheckStream(uint crc)
         {
             mExpectedCRC = crc;
-            mCurrentCRC = ManagedLzma.LZMA.Master.SevenZip.CRC.kInitCRC;
+            mCurrentCRC = CRC.kInitCRC;
         }
 
         protected override void Dispose(bool disposing)
@@ -27,7 +27,7 @@ namespace SharpCompress.Compressor.LZMA.Utilites
                 if(disposing && !mClosed)
                 {
                     mClosed = true;
-                    mCurrentCRC = ManagedLzma.LZMA.Master.SevenZip.CRC.Finish(mCurrentCRC);
+                    mCurrentCRC = CRC.Finish(mCurrentCRC);
 #if DEBUG
                     if(mCurrentCRC == mExpectedCRC)
                         System.Diagnostics.Debug.WriteLine("CRC ok: " + mExpectedCRC.ToString("x8"));
@@ -108,7 +108,7 @@ namespace SharpCompress.Compressor.LZMA.Utilites
             for(int i = 0; i < count; i++)
                 mBytes[buffer[offset + i]]++;
 
-            mCurrentCRC = ManagedLzma.LZMA.Master.SevenZip.CRC.Update(mCurrentCRC, buffer, offset, count);
+            mCurrentCRC = CRC.Update(mCurrentCRC, buffer, offset, count);
         }
     }
 }
diff --git a/SharpCompress/SharpCompress.3.5.csproj b/SharpCompress/SharpCompress.3.5.csproj
index c034d158..659a38e0 100644
--- a/SharpCompress/SharpCompress.3.5.csproj
+++ b/SharpCompress/SharpCompress.3.5.csproj
@@ -196,12 +196,12 @@
     <Compile Include="Compressor\LZMA\Bcj2DecoderStream.cs" />
     <Compile Include="Compressor\LZMA\BitVector.cs" />
     <Compile Include="Compressor\LZMA\CRC.cs" />
-    <Compile Include="Compressor\LZMA\CRC2.cs" />
     <Compile Include="Compressor\LZMA\DecoderStream.cs" />
     <Compile Include="Compressor\LZMA\ICoder.cs" />
     <Compile Include="Compressor\LZMA\Log.cs" />
     <Compile Include="Compressor\LZMA\LzmaEncoderProperties.cs" />
     <Compile Include="Compressor\LZMA\LzmaStream.cs" />
+    <Compile Include="Compressor\LZMA\LZ\CRC.cs" />
     <Compile Include="Compressor\LZMA\LZ\LzBinTree.cs" />
     <Compile Include="Compressor\LZMA\LZ\LzInWindow.cs" />
     <Compile Include="Compressor\LZMA\LzmaBase.cs" />
diff --git a/SharpCompress/SharpCompress.Silverlight.csproj b/SharpCompress/SharpCompress.Silverlight.csproj
index a806eecd..ff9bdf90 100644
--- a/SharpCompress/SharpCompress.Silverlight.csproj
+++ b/SharpCompress/SharpCompress.Silverlight.csproj
@@ -210,12 +210,12 @@
     <Compile Include="Compressor\LZMA\Bcj2DecoderStream.cs" />
     <Compile Include="Compressor\LZMA\BitVector.cs" />
     <Compile Include="Compressor\LZMA\CRC.cs" />
-    <Compile Include="Compressor\LZMA\CRC2.cs" />
     <Compile Include="Compressor\LZMA\DecoderStream.cs" />
     <Compile Include="Compressor\LZMA\ICoder.cs" />
     <Compile Include="Compressor\LZMA\Log.cs" />
     <Compile Include="Compressor\LZMA\LzmaEncoderProperties.cs" />
     <Compile Include="Compressor\LZMA\LzmaStream.cs" />
+    <Compile Include="Compressor\LZMA\LZ\CRC.cs" />
     <Compile Include="Compressor\LZMA\LZ\LzBinTree.cs" />
     <Compile Include="Compressor\LZMA\LZ\LzInWindow.cs" />
     <Compile Include="Compressor\LZMA\LzmaBase.cs" />
diff --git a/SharpCompress/SharpCompress.WP7.csproj b/SharpCompress/SharpCompress.WP7.csproj
index d25a606f..ddaa5cd5 100644
--- a/SharpCompress/SharpCompress.WP7.csproj
+++ b/SharpCompress/SharpCompress.WP7.csproj
@@ -179,12 +179,12 @@
     <Compile Include="Compressor\LZMA\Bcj2DecoderStream.cs" />
     <Compile Include="Compressor\LZMA\BitVector.cs" />
     <Compile Include="Compressor\LZMA\CRC.cs" />
-    <Compile Include="Compressor\LZMA\CRC2.cs" />
     <Compile Include="Compressor\LZMA\DecoderStream.cs" />
     <Compile Include="Compressor\LZMA\ICoder.cs" />
     <Compile Include="Compressor\LZMA\Log.cs" />
     <Compile Include="Compressor\LZMA\LzmaEncoderProperties.cs" />
     <Compile Include="Compressor\LZMA\LzmaStream.cs" />
+    <Compile Include="Compressor\LZMA\LZ\CRC.cs" />
     <Compile Include="Compressor\LZMA\LZ\LzBinTree.cs" />
     <Compile Include="Compressor\LZMA\LZ\LzInWindow.cs" />
     <Compile Include="Compressor\LZMA\LzmaBase.cs" />
diff --git a/SharpCompress/SharpCompress.csproj b/SharpCompress/SharpCompress.csproj
index fe59c9e9..a93a9b61 100644
--- a/SharpCompress/SharpCompress.csproj
+++ b/SharpCompress/SharpCompress.csproj
@@ -172,7 +172,7 @@
     <Compile Include="Compressor\LZMA\BitVector.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Compressor\LZMA\CRC2.cs" />
+    <Compile Include="Compressor\LZMA\LZ\CRC.cs" />
     <Compile Include="Compressor\LZMA\CRC.cs" />
     <Compile Include="Common\SevenZip\ArchiveDatabase.cs" />
     <Compile Include="Common\SevenZip\ArchiveReader.cs" />