diff --git a/7zip/Common/CRC.cs b/7zip/Common/CRC.cs
index fe51f6c..668b491 100644
--- a/7zip/Common/CRC.cs
+++ b/7zip/Common/CRC.cs
@@ -2,7 +2,7 @@
 
 namespace SevenZip
 {
-    class CRC
+    internal class CRC
     {
         public static readonly uint[] Table;
 
@@ -14,42 +14,51 @@ namespace SevenZip
             {
                 uint r = i;
                 for (int j = 0; j < 8; j++)
+                {
                     if ((r & 1) != 0)
+                    {
                         r = (r >> 1) ^ kPoly;
+                    }
                     else
+                    {
                         r >>= 1;
+                    }
+                }
+
                 Table[i] = r;
             }
         }
 
-        uint _value = 0xFFFFFFFF;
+        private uint _value = 0xFFFFFFFF;
 
         public void Init() { _value = 0xFFFFFFFF; }
 
         public void UpdateByte(byte b)
         {
-            _value = Table[(((byte)(_value)) ^ b)] ^ (_value >> 8);
+            _value = Table[((byte)(_value)) ^ b] ^ (_value >> 8);
         }
 
         public void Update(byte[] data, uint offset, uint size)
         {
             for (uint i = 0; i < size; i++)
-                _value = Table[(((byte)(_value)) ^ data[offset + i])] ^ (_value >> 8);
+            {
+                _value = Table[((byte)(_value)) ^ data[offset + i]] ^ (_value >> 8);
+            }
         }
 
         public uint GetDigest() { return _value ^ 0xFFFFFFFF; }
 
-        static uint CalculateDigest(byte[] data, uint offset, uint size)
+        private static uint CalculateDigest(byte[] data, uint offset, uint size)
         {
-            CRC crc = new CRC();
+            CRC crc = new();
             // crc.Init();
             crc.Update(data, offset, size);
             return crc.GetDigest();
         }
 
-        static bool VerifyDigest(uint digest, byte[] data, uint offset, uint size)
+        private static bool VerifyDigest(uint digest, byte[] data, uint offset, uint size)
         {
-            return (CalculateDigest(data, offset, size) == digest);
+            return CalculateDigest(data, offset, size) == digest;
         }
     }
 }
diff --git a/7zip/Common/CommandLineParser.cs b/7zip/Common/CommandLineParser.cs
index 8c82ed8..c1134fe 100644
--- a/7zip/Common/CommandLineParser.cs
+++ b/7zip/Common/CommandLineParser.cs
@@ -47,7 +47,7 @@ namespace SevenZip.CommandLineParser
     {
         public bool ThereIs;
         public bool WithMinus;
-        public ArrayList PostStrings = new ArrayList();
+        public ArrayList PostStrings = new();
         public int PostCharIndex;
         public SwitchResult()
         {
@@ -57,28 +57,39 @@ namespace SevenZip.CommandLineParser
 
     public class Parser
     {
-        public ArrayList NonSwitchStrings = new ArrayList();
-        SwitchResult[] _switches;
+        public ArrayList NonSwitchStrings = new();
+        private readonly SwitchResult[] _switches;
 
         public Parser(int numSwitches)
         {
             _switches = new SwitchResult[numSwitches];
             for (int i = 0; i < numSwitches; i++)
+            {
                 _switches[i] = new SwitchResult();
+            }
         }
 
-        bool ParseString(string srcString, SwitchForm[] switchForms)
+        private bool ParseString(string srcString, SwitchForm[] switchForms)
         {
             int len = srcString.Length;
             if (len == 0)
+            {
                 return false;
+            }
+
             int pos = 0;
             if (!IsItSwitchChar(srcString[pos]))
+            {
                 return false;
+            }
+
             while (pos < len)
             {
                 if (IsItSwitchChar(srcString[pos]))
+                {
                     pos++;
+                }
+
                 const int kNoLen = -1;
                 int matchedSwitchIndex = 0;
                 int maxLen = kNoLen;
@@ -86,7 +97,10 @@ namespace SevenZip.CommandLineParser
                 {
                     int switchLen = switchForms[switchIndex].IDString.Length;
                     if (switchLen <= maxLen || pos + switchLen > len)
+                    {
                         continue;
+                    }
+
                     if (String.Compare(switchForms[switchIndex].IDString, 0,
                             srcString, pos, switchLen, true) == 0)
                     {
@@ -95,11 +109,17 @@ namespace SevenZip.CommandLineParser
                     }
                 }
                 if (maxLen == kNoLen)
+                {
                     throw new Exception("maxLen == kNoLen");
+                }
+
                 SwitchResult matchedSwitch = _switches[matchedSwitchIndex];
                 SwitchForm switchForm = switchForms[matchedSwitchIndex];
                 if ((!switchForm.Multi) && matchedSwitch.ThereIs)
+                {
                     throw new Exception("switch must be single");
+                }
+
                 matchedSwitch.ThereIs = true;
                 pos += maxLen;
                 int tailSize = len - pos;
@@ -109,28 +129,39 @@ namespace SevenZip.CommandLineParser
                     case SwitchType.PostMinus:
                         {
                             if (tailSize == 0)
+                            {
                                 matchedSwitch.WithMinus = false;
+                            }
                             else
                             {
                                 matchedSwitch.WithMinus = (srcString[pos] == kSwitchMinus);
                                 if (matchedSwitch.WithMinus)
+                                {
                                     pos++;
+                                }
                             }
                             break;
                         }
                     case SwitchType.PostChar:
                         {
                             if (tailSize < switchForm.MinLen)
+                            {
                                 throw new Exception("switch is not full");
+                            }
+
                             string charSet = switchForm.PostCharSet;
                             const int kEmptyCharValue = -1;
                             if (tailSize == 0)
+                            {
                                 matchedSwitch.PostCharIndex = kEmptyCharValue;
+                            }
                             else
                             {
                                 int index = charSet.IndexOf(srcString[pos]);
                                 if (index < 0)
+                                {
                                     matchedSwitch.PostCharIndex = kEmptyCharValue;
+                                }
                                 else
                                 {
                                     matchedSwitch.PostCharIndex = index;
@@ -144,10 +175,13 @@ namespace SevenZip.CommandLineParser
                         {
                             int minLen = switchForm.MinLen;
                             if (tailSize < minLen)
+                            {
                                 throw new Exception("switch is not full");
+                            }
+
                             if (type == SwitchType.UnLimitedPostString)
                             {
-                                matchedSwitch.PostStrings.Add(srcString.Substring(pos));
+                                matchedSwitch.PostStrings.Add(srcString[pos..]);
                                 return true;
                             }
                             String stringSwitch = srcString.Substring(pos, minLen);
@@ -156,7 +190,10 @@ namespace SevenZip.CommandLineParser
                             {
                                 char c = srcString[pos];
                                 if (IsItSwitchChar(c))
+                                {
                                     break;
+                                }
+
                                 stringSwitch += c;
                             }
                             matchedSwitch.PostStrings.Add(stringSwitch);
@@ -165,7 +202,6 @@ namespace SevenZip.CommandLineParser
                 }
             }
             return true;
-
         }
 
         public void ParseStrings(SwitchForm[] switchForms, string[] commandStrings)
@@ -176,13 +212,19 @@ namespace SevenZip.CommandLineParser
             {
                 string s = commandStrings[i];
                 if (stopSwitch)
+                {
                     NonSwitchStrings.Add(s);
+                }
                 else
                     if (s == kStopSwitchParsing)
+                {
                     stopSwitch = true;
+                }
                 else
                     if (!ParseString(s, switchForms))
+                {
                     NonSwitchStrings.Add(s);
+                }
             }
         }
 
@@ -198,7 +240,7 @@ namespace SevenZip.CommandLineParser
                 {
                     if (commandString.IndexOf(id) == 0)
                     {
-                        postString = commandString.Substring(id.Length);
+                        postString = commandString[id.Length..];
                         return i;
                     }
                 }
@@ -213,7 +255,7 @@ namespace SevenZip.CommandLineParser
             return -1;
         }
 
-        static bool ParseSubCharsCommand(int numForms, CommandSubCharsSet[] forms,
+        private static bool ParseSubCharsCommand(int numForms, CommandSubCharsSet[] forms,
             string commandString, ArrayList indices)
         {
             indices.Clear();
@@ -230,28 +272,37 @@ namespace SevenZip.CommandLineParser
                     if (newIndex >= 0)
                     {
                         if (currentIndex >= 0)
+                        {
                             return false;
+                        }
+
                         if (commandString.IndexOf(c, newIndex + 1) >= 0)
+                        {
                             return false;
+                        }
+
                         currentIndex = j;
                         numUsedChars++;
                     }
                 }
                 if (currentIndex == -1 && !charsSet.EmptyAllowed)
+                {
                     return false;
+                }
+
                 indices.Add(currentIndex);
             }
-            return (numUsedChars == commandString.Length);
+            return numUsedChars == commandString.Length;
         }
-        const char kSwitchID1 = '-';
-        const char kSwitchID2 = '/';
+        private const char kSwitchID1 = '-';
+        private const char kSwitchID2 = '/';
 
-        const char kSwitchMinus = '-';
-        const string kStopSwitchParsing = "--";
+        private const char kSwitchMinus = '-';
+        private const string kStopSwitchParsing = "--";
 
-        static bool IsItSwitchChar(char c)
+        private static bool IsItSwitchChar(char c)
         {
-            return (c == kSwitchID1 || c == kSwitchID2);
+            return c == kSwitchID1 || c == kSwitchID2;
         }
     }
 
@@ -266,7 +317,7 @@ namespace SevenZip.CommandLineParser
         }
     }
 
-    class CommandSubCharsSet
+    internal class CommandSubCharsSet
     {
         public string Chars = "";
         public bool EmptyAllowed = false;
diff --git a/7zip/Common/InBuffer.cs b/7zip/Common/InBuffer.cs
index 773f0a6..2c56d2e 100644
--- a/7zip/Common/InBuffer.cs
+++ b/7zip/Common/InBuffer.cs
@@ -4,13 +4,13 @@ namespace SevenZip.Buffer
 {
     public class InBuffer
     {
-        byte[] m_Buffer;
-        uint m_Pos;
-        uint m_Limit;
-        uint m_BufferSize;
-        System.IO.Stream m_Stream;
-        bool m_StreamWasExhausted;
-        ulong m_ProcessedSize;
+        private readonly byte[] m_Buffer;
+        private uint m_Pos;
+        private uint m_Limit;
+        private readonly uint m_BufferSize;
+        private System.IO.Stream m_Stream;
+        private bool m_StreamWasExhausted;
+        private ulong m_ProcessedSize;
 
         public InBuffer(uint bufferSize)
         {
@@ -30,16 +30,18 @@ namespace SevenZip.Buffer
         public bool ReadBlock()
         {
             if (m_StreamWasExhausted)
+            {
                 return false;
+            }
+
             m_ProcessedSize += m_Pos;
             int aNumProcessedBytes = m_Stream.Read(m_Buffer, 0, (int)m_BufferSize);
             m_Pos = 0;
             m_Limit = (uint)aNumProcessedBytes;
             m_StreamWasExhausted = (aNumProcessedBytes == 0);
-            return (!m_StreamWasExhausted);
+            return !m_StreamWasExhausted;
         }
 
-
         public void ReleaseStream()
         {
             // m_Stream.Close(); 
@@ -49,8 +51,13 @@ namespace SevenZip.Buffer
         public bool ReadByte(byte b) // check it
         {
             if (m_Pos >= m_Limit)
+            {
                 if (!ReadBlock())
+                {
                     return false;
+                }
+            }
+
             b = m_Buffer[m_Pos++];
             return true;
         }
@@ -59,8 +66,13 @@ namespace SevenZip.Buffer
         {
             // return (byte)m_Stream.ReadByte();
             if (m_Pos >= m_Limit)
+            {
                 if (!ReadBlock())
+                {
                     return 0xFF;
+                }
+            }
+
             return m_Buffer[m_Pos++];
         }
 
diff --git a/7zip/Common/OutBuffer.cs b/7zip/Common/OutBuffer.cs
index a4378ea..a9657df 100644
--- a/7zip/Common/OutBuffer.cs
+++ b/7zip/Common/OutBuffer.cs
@@ -4,11 +4,11 @@ namespace SevenZip.Buffer
 {
     public class OutBuffer
     {
-        byte[] m_Buffer;
-        uint m_Pos;
-        uint m_BufferSize;
-        System.IO.Stream m_Stream;
-        ulong m_ProcessedSize;
+        private readonly byte[] m_Buffer;
+        private uint m_Pos;
+        private readonly uint m_BufferSize;
+        private System.IO.Stream m_Stream;
+        private ulong m_ProcessedSize;
 
         public OutBuffer(uint bufferSize)
         {
@@ -31,13 +31,18 @@ namespace SevenZip.Buffer
         {
             m_Buffer[m_Pos++] = b;
             if (m_Pos >= m_BufferSize)
+            {
                 FlushData();
+            }
         }
 
         public void FlushData()
         {
             if (m_Pos == 0)
+            {
                 return;
+            }
+
             m_Stream.Write(m_Buffer, 0, (int)m_Pos);
             m_Pos = 0;
         }
diff --git a/7zip/Compress/LZ/IMatchFinder.cs b/7zip/Compress/LZ/IMatchFinder.cs
index d484fe8..e0ebbd8 100644
--- a/7zip/Compress/LZ/IMatchFinder.cs
+++ b/7zip/Compress/LZ/IMatchFinder.cs
@@ -4,7 +4,7 @@ using System;
 
 namespace SevenZip.Compression.LZ
 {
-    interface IInWindowStream
+    internal interface IInWindowStream
     {
         void SetStream(System.IO.Stream inStream);
         void Init();
@@ -14,7 +14,7 @@ namespace SevenZip.Compression.LZ
         UInt32 GetNumAvailableBytes();
     }
 
-    interface IMatchFinder : IInWindowStream
+    internal interface IMatchFinder : IInWindowStream
     {
         void Create(UInt32 historySize, UInt32 keepAddBufferBefore,
                 UInt32 matchMaxLen, UInt32 keepAddBufferAfter);
diff --git a/7zip/Compress/LZ/LzBinTree.cs b/7zip/Compress/LZ/LzBinTree.cs
index dfc09a6..93dfd0e 100644
--- a/7zip/Compress/LZ/LzBinTree.cs
+++ b/7zip/Compress/LZ/LzBinTree.cs
@@ -6,30 +6,30 @@ namespace SevenZip.Compression.LZ
 {
     public class BinTree : InWindow, IMatchFinder
     {
-        UInt32 _cyclicBufferPos;
-        UInt32 _cyclicBufferSize = 0;
-        UInt32 _matchMaxLen;
+        private UInt32 _cyclicBufferPos;
+        private UInt32 _cyclicBufferSize = 0;
+        private UInt32 _matchMaxLen;
 
-        UInt32[] _son;
-        UInt32[] _hash;
+        private UInt32[] _son;
+        private UInt32[] _hash;
 
-        UInt32 _cutValue = 0xFF;
-        UInt32 _hashMask;
-        UInt32 _hashSizeSum = 0;
+        private UInt32 _cutValue = 0xFF;
+        private UInt32 _hashMask;
+        private UInt32 _hashSizeSum = 0;
 
-        bool HASH_ARRAY = true;
+        private bool HASH_ARRAY = true;
 
-        const UInt32 kHash2Size = 1 << 10;
-        const UInt32 kHash3Size = 1 << 16;
-        const UInt32 kBT2HashSize = 1 << 16;
-        const UInt32 kStartMaxLen = 1;
-        const UInt32 kHash3Offset = kHash2Size;
-        const UInt32 kEmptyHashValue = 0;
-        const UInt32 kMaxValForNormalize = ((UInt32)1 << 31) - 1;
+        private const UInt32 kHash2Size = 1 << 10;
+        private const UInt32 kHash3Size = 1 << 16;
+        private const UInt32 kBT2HashSize = 1 << 16;
+        private const UInt32 kStartMaxLen = 1;
+        private const UInt32 kHash3Offset = kHash2Size;
+        private const UInt32 kEmptyHashValue = 0;
+        private const UInt32 kMaxValForNormalize = ((UInt32)1 << 31) - 1;
 
-        UInt32 kNumHashDirectBytes = 0;
-        UInt32 kMinMatchCheck = 4;
-        UInt32 kFixHashSize = kHash2Size + kHash3Size;
+        private UInt32 kNumHashDirectBytes = 0;
+        private UInt32 kMinMatchCheck = 4;
+        private UInt32 kFixHashSize = kHash2Size + kHash3Size;
 
         public void SetType(int numHashBytes)
         {
@@ -55,7 +55,10 @@ namespace SevenZip.Compression.LZ
         {
             base.Init();
             for (UInt32 i = 0; i < _hashSizeSum; i++)
+            {
                 _hash[i] = kEmptyHashValue;
+            }
+
             _cyclicBufferPos = 0;
             ReduceOffsets(-1);
         }
@@ -63,10 +66,15 @@ namespace SevenZip.Compression.LZ
         public new void MovePos()
         {
             if (++_cyclicBufferPos >= _cyclicBufferSize)
+            {
                 _cyclicBufferPos = 0;
+            }
+
             base.MovePos();
             if (_pos == kMaxValForNormalize)
+            {
                 Normalize();
+            }
         }
 
         public new Byte GetIndexByte(Int32 index) { return base.GetIndexByte(index); }
@@ -80,11 +88,14 @@ namespace SevenZip.Compression.LZ
                 UInt32 matchMaxLen, UInt32 keepAddBufferAfter)
         {
             if (historySize > kMaxValForNormalize - 256)
+            {
                 throw new Exception();
+            }
+
             _cutValue = 16 + (matchMaxLen >> 1);
 
-            UInt32 windowReservSize = (historySize + keepAddBufferBefore +
-                    matchMaxLen + keepAddBufferAfter) / 2 + 256;
+            UInt32 windowReservSize = ((historySize + keepAddBufferBefore +
+                    matchMaxLen + keepAddBufferAfter) / 2) + 256;
 
             base.Create(historySize + keepAddBufferBefore, matchMaxLen + keepAddBufferAfter, windowReservSize);
 
@@ -92,7 +103,9 @@ namespace SevenZip.Compression.LZ
 
             UInt32 cyclicBufferSize = historySize + 1;
             if (_cyclicBufferSize != cyclicBufferSize)
+            {
                 _son = new UInt32[(_cyclicBufferSize = cyclicBufferSize) * 2];
+            }
 
             UInt32 hs = kBT2HashSize;
 
@@ -106,20 +119,27 @@ namespace SevenZip.Compression.LZ
                 hs >>= 1;
                 hs |= 0xFFFF;
                 if (hs > (1 << 24))
+                {
                     hs >>= 1;
+                }
+
                 _hashMask = hs;
                 hs++;
                 hs += kFixHashSize;
             }
             if (hs != _hashSizeSum)
+            {
                 _hash = new UInt32[_hashSizeSum = hs];
+            }
         }
 
         public UInt32 GetMatches(UInt32[] distances)
         {
             UInt32 lenLimit;
             if (_pos + _matchMaxLen <= _streamPos)
+            {
                 lenLimit = _matchMaxLen;
+            }
             else
             {
                 lenLimit = _streamPos - _pos;
@@ -145,7 +165,9 @@ namespace SevenZip.Compression.LZ
                 hashValue = (temp ^ (CRC.Table[_bufferBase[cur + 3]] << 5)) & _hashMask;
             }
             else
+            {
                 hashValue = _bufferBase[cur] ^ ((UInt32)(_bufferBase[cur + 1]) << 8);
+            }
 
             UInt32 curMatch = _hash[kFixHashSize + hashValue];
             if (HASH_ARRAY)
@@ -155,20 +177,29 @@ namespace SevenZip.Compression.LZ
                 _hash[hash2Value] = _pos;
                 _hash[kHash3Offset + hash3Value] = _pos;
                 if (curMatch2 > matchMinPos)
+                {
                     if (_bufferBase[_bufferOffset + curMatch2] == _bufferBase[cur])
                     {
                         distances[offset++] = maxLen = 2;
                         distances[offset++] = _pos - curMatch2 - 1;
                     }
+                }
+
                 if (curMatch3 > matchMinPos)
+                {
                     if (_bufferBase[_bufferOffset + curMatch3] == _bufferBase[cur])
                     {
                         if (curMatch3 == curMatch2)
+                        {
                             offset -= 2;
+                        }
+
                         distances[offset++] = maxLen = 3;
                         distances[offset++] = _pos - curMatch3 - 1;
                         curMatch2 = curMatch3;
                     }
+                }
+
                 if (offset != 0 && curMatch2 == curMatch)
                 {
                     offset -= 2;
@@ -216,8 +247,13 @@ namespace SevenZip.Compression.LZ
                 if (_bufferBase[pby1 + len] == _bufferBase[cur + len])
                 {
                     while (++len != lenLimit)
+                    {
                         if (_bufferBase[pby1 + len] != _bufferBase[cur + len])
+                        {
                             break;
+                        }
+                    }
+
                     if (maxLen < len)
                     {
                         distances[offset++] = maxLen = len;
@@ -255,7 +291,9 @@ namespace SevenZip.Compression.LZ
             {
                 UInt32 lenLimit;
                 if (_pos + _matchMaxLen <= _streamPos)
+                {
                     lenLimit = _matchMaxLen;
+                }
                 else
                 {
                     lenLimit = _streamPos - _pos;
@@ -282,7 +320,9 @@ namespace SevenZip.Compression.LZ
                     hashValue = (temp ^ (CRC.Table[_bufferBase[cur + 3]] << 5)) & _hashMask;
                 }
                 else
+                {
                     hashValue = _bufferBase[cur] ^ ((UInt32)(_bufferBase[cur + 1]) << 8);
+                }
 
                 UInt32 curMatch = _hash[kFixHashSize + hashValue];
                 _hash[kFixHashSize + hashValue] = _pos;
@@ -312,8 +352,13 @@ namespace SevenZip.Compression.LZ
                     if (_bufferBase[pby1 + len] == _bufferBase[cur + len])
                     {
                         while (++len != lenLimit)
+                        {
                             if (_bufferBase[pby1 + len] != _bufferBase[cur + len])
+                            {
                                 break;
+                            }
+                        }
+
                         if (len == lenLimit)
                         {
                             _son[ptr1] = _son[cyclicPos];
@@ -341,20 +386,25 @@ namespace SevenZip.Compression.LZ
             while (--num != 0);
         }
 
-        void NormalizeLinks(UInt32[] items, UInt32 numItems, UInt32 subValue)
+        private void NormalizeLinks(UInt32[] items, UInt32 numItems, UInt32 subValue)
         {
             for (UInt32 i = 0; i < numItems; i++)
             {
                 UInt32 value = items[i];
                 if (value <= subValue)
+                {
                     value = kEmptyHashValue;
+                }
                 else
+                {
                     value -= subValue;
+                }
+
                 items[i] = value;
             }
         }
 
-        void Normalize()
+        private void Normalize()
         {
             UInt32 subValue = _pos - _cyclicBufferSize;
             NormalizeLinks(_son, _cyclicBufferSize * 2, subValue);
diff --git a/7zip/Compress/LZ/LzInWindow.cs b/7zip/Compress/LZ/LzInWindow.cs
index e444c9c..6b18168 100644
--- a/7zip/Compress/LZ/LzInWindow.cs
+++ b/7zip/Compress/LZ/LzInWindow.cs
@@ -7,62 +7,77 @@ namespace SevenZip.Compression.LZ
     public class InWindow
     {
         public Byte[] _bufferBase = null; // pointer to buffer with data
-        System.IO.Stream _stream;
-        UInt32 _posLimit; // offset (from _buffer) of first byte when new block reading must be done
-        bool _streamEndWasReached; // if (true) then _streamPos shows real end of stream
+        private System.IO.Stream _stream;
+        private UInt32 _posLimit; // offset (from _buffer) of first byte when new block reading must be done
+        private bool _streamEndWasReached; // if (true) then _streamPos shows real end of stream
 
-        UInt32 _pointerToLastSafePosition;
+        private UInt32 _pointerToLastSafePosition;
 
         public UInt32 _bufferOffset;
 
         public UInt32 _blockSize; // Size of Allocated memory block
         public UInt32 _pos; // offset (from _buffer) of curent byte
-        UInt32 _keepSizeBefore; // how many BYTEs must be kept in buffer before _pos
-        UInt32 _keepSizeAfter; // how many BYTEs must be kept buffer after _pos
+        private UInt32 _keepSizeBefore; // how many BYTEs must be kept in buffer before _pos
+        private UInt32 _keepSizeAfter; // how many BYTEs must be kept buffer after _pos
         public UInt32 _streamPos; // offset (from _buffer) of first not read byte from Stream
 
         public void MoveBlock()
         {
-            UInt32 offset = (UInt32)(_bufferOffset) + _pos - _keepSizeBefore;
+            UInt32 offset = _bufferOffset + _pos - _keepSizeBefore;
             // we need one additional byte, since MovePos moves on 1 byte.
             if (offset > 0)
+            {
                 offset--;
+            }
 
-            UInt32 numBytes = (UInt32)(_bufferOffset) + _streamPos - offset;
+            UInt32 numBytes = _bufferOffset + _streamPos - offset;
 
             // check negative offset ????
             for (UInt32 i = 0; i < numBytes; i++)
+            {
                 _bufferBase[i] = _bufferBase[offset + i];
+            }
+
             _bufferOffset -= offset;
         }
 
         public virtual void ReadBlock()
         {
             if (_streamEndWasReached)
+            {
                 return;
+            }
+
             while (true)
             {
                 int size = (int)((0 - _bufferOffset) + _blockSize - _streamPos);
                 if (size == 0)
+                {
                     return;
+                }
+
                 int numReadBytes = _stream.Read(_bufferBase, (int)(_bufferOffset + _streamPos), size);
                 if (numReadBytes == 0)
                 {
                     _posLimit = _streamPos;
                     UInt32 pointerToPostion = _bufferOffset + _posLimit;
                     if (pointerToPostion > _pointerToLastSafePosition)
-                        _posLimit = (UInt32)(_pointerToLastSafePosition - _bufferOffset);
+                    {
+                        _posLimit = _pointerToLastSafePosition - _bufferOffset;
+                    }
 
                     _streamEndWasReached = true;
                     return;
                 }
                 _streamPos += (UInt32)numReadBytes;
                 if (_streamPos >= _pos + _keepSizeAfter)
+                {
                     _posLimit = _streamPos - _keepSizeAfter;
+                }
             }
         }
 
-        void Free() { _bufferBase = null; }
+        private void Free() { _bufferBase = null; }
 
         public void Create(UInt32 keepSizeBefore, UInt32 keepSizeAfter, UInt32 keepSizeReserv)
         {
@@ -97,7 +112,10 @@ namespace SevenZip.Compression.LZ
             {
                 UInt32 pointerToPostion = _bufferOffset + _pos;
                 if (pointerToPostion > _pointerToLastSafePosition)
+                {
                     MoveBlock();
+                }
+
                 ReadBlock();
             }
         }
@@ -108,14 +126,22 @@ namespace SevenZip.Compression.LZ
         public UInt32 GetMatchLen(Int32 index, UInt32 distance, UInt32 limit)
         {
             if (_streamEndWasReached)
-                if ((_pos + index) + limit > _streamPos)
+            {
+                if (_pos + index + limit > _streamPos)
+                {
                     limit = _streamPos - (UInt32)(_pos + index);
+                }
+            }
+
             distance++;
             // Byte *pby = _buffer + (size_t)_pos + index;
             UInt32 pby = _bufferOffset + _pos + (UInt32)index;
 
             UInt32 i;
-            for (i = 0; i < limit && _bufferBase[pby + i] == _bufferBase[pby + i - distance]; i++) ;
+            for (i = 0; i < limit && _bufferBase[pby + i] == _bufferBase[pby + i - distance]; i++)
+            {
+            }
+
             return i;
         }
 
diff --git a/7zip/Compress/LZ/LzOutWindow.cs b/7zip/Compress/LZ/LzOutWindow.cs
index 23e3b67..24bbd49 100644
--- a/7zip/Compress/LZ/LzOutWindow.cs
+++ b/7zip/Compress/LZ/LzOutWindow.cs
@@ -4,11 +4,11 @@ namespace SevenZip.Compression.LZ
 {
     public class OutWindow
     {
-        byte[] _buffer = null;
-        uint _pos;
-        uint _windowSize = 0;
-        uint _streamPos;
-        System.IO.Stream _stream;
+        private byte[] _buffer = null;
+        private uint _pos;
+        private uint _windowSize = 0;
+        private uint _streamPos;
+        private System.IO.Stream _stream;
 
         public uint TrainSize = 0;
 
@@ -47,15 +47,23 @@ namespace SevenZip.Compression.LZ
             {
                 uint curSize = _windowSize - _pos;
                 if (size < curSize)
+                {
                     curSize = size;
+                }
+
                 int numReadBytes = stream.Read(_buffer, (int)_pos, (int)curSize);
                 if (numReadBytes == 0)
+                {
                     return false;
+                }
+
                 size -= (uint)numReadBytes;
                 _pos += (uint)numReadBytes;
                 _streamPos += (uint)numReadBytes;
                 if (_pos == _windowSize)
+                {
                     _streamPos = _pos = 0;
+                }
             }
             return true;
         }
@@ -70,10 +78,16 @@ namespace SevenZip.Compression.LZ
         {
             uint size = _pos - _streamPos;
             if (size == 0)
+            {
                 return;
+            }
+
             _stream.Write(_buffer, (int)_streamPos, (int)size);
             if (_pos >= _windowSize)
+            {
                 _pos = 0;
+            }
+
             _streamPos = _pos;
         }
 
@@ -81,14 +95,22 @@ namespace SevenZip.Compression.LZ
         {
             uint pos = _pos - distance - 1;
             if (pos >= _windowSize)
+            {
                 pos += _windowSize;
+            }
+
             for (; len > 0; len--)
             {
                 if (pos >= _windowSize)
+                {
                     pos = 0;
+                }
+
                 _buffer[_pos++] = _buffer[pos++];
                 if (_pos >= _windowSize)
+                {
                     Flush();
+                }
             }
         }
 
@@ -96,14 +118,19 @@ namespace SevenZip.Compression.LZ
         {
             _buffer[_pos++] = b;
             if (_pos >= _windowSize)
+            {
                 Flush();
+            }
         }
 
         public byte GetByte(uint distance)
         {
             uint pos = _pos - distance - 1;
             if (pos >= _windowSize)
+            {
                 pos += _windowSize;
+            }
+
             return _buffer[pos];
         }
     }
diff --git a/7zip/Compress/LZMA/LzmaBase.cs b/7zip/Compress/LZMA/LzmaBase.cs
index 3692c21..61b35ee 100644
--- a/7zip/Compress/LZMA/LzmaBase.cs
+++ b/7zip/Compress/LZMA/LzmaBase.cs
@@ -18,9 +18,18 @@ namespace SevenZip.Compression.LZMA
             public void Init() { Index = 0; }
             public void UpdateChar()
             {
-                if (Index < 4) Index = 0;
-                else if (Index < 10) Index -= 3;
-                else Index -= 6;
+                if (Index < 4)
+                {
+                    Index = 0;
+                }
+                else if (Index < 10)
+                {
+                    Index -= 3;
+                }
+                else
+                {
+                    Index -= 6;
+                }
             }
             public void UpdateMatch() { Index = (uint)(Index < 7 ? 7 : 10); }
             public void UpdateRep() { Index = (uint)(Index < 7 ? 8 : 11); }
@@ -42,8 +51,11 @@ namespace SevenZip.Compression.LZMA
         {
             len -= kMatchMinLen;
             if (len < kNumLenToPosStates)
+            {
                 return len;
-            return (uint)(kNumLenToPosStates - 1);
+            }
+
+            return kNumLenToPosStates - 1;
         }
 
         public const int kNumAlignBits = 4;
diff --git a/7zip/Compress/LZMA/LzmaDecoder.cs b/7zip/Compress/LZMA/LzmaDecoder.cs
index c4a50ff..a67d349 100644
--- a/7zip/Compress/LZMA/LzmaDecoder.cs
+++ b/7zip/Compress/LZMA/LzmaDecoder.cs
@@ -9,14 +9,14 @@ namespace SevenZip.Compression.LZMA
 
     public class Decoder : ICoder, ISetDecoderProperties // ,System.IO.Stream
     {
-        class LenDecoder
+        private class LenDecoder
         {
-            BitDecoder m_Choice = new BitDecoder();
-            BitDecoder m_Choice2 = new BitDecoder();
-            BitTreeDecoder[] m_LowCoder = new BitTreeDecoder[Base.kNumPosStatesMax];
-            BitTreeDecoder[] m_MidCoder = new BitTreeDecoder[Base.kNumPosStatesMax];
-            BitTreeDecoder m_HighCoder = new BitTreeDecoder(Base.kNumHighLenBits);
-            uint m_NumPosStates = 0;
+            private BitDecoder m_Choice = new();
+            private BitDecoder m_Choice2 = new();
+            private readonly BitTreeDecoder[] m_LowCoder = new BitTreeDecoder[Base.kNumPosStatesMax];
+            private readonly BitTreeDecoder[] m_MidCoder = new BitTreeDecoder[Base.kNumPosStatesMax];
+            private readonly BitTreeDecoder m_HighCoder = new(Base.kNumHighLenBits);
+            private uint m_NumPosStates = 0;
 
             public void Create(uint numPosStates)
             {
@@ -43,12 +43,16 @@ namespace SevenZip.Compression.LZMA
             public uint Decode(RangeCoder.Decoder rangeDecoder, uint posState)
             {
                 if (m_Choice.Decode(rangeDecoder) == 0)
+                {
                     return m_LowCoder[posState].Decode(rangeDecoder);
+                }
                 else
                 {
                     uint symbol = Base.kNumLowLenSymbols;
                     if (m_Choice2.Decode(rangeDecoder) == 0)
+                    {
                         symbol += m_MidCoder[posState].Decode(rangeDecoder);
+                    }
                     else
                     {
                         symbol += Base.kNumMidLenSymbols;
@@ -59,19 +63,25 @@ namespace SevenZip.Compression.LZMA
             }
         }
 
-        class LiteralDecoder
+        private class LiteralDecoder
         {
-            struct Decoder2
+            private struct Decoder2
             {
-                BitDecoder[] m_Decoders;
+                private BitDecoder[] m_Decoders;
                 public void Create() { m_Decoders = new BitDecoder[0x300]; }
-                public void Init() { for (int i = 0; i < 0x300; i++) m_Decoders[i].Init(); }
+                public void Init() { for (int i = 0; i < 0x300; i++)
+                    {
+                        m_Decoders[i].Init();
+                    }
+                }
 
                 public byte DecodeNormal(RangeCoder.Decoder rangeDecoder)
                 {
                     uint symbol = 1;
                     do
+                    {
                         symbol = (symbol << 1) | m_Decoders[symbol].Decode(rangeDecoder);
+                    }
                     while (symbol < 0x100);
                     return (byte)symbol;
                 }
@@ -88,7 +98,10 @@ namespace SevenZip.Compression.LZMA
                         if (matchBit != bit)
                         {
                             while (symbol < 0x100)
+                            {
                                 symbol = (symbol << 1) | m_Decoders[symbol].Decode(rangeDecoder);
+                            }
+
                             break;
                         }
                     }
@@ -97,33 +110,40 @@ namespace SevenZip.Compression.LZMA
                 }
             }
 
-            Decoder2[] m_Coders;
-            int m_NumPrevBits;
-            int m_NumPosBits;
-            uint m_PosMask;
+            private Decoder2[] m_Coders;
+            private int m_NumPrevBits;
+            private int m_NumPosBits;
+            private uint m_PosMask;
 
             public void Create(int numPosBits, int numPrevBits)
             {
                 if (m_Coders != null && m_NumPrevBits == numPrevBits &&
                     m_NumPosBits == numPosBits)
+                {
                     return;
+                }
+
                 m_NumPosBits = numPosBits;
                 m_PosMask = ((uint)1 << numPosBits) - 1;
                 m_NumPrevBits = numPrevBits;
                 uint numStates = (uint)1 << (m_NumPrevBits + m_NumPosBits);
                 m_Coders = new Decoder2[numStates];
                 for (uint i = 0; i < numStates; i++)
+                {
                     m_Coders[i].Create();
+                }
             }
 
             public void Init()
             {
                 uint numStates = (uint)1 << (m_NumPrevBits + m_NumPosBits);
                 for (uint i = 0; i < numStates; i++)
+                {
                     m_Coders[i].Init();
+                }
             }
 
-            uint GetState(uint pos, byte prevByte)
+            private uint GetState(uint pos, byte prevByte)
             { return ((pos & m_PosMask) << m_NumPrevBits) + (uint)(prevByte >> (8 - m_NumPrevBits)); }
 
             public byte DecodeNormal(RangeCoder.Decoder rangeDecoder, uint pos, byte prevByte)
@@ -133,70 +153,81 @@ namespace SevenZip.Compression.LZMA
             { return m_Coders[GetState(pos, prevByte)].DecodeWithMatchByte(rangeDecoder, matchByte); }
         };
 
-        LZ.OutWindow m_OutWindow = new LZ.OutWindow();
-        RangeCoder.Decoder m_RangeDecoder = new RangeCoder.Decoder();
+        private readonly LZ.OutWindow m_OutWindow = new();
+        private readonly RangeCoder.Decoder m_RangeDecoder = new();
 
-        BitDecoder[] m_IsMatchDecoders = new BitDecoder[Base.kNumStates << Base.kNumPosStatesBitsMax];
-        BitDecoder[] m_IsRepDecoders = new BitDecoder[Base.kNumStates];
-        BitDecoder[] m_IsRepG0Decoders = new BitDecoder[Base.kNumStates];
-        BitDecoder[] m_IsRepG1Decoders = new BitDecoder[Base.kNumStates];
-        BitDecoder[] m_IsRepG2Decoders = new BitDecoder[Base.kNumStates];
-        BitDecoder[] m_IsRep0LongDecoders = new BitDecoder[Base.kNumStates << Base.kNumPosStatesBitsMax];
+        private readonly BitDecoder[] m_IsMatchDecoders = new BitDecoder[Base.kNumStates << Base.kNumPosStatesBitsMax];
+        private readonly BitDecoder[] m_IsRepDecoders = new BitDecoder[Base.kNumStates];
+        private readonly BitDecoder[] m_IsRepG0Decoders = new BitDecoder[Base.kNumStates];
+        private readonly BitDecoder[] m_IsRepG1Decoders = new BitDecoder[Base.kNumStates];
+        private readonly BitDecoder[] m_IsRepG2Decoders = new BitDecoder[Base.kNumStates];
+        private readonly BitDecoder[] m_IsRep0LongDecoders = new BitDecoder[Base.kNumStates << Base.kNumPosStatesBitsMax];
 
-        BitTreeDecoder[] m_PosSlotDecoder = new BitTreeDecoder[Base.kNumLenToPosStates];
-        BitDecoder[] m_PosDecoders = new BitDecoder[Base.kNumFullDistances - Base.kEndPosModelIndex];
+        private readonly BitTreeDecoder[] m_PosSlotDecoder = new BitTreeDecoder[Base.kNumLenToPosStates];
+        private readonly BitDecoder[] m_PosDecoders = new BitDecoder[Base.kNumFullDistances - Base.kEndPosModelIndex];
 
-        BitTreeDecoder m_PosAlignDecoder = new BitTreeDecoder(Base.kNumAlignBits);
+        private readonly BitTreeDecoder m_PosAlignDecoder = new(Base.kNumAlignBits);
 
-        LenDecoder m_LenDecoder = new LenDecoder();
-        LenDecoder m_RepLenDecoder = new LenDecoder();
+        private readonly LenDecoder m_LenDecoder = new();
+        private readonly LenDecoder m_RepLenDecoder = new();
 
-        LiteralDecoder m_LiteralDecoder = new LiteralDecoder();
+        private readonly LiteralDecoder m_LiteralDecoder = new();
 
-        uint m_DictionarySize;
-        uint m_DictionarySizeCheck;
+        private uint m_DictionarySize;
+        private uint m_DictionarySizeCheck;
 
-        uint m_PosStateMask;
+        private uint m_PosStateMask;
 
         public Decoder()
         {
             m_DictionarySize = 0xFFFFFFFF;
             for (int i = 0; i < Base.kNumLenToPosStates; i++)
+            {
                 m_PosSlotDecoder[i] = new BitTreeDecoder(Base.kNumPosSlotBits);
+            }
         }
 
-        void SetDictionarySize(uint dictionarySize)
+        private void SetDictionarySize(uint dictionarySize)
         {
             if (m_DictionarySize != dictionarySize)
             {
                 m_DictionarySize = dictionarySize;
                 m_DictionarySizeCheck = Math.Max(m_DictionarySize, 1);
-                uint blockSize = Math.Max(m_DictionarySizeCheck, (1 << 12));
+                uint blockSize = Math.Max(m_DictionarySizeCheck, 1 << 12);
                 m_OutWindow.Create(blockSize);
             }
         }
 
-        void SetLiteralProperties(int lp, int lc)
+        private void SetLiteralProperties(int lp, int lc)
         {
             if (lp > 8)
+            {
                 throw new InvalidParamException();
+            }
+
             if (lc > 8)
+            {
                 throw new InvalidParamException();
+            }
+
             m_LiteralDecoder.Create(lp, lc);
         }
 
-        void SetPosBitsProperties(int pb)
+        private void SetPosBitsProperties(int pb)
         {
             if (pb > Base.kNumPosStatesBitsMax)
+            {
                 throw new InvalidParamException();
+            }
+
             uint numPosStates = (uint)1 << pb;
             m_LenDecoder.Create(numPosStates);
             m_RepLenDecoder.Create(numPosStates);
             m_PosStateMask = numPosStates - 1;
         }
 
-        bool _solid = false;
-        void Init(System.IO.Stream inStream, System.IO.Stream outStream)
+        private bool _solid = false;
+        private void Init(System.IO.Stream inStream, System.IO.Stream outStream)
         {
             m_RangeDecoder.Init(inStream);
             m_OutWindow.Init(outStream, _solid);
@@ -218,10 +249,14 @@ namespace SevenZip.Compression.LZMA
 
             m_LiteralDecoder.Init();
             for (i = 0; i < Base.kNumLenToPosStates; i++)
+            {
                 m_PosSlotDecoder[i].Init();
+            }
             // m_PosSpecDecoder.Init();
             for (i = 0; i < Base.kNumFullDistances - Base.kEndPosModelIndex; i++)
+            {
                 m_PosDecoders[i].Init();
+            }
 
             m_LenDecoder.Init();
             m_RepLenDecoder.Init();
@@ -233,7 +268,7 @@ namespace SevenZip.Compression.LZMA
         {
             Init(inStream, outStream);
 
-            Base.State state = new Base.State();
+            Base.State state = new();
             state.Init();
             uint rep0 = 0, rep1 = 0, rep2 = 0, rep3 = 0;
 
@@ -242,7 +277,10 @@ namespace SevenZip.Compression.LZMA
             if (nowPos64 < outSize64)
             {
                 if (m_IsMatchDecoders[state.Index << Base.kNumPosStatesBitsMax].Decode(m_RangeDecoder) != 0)
+                {
                     throw new DataErrorException();
+                }
+
                 state.UpdateChar();
                 byte b = m_LiteralDecoder.DecodeNormal(m_RangeDecoder, 0, 0);
                 m_OutWindow.PutByte(b);
@@ -263,11 +301,11 @@ namespace SevenZip.Compression.LZMA
                         {
                             byte b;
                             byte prevByte = m_OutWindow.GetByte(0);
-                            if (!state.IsCharState())
-                                b = m_LiteralDecoder.DecodeWithMatchByte(m_RangeDecoder,
-                                    (uint)nowPos64, prevByte, m_OutWindow.GetByte(rep0));
-                            else
-                                b = m_LiteralDecoder.DecodeNormal(m_RangeDecoder, (uint)nowPos64, prevByte);
+                            b = !state.IsCharState()
+                                ? m_LiteralDecoder.DecodeWithMatchByte(m_RangeDecoder,
+                                   (uint)nowPos64, prevByte, m_OutWindow.GetByte(rep0))
+                                : m_LiteralDecoder.DecodeNormal(m_RangeDecoder, (uint)nowPos64, prevByte);
+
                             m_OutWindow.PutByte(b);
                             state.UpdateChar();
                             nowPos64++;
@@ -297,7 +335,9 @@ namespace SevenZip.Compression.LZMA
                                     else
                                     {
                                         if (m_IsRepG2Decoders[state.Index].Decode(m_RangeDecoder) == 0)
+                                        {
                                             distance = rep2;
+                                        }
                                         else
                                         {
                                             distance = rep3;
@@ -324,8 +364,10 @@ namespace SevenZip.Compression.LZMA
                                     int numDirectBits = (int)((posSlot >> 1) - 1);
                                     rep0 = ((2 | (posSlot & 1)) << numDirectBits);
                                     if (posSlot < Base.kEndPosModelIndex)
+                                    {
                                         rep0 += BitTreeDecoder.ReverseDecode(m_PosDecoders,
-                                                rep0 - posSlot - 1, m_RangeDecoder, numDirectBits);
+                                               rep0 - posSlot - 1, m_RangeDecoder, numDirectBits);
+                                    }
                                     else
                                     {
                                         rep0 += (m_RangeDecoder.DecodeDirectBits(
@@ -334,12 +376,17 @@ namespace SevenZip.Compression.LZMA
                                     }
                                 }
                                 else
+                                {
                                     rep0 = posSlot;
+                                }
                             }
                             if (rep0 >= m_OutWindow.TrainSize + nowPos64 || rep0 >= m_DictionarySizeCheck)
                             {
                                 if (rep0 == 0xFFFFFFFF)
+                                {
                                     break;
+                                }
+
                                 throw new DataErrorException();
                             }
                             m_OutWindow.CopyBlock(rep0, len);
@@ -350,7 +397,6 @@ namespace SevenZip.Compression.LZMA
             }
             catch (OperationCanceledException)
             {
-
             }
 
             m_OutWindow.Flush();
@@ -361,16 +407,25 @@ namespace SevenZip.Compression.LZMA
         public void SetDecoderProperties(byte[] properties)
         {
             if (properties.Length < 5)
+            {
                 throw new InvalidParamException();
+            }
+
             int lc = properties[0] % 9;
             int remainder = properties[0] / 9;
             int lp = remainder % 5;
             int pb = remainder / 5;
             if (pb > Base.kNumPosStatesBitsMax)
+            {
                 throw new InvalidParamException();
+            }
+
             UInt32 dictionarySize = 0;
             for (int i = 0; i < 4; i++)
+            {
                 dictionarySize += ((UInt32)(properties[1 + i])) << (i * 8);
+            }
+
             SetDictionarySize(dictionarySize);
             SetLiteralProperties(lp, lc);
             SetPosBitsProperties(pb);
diff --git a/7zip/Compress/LZMA/LzmaEncoder.cs b/7zip/Compress/LZMA/LzmaEncoder.cs
index f07afbd..7281099 100644
--- a/7zip/Compress/LZMA/LzmaEncoder.cs
+++ b/7zip/Compress/LZMA/LzmaEncoder.cs
@@ -9,15 +9,15 @@ namespace SevenZip.Compression.LZMA
 
     public class Encoder : ICoder, ISetCoderProperties, IWriteCoderProperties
     {
-        enum EMatchFinderType
+        private enum EMatchFinderType
         {
             BT2,
             BT4,
         };
 
-        const UInt32 kIfinityPrice = 0xFFFFFFF;
+        private const UInt32 kIfinityPrice = 0xFFFFFFF;
 
-        static Byte[] g_FastPos = new Byte[1 << 11];
+        private static readonly Byte[] g_FastPos = new Byte[1 << 11];
 
         static Encoder()
         {
@@ -29,52 +29,72 @@ namespace SevenZip.Compression.LZMA
             {
                 UInt32 k = ((UInt32)1 << ((slotFast >> 1) - 1));
                 for (UInt32 j = 0; j < k; j++, c++)
+                {
                     g_FastPos[c] = slotFast;
+                }
             }
         }
 
-        static UInt32 GetPosSlot(UInt32 pos)
+        private static UInt32 GetPosSlot(UInt32 pos)
         {
             if (pos < (1 << 11))
+            {
                 return g_FastPos[pos];
+            }
+
             if (pos < (1 << 21))
+            {
                 return (UInt32)(g_FastPos[pos >> 10] + 20);
+            }
+
             return (UInt32)(g_FastPos[pos >> 20] + 40);
         }
 
-        static UInt32 GetPosSlot2(UInt32 pos)
+        private static UInt32 GetPosSlot2(UInt32 pos)
         {
             if (pos < (1 << 17))
+            {
                 return (UInt32)(g_FastPos[pos >> 6] + 12);
+            }
+
             if (pos < (1 << 27))
+            {
                 return (UInt32)(g_FastPos[pos >> 16] + 32);
+            }
+
             return (UInt32)(g_FastPos[pos >> 26] + 52);
         }
 
-        Base.State _state = new Base.State();
-        Byte _previousByte;
-        UInt32[] _repDistances = new UInt32[Base.kNumRepDistances];
+        private Base.State _state = new();
+        private Byte _previousByte;
+        private readonly UInt32[] _repDistances = new UInt32[Base.kNumRepDistances];
 
-        void BaseInit()
+        private void BaseInit()
         {
             _state.Init();
             _previousByte = 0;
             for (UInt32 i = 0; i < Base.kNumRepDistances; i++)
+            {
                 _repDistances[i] = 0;
+            }
         }
 
-        const int kDefaultDictionaryLogSize = 22;
-        const UInt32 kNumFastBytesDefault = 0x20;
+        private const int kDefaultDictionaryLogSize = 22;
+        private const UInt32 kNumFastBytesDefault = 0x20;
 
-        class LiteralEncoder
+        private class LiteralEncoder
         {
             public struct Encoder2
             {
-                BitEncoder[] m_Encoders;
+                private BitEncoder[] m_Encoders;
 
                 public void Create() { m_Encoders = new BitEncoder[0x300]; }
 
-                public void Init() { for (int i = 0; i < 0x300; i++) m_Encoders[i].Init(); }
+                public void Init() { for (int i = 0; i < 0x300; i++)
+                    {
+                        m_Encoders[i].Init();
+                    }
+                }
 
                 public void Encode(RangeCoder.Encoder rangeEncoder, byte symbol)
                 {
@@ -136,49 +156,56 @@ namespace SevenZip.Compression.LZMA
                 }
             }
 
-            Encoder2[] m_Coders;
-            int m_NumPrevBits;
-            int m_NumPosBits;
-            uint m_PosMask;
+            private Encoder2[] m_Coders;
+            private int m_NumPrevBits;
+            private int m_NumPosBits;
+            private uint m_PosMask;
 
             public void Create(int numPosBits, int numPrevBits)
             {
                 if (m_Coders != null && m_NumPrevBits == numPrevBits && m_NumPosBits == numPosBits)
+                {
                     return;
+                }
+
                 m_NumPosBits = numPosBits;
                 m_PosMask = ((uint)1 << numPosBits) - 1;
                 m_NumPrevBits = numPrevBits;
                 uint numStates = (uint)1 << (m_NumPrevBits + m_NumPosBits);
                 m_Coders = new Encoder2[numStates];
                 for (uint i = 0; i < numStates; i++)
+                {
                     m_Coders[i].Create();
+                }
             }
 
             public void Init()
             {
                 uint numStates = (uint)1 << (m_NumPrevBits + m_NumPosBits);
                 for (uint i = 0; i < numStates; i++)
+                {
                     m_Coders[i].Init();
+                }
             }
 
             public Encoder2 GetSubCoder(UInt32 pos, Byte prevByte)
             { return m_Coders[((pos & m_PosMask) << m_NumPrevBits) + (uint)(prevByte >> (8 - m_NumPrevBits))]; }
         }
 
-        class LenEncoder
+        private class LenEncoder
         {
-            RangeCoder.BitEncoder _choice = new RangeCoder.BitEncoder();
-            RangeCoder.BitEncoder _choice2 = new RangeCoder.BitEncoder();
-            RangeCoder.BitTreeEncoder[] _lowCoder = new RangeCoder.BitTreeEncoder[Base.kNumPosStatesEncodingMax];
-            RangeCoder.BitTreeEncoder[] _midCoder = new RangeCoder.BitTreeEncoder[Base.kNumPosStatesEncodingMax];
-            RangeCoder.BitTreeEncoder _highCoder = new RangeCoder.BitTreeEncoder(Base.kNumHighLenBits);
+            private BitEncoder _choice = new();
+            private BitEncoder _choice2 = new();
+            private readonly BitTreeEncoder[] _lowCoder = new BitTreeEncoder[Base.kNumPosStatesEncodingMax];
+            private readonly BitTreeEncoder[] _midCoder = new BitTreeEncoder[Base.kNumPosStatesEncodingMax];
+            private readonly BitTreeEncoder _highCoder = new(Base.kNumHighLenBits);
 
             public LenEncoder()
             {
                 for (UInt32 posState = 0; posState < Base.kNumPosStatesEncodingMax; posState++)
                 {
-                    _lowCoder[posState] = new RangeCoder.BitTreeEncoder(Base.kNumLowLenBits);
-                    _midCoder[posState] = new RangeCoder.BitTreeEncoder(Base.kNumMidLenBits);
+                    _lowCoder[posState] = new BitTreeEncoder(Base.kNumLowLenBits);
+                    _midCoder[posState] = new BitTreeEncoder(Base.kNumMidLenBits);
                 }
             }
 
@@ -228,36 +255,44 @@ namespace SevenZip.Compression.LZMA
                 for (i = 0; i < Base.kNumLowLenSymbols; i++)
                 {
                     if (i >= numSymbols)
+                    {
                         return;
+                    }
+
                     prices[st + i] = a0 + _lowCoder[posState].GetPrice(i);
                 }
                 for (; i < Base.kNumLowLenSymbols + Base.kNumMidLenSymbols; i++)
                 {
                     if (i >= numSymbols)
+                    {
                         return;
+                    }
+
                     prices[st + i] = b0 + _midCoder[posState].GetPrice(i - Base.kNumLowLenSymbols);
                 }
                 for (; i < numSymbols; i++)
+                {
                     prices[st + i] = b1 + _highCoder.GetPrice(i - Base.kNumLowLenSymbols - Base.kNumMidLenSymbols);
+                }
             }
         };
 
-        const UInt32 kNumLenSpecSymbols = Base.kNumLowLenSymbols + Base.kNumMidLenSymbols;
+        private const UInt32 kNumLenSpecSymbols = Base.kNumLowLenSymbols + Base.kNumMidLenSymbols;
 
-        class LenPriceTableEncoder : LenEncoder
+        private class LenPriceTableEncoder : LenEncoder
         {
-            UInt32[] _prices = new UInt32[Base.kNumLenSymbols << Base.kNumPosStatesBitsEncodingMax];
-            UInt32 _tableSize;
-            UInt32[] _counters = new UInt32[Base.kNumPosStatesEncodingMax];
+            private readonly UInt32[] _prices = new UInt32[Base.kNumLenSymbols << Base.kNumPosStatesBitsEncodingMax];
+            private UInt32 _tableSize;
+            private readonly UInt32[] _counters = new UInt32[Base.kNumPosStatesEncodingMax];
 
             public void SetTableSize(UInt32 tableSize) { _tableSize = tableSize; }
 
             public UInt32 GetPrice(UInt32 symbol, UInt32 posState)
             {
-                return _prices[posState * Base.kNumLenSymbols + symbol];
+                return _prices[(posState * Base.kNumLenSymbols) + symbol];
             }
 
-            void UpdateTable(UInt32 posState)
+            private void UpdateTable(UInt32 posState)
             {
                 SetPrices(posState, _tableSize, _prices, posState * Base.kNumLenSymbols);
                 _counters[posState] = _tableSize;
@@ -266,19 +301,23 @@ namespace SevenZip.Compression.LZMA
             public void UpdateTables(UInt32 numPosStates)
             {
                 for (UInt32 posState = 0; posState < numPosStates; posState++)
+                {
                     UpdateTable(posState);
+                }
             }
 
             public new void Encode(RangeCoder.Encoder rangeEncoder, UInt32 symbol, UInt32 posState)
             {
                 base.Encode(rangeEncoder, symbol, posState);
                 if (--_counters[posState] == 0)
+                {
                     UpdateTable(posState);
+                }
             }
         }
 
-        const UInt32 kNumOpts = 1 << 12;
-        class Optimal
+        private const UInt32 kNumOpts = 1 << 12;
+        private class Optimal
         {
             public Base.State State;
 
@@ -298,83 +337,89 @@ namespace SevenZip.Compression.LZMA
             public UInt32 Backs3;
 
             public void MakeAsChar() { BackPrev = 0xFFFFFFFF; Prev1IsChar = false; }
-            public void MakeAsShortRep() { BackPrev = 0; ; Prev1IsChar = false; }
-            public bool IsShortRep() { return (BackPrev == 0); }
+            public void MakeAsShortRep() { BackPrev = 0;  Prev1IsChar = false; }
+            public bool IsShortRep() { return BackPrev == 0; }
         };
-        Optimal[] _optimum = new Optimal[kNumOpts];
-        LZ.IMatchFinder _matchFinder = null;
-        RangeCoder.Encoder _rangeEncoder = new RangeCoder.Encoder();
+        private readonly Optimal[] _optimum = new Optimal[kNumOpts];
+        private LZ.IMatchFinder _matchFinder = null;
+        private readonly RangeCoder.Encoder _rangeEncoder = new();
 
-        RangeCoder.BitEncoder[] _isMatch = new RangeCoder.BitEncoder[Base.kNumStates << Base.kNumPosStatesBitsMax];
-        RangeCoder.BitEncoder[] _isRep = new RangeCoder.BitEncoder[Base.kNumStates];
-        RangeCoder.BitEncoder[] _isRepG0 = new RangeCoder.BitEncoder[Base.kNumStates];
-        RangeCoder.BitEncoder[] _isRepG1 = new RangeCoder.BitEncoder[Base.kNumStates];
-        RangeCoder.BitEncoder[] _isRepG2 = new RangeCoder.BitEncoder[Base.kNumStates];
-        RangeCoder.BitEncoder[] _isRep0Long = new RangeCoder.BitEncoder[Base.kNumStates << Base.kNumPosStatesBitsMax];
+        private readonly BitEncoder[] _isMatch = new BitEncoder[Base.kNumStates << Base.kNumPosStatesBitsMax];
+        private readonly BitEncoder[] _isRep = new BitEncoder[Base.kNumStates];
+        private readonly BitEncoder[] _isRepG0 = new BitEncoder[Base.kNumStates];
+        private readonly BitEncoder[] _isRepG1 = new BitEncoder[Base.kNumStates];
+        private readonly BitEncoder[] _isRepG2 = new BitEncoder[Base.kNumStates];
+        private readonly BitEncoder[] _isRep0Long = new BitEncoder[Base.kNumStates << Base.kNumPosStatesBitsMax];
 
-        RangeCoder.BitTreeEncoder[] _posSlotEncoder = new RangeCoder.BitTreeEncoder[Base.kNumLenToPosStates];
+        private readonly BitTreeEncoder[] _posSlotEncoder = new BitTreeEncoder[Base.kNumLenToPosStates];
 
-        RangeCoder.BitEncoder[] _posEncoders = new RangeCoder.BitEncoder[Base.kNumFullDistances - Base.kEndPosModelIndex];
-        RangeCoder.BitTreeEncoder _posAlignEncoder = new RangeCoder.BitTreeEncoder(Base.kNumAlignBits);
+        private readonly BitEncoder[] _posEncoders = new BitEncoder[Base.kNumFullDistances - Base.kEndPosModelIndex];
+        private readonly BitTreeEncoder _posAlignEncoder = new(Base.kNumAlignBits);
 
-        LenPriceTableEncoder _lenEncoder = new LenPriceTableEncoder();
-        LenPriceTableEncoder _repMatchLenEncoder = new LenPriceTableEncoder();
+        private readonly LenPriceTableEncoder _lenEncoder = new();
+        private readonly LenPriceTableEncoder _repMatchLenEncoder = new();
 
-        LiteralEncoder _literalEncoder = new LiteralEncoder();
+        private readonly LiteralEncoder _literalEncoder = new();
 
-        UInt32[] _matchDistances = new UInt32[Base.kMatchMaxLen * 2 + 2];
+        private readonly UInt32[] _matchDistances = new UInt32[(Base.kMatchMaxLen * 2) + 2];
 
-        UInt32 _numFastBytes = kNumFastBytesDefault;
-        UInt32 _longestMatchLength;
-        UInt32 _numDistancePairs;
+        private UInt32 _numFastBytes = kNumFastBytesDefault;
+        private UInt32 _longestMatchLength;
+        private UInt32 _numDistancePairs;
 
-        UInt32 _additionalOffset;
+        private UInt32 _additionalOffset;
 
-        UInt32 _optimumEndIndex;
-        UInt32 _optimumCurrentIndex;
+        private UInt32 _optimumEndIndex;
+        private UInt32 _optimumCurrentIndex;
 
-        bool _longestMatchWasFound;
+        private bool _longestMatchWasFound;
 
-        UInt32[] _posSlotPrices = new UInt32[1 << (Base.kNumPosSlotBits + Base.kNumLenToPosStatesBits)];
-        UInt32[] _distancesPrices = new UInt32[Base.kNumFullDistances << Base.kNumLenToPosStatesBits];
-        UInt32[] _alignPrices = new UInt32[Base.kAlignTableSize];
-        UInt32 _alignPriceCount;
+        private readonly UInt32[] _posSlotPrices = new UInt32[1 << (Base.kNumPosSlotBits + Base.kNumLenToPosStatesBits)];
+        private readonly UInt32[] _distancesPrices = new UInt32[Base.kNumFullDistances << Base.kNumLenToPosStatesBits];
+        private readonly UInt32[] _alignPrices = new UInt32[Base.kAlignTableSize];
+        private UInt32 _alignPriceCount;
 
-        UInt32 _distTableSize = (kDefaultDictionaryLogSize * 2);
+        private UInt32 _distTableSize = (kDefaultDictionaryLogSize * 2);
 
-        int _posStateBits = 2;
-        UInt32 _posStateMask = (4 - 1);
-        int _numLiteralPosStateBits = 0;
-        int _numLiteralContextBits = 3;
+        private int _posStateBits = 2;
+        private UInt32 _posStateMask = (4 - 1);
+        private int _numLiteralPosStateBits = 0;
+        private int _numLiteralContextBits = 3;
 
-        UInt32 _dictionarySize = (1 << kDefaultDictionaryLogSize);
-        UInt32 _dictionarySizePrev = 0xFFFFFFFF;
-        UInt32 _numFastBytesPrev = 0xFFFFFFFF;
+        private UInt32 _dictionarySize = (1 << kDefaultDictionaryLogSize);
+        private UInt32 _dictionarySizePrev = 0xFFFFFFFF;
+        private UInt32 _numFastBytesPrev = 0xFFFFFFFF;
 
-        Int64 nowPos64;
-        bool _finished;
-        System.IO.Stream _inStream;
+        private Int64 nowPos64;
+        private bool _finished;
+        private System.IO.Stream _inStream;
 
-        EMatchFinderType _matchFinderType = EMatchFinderType.BT4;
-        bool _writeEndMark = false;
+        private EMatchFinderType _matchFinderType = EMatchFinderType.BT4;
+        private bool _writeEndMark = false;
 
-        bool _needReleaseMFStream;
+        private bool _needReleaseMFStream;
 
-        void Create()
+        private void Create()
         {
             if (_matchFinder == null)
             {
-                LZ.BinTree bt = new LZ.BinTree();
+                LZ.BinTree bt = new();
                 int numHashBytes = 4;
                 if (_matchFinderType == EMatchFinderType.BT2)
+                {
                     numHashBytes = 2;
+                }
+
                 bt.SetType(numHashBytes);
                 _matchFinder = bt;
             }
             _literalEncoder.Create(_numLiteralPosStateBits, _numLiteralContextBits);
 
             if (_dictionarySize == _dictionarySizePrev && _numFastBytesPrev == _numFastBytes)
+            {
                 return;
+            }
+
             _matchFinder.Create(_dictionarySize, kNumOpts, _numFastBytes, Base.kMatchMaxLen + 1);
             _dictionarySizePrev = _dictionarySize;
             _numFastBytesPrev = _numFastBytes;
@@ -383,17 +428,22 @@ namespace SevenZip.Compression.LZMA
         public Encoder()
         {
             for (int i = 0; i < kNumOpts; i++)
+            {
                 _optimum[i] = new Optimal();
+            }
+
             for (int i = 0; i < Base.kNumLenToPosStates; i++)
-                _posSlotEncoder[i] = new RangeCoder.BitTreeEncoder(Base.kNumPosSlotBits);
+            {
+                _posSlotEncoder[i] = new BitTreeEncoder(Base.kNumPosSlotBits);
+            }
         }
 
-        void SetWriteEndMarkerMode(bool writeEndMarker)
+        private void SetWriteEndMarkerMode(bool writeEndMarker)
         {
             _writeEndMark = writeEndMarker;
         }
 
-        void Init()
+        private void Init()
         {
             BaseInit();
             _rangeEncoder.Init();
@@ -414,9 +464,14 @@ namespace SevenZip.Compression.LZMA
             }
             _literalEncoder.Init();
             for (i = 0; i < Base.kNumLenToPosStates; i++)
+            {
                 _posSlotEncoder[i].Init();
+            }
+
             for (i = 0; i < Base.kNumFullDistances - Base.kEndPosModelIndex; i++)
+            {
                 _posEncoders[i].Init();
+            }
 
             _lenEncoder.Init((UInt32)1 << _posStateBits);
             _repMatchLenEncoder.Init((UInt32)1 << _posStateBits);
@@ -429,7 +484,7 @@ namespace SevenZip.Compression.LZMA
             _additionalOffset = 0;
         }
 
-        void ReadMatchDistances(out UInt32 lenRes, out UInt32 numDistancePairs)
+        private void ReadMatchDistances(out UInt32 lenRes, out UInt32 numDistancePairs)
         {
             lenRes = 0;
             numDistancePairs = _matchFinder.GetMatches(_matchDistances);
@@ -437,14 +492,15 @@ namespace SevenZip.Compression.LZMA
             {
                 lenRes = _matchDistances[numDistancePairs - 2];
                 if (lenRes == _numFastBytes)
+                {
                     lenRes += _matchFinder.GetMatchLen((int)lenRes - 1, _matchDistances[numDistancePairs - 1],
                         Base.kMatchMaxLen - lenRes);
+                }
             }
             _additionalOffset++;
         }
 
-
-        void MovePos(UInt32 num)
+        private void MovePos(UInt32 num)
         {
             if (num > 0)
             {
@@ -453,13 +509,13 @@ namespace SevenZip.Compression.LZMA
             }
         }
 
-        UInt32 GetRepLen1Price(Base.State state, UInt32 posState)
+        private UInt32 GetRepLen1Price(Base.State state, UInt32 posState)
         {
             return _isRepG0[state.Index].GetPrice0() +
                     _isRep0Long[(state.Index << Base.kNumPosStatesBitsMax) + posState].GetPrice0();
         }
 
-        UInt32 GetPureRepPrice(UInt32 repIndex, Base.State state, UInt32 posState)
+        private UInt32 GetPureRepPrice(UInt32 repIndex, Base.State state, UInt32 posState)
         {
             UInt32 price;
             if (repIndex == 0)
@@ -471,7 +527,9 @@ namespace SevenZip.Compression.LZMA
             {
                 price = _isRepG0[state.Index].GetPrice1();
                 if (repIndex == 1)
+                {
                     price += _isRepG1[state.Index].GetPrice0();
+                }
                 else
                 {
                     price += _isRepG1[state.Index].GetPrice1();
@@ -481,25 +539,25 @@ namespace SevenZip.Compression.LZMA
             return price;
         }
 
-        UInt32 GetRepPrice(UInt32 repIndex, UInt32 len, Base.State state, UInt32 posState)
+        private UInt32 GetRepPrice(UInt32 repIndex, UInt32 len, Base.State state, UInt32 posState)
         {
             UInt32 price = _repMatchLenEncoder.GetPrice(len - Base.kMatchMinLen, posState);
             return price + GetPureRepPrice(repIndex, state, posState);
         }
 
-        UInt32 GetPosLenPrice(UInt32 pos, UInt32 len, UInt32 posState)
+        private UInt32 GetPosLenPrice(UInt32 pos, UInt32 len, UInt32 posState)
         {
             UInt32 price;
             UInt32 lenToPosState = Base.GetLenToPosState(len);
-            if (pos < Base.kNumFullDistances)
-                price = _distancesPrices[(lenToPosState * Base.kNumFullDistances) + pos];
-            else
-                price = _posSlotPrices[(lenToPosState << Base.kNumPosSlotBits) + GetPosSlot2(pos)] +
-                    _alignPrices[pos & Base.kAlignMask];
+            price = pos < Base.kNumFullDistances
+                ? _distancesPrices[(lenToPosState * Base.kNumFullDistances) + pos]
+                : _posSlotPrices[(lenToPosState << Base.kNumPosSlotBits) + GetPosSlot2(pos)] +
+                   _alignPrices[pos & Base.kAlignMask];
+
             return price + _lenEncoder.GetPrice(len - Base.kMatchMinLen, posState);
         }
 
-        UInt32 Backward(out UInt32 backRes, UInt32 cur)
+        private UInt32 Backward(out UInt32 backRes, UInt32 cur)
         {
             _optimumEndIndex = cur;
             UInt32 posMem = _optimum[cur].PosPrev;
@@ -533,11 +591,10 @@ namespace SevenZip.Compression.LZMA
             return _optimumCurrentIndex;
         }
 
-        UInt32[] reps = new UInt32[Base.kNumRepDistances];
-        UInt32[] repLens = new UInt32[Base.kNumRepDistances];
+        private readonly UInt32[] reps = new UInt32[Base.kNumRepDistances];
+        private readonly UInt32[] repLens = new UInt32[Base.kNumRepDistances];
 
-
-        UInt32 GetOptimum(UInt32 position, out UInt32 backRes)
+        private UInt32 GetOptimum(UInt32 position, out UInt32 backRes)
         {
             if (_optimumEndIndex != _optimumCurrentIndex)
             {
@@ -567,7 +624,9 @@ namespace SevenZip.Compression.LZMA
                 return 1;
             }
             if (numAvailableBytes > Base.kMatchMaxLen)
+            {
                 numAvailableBytes = Base.kMatchMaxLen;
+            }
 
             UInt32 repMaxIndex = 0;
             UInt32 i;
@@ -576,7 +635,9 @@ namespace SevenZip.Compression.LZMA
                 reps[i] = _repDistances[i];
                 repLens[i] = _matchFinder.GetMatchLen(0 - 1, reps[i], Base.kMatchMaxLen);
                 if (repLens[i] > repLens[repMaxIndex])
+                {
                     repMaxIndex = i;
+                }
             }
             if (repLens[repMaxIndex] >= _numFastBytes)
             {
@@ -598,7 +659,7 @@ namespace SevenZip.Compression.LZMA
 
             if (lenMain < 2 && currentByte != matchByte && repLens[repMaxIndex] < 2)
             {
-                backRes = (UInt32)0xFFFFFFFF;
+                backRes = 0xFFFFFFFF;
                 return 1;
             }
 
@@ -640,14 +701,19 @@ namespace SevenZip.Compression.LZMA
 
             UInt32 len = lenEnd;
             do
+            {
                 _optimum[len--].Price = kIfinityPrice;
+            }
             while (len >= 2);
 
             for (i = 0; i < Base.kNumRepDistances; i++)
             {
                 UInt32 repLen = repLens[i];
                 if (repLen < 2)
+                {
                     continue;
+                }
+
                 UInt32 price = repMatchPrice + GetPureRepPrice(i, _state, posState);
                 do
                 {
@@ -671,7 +737,10 @@ namespace SevenZip.Compression.LZMA
             {
                 UInt32 offs = 0;
                 while (len > _matchDistances[offs])
+                {
                     offs += 2;
+                }
+
                 for (; ; len++)
                 {
                     UInt32 distance = _matchDistances[offs + 1];
@@ -688,7 +757,9 @@ namespace SevenZip.Compression.LZMA
                     {
                         offs += 2;
                         if (offs == numDistancePairs)
+                        {
                             break;
+                        }
                     }
                 }
             }
@@ -699,9 +770,11 @@ namespace SevenZip.Compression.LZMA
             {
                 cur++;
                 if (cur == lenEnd)
+                {
                     return Backward(out backRes, cur);
-                UInt32 newLen;
-                ReadMatchDistances(out newLen, out numDistancePairs);
+                }
+
+                ReadMatchDistances(out uint newLen, out numDistancePairs);
                 if (newLen >= _numFastBytes)
                 {
                     _numDistancePairs = numDistancePairs;
@@ -719,22 +792,36 @@ namespace SevenZip.Compression.LZMA
                     {
                         state = _optimum[_optimum[cur].PosPrev2].State;
                         if (_optimum[cur].BackPrev2 < Base.kNumRepDistances)
+                        {
                             state.UpdateRep();
+                        }
                         else
+                        {
                             state.UpdateMatch();
+                        }
                     }
                     else
+                    {
                         state = _optimum[posPrev].State;
+                    }
+
                     state.UpdateChar();
                 }
                 else
+                {
                     state = _optimum[posPrev].State;
+                }
+
                 if (posPrev == cur - 1)
                 {
                     if (_optimum[cur].IsShortRep())
+                    {
                         state.UpdateShortRep();
+                    }
                     else
+                    {
                         state.UpdateChar();
+                    }
                 }
                 else
                 {
@@ -749,9 +836,13 @@ namespace SevenZip.Compression.LZMA
                     {
                         pos = _optimum[cur].BackPrev;
                         if (pos < Base.kNumRepDistances)
+                        {
                             state.UpdateRep();
+                        }
                         else
+                        {
                             state.UpdateMatch();
+                        }
                     }
                     Optimal opt = _optimum[posPrev];
                     if (pos < Base.kNumRepDistances)
@@ -842,9 +933,15 @@ namespace SevenZip.Compression.LZMA
                 numAvailableBytes = numAvailableBytesFull;
 
                 if (numAvailableBytes < 2)
+                {
                     continue;
+                }
+
                 if (numAvailableBytes > _numFastBytes)
+                {
                     numAvailableBytes = _numFastBytes;
+                }
+
                 if (!nextIsChar && matchByte != currentByte)
                 {
                     // try Literal + rep0
@@ -861,7 +958,10 @@ namespace SevenZip.Compression.LZMA
                         {
                             UInt32 offset = cur + 1 + lenTest2;
                             while (lenEnd < offset)
+                            {
                                 _optimum[++lenEnd].Price = kIfinityPrice;
+                            }
+
                             UInt32 curAndLenPrice = nextRepMatchPrice + GetRepPrice(
                                 0, lenTest2, state2, posStateNext);
                             Optimal optimum = _optimum[offset];
@@ -883,12 +983,18 @@ namespace SevenZip.Compression.LZMA
                 {
                     UInt32 lenTest = _matchFinder.GetMatchLen(0 - 1, reps[repIndex], numAvailableBytes);
                     if (lenTest < 2)
+                    {
                         continue;
+                    }
+
                     UInt32 lenTestTemp = lenTest;
                     do
                     {
                         while (lenEnd < cur + lenTest)
+                        {
                             _optimum[++lenEnd].Price = kIfinityPrice;
+                        }
+
                         UInt32 curAndLenPrice = repMatchPrice + GetRepPrice(repIndex, lenTest, state, posState);
                         Optimal optimum = _optimum[cur + lenTest];
                         if (curAndLenPrice < optimum.Price)
@@ -903,7 +1009,9 @@ namespace SevenZip.Compression.LZMA
                     lenTest = lenTestTemp;
 
                     if (repIndex == 0)
+                    {
                         startLen = lenTest + 1;
+                    }
 
                     // if (_maxMode)
                     if (lenTest < numAvailableBytesFull)
@@ -920,7 +1028,7 @@ namespace SevenZip.Compression.LZMA
                                     _isMatch[(state2.Index << Base.kNumPosStatesBitsMax) + posStateNext].GetPrice0() +
                                     _literalEncoder.GetSubCoder(position + lenTest,
                                     _matchFinder.GetIndexByte((Int32)lenTest - 1 - 1)).GetPrice(true,
-                                    _matchFinder.GetIndexByte((Int32)((Int32)lenTest - 1 - (Int32)(reps[repIndex] + 1))),
+                                    _matchFinder.GetIndexByte((Int32)lenTest - 1 - (Int32)(reps[repIndex] + 1)),
                                     _matchFinder.GetIndexByte((Int32)lenTest - 1));
                             state2.UpdateChar();
                             posStateNext = (position + lenTest + 1) & _posStateMask;
@@ -931,7 +1039,10 @@ namespace SevenZip.Compression.LZMA
                             {
                                 UInt32 offset = lenTest + 1 + lenTest2;
                                 while (lenEnd < cur + offset)
+                                {
                                     _optimum[++lenEnd].Price = kIfinityPrice;
+                                }
+
                                 UInt32 curAndLenPrice = nextRepMatchPrice + GetRepPrice(0, lenTest2, state2, posStateNext);
                                 Optimal optimum = _optimum[cur + offset];
                                 if (curAndLenPrice < optimum.Price)
@@ -952,7 +1063,10 @@ namespace SevenZip.Compression.LZMA
                 if (newLen > numAvailableBytes)
                 {
                     newLen = numAvailableBytes;
-                    for (numDistancePairs = 0; newLen > _matchDistances[numDistancePairs]; numDistancePairs += 2) ;
+                    for (numDistancePairs = 0; newLen > _matchDistances[numDistancePairs]; numDistancePairs += 2)
+                    {
+                    }
+
                     _matchDistances[numDistancePairs] = newLen;
                     numDistancePairs += 2;
                 }
@@ -960,11 +1074,15 @@ namespace SevenZip.Compression.LZMA
                 {
                     normalMatchPrice = matchPrice + _isRep[state.Index].GetPrice0();
                     while (lenEnd < cur + newLen)
+                    {
                         _optimum[++lenEnd].Price = kIfinityPrice;
+                    }
 
                     UInt32 offs = 0;
                     while (startLen > _matchDistances[offs])
+                    {
                         offs += 2;
+                    }
 
                     for (UInt32 lenTest = startLen; ; lenTest++)
                     {
@@ -1004,7 +1122,10 @@ namespace SevenZip.Compression.LZMA
 
                                     UInt32 offset = lenTest + 1 + lenTest2;
                                     while (lenEnd < cur + offset)
+                                    {
                                         _optimum[++lenEnd].Price = kIfinityPrice;
+                                    }
+
                                     curAndLenPrice = nextRepMatchPrice + GetRepPrice(0, lenTest2, state2, posStateNext);
                                     optimum = _optimum[cur + offset];
                                     if (curAndLenPrice < optimum.Price)
@@ -1021,39 +1142,43 @@ namespace SevenZip.Compression.LZMA
                             }
                             offs += 2;
                             if (offs == numDistancePairs)
+                            {
                                 break;
+                            }
                         }
                     }
                 }
             }
         }
 
-        bool ChangePair(UInt32 smallDist, UInt32 bigDist)
+        private bool ChangePair(UInt32 smallDist, UInt32 bigDist)
         {
             const int kDif = 7;
-            return (smallDist < ((UInt32)(1) << (32 - kDif)) && bigDist >= (smallDist << kDif));
+            return smallDist < ((UInt32)(1) << (32 - kDif)) && bigDist >= (smallDist << kDif);
         }
 
-        void WriteEndMarker(UInt32 posState)
+        private void WriteEndMarker(UInt32 posState)
         {
             if (!_writeEndMark)
+            {
                 return;
+            }
 
             _isMatch[(_state.Index << Base.kNumPosStatesBitsMax) + posState].Encode(_rangeEncoder, 1);
             _isRep[_state.Index].Encode(_rangeEncoder, 0);
             _state.UpdateMatch();
-            UInt32 len = Base.kMatchMinLen;
+            const UInt32 len = Base.kMatchMinLen;
             _lenEncoder.Encode(_rangeEncoder, len - Base.kMatchMinLen, posState);
-            UInt32 posSlot = (1 << Base.kNumPosSlotBits) - 1;
+            const UInt32 posSlot = (1 << Base.kNumPosSlotBits) - 1;
             UInt32 lenToPosState = Base.GetLenToPosState(len);
             _posSlotEncoder[lenToPosState].Encode(_rangeEncoder, posSlot);
-            int footerBits = 30;
+            const int footerBits = 30;
             UInt32 posReduced = (((UInt32)1) << footerBits) - 1;
             _rangeEncoder.EncodeDirectBits(posReduced >> Base.kNumAlignBits, footerBits - Base.kNumAlignBits);
             _posAlignEncoder.ReverseEncode(_rangeEncoder, posReduced & Base.kAlignMask);
         }
 
-        void Flush(UInt32 nowPos)
+        private void Flush(UInt32 nowPos)
         {
             ReleaseMFStream();
             WriteEndMarker(nowPos & _posStateMask);
@@ -1074,13 +1199,17 @@ namespace SevenZip.Compression.LZMA
                 _needReleaseMFStream = true;
                 _inStream = null;
                 if (_trainSize > 0)
+                {
                     _matchFinder.Skip(_trainSize);
+                }
             }
 
             if (_finished)
+            {
                 return;
-            _finished = true;
+            }
 
+            _finished = true;
 
             Int64 progressPosValuePrev = nowPos64;
             if (nowPos64 == 0)
@@ -1090,8 +1219,8 @@ namespace SevenZip.Compression.LZMA
                     Flush((UInt32)nowPos64);
                     return;
                 }
-                UInt32 len, numDistancePairs; // it's not used
-                ReadMatchDistances(out len, out numDistancePairs);
+                // it's not used
+                ReadMatchDistances(out uint len, out uint numDistancePairs);
                 UInt32 posState = (UInt32)(nowPos64) & _posStateMask;
                 _isMatch[(_state.Index << Base.kNumPosStatesBitsMax) + posState].Encode(_rangeEncoder, 0);
                 _state.UpdateChar();
@@ -1108,8 +1237,7 @@ namespace SevenZip.Compression.LZMA
             }
             while (true)
             {
-                UInt32 pos;
-                UInt32 len = GetOptimum((UInt32)nowPos64, out pos);
+                UInt32 len = GetOptimum((UInt32)nowPos64, out uint pos);
 
                 UInt32 posState = ((UInt32)nowPos64) & _posStateMask;
                 UInt32 complexState = (_state.Index << Base.kNumPosStatesBitsMax) + posState;
@@ -1124,7 +1252,10 @@ namespace SevenZip.Compression.LZMA
                         subCoder.EncodeMatched(_rangeEncoder, matchByte, curByte);
                     }
                     else
+                    {
                         subCoder.Encode(_rangeEncoder, curByte);
+                    }
+
                     _previousByte = curByte;
                     _state.UpdateChar();
                 }
@@ -1138,15 +1269,21 @@ namespace SevenZip.Compression.LZMA
                         {
                             _isRepG0[_state.Index].Encode(_rangeEncoder, 0);
                             if (len == 1)
+                            {
                                 _isRep0Long[complexState].Encode(_rangeEncoder, 0);
+                            }
                             else
+                            {
                                 _isRep0Long[complexState].Encode(_rangeEncoder, 1);
+                            }
                         }
                         else
                         {
                             _isRepG0[_state.Index].Encode(_rangeEncoder, 1);
                             if (pos == 1)
+                            {
                                 _isRepG1[_state.Index].Encode(_rangeEncoder, 0);
+                            }
                             else
                             {
                                 _isRepG1[_state.Index].Encode(_rangeEncoder, 1);
@@ -1154,7 +1291,9 @@ namespace SevenZip.Compression.LZMA
                             }
                         }
                         if (len == 1)
+                        {
                             _state.UpdateShortRep();
+                        }
                         else
                         {
                             _repMatchLenEncoder.Encode(_rangeEncoder, len - Base.kMatchMinLen, posState);
@@ -1164,7 +1303,10 @@ namespace SevenZip.Compression.LZMA
                         if (pos != 0)
                         {
                             for (UInt32 i = pos; i >= 1; i--)
+                            {
                                 _repDistances[i] = _repDistances[i - 1];
+                            }
+
                             _repDistances[0] = distance;
                         }
                     }
@@ -1185,8 +1327,10 @@ namespace SevenZip.Compression.LZMA
                             UInt32 posReduced = pos - baseVal;
 
                             if (posSlot < Base.kEndPosModelIndex)
+                            {
                                 RangeCoder.BitTreeEncoder.ReverseEncode(_posEncoders,
-                                        baseVal - posSlot - 1, _rangeEncoder, footerBits, posReduced);
+                                       baseVal - posSlot - 1, _rangeEncoder, footerBits, posReduced);
+                            }
                             else
                             {
                                 _rangeEncoder.EncodeDirectBits(posReduced >> Base.kNumAlignBits, footerBits - Base.kNumAlignBits);
@@ -1196,7 +1340,10 @@ namespace SevenZip.Compression.LZMA
                         }
                         UInt32 distance = pos;
                         for (UInt32 i = Base.kNumRepDistances - 1; i >= 1; i--)
+                        {
                             _repDistances[i] = _repDistances[i - 1];
+                        }
+
                         _repDistances[0] = distance;
                         _matchPriceCount++;
                     }
@@ -1208,9 +1355,15 @@ namespace SevenZip.Compression.LZMA
                 {
                     // if (!_fastMode)
                     if (_matchPriceCount >= (1 << 7))
+                    {
                         FillDistancesPrices();
+                    }
+
                     if (_alignPriceCount >= Base.kAlignTableSize)
+                    {
                         FillAlignPrices();
+                    }
+
                     inSize = nowPos64;
                     outSize = _rangeEncoder.GetProcessedSizeAdd();
                     if (_matchFinder.GetNumAvailableBytes() == 0)
@@ -1229,7 +1382,7 @@ namespace SevenZip.Compression.LZMA
             }
         }
 
-        void ReleaseMFStream()
+        private void ReleaseMFStream()
         {
             if (_matchFinder != null && _needReleaseMFStream)
             {
@@ -1238,16 +1391,16 @@ namespace SevenZip.Compression.LZMA
             }
         }
 
-        void SetOutStream(System.IO.Stream outStream) { _rangeEncoder.SetStream(outStream); }
-        void ReleaseOutStream() { _rangeEncoder.ReleaseStream(); }
+        private void SetOutStream(System.IO.Stream outStream) { _rangeEncoder.SetStream(outStream); }
+        private void ReleaseOutStream() { _rangeEncoder.ReleaseStream(); }
 
-        void ReleaseStreams()
+        private void ReleaseStreams()
         {
             ReleaseMFStream();
             ReleaseOutStream();
         }
 
-        void SetStreams(System.IO.Stream inStream, System.IO.Stream outStream,
+        private void SetStreams(System.IO.Stream inStream, System.IO.Stream outStream,
                 Int64 inSize, Int64 outSize)
         {
             _inStream = inStream;
@@ -1270,7 +1423,6 @@ namespace SevenZip.Compression.LZMA
             nowPos64 = 0;
         }
 
-
         public void Code(System.IO.Stream inStream, System.IO.Stream outStream,
             Int64 inSize, Int64 outSize, ICodeProgress progress, CancellationToken? token = null)
         {
@@ -1281,16 +1433,13 @@ namespace SevenZip.Compression.LZMA
                 while (true)
                 {
                     token?.ThrowIfCancellationRequested();
-                    Int64 processedInSize;
-                    Int64 processedOutSize;
-                    bool finished;
-                    CodeOneBlock(out processedInSize, out processedOutSize, out finished);
+                    CodeOneBlock(out long processedInSize, out long processedOutSize, out bool finished);
                     if (finished)
-                        return;
-                    if (progress != null)
                     {
-                        progress.SetProgress(processedInSize, processedOutSize);
+                        return;
                     }
+
+                    progress?.SetProgress(processedInSize, processedOutSize);
                 }
             }
             finally
@@ -1299,21 +1448,24 @@ namespace SevenZip.Compression.LZMA
             }
         }
 
-        const int kPropSize = 5;
-        Byte[] properties = new Byte[kPropSize];
+        private const int kPropSize = 5;
+        private readonly Byte[] properties = new Byte[kPropSize];
 
         public void WriteCoderProperties(System.IO.Stream outStream)
         {
-            properties[0] = (Byte)((_posStateBits * 5 + _numLiteralPosStateBits) * 9 + _numLiteralContextBits);
+            properties[0] = (Byte)((((_posStateBits * 5) + _numLiteralPosStateBits) * 9) + _numLiteralContextBits);
             for (int i = 0; i < 4; i++)
+            {
                 properties[1 + i] = (Byte)((_dictionarySize >> (8 * i)) & 0xFF);
+            }
+
             outStream.Write(properties, 0, kPropSize);
         }
 
-        UInt32[] tempPrices = new UInt32[Base.kNumFullDistances];
-        UInt32 _matchPriceCount;
+        private readonly UInt32[] tempPrices = new UInt32[Base.kNumFullDistances];
+        private UInt32 _matchPriceCount;
 
-        void FillDistancesPrices()
+        private void FillDistancesPrices()
         {
             for (UInt32 i = Base.kStartPosModelIndex; i < Base.kNumFullDistances; i++)
             {
@@ -1327,43 +1479,60 @@ namespace SevenZip.Compression.LZMA
             for (UInt32 lenToPosState = 0; lenToPosState < Base.kNumLenToPosStates; lenToPosState++)
             {
                 UInt32 posSlot;
-                RangeCoder.BitTreeEncoder encoder = _posSlotEncoder[lenToPosState];
+                BitTreeEncoder encoder = _posSlotEncoder[lenToPosState];
 
                 UInt32 st = (lenToPosState << Base.kNumPosSlotBits);
                 for (posSlot = 0; posSlot < _distTableSize; posSlot++)
+                {
                     _posSlotPrices[st + posSlot] = encoder.GetPrice(posSlot);
+                }
+
                 for (posSlot = Base.kEndPosModelIndex; posSlot < _distTableSize; posSlot++)
-                    _posSlotPrices[st + posSlot] += ((((posSlot >> 1) - 1) - Base.kNumAlignBits) << RangeCoder.BitEncoder.kNumBitPriceShiftBits);
+                {
+                    _posSlotPrices[st + posSlot] += (((posSlot >> 1) - 1 - Base.kNumAlignBits) << RangeCoder.BitEncoder.kNumBitPriceShiftBits);
+                }
 
                 UInt32 st2 = lenToPosState * Base.kNumFullDistances;
                 UInt32 i;
                 for (i = 0; i < Base.kStartPosModelIndex; i++)
+                {
                     _distancesPrices[st2 + i] = _posSlotPrices[st + i];
+                }
+
                 for (; i < Base.kNumFullDistances; i++)
+                {
                     _distancesPrices[st2 + i] = _posSlotPrices[st + GetPosSlot(i)] + tempPrices[i];
+                }
             }
             _matchPriceCount = 0;
         }
 
-        void FillAlignPrices()
+        private void FillAlignPrices()
         {
             for (UInt32 i = 0; i < Base.kAlignTableSize; i++)
+            {
                 _alignPrices[i] = _posAlignEncoder.ReverseGetPrice(i);
+            }
+
             _alignPriceCount = 0;
         }
 
-
-        static string[] kMatchFinderIDs =
+        private static readonly string[] kMatchFinderIDs =
         {
             "BT2",
             "BT4",
         };
 
-        static int FindMatchFinder(string s)
+        private static int FindMatchFinder(string s)
         {
             for (int m = 0; m < kMatchFinderIDs.Length; m++)
+            {
                 if (s == kMatchFinderIDs[m])
+                {
                     return m;
+                }
+            }
+
             return -1;
         }
 
@@ -1377,10 +1546,16 @@ namespace SevenZip.Compression.LZMA
                     case CoderPropID.NumFastBytes:
                         {
                             if (!(prop is Int32))
+                            {
                                 throw new InvalidParamException();
+                            }
+
                             Int32 numFastBytes = (Int32)prop;
                             if (numFastBytes < 5 || numFastBytes > Base.kMatchMaxLen)
+                            {
                                 throw new InvalidParamException();
+                            }
+
                             _numFastBytes = (UInt32)numFastBytes;
                             break;
                         }
@@ -1398,11 +1573,17 @@ namespace SevenZip.Compression.LZMA
                     case CoderPropID.MatchFinder:
                         {
                             if (!(prop is String))
+                            {
                                 throw new InvalidParamException();
+                            }
+
                             EMatchFinderType matchFinderIndexPrev = _matchFinderType;
                             int m = FindMatchFinder(((string)prop).ToUpper());
                             if (m < 0)
+                            {
                                 throw new InvalidParamException();
+                            }
+
                             _matchFinderType = (EMatchFinderType)m;
                             if (_matchFinder != null && matchFinderIndexPrev != _matchFinderType)
                             {
@@ -1415,54 +1596,84 @@ namespace SevenZip.Compression.LZMA
                         {
                             const int kDicLogSizeMaxCompress = 30;
                             if (!(prop is Int32))
-                                throw new InvalidParamException(); ;
+                            {
+                                throw new InvalidParamException();
+                            }
                             Int32 dictionarySize = (Int32)prop;
                             if (dictionarySize < (UInt32)(1 << Base.kDicLogSizeMin) ||
                                 dictionarySize > (UInt32)(1 << kDicLogSizeMaxCompress))
+                            {
                                 throw new InvalidParamException();
+                            }
+
                             _dictionarySize = (UInt32)dictionarySize;
                             int dicLogSize;
                             for (dicLogSize = 0; dicLogSize < (UInt32)kDicLogSizeMaxCompress; dicLogSize++)
+                            {
                                 if (dictionarySize <= ((UInt32)(1) << dicLogSize))
+                                {
                                     break;
+                                }
+                            }
+
                             _distTableSize = (UInt32)dicLogSize * 2;
                             break;
                         }
                     case CoderPropID.PosStateBits:
                         {
                             if (!(prop is Int32))
+                            {
                                 throw new InvalidParamException();
+                            }
+
                             Int32 v = (Int32)prop;
                             if (v < 0 || v > (UInt32)Base.kNumPosStatesBitsEncodingMax)
+                            {
                                 throw new InvalidParamException();
-                            _posStateBits = (int)v;
-                            _posStateMask = (((UInt32)1) << (int)_posStateBits) - 1;
+                            }
+
+                            _posStateBits = v;
+                            _posStateMask = (((UInt32)1) << _posStateBits) - 1;
                             break;
                         }
                     case CoderPropID.LitPosBits:
                         {
                             if (!(prop is Int32))
+                            {
                                 throw new InvalidParamException();
+                            }
+
                             Int32 v = (Int32)prop;
-                            if (v < 0 || v > (UInt32)Base.kNumLitPosStatesBitsEncodingMax)
+                            if (v < 0 || v > Base.kNumLitPosStatesBitsEncodingMax)
+                            {
                                 throw new InvalidParamException();
-                            _numLiteralPosStateBits = (int)v;
+                            }
+
+                            _numLiteralPosStateBits = v;
                             break;
                         }
                     case CoderPropID.LitContextBits:
                         {
                             if (!(prop is Int32))
+                            {
                                 throw new InvalidParamException();
+                            }
+
                             Int32 v = (Int32)prop;
-                            if (v < 0 || v > (UInt32)Base.kNumLitContextBitsMax)
-                                throw new InvalidParamException(); ;
-                            _numLiteralContextBits = (int)v;
+                            if (v < 0 || v > Base.kNumLitContextBitsMax)
+                            {
+                                throw new InvalidParamException();
+                            }
+                            _numLiteralContextBits = v;
                             break;
                         }
                     case CoderPropID.EndMarker:
                         {
                             if (!(prop is Boolean))
+                            {
                                 throw new InvalidParamException();
+                            }
+
                             SetWriteEndMarkerMode((Boolean)prop);
                             break;
                         }
@@ -1472,11 +1683,10 @@ namespace SevenZip.Compression.LZMA
             }
         }
 
-        uint _trainSize = 0;
+        private uint _trainSize = 0;
         public void SetTrainSize(uint trainSize)
         {
             _trainSize = trainSize;
         }
-
     }
 }
diff --git a/7zip/Compress/RangeCoder/RangeCoder.cs b/7zip/Compress/RangeCoder/RangeCoder.cs
index bf78c3b..45025d1 100644
--- a/7zip/Compress/RangeCoder/RangeCoder.cs
+++ b/7zip/Compress/RangeCoder/RangeCoder.cs
@@ -2,18 +2,18 @@ using System;
 
 namespace SevenZip.Compression.RangeCoder
 {
-    class Encoder
+    internal class Encoder
     {
         public const uint kTopValue = (1 << 24);
 
-        System.IO.Stream Stream;
+        private System.IO.Stream Stream;
 
         public UInt64 Low;
         public uint Range;
-        uint _cacheSize;
-        byte _cache;
+        private uint _cacheSize;
+        private byte _cache;
 
-        long StartPosition;
+        private long StartPosition;
 
         public void SetStream(System.IO.Stream stream)
         {
@@ -38,7 +38,9 @@ namespace SevenZip.Compression.RangeCoder
         public void FlushData()
         {
             for (int i = 0; i < 5; i++)
+            {
                 ShiftLow();
+            }
         }
 
         public void FlushStream()
@@ -64,7 +66,7 @@ namespace SevenZip.Compression.RangeCoder
 
         public void ShiftLow()
         {
-            if ((uint)Low < (uint)0xFF000000 || (uint)(Low >> 32) == 1)
+            if ((uint)Low < 0xFF000000 || (uint)(Low >> 32) == 1)
             {
                 byte temp = _cache;
                 do
@@ -85,7 +87,10 @@ namespace SevenZip.Compression.RangeCoder
             {
                 Range >>= 1;
                 if (((v >> i) & 1) == 1)
+                {
                     Low += Range;
+                }
+
                 if (Range < kTopValue)
                 {
                     Range <<= 8;
@@ -98,7 +103,9 @@ namespace SevenZip.Compression.RangeCoder
         {
             uint newBound = (Range >> numTotalBits) * size0;
             if (symbol == 0)
+            {
                 Range = newBound;
+            }
             else
             {
                 Low += newBound;
@@ -119,7 +126,7 @@ namespace SevenZip.Compression.RangeCoder
         }
     }
 
-    class Decoder
+    internal class Decoder
     {
         public const uint kTopValue = (1 << 24);
         public uint Range;
@@ -135,7 +142,9 @@ namespace SevenZip.Compression.RangeCoder
             Code = 0;
             Range = 0xFFFFFFFF;
             for (int i = 0; i < 5; i++)
+            {
                 Code = (Code << 8) | (byte)Stream.ReadByte();
+            }
         }
 
         public void ReleaseStream()
diff --git a/7zip/Compress/RangeCoder/RangeCoderBit.cs b/7zip/Compress/RangeCoder/RangeCoderBit.cs
index 05a486e..cb88d5c 100644
--- a/7zip/Compress/RangeCoder/RangeCoderBit.cs
+++ b/7zip/Compress/RangeCoder/RangeCoderBit.cs
@@ -2,24 +2,28 @@ using System;
 
 namespace SevenZip.Compression.RangeCoder
 {
-    struct BitEncoder
+    internal struct BitEncoder
     {
         public const int kNumBitModelTotalBits = 11;
         public const uint kBitModelTotal = (1 << kNumBitModelTotalBits);
-        const int kNumMoveBits = 5;
-        const int kNumMoveReducingBits = 2;
+        private const int kNumMoveBits = 5;
+        private const int kNumMoveReducingBits = 2;
         public const int kNumBitPriceShiftBits = 6;
 
-        uint Prob;
+        private uint Prob;
 
         public void Init() { Prob = kBitModelTotal >> 1; }
 
         public void UpdateModel(uint symbol)
         {
             if (symbol == 0)
+            {
                 Prob += (kBitModelTotal - Prob) >> kNumMoveBits;
+            }
             else
-                Prob -= (Prob) >> kNumMoveBits;
+            {
+                Prob -= Prob >> kNumMoveBits;
+            }
         }
 
         public void Encode(Encoder encoder, uint symbol)
@@ -36,7 +40,7 @@ namespace SevenZip.Compression.RangeCoder
             {
                 encoder.Low += newBound;
                 encoder.Range -= newBound;
-                Prob -= (Prob) >> kNumMoveBits;
+                Prob -= Prob >> kNumMoveBits;
             }
             if (encoder.Range < Encoder.kTopValue)
             {
@@ -45,7 +49,7 @@ namespace SevenZip.Compression.RangeCoder
             }
         }
 
-        private static UInt32[] ProbPrices = new UInt32[kBitModelTotal >> kNumMoveReducingBits];
+        private static readonly UInt32[] ProbPrices = new UInt32[kBitModelTotal >> kNumMoveReducingBits];
 
         static BitEncoder()
         {
@@ -55,40 +59,46 @@ namespace SevenZip.Compression.RangeCoder
                 UInt32 start = (UInt32)1 << (kNumBits - i - 1);
                 UInt32 end = (UInt32)1 << (kNumBits - i);
                 for (UInt32 j = start; j < end; j++)
+                {
                     ProbPrices[j] = ((UInt32)i << kNumBitPriceShiftBits) +
                         (((end - j) << kNumBitPriceShiftBits) >> (kNumBits - i - 1));
+                }
             }
         }
 
         public uint GetPrice(uint symbol)
         {
-            return ProbPrices[(((Prob - symbol) ^ ((-(int)symbol))) & (kBitModelTotal - 1)) >> kNumMoveReducingBits];
+            return ProbPrices[(((Prob - symbol) ^ (-(int)symbol)) & (kBitModelTotal - 1)) >> kNumMoveReducingBits];
         }
         public uint GetPrice0() { return ProbPrices[Prob >> kNumMoveReducingBits]; }
         public uint GetPrice1() { return ProbPrices[(kBitModelTotal - Prob) >> kNumMoveReducingBits]; }
     }
 
-    struct BitDecoder
+    internal struct BitDecoder
     {
         public const int kNumBitModelTotalBits = 11;
         public const uint kBitModelTotal = (1 << kNumBitModelTotalBits);
-        const int kNumMoveBits = 5;
+        private const int kNumMoveBits = 5;
 
-        uint Prob;
+        private uint Prob;
 
         public void UpdateModel(int numMoveBits, uint symbol)
         {
             if (symbol == 0)
+            {
                 Prob += (kBitModelTotal - Prob) >> numMoveBits;
+            }
             else
-                Prob -= (Prob) >> numMoveBits;
+            {
+                Prob -= Prob >> numMoveBits;
+            }
         }
 
         public void Init() { Prob = kBitModelTotal >> 1; }
 
-        public uint Decode(RangeCoder.Decoder rangeDecoder)
+        public uint Decode(Decoder rangeDecoder)
         {
-            uint newBound = (uint)(rangeDecoder.Range >> kNumBitModelTotalBits) * (uint)Prob;
+            uint newBound = (rangeDecoder.Range >> kNumBitModelTotalBits) * Prob;
             if (rangeDecoder.Code < newBound)
             {
                 rangeDecoder.Range = newBound;
@@ -104,7 +114,7 @@ namespace SevenZip.Compression.RangeCoder
             {
                 rangeDecoder.Range -= newBound;
                 rangeDecoder.Code -= newBound;
-                Prob -= (Prob) >> kNumMoveBits;
+                Prob -= Prob >> kNumMoveBits;
                 if (rangeDecoder.Range < Decoder.kTopValue)
                 {
                     rangeDecoder.Code = (rangeDecoder.Code << 8) | (byte)rangeDecoder.Stream.ReadByte();
diff --git a/7zip/Compress/RangeCoder/RangeCoderBitTree.cs b/7zip/Compress/RangeCoder/RangeCoderBitTree.cs
index 0defdc8..7d3c026 100644
--- a/7zip/Compress/RangeCoder/RangeCoderBitTree.cs
+++ b/7zip/Compress/RangeCoder/RangeCoderBitTree.cs
@@ -2,10 +2,10 @@ using System;
 
 namespace SevenZip.Compression.RangeCoder
 {
-    struct BitTreeEncoder
+    internal struct BitTreeEncoder
     {
-        BitEncoder[] Models;
-        int NumBitLevels;
+        private readonly BitEncoder[] Models;
+        private readonly int NumBitLevels;
 
         public BitTreeEncoder(int numBitLevels)
         {
@@ -16,7 +16,9 @@ namespace SevenZip.Compression.RangeCoder
         public void Init()
         {
             for (uint i = 1; i < (1 << NumBitLevels); i++)
+            {
                 Models[i].Init();
+            }
         }
 
         public void Encode(Encoder rangeEncoder, UInt32 symbol)
@@ -100,10 +102,10 @@ namespace SevenZip.Compression.RangeCoder
         }
     }
 
-    struct BitTreeDecoder
+    internal struct BitTreeDecoder
     {
-        BitDecoder[] Models;
-        int NumBitLevels;
+        private readonly BitDecoder[] Models;
+        private readonly int NumBitLevels;
 
         public BitTreeDecoder(int numBitLevels)
         {
@@ -114,18 +116,23 @@ namespace SevenZip.Compression.RangeCoder
         public void Init()
         {
             for (uint i = 1; i < (1 << NumBitLevels); i++)
+            {
                 Models[i].Init();
+            }
         }
 
-        public uint Decode(RangeCoder.Decoder rangeDecoder)
+        public uint Decode(Decoder rangeDecoder)
         {
             uint m = 1;
             for (int bitIndex = NumBitLevels; bitIndex > 0; bitIndex--)
+            {
                 m = (m << 1) + Models[m].Decode(rangeDecoder);
+            }
+
             return m - ((uint)1 << NumBitLevels);
         }
 
-        public uint ReverseDecode(RangeCoder.Decoder rangeDecoder)
+        public uint ReverseDecode(Decoder rangeDecoder)
         {
             uint m = 1;
             uint symbol = 0;
@@ -140,7 +147,7 @@ namespace SevenZip.Compression.RangeCoder
         }
 
         public static uint ReverseDecode(BitDecoder[] Models, UInt32 startIndex,
-            RangeCoder.Decoder rangeDecoder, int NumBitLevels)
+            Decoder rangeDecoder, int NumBitLevels)
         {
             uint m = 1;
             uint symbol = 0;
diff --git a/7zip/ICoder.cs b/7zip/ICoder.cs
index 5b8251c..a6773cf 100644
--- a/7zip/ICoder.cs
+++ b/7zip/ICoder.cs
@@ -8,7 +8,7 @@ namespace SevenZip
     /// <summary>
     /// The exception that is thrown when an error in input stream occurs during decoding.
     /// </summary>
-    class DataErrorException : ApplicationException
+    internal class DataErrorException : ApplicationException
     {
         public DataErrorException() : base("Data Error") { }
     }
@@ -16,7 +16,7 @@ namespace SevenZip
     /// <summary>
     /// The exception that is thrown when the value of an argument is outside the allowable range.
     /// </summary>
-    class InvalidParamException : ApplicationException
+    internal class InvalidParamException : ApplicationException
     {
         public InvalidParamException() : base("Invalid Parameter") { }
     }
@@ -55,7 +55,7 @@ namespace SevenZip
         /// <param name="progress">
         /// callback progress reference.
         /// </param>
-        /// <exception cref="SevenZip.DataErrorException">
+        /// <exception cref="DataErrorException">
         /// if input stream is not valid
         /// </exception>
         void Code(System.IO.Stream inStream, System.IO.Stream outStream,
@@ -140,7 +140,6 @@ namespace SevenZip
         EndMarker
     };
 
-
     public interface ISetCoderProperties
     {
         void SetCoderProperties(CoderPropID[] propIDs, object[] properties);
diff --git a/App.xaml.cs b/App.xaml.cs
index 34a5dd6..a6f94d0 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -35,7 +35,7 @@ namespace WPinternals
         internal static Action NavigateToUnlockBoot;
         internal static PatchEngine PatchEngine;
         internal static WPinternalsConfig Config;
-        internal static Mutex mutex = new Mutex(false, "Global\\WPinternalsRunning");
+        internal static Mutex mutex = new(false, "Global\\WPinternalsRunning");
         internal static DownloadsViewModel DownloadManager;
         internal static bool InterruptBoot = false;
         internal static bool IsPnPEventLogMissing = true;
@@ -49,24 +49,29 @@ namespace WPinternals
             System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
 #endif
 
-            if (Environment.GetCommandLineArgs().Count() > 1)
+            if (Environment.GetCommandLineArgs().Length > 1)
+            {
                 CommandLine.OpenConsole();
+            }
 
             try
             {
                 if (!mutex.WaitOne(0, false))
                 {
-                    if (Environment.GetCommandLineArgs().Count() > 1)
+                    if (Environment.GetCommandLineArgs().Length > 1)
                     {
                         Console.WriteLine("Windows Phone Internals is already running");
                         CommandLine.CloseConsole();
                     }
                     else
+                    {
                         MessageBox.Show("Windows Phone Internals is already running.", "Windows Phone Internals", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                    }
+
                     Environment.Exit(0);
                 }
             }
-            catch (AbandonedMutexException) { };
+            catch (AbandonedMutexException) { }
 
             Registration.CheckExpiration();
 
@@ -78,20 +83,16 @@ namespace WPinternals
             }
             else
             {
-                using (Stream stream = System.Reflection.Assembly.GetEntryAssembly().GetManifestResourceStream("WPinternals.PatchDefinitions.xml"))
-                {
-                    using (StreamReader sr = new StreamReader(stream))
-                    {
-                        PatchDefintionsXml = sr.ReadToEnd();
-                    }
-                }
+                using Stream stream = System.Reflection.Assembly.GetEntryAssembly().GetManifestResourceStream("WPinternals.PatchDefinitions.xml");
+                using StreamReader sr = new(stream);
+                PatchDefintionsXml = sr.ReadToEnd();
             }
             PatchEngine = new PatchEngine(PatchDefintionsXml);
 
             Config = WPinternalsConfig.ReadConfig();
         }
 
-        void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
+        private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
             if (e.ExceptionObject is Exception)
             {
diff --git a/CommandLine.cs b/CommandLine.cs
index 9d39dcc..b45b274 100644
--- a/CommandLine.cs
+++ b/CommandLine.cs
@@ -32,16 +32,16 @@ namespace WPinternals
     internal static class CommandLine
     {
         [DllImport("kernel32.dll", SetLastError = true)]
-        static extern bool AllocConsole();
+        private static extern bool AllocConsole();
 
         [DllImport("kernel32.dll", SetLastError = true)]
         private static extern bool AttachConsole(int dwProcessId);
 
         [DllImport("kernel32.dll")]
-        static extern IntPtr GetConsoleWindow();
+        private static extern IntPtr GetConsoleWindow();
 
         [DllImport("user32.dll")]
-        static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
+        private static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
 
         private const UInt32 StdOutputHandle = 0xFFFFFFF5;
 
@@ -57,8 +57,8 @@ namespace WPinternals
         [DllImport("user32.dll")]
         private static extern IntPtr GetForegroundWindow();
 
-        const int SW_HIDE = 0;
-        const int SW_SHOW = 5;
+        private const int SW_HIDE = 0;
+        private const int SW_SHOW = 5;
 
         private const int MY_CODE_PAGE = 437;
         private const uint GENERIC_WRITE = 0x40000000;
@@ -110,7 +110,9 @@ namespace WPinternals
                 string[] args = Environment.GetCommandLineArgs();
 
                 if (args.Length == 1)
+                {
                     return;
+                }
 
                 switch (args[1].ToLower().TrimStart(new char[] { '-', '/' }))
                 {
@@ -123,22 +125,32 @@ namespace WPinternals
 #endif
                     case "flashpartition":
                         if (args.Length < 4)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -FlashPartition <Partition name> <Partition file> <Optional: FFU file>");
+                        }
+
                         if (args.Length >= 5)
+                        {
                             await LumiaV2UnlockBootViewModel.LumiaV2FlashPartition(UIContext, args[4], args[2], args[3]);
+                        }
                         else
+                        {
                             await LumiaV2UnlockBootViewModel.LumiaV2FlashPartition(UIContext, null, args[2], args[3]);
+                        }
+
                         break;
                     case "flashraw":
                         if (args.Length < 4)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -FlashRaw <Start sector> <Raw file> <Optional: FFU file>");
+                        }
+
                         UInt64 StartSector = 0;
                         try
                         {
-                            if (args[2].StartsWith("0x", StringComparison.OrdinalIgnoreCase))
-                                StartSector = Convert.ToUInt64(args[2].Substring(2), 16);
-                            else
-                                StartSector = Convert.ToUInt64(args[2], 10);
+                            StartSector = args[2].StartsWith("0x", StringComparison.OrdinalIgnoreCase)
+                                ? Convert.ToUInt64(args[2][2..], 16)
+                                : Convert.ToUInt64(args[2], 10);
                         }
                         catch
                         {
@@ -146,13 +158,21 @@ namespace WPinternals
                             break;
                         }
                         if (args.Length >= 5)
+                        {
                             await LumiaV2UnlockBootViewModel.LumiaV2FlashRaw(UIContext, StartSector, args[3], args[4]);
+                        }
                         else
+                        {
                             await LumiaV2UnlockBootViewModel.LumiaV2FlashRaw(UIContext, StartSector, args[3], null);
+                        }
+
                         break;
                     case "flashpartitionimmediately":
                         if (args.Length < 5)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -FlashPartition <Partition name> <Partition file> <FFU Path>");
+                        }
+
                         await LumiaV2UnlockBootViewModel.LumiaV2FlashPartition(UIContext, args[4], args[2], args[3], false);
                         break;
                     case "readgpt":
@@ -166,12 +186,18 @@ namespace WPinternals
 
                             GPT GPT = FlashModel.ReadGPT(); // May throw NotSupportedException
                             foreach (Partition Partition in GPT.Partitions)
+                            {
                                 LogFile.Log(Partition.Name.PadRight(20) + "0x" + Partition.FirstSector.ToString("X8") + " - 0x" + Partition.LastSector.ToString("X8") + "    " + Partition.Volume, LogType.ConsoleOnly);
+                            }
 
                             if (FlashModel.ReadPhoneInfo(false).FlashAppProtocolVersionMajor >= 2)
+                            {
                                 FlashModel.SwitchToFlashAppContext();
+                            }
                             else
+                            {
                                 await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
+                            }
 
                             Notifier.Stop();
                         }
@@ -186,7 +212,10 @@ namespace WPinternals
                         break;
                     case "backupgpt":
                         if (args.Length < 3)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -BackupGPT <Path to xml-file>");
+                        }
+
                         LogFile.BeginAction("BackupGPT");
                         try
                         {
@@ -210,7 +239,10 @@ namespace WPinternals
                         break;
                     case "restoregpt":
                         if (args.Length < 3)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -RestoreGPT <Path to xml-file>");
+                        }
+
                         LogFile.BeginAction("RestoreGPT");
                         try
                         {
@@ -218,7 +250,7 @@ namespace WPinternals
                             UIContext.Send(s => Notifier.Start(), null);
                             FlashModel = (NokiaFlashModel)(await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash));
                             byte[] GptChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(FlashModel, 0x20000);
-                            GPT GPT = new GPT(GptChunk);
+                            GPT GPT = new(GptChunk);
                             string Xml = File.ReadAllText(args[2]);
                             GPT.MergePartitions(Xml, false);
                             GPT.Rebuild();
@@ -237,7 +269,10 @@ namespace WPinternals
                         break;
                     case "mergegpt":
                         if (args.Length < 4)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -MergeGPT <Path to input-xml-file> <Path to input-xml-file> <Optional: Path to output-xml-file> Or use: WPinternals.exe -MergeGPT <Path to input-xml-file> <Path to ZIP-file including Partitions.xml> <Optional: Path to output-xml-file>");
+                        }
+
                         LogFile.BeginAction("MergeGPT");
                         try
                         {
@@ -254,8 +289,7 @@ namespace WPinternals
 
                             if (Archive == null)
                             {
-                                if (s != null)
-                                    s.Close();
+                                s?.Close();
 
                                 // Assume Xml-file
                                 GPT.MergePartitionsFromFile(args[3], true);
@@ -264,28 +298,29 @@ namespace WPinternals
                             {
                                 ZipArchiveEntry PartitionEntry = Archive.GetEntry("Partitions.xml");
                                 if (PartitionEntry == null)
+                                {
                                     GPT.MergePartitions(null, true, Archive);
+                                }
                                 else
                                 {
-                                    using (Stream ZipStream = PartitionEntry.Open())
-                                    {
-                                        using (StreamReader ZipReader = new StreamReader(ZipStream))
-                                        {
-                                            string PartitionXml = ZipReader.ReadToEnd();
-                                            GPT.MergePartitions(PartitionXml, true, Archive);
-                                        }
-                                    }
+                                    using Stream ZipStream = PartitionEntry.Open();
+                                    using StreamReader ZipReader = new(ZipStream);
+                                    string PartitionXml = ZipReader.ReadToEnd();
+                                    GPT.MergePartitions(PartitionXml, true, Archive);
                                 }
                             }
 
-                            if (Archive != null)
-                                Archive.Dispose();
+                            Archive?.Dispose();
 
-                            if (args.Count() >= 5)
+                            if (args.Length >= 5)
+                            {
                                 GPT.WritePartitions(args[4]);
+                            }
 
                             foreach (Partition Partition in GPT.Partitions)
+                            {
                                 LogFile.Log(Partition.Name.PadRight(20) + "0x" + Partition.FirstSector.ToString("X8") + " - 0x" + Partition.LastSector.ToString("X8") + "    " + Partition.Volume, LogType.ConsoleOnly);
+                            }
                         }
                         catch (Exception Ex)
                         {
@@ -298,7 +333,10 @@ namespace WPinternals
                         break;
                     case "dumpffu":
                         if (args.Length < 4)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DumpFFU <FFU Path> <Destination Path> <Optional: Partition Name>");
+                        }
+
                         FFU = new FFU(args[2]);
                         if (args.Length < 5)
                         {
@@ -314,13 +352,18 @@ namespace WPinternals
                         {
                             Partition Target = FFU.GPT.GetPartition(args[4]);
                             if ((Target == null) || (!FFU.IsPartitionPresentInFFU(Target.Name)))
+                            {
                                 throw new InvalidOperationException("Partition not found in FFU!");
+                            }
+
                             FFU.WritePartition(Target.Name, System.IO.Path.Combine(args[3], Target.Name + ".bin"));
                         }
                         break;
                     case "dumpuefi":
                         if (args.Length < 4)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DumpUEFI <UEFI binary or FFU file> <Destination Path>");
+                        }
 
                         byte[] UefiBinary;
                         if (FFU.IsFFU(args[2]))
@@ -333,29 +376,21 @@ namespace WPinternals
                             UefiBinary = File.ReadAllBytes(args[2]);
                         }
 
-                        UEFI UEFI = new UEFI(UefiBinary);
+                        UEFI UEFI = new(UefiBinary);
 
                         foreach (EFI Efi in UEFI.EFIs)
                         {
                             byte[] EfiBinary = UEFI.GetFile(Efi.Guid);
-                            string Name = Efi.Name;
-                            if (Name == null)
-                                Name = Efi.Guid.ToString();
+                            string Name = Efi.Name ?? Efi.Guid.ToString();
+
                             if (!Name.Contains('.'))
                             {
-                                switch (Efi.Type)
+                                Name += Efi.Type switch
                                 {
-                                    case 5:
-                                    case 7:
-                                        Name += ".dll";
-                                        break;
-                                    case 9:
-                                        Name += ".exe";
-                                        break;
-                                    default:
-                                        Name += ".bin";
-                                        break;
-                                }
+                                    5 or 7 => ".dll",
+                                    9 => ".exe",
+                                    _ => ".bin",
+                                };
                             }
                             string EfiPath = Path.Combine(args[3], Name);
                             Directory.CreateDirectory(Path.GetDirectoryName(EfiPath));
@@ -364,53 +399,86 @@ namespace WPinternals
                         break;
                     case "testprogrammer":
                         if (args.Length < 3)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -TestProgrammer <Path to ede-file>");
+                        }
+
                         await TestCode.TestProgrammer(UIContext, args[2]);
                         break;
                     case "findflashingprofile":
                         Notifier = new PhoneNotifierViewModel();
                         UIContext.Send(s => Notifier.Start(), null);
                         if (args.Length > 2)
+                        {
                             await LumiaV2UnlockBootViewModel.LumiaV2FindFlashingProfile(Notifier, args[2]);
+                        }
                         else
+                        {
                             await LumiaV2UnlockBootViewModel.LumiaV2FindFlashingProfile(Notifier, null);
+                        }
+
                         Notifier.Stop();
                         break;
                     case "findflashingprofileexperimental":
                         Notifier = new PhoneNotifierViewModel();
                         UIContext.Send(s => Notifier.Start(), null);
                         if (args.Length > 2)
+                        {
                             await LumiaV2UnlockBootViewModel.LumiaV2FindFlashingProfile(Notifier, args[2], Experimental: true);
+                        }
                         else
+                        {
                             await LumiaV2UnlockBootViewModel.LumiaV2FindFlashingProfile(Notifier, null, Experimental: true);
+                        }
+
                         Notifier.Stop();
                         break;
                     case "findflashingprofilenorestart":
                         Notifier = new PhoneNotifierViewModel();
                         UIContext.Send(s => Notifier.Start(), null);
                         if (args.Length > 2)
+                        {
                             await LumiaV2UnlockBootViewModel.LumiaV2FindFlashingProfile(Notifier, args[2], false);
+                        }
                         else
+                        {
                             await LumiaV2UnlockBootViewModel.LumiaV2FindFlashingProfile(Notifier, null, false);
+                        }
+
                         Notifier.Stop();
                         break;
                     case "enabletestsigning":
                         if (args.Length > 2)
+                        {
                             await LumiaV2UnlockBootViewModel.LumiaV2EnableTestSigning(UIContext, args[2]);
+                        }
                         else
+                        {
                             await LumiaV2UnlockBootViewModel.LumiaV2EnableTestSigning(UIContext, null);
+                        }
+
                         break;
                     case "enabletestsigningnorestart":
                         if (args.Length > 2)
+                        {
                             await LumiaV2UnlockBootViewModel.LumiaV2EnableTestSigning(UIContext, args[2], false);
+                        }
                         else
+                        {
                             await LumiaV2UnlockBootViewModel.LumiaV2EnableTestSigning(UIContext, null, false);
+                        }
+
                         break;
                     case "clearnv":
                         if (args.Length > 2)
+                        {
                             await LumiaV2UnlockBootViewModel.LumiaV2ClearNV(UIContext, args[2]);
+                        }
                         else
+                        {
                             await LumiaV2UnlockBootViewModel.LumiaV2ClearNV(UIContext, null);
+                        }
+
                         break;
                     case "switchtomassstoragemode":
                         LogFile.BeginAction("SwitchToMassStorageMode");
@@ -420,9 +488,14 @@ namespace WPinternals
                             UIContext.Send(s => Notifier.Start(), null);
                             LogFile.Log("Command: Switch to Mass Storage Mode", LogType.FileAndConsole);
                             if (args.Length > 2)
+                            {
                                 await LumiaV2UnlockBootViewModel.LumiaV2SwitchToMassStorageMode(Notifier, args[2]);
+                            }
                             else
+                            {
                                 await LumiaV2UnlockBootViewModel.LumiaV2SwitchToMassStorageMode(Notifier, null);
+                            }
+
                             Notifier.Stop();
                         }
                         catch (Exception Ex)
@@ -455,17 +528,18 @@ namespace WPinternals
 
                                     // Check if the current FFU matches the connected phone, so that the FFU can be used for profiling.
                                     if (Info.PlatformID.StartsWith(PlatformID, StringComparison.OrdinalIgnoreCase))
+                                    {
                                         ProfileFFU = CurrentFFU;
+                                    }
                                 }
                             }
 
                             if (ProfileFFU == null)
                             {
                                 List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => (Info.PlatformID.StartsWith(e.PlatformID, StringComparison.OrdinalIgnoreCase) && e.Exists())).ToList();
-                                if (FFUs.Count() > 0)
-                                    ProfileFFU = new FFU(FFUs[0].Path);
-                                else
-                                    throw new WPinternalsException("Profile FFU missing", "No profile FFU has been found in the repository for your device. You can add a profile FFU within the download section of the tool or by using the command line.");
+                                ProfileFFU = FFUs.Count > 0
+                                    ? new FFU(FFUs[0].Path)
+                                    : throw new WPinternalsException("Profile FFU missing", "No profile FFU has been found in the repository for your device. You can add a profile FFU within the download section of the tool or by using the command line.");
                             }
                             LogFile.Log("Profile FFU: " + ProfileFFU.Path);
 
@@ -481,22 +555,34 @@ namespace WPinternals
                         break;
                     case "addffu":
                         if (args.Length < 3)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -AddFFU <Path to FFU-file>");
+                        }
+
                         App.Config.AddFfuToRepository(args[2]);
                         break;
                     case "removeffu":
                         if (args.Length < 3)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -RemoveFFU <Path to FFU-file>");
+                        }
+
                         App.Config.RemoveFfuFromRepository(args[2]);
                         break;
                     case "addemergency":
                         if (args.Length < 5)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -AddEmergnency <Type> <Path to Programmer-file> <Path to Payload-file>");
+                        }
+
                         App.Config.AddEmergencyToRepository(args[2], args[3], args[4]);
                         break;
                     case "removeemergency":
                         if (args.Length < 3)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -RemoveEmergency <Path to Programmer-file>");
+                        }
+
                         App.Config.RemoveEmergencyFromRepository(args[2]);
                         break;
                     case "listrepository":
@@ -510,9 +596,15 @@ namespace WPinternals
                             LogFile.Log("File: " + Entry.Path + (Entry.Exists() ? "" : " (file is missing)"), LogType.ConsoleOnly);
                             LogFile.Log("Platform ID: " + Entry.PlatformID, LogType.ConsoleOnly);
                             if (Entry.FirmwareVersion != null)
+                            {
                                 LogFile.Log("Firmware version: " + Entry.FirmwareVersion, LogType.ConsoleOnly);
+                            }
+
                             if (Entry.OSVersion != null)
+                            {
                                 LogFile.Log("OS version: " + Entry.OSVersion, LogType.ConsoleOnly);
+                            }
+
                             Count++;
                         }
                         LogFile.Log("", LogType.ConsoleOnly);
@@ -525,13 +617,19 @@ namespace WPinternals
                             LogFile.Log("Type: " + Entry.Type, LogType.ConsoleOnly);
                             LogFile.Log("Programmer file: " + Entry.ProgrammerPath + (Entry.ProgrammerExists() ? "" : " (file is missing)"), LogType.ConsoleOnly);
                             if (Entry.PayloadPath != null)
+                            {
                                 LogFile.Log("Payload file: " + Entry.PayloadPath + (Entry.PayloadExists() ? "" : " (file is missing)"), LogType.ConsoleOnly);
+                            }
+
                             Count++;
                         }
                         break;
                     case "showffu":
                         if (args.Length < 3)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -ShowFFU <Path to FFU-file>");
+                        }
+
                         string FFUPath = args[2];
                         LogFile.Log("FFU: " + FFUPath, LogType.ConsoleOnly);
                         FFU = new FFU(FFUPath);
@@ -540,10 +638,15 @@ namespace WPinternals
                         LogFile.Log("Platform ID: " + FFU.PlatformID, LogType.ConsoleOnly);
                         string Firmware = FFU.GetFirmwareVersion();
                         if (Firmware != null)
+                        {
                             LogFile.Log("Firmware version: " + Firmware, LogType.ConsoleOnly);
+                        }
+
                         string OSVersion = FFU.GetOSVersion();
                         if (OSVersion != null)
+                        {
                             LogFile.Log("OS version: " + OSVersion, LogType.ConsoleOnly);
+                        }
 
                         // Show partitions from GPT (also show which partitions are in the FFU payload)
                         LogFile.Log("", LogType.ConsoleOnly);
@@ -587,31 +690,33 @@ namespace WPinternals
 
                                     // Check if the current FFU matches the connected phone, so that the FFU can be used for profiling.
                                     if (Info.PlatformID.StartsWith(PlatformID, StringComparison.OrdinalIgnoreCase))
+                                    {
                                         ProfileFFU = CurrentFFU;
+                                    }
 
                                     // Check if the current FFU is supported for unlocking.
-                                    if (App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V2-EFIESP").First().TargetVersions.Any(v => v.Description == CurrentVersion))
+                                    if (App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == CurrentVersion))
+                                    {
                                         SupportedFFU = CurrentFFU;
+                                    }
                                 }
                             }
 
                             if (ProfileFFU == null)
                             {
                                 List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => (Info.PlatformID.StartsWith(e.PlatformID, StringComparison.OrdinalIgnoreCase) && e.Exists())).ToList();
-                                if (FFUs.Count() > 0)
-                                    ProfileFFU = new FFU(FFUs[0].Path);
-                                else
-                                    throw new WPinternalsException("Profile FFU missing", "No profile FFU has been found in the repository for your device. You can add a profile FFU within the download section of the tool or by using the command line.");
+                                ProfileFFU = FFUs.Count > 0
+                                    ? new FFU(FFUs[0].Path)
+                                    : throw new WPinternalsException("Profile FFU missing", "No profile FFU has been found in the repository for your device. You can add a profile FFU within the download section of the tool or by using the command line.");
                             }
                             LogFile.Log("Profile FFU: " + ProfileFFU.Path);
 
                             if (SupportedFFU == null)
                             {
-                                List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V2-EFIESP").First().TargetVersions.Any(v => v.Description == e.OSVersion)).ToList();
-                                if (FFUs.Count() > 0)
-                                    SupportedFFU = new FFU(FFUs[0].Path);
-                                else
-                                    throw new WPinternalsException("No donor-FFU found with supported OS version", "No donor-FFU has been found in the repository with a supported OS version. You can add a donor-FFU within the download section of the tool or by using the command line. A donor-FFU can be for a different device and a different CPU than your device. It is only used to gather Operating System specific binaries to be patched and used as part of the unlock process.");
+                                List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)).ToList();
+                                SupportedFFU = FFUs.Count > 0
+                                    ? new FFU(FFUs[0].Path)
+                                    : throw new WPinternalsException("No donor-FFU found with supported OS version", "No donor-FFU has been found in the repository with a supported OS version. You can add a donor-FFU within the download section of the tool or by using the command line. A donor-FFU can be for a different device and a different CPU than your device. It is only used to gather Operating System specific binaries to be patched and used as part of the unlock process.");
                             }
 
                             await LumiaUnlockBootloaderViewModel.LumiaUnlockUEFI(Notifier, ProfileFFU.Path, null, SupportedFFU.Path);
@@ -633,7 +738,10 @@ namespace WPinternals
                         {
                             LogFile.Log("Command: Flash Custom ROM", LogType.FileAndConsole);
                             if (args.Length < 3)
+                            {
                                 throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -FlashCustomROM <Path to Custom ROM ZIP-file>");
+                            }
+
                             string CustomRomPath = args[2];
                             LogFile.Log("Custom ROM: " + CustomRomPath, LogType.FileAndConsole);
                             Notifier = new PhoneNotifierViewModel();
@@ -661,7 +769,10 @@ namespace WPinternals
                         {
                             LogFile.Log("Command: Flash FFU", LogType.FileAndConsole);
                             if (args.Length < 3)
+                            {
                                 throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -FlashFFU <Path to FFU-file>");
+                            }
+
                             FFUPath = args[2];
                             LogFile.Log("FFU file: " + FFUPath, LogType.FileAndConsole);
                             Notifier = new PhoneNotifierViewModel();
@@ -695,7 +806,10 @@ namespace WPinternals
                             App.PatchEngine.TargetPath = Drive + "\\";
                             PatchResult = App.PatchEngine.Patch("SecureBootHack-MainOS");
                             if (!PatchResult)
+                            {
                                 throw new WPinternalsException("Patch failed", "An error occured while patching Operating System files on the MainOS partition of your phone. Make sure your phone runs a supported Operating System version.");
+                            }
+
                             LogFile.Log("Fixed bootloader", LogType.FileAndConsole);
                             LogFile.Log("The phone is left in Mass Storage mode", LogType.FileAndConsole);
                             LogFile.Log("Press and hold the power-button of the phone for at least 10 seconds to reset the phone", LogType.FileAndConsole);
@@ -721,14 +835,23 @@ namespace WPinternals
                             App.PatchEngine.TargetPath = Drive + "\\EFIESP\\";
                             PatchResult = App.PatchEngine.Patch("SecureBootHack-V2-EFIESP");
                             if (!PatchResult)
+                            {
                                 throw new WPinternalsException("Patch failed", "An error occured while patching Operating System files on the EFIESP partition of your phone. Make sure no boot files have been tampered with and you use the latest version of the tool. This error cannot be caused by an incorrect Operating System version as the tool automatically uses replacement if the version isn't supported.");
+                            }
+
                             App.PatchEngine.TargetPath = Drive + "\\";
                             PatchResult = App.PatchEngine.Patch("SecureBootHack-MainOS");
                             if (!PatchResult)
+                            {
                                 throw new WPinternalsException("Patch failed", "An error occured while patching Operating System files on the MainOS partition of your phone. Make sure your phone runs a supported Operating System version.");
+                            }
+
                             PatchResult = App.PatchEngine.Patch("RootAccess-MainOS");
                             if (!PatchResult)
+                            {
                                 throw new WPinternalsException("Patch failed", "An error occured while modifying Operating System files on the MainOS partition of your phone for Root Access. Make sure your phone runs a supported Operating System version.");
+                            }
+
                             LogFile.Log("Root Access enabled!", LogType.FileAndConsole);
                             LogFile.Log("The phone is left in Mass Storage mode", LogType.FileAndConsole);
                             LogFile.Log("Press and hold the power-button of the phone for at least 10 seconds to reset the phone", LogType.FileAndConsole);
@@ -745,31 +868,40 @@ namespace WPinternals
                     case "unlockbootloaderonimage":
                         LogFile.Log("Command: Unlock bootloader on image", LogType.FileAndConsole);
                         if (args.Length < 3)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -UnlockBootLoaderOnImage <EFIESP image file> <Optional: MainOS image file> <Optional: donor-FFU file with supported version of bootfiles>");
+                        }
+
                         FFUFilePath = null;
                         EfiEspImagePath = args[2];
                         if (args.Length > 3)
                         {
                             if (FFU.IsFFU(args[3]))
+                            {
                                 FFUFilePath = args[3];
+                            }
                             else
+                            {
                                 MainOsImagePath = args[3];
+                            }
                         }
                         if (args.Length > 4)
+                        {
                             FFUFilePath = args[4];
+                        }
 
-                        using (FileStream FileSystemStream = new FileStream(EfiEspImagePath, FileMode.Open, FileAccess.ReadWrite))
+                        using (FileStream FileSystemStream = new(EfiEspImagePath, FileMode.Open, FileAccess.ReadWrite))
                         {
                             UnlockedEFIESPFileSystem = new DiscUtils.Fat.FatFileSystem(FileSystemStream);
 
                             if (FFUFilePath != null)
                             {
-                                FFU SupportedFFU = new FFU(FFUFilePath);
+                                FFU SupportedFFU = new(FFUFilePath);
                                 LogFile.Log("Donor FFU: " + SupportedFFU.Path);
                                 byte[] SupportedEFIESP = SupportedFFU.GetPartition("EFIESP");
-                                DiscUtils.Fat.FatFileSystem SupportedEFIESPFileSystem = new DiscUtils.Fat.FatFileSystem(new MemoryStream(SupportedEFIESP));
-                                DiscUtils.SparseStream SupportedMobileStartupStream = SupportedEFIESPFileSystem.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Open);
-                                MemoryStream SupportedMobileStartupMemStream = new MemoryStream();
+                                DiscUtils.Fat.FatFileSystem SupportedEFIESPFileSystem = new(new MemoryStream(SupportedEFIESP));
+                                DiscUtils.Streams.SparseStream SupportedMobileStartupStream = SupportedEFIESPFileSystem.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Open);
+                                MemoryStream SupportedMobileStartupMemStream = new();
                                 SupportedMobileStartupStream.CopyTo(SupportedMobileStartupMemStream);
                                 byte[] SupportedMobileStartup = SupportedMobileStartupMemStream.ToArray();
                                 SupportedMobileStartupMemStream.Close();
@@ -785,42 +917,48 @@ namespace WPinternals
                             App.PatchEngine.TargetImage = UnlockedEFIESPFileSystem;
                             PatchResult = App.PatchEngine.Patch("SecureBootHack-V2-EFIESP");
                             if (!PatchResult)
+                            {
                                 throw new WPinternalsException("Failed to patch bootloader", "An error occured while patching Operating System files on the EFIESP partition provided. Make sure no boot files have been tampered with and you use the latest version of the tool. This error cannot be caused by an incorrect Operating System version as the tool automatically uses replacement if the version isn't supported, unless the replacement files have been tampered with or are not compatible.");
+                            }
 
                             // Edit BCD
                             LogFile.Log("Edit BCD");
-                            using (Stream BCDFileStream = UnlockedEFIESPFileSystem.OpenFile(@"efi\Microsoft\Boot\BCD", FileMode.Open, FileAccess.ReadWrite))
+                            using Stream BCDFileStream = UnlockedEFIESPFileSystem.OpenFile(@"efi\Microsoft\Boot\BCD", FileMode.Open, FileAccess.ReadWrite);
+                            using DiscUtils.Registry.RegistryHive BCDHive = new(BCDFileStream);
+                            DiscUtils.BootConfig.Store BCDStore = new(BCDHive.Root);
+                            DiscUtils.BootConfig.BcdObject MobileStartupObject = BCDStore.GetObject(new Guid("{01de5a27-8705-40db-bad6-96fa5187d4a6}"));
+                            DiscUtils.BootConfig.Element NoCodeIntegrityElement = MobileStartupObject.GetElement(0x16000048);
+                            if (NoCodeIntegrityElement != null)
                             {
-                                using (DiscUtils.Registry.RegistryHive BCDHive = new DiscUtils.Registry.RegistryHive(BCDFileStream))
-                                {
-                                    DiscUtils.BootConfig.Store BCDStore = new DiscUtils.BootConfig.Store(BCDHive.Root);
-                                    DiscUtils.BootConfig.BcdObject MobileStartupObject = BCDStore.GetObject(new Guid("{01de5a27-8705-40db-bad6-96fa5187d4a6}"));
-                                    DiscUtils.BootConfig.Element NoCodeIntegrityElement = MobileStartupObject.GetElement(0x16000048);
-                                    if (NoCodeIntegrityElement != null)
-                                        NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
-                                    else
-                                        MobileStartupObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
+                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
+                            }
+                            else
+                            {
+                                MobileStartupObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
+                            }
 
-                                    DiscUtils.BootConfig.BcdObject WinLoadObject = BCDStore.GetObject(new Guid("{7619dcc9-fafe-11d9-b411-000476eba25f}"));
-                                    NoCodeIntegrityElement = WinLoadObject.GetElement(0x16000048);
-                                    if (NoCodeIntegrityElement != null)
-                                        NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
-                                    else
-                                        WinLoadObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
-                                }
+                            DiscUtils.BootConfig.BcdObject WinLoadObject = BCDStore.GetObject(new Guid("{7619dcc9-fafe-11d9-b411-000476eba25f}"));
+                            NoCodeIntegrityElement = WinLoadObject.GetElement(0x16000048);
+                            if (NoCodeIntegrityElement != null)
+                            {
+                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
+                            }
+                            else
+                            {
+                                WinLoadObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
                             }
                         }
 
                         if (MainOsImagePath != null)
                         {
-                            using (FileStream FileSystemStream = new FileStream(MainOsImagePath, FileMode.Open, FileAccess.ReadWrite))
-                            {
-                                UnlockedMainOsFileSystem = new DiscUtils.Ntfs.NtfsFileSystem(FileSystemStream);
+                            using FileStream FileSystemStream = new(MainOsImagePath, FileMode.Open, FileAccess.ReadWrite);
+                            UnlockedMainOsFileSystem = new DiscUtils.Ntfs.NtfsFileSystem(FileSystemStream);
 
-                                App.PatchEngine.TargetImage = UnlockedMainOsFileSystem;
-                                PatchResult = App.PatchEngine.Patch("SecureBootHack-MainOS");
-                                if (!PatchResult)
-                                    throw new WPinternalsException("Failed to patch MainOS", "An error occured while patching Operating System files on the MainOS partition you provided. Make sure your phone runs a supported Operating System version.");
+                            App.PatchEngine.TargetImage = UnlockedMainOsFileSystem;
+                            PatchResult = App.PatchEngine.Patch("SecureBootHack-MainOS");
+                            if (!PatchResult)
+                            {
+                                throw new WPinternalsException("Failed to patch MainOS", "An error occured while patching Operating System files on the MainOS partition you provided. Make sure your phone runs a supported Operating System version.");
                             }
                         }
                         LogFile.Log("Bootloader unlocked on image", LogType.FileAndConsole);
@@ -828,26 +966,30 @@ namespace WPinternals
                     case "enablerootaccessonimage":
                         LogFile.Log("Command: Enable root access on image", LogType.FileAndConsole);
                         if (args.Length < 4)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -EnableRootAccessOnImage <EFIESP image file> <MainOS image file> <Optional: donor-FFU file with supported version of bootfiles>");
+                        }
 
                         FFUFilePath = null;
                         EfiEspImagePath = args[2];
                         MainOsImagePath = args[3];
                         if (args.Length > 4)
+                        {
                             FFUFilePath = args[4];
+                        }
 
-                        using (FileStream FileSystemStream = new FileStream(EfiEspImagePath, FileMode.Open, FileAccess.ReadWrite))
+                        using (FileStream FileSystemStream = new(EfiEspImagePath, FileMode.Open, FileAccess.ReadWrite))
                         {
                             UnlockedEFIESPFileSystem = new DiscUtils.Fat.FatFileSystem(FileSystemStream);
 
                             if (FFUFilePath != null)
                             {
-                                FFU SupportedFFU = new FFU(FFUFilePath);
+                                FFU SupportedFFU = new(FFUFilePath);
                                 LogFile.Log("Supported FFU: " + SupportedFFU.Path);
                                 byte[] SupportedEFIESP = SupportedFFU.GetPartition("EFIESP");
-                                DiscUtils.Fat.FatFileSystem SupportedEFIESPFileSystem = new DiscUtils.Fat.FatFileSystem(new MemoryStream(SupportedEFIESP));
-                                DiscUtils.SparseStream SupportedMobileStartupStream = SupportedEFIESPFileSystem.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Open);
-                                MemoryStream SupportedMobileStartupMemStream = new MemoryStream();
+                                DiscUtils.Fat.FatFileSystem SupportedEFIESPFileSystem = new(new MemoryStream(SupportedEFIESP));
+                                DiscUtils.Streams.SparseStream SupportedMobileStartupStream = SupportedEFIESPFileSystem.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Open);
+                                MemoryStream SupportedMobileStartupMemStream = new();
                                 SupportedMobileStartupStream.CopyTo(SupportedMobileStartupMemStream);
                                 byte[] SupportedMobileStartup = SupportedMobileStartupMemStream.ToArray();
                                 SupportedMobileStartupMemStream.Close();
@@ -863,70 +1005,90 @@ namespace WPinternals
                             App.PatchEngine.TargetImage = UnlockedEFIESPFileSystem;
                             PatchResult = App.PatchEngine.Patch("SecureBootHack-V2-EFIESP");
                             if (!PatchResult)
+                            {
                                 throw new WPinternalsException("Failed to patch bootloader", "An error occured while patching Operating System files on the EFIESP partition provided. Make sure no boot files have been tampered with and you use the latest version of the tool. This error cannot be caused by an incorrect Operating System version as the tool automatically uses replacement if the version isn't supported, unless the replacement files have been tampered with or are not compatible.");
+                            }
 
                             // Edit BCD
                             LogFile.Log("Edit BCD");
-                            using (Stream BCDFileStream = UnlockedEFIESPFileSystem.OpenFile(@"efi\Microsoft\Boot\BCD", FileMode.Open, FileAccess.ReadWrite))
+                            using Stream BCDFileStream = UnlockedEFIESPFileSystem.OpenFile(@"efi\Microsoft\Boot\BCD", FileMode.Open, FileAccess.ReadWrite);
+                            using DiscUtils.Registry.RegistryHive BCDHive = new(BCDFileStream);
+                            DiscUtils.BootConfig.Store BCDStore = new(BCDHive.Root);
+                            DiscUtils.BootConfig.BcdObject MobileStartupObject = BCDStore.GetObject(new Guid("{01de5a27-8705-40db-bad6-96fa5187d4a6}"));
+                            DiscUtils.BootConfig.Element NoCodeIntegrityElement = MobileStartupObject.GetElement(0x16000048);
+                            if (NoCodeIntegrityElement != null)
                             {
-                                using (DiscUtils.Registry.RegistryHive BCDHive = new DiscUtils.Registry.RegistryHive(BCDFileStream))
-                                {
-                                    DiscUtils.BootConfig.Store BCDStore = new DiscUtils.BootConfig.Store(BCDHive.Root);
-                                    DiscUtils.BootConfig.BcdObject MobileStartupObject = BCDStore.GetObject(new Guid("{01de5a27-8705-40db-bad6-96fa5187d4a6}"));
-                                    DiscUtils.BootConfig.Element NoCodeIntegrityElement = MobileStartupObject.GetElement(0x16000048);
-                                    if (NoCodeIntegrityElement != null)
-                                        NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
-                                    else
-                                        MobileStartupObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
+                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
+                            }
+                            else
+                            {
+                                MobileStartupObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
+                            }
 
-                                    DiscUtils.BootConfig.BcdObject WinLoadObject = BCDStore.GetObject(new Guid("{7619dcc9-fafe-11d9-b411-000476eba25f}"));
-                                    NoCodeIntegrityElement = WinLoadObject.GetElement(0x16000048);
-                                    if (NoCodeIntegrityElement != null)
-                                        NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
-                                    else
-                                        WinLoadObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
-                                }
+                            DiscUtils.BootConfig.BcdObject WinLoadObject = BCDStore.GetObject(new Guid("{7619dcc9-fafe-11d9-b411-000476eba25f}"));
+                            NoCodeIntegrityElement = WinLoadObject.GetElement(0x16000048);
+                            if (NoCodeIntegrityElement != null)
+                            {
+                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
+                            }
+                            else
+                            {
+                                WinLoadObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
                             }
                         }
 
-                        using (FileStream FileSystemStream = new FileStream(MainOsImagePath, FileMode.Open, FileAccess.ReadWrite))
+                        using (FileStream FileSystemStream = new(MainOsImagePath, FileMode.Open, FileAccess.ReadWrite))
                         {
                             UnlockedMainOsFileSystem = new DiscUtils.Ntfs.NtfsFileSystem(FileSystemStream);
 
                             App.PatchEngine.TargetImage = UnlockedMainOsFileSystem;
                             PatchResult = App.PatchEngine.Patch("SecureBootHack-MainOS");
                             if (!PatchResult)
+                            {
                                 throw new WPinternalsException("Failed to patch MainOS", "An error occured while patching Operating System files on the MainOS partition you provided. Make sure your phone runs a supported Operating System version.");
+                            }
+
                             PatchResult = App.PatchEngine.Patch("RootAccess-MainOS");
                             if (!PatchResult)
+                            {
                                 throw new WPinternalsException("Failed to patch MainOS", "An error occured while modifying Operating System files on the MainOS partition you provided for Root Access. Make sure your phone runs a supported Operating System version.");
+                            }
                         }
                         LogFile.Log("Root access enabled on image", LogType.FileAndConsole);
                         break;
                     case "unlockbootloaderonmountedimage":
                         LogFile.Log("Command: Unlock bootloader on mounted image", LogType.FileAndConsole);
                         if (args.Length < 3)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -UnlockBootLoaderOnMountedImage <Directory of mounted EFIESP image file> <Optional: Directory of mounted MainOS image file> <Optional: donor-FFU file with supported version of bootfiles>");
+                        }
+
                         FFUFilePath = null;
                         EfiEspImagePath = args[2];
                         if (args.Length > 3)
                         {
                             if (FFU.IsFFU(args[3]))
+                            {
                                 FFUFilePath = args[3];
+                            }
                             else
+                            {
                                 MainOsImagePath = args[3];
+                            }
                         }
                         if (args.Length > 4)
+                        {
                             FFUFilePath = args[4];
+                        }
 
                         if (FFUFilePath != null)
                         {
-                            FFU SupportedFFU = new FFU(FFUFilePath);
+                            FFU SupportedFFU = new(FFUFilePath);
                             LogFile.Log("Donor-FFU: " + SupportedFFU.Path);
                             byte[] SupportedEFIESP = SupportedFFU.GetPartition("EFIESP");
-                            DiscUtils.Fat.FatFileSystem SupportedEFIESPFileSystem = new DiscUtils.Fat.FatFileSystem(new MemoryStream(SupportedEFIESP));
-                            DiscUtils.SparseStream SupportedMobileStartupStream = SupportedEFIESPFileSystem.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Open);
-                            MemoryStream SupportedMobileStartupMemStream = new MemoryStream();
+                            DiscUtils.Fat.FatFileSystem SupportedEFIESPFileSystem = new(new MemoryStream(SupportedEFIESP));
+                            DiscUtils.Streams.SparseStream SupportedMobileStartupStream = SupportedEFIESPFileSystem.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Open);
+                            MemoryStream SupportedMobileStartupMemStream = new();
                             SupportedMobileStartupStream.CopyTo(SupportedMobileStartupMemStream);
                             byte[] SupportedMobileStartup = SupportedMobileStartupMemStream.ToArray();
                             SupportedMobileStartupMemStream.Close();
@@ -942,28 +1104,36 @@ namespace WPinternals
                         App.PatchEngine.TargetPath = EfiEspImagePath;
                         PatchResult = App.PatchEngine.Patch("SecureBootHack-V2-EFIESP");
                         if (!PatchResult)
+                        {
                             throw new WPinternalsException("Failed to patch bootloader", "An error occured while patching Operating System files on the EFIESP partition provided. Make sure no boot files have been tampered with and you use the latest version of the tool. This error cannot be caused by an incorrect Operating System version as the tool automatically uses replacement if the version isn't supported, unless the replacement files have been tampered with or are not compatible.");
+                        }
 
                         // Edit BCD
                         LogFile.Log("Edit BCD");
                         using (Stream BCDFileStream = File.Open(Path.Combine(EfiEspImagePath, @"efi\Microsoft\Boot\BCD"), FileMode.Open, FileAccess.ReadWrite))
                         {
-                            using (DiscUtils.Registry.RegistryHive BCDHive = new DiscUtils.Registry.RegistryHive(BCDFileStream))
+                            using DiscUtils.Registry.RegistryHive BCDHive = new(BCDFileStream);
+                            DiscUtils.BootConfig.Store BCDStore = new(BCDHive.Root);
+                            DiscUtils.BootConfig.BcdObject MobileStartupObject = BCDStore.GetObject(new Guid("{01de5a27-8705-40db-bad6-96fa5187d4a6}"));
+                            DiscUtils.BootConfig.Element NoCodeIntegrityElement = MobileStartupObject.GetElement(0x16000048);
+                            if (NoCodeIntegrityElement != null)
                             {
-                                DiscUtils.BootConfig.Store BCDStore = new DiscUtils.BootConfig.Store(BCDHive.Root);
-                                DiscUtils.BootConfig.BcdObject MobileStartupObject = BCDStore.GetObject(new Guid("{01de5a27-8705-40db-bad6-96fa5187d4a6}"));
-                                DiscUtils.BootConfig.Element NoCodeIntegrityElement = MobileStartupObject.GetElement(0x16000048);
-                                if (NoCodeIntegrityElement != null)
-                                    NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
-                                else
-                                    MobileStartupObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
+                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
+                            }
+                            else
+                            {
+                                MobileStartupObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
+                            }
 
-                                DiscUtils.BootConfig.BcdObject WinLoadObject = BCDStore.GetObject(new Guid("{7619dcc9-fafe-11d9-b411-000476eba25f}"));
-                                NoCodeIntegrityElement = WinLoadObject.GetElement(0x16000048);
-                                if (NoCodeIntegrityElement != null)
-                                    NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
-                                else
-                                    WinLoadObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
+                            DiscUtils.BootConfig.BcdObject WinLoadObject = BCDStore.GetObject(new Guid("{7619dcc9-fafe-11d9-b411-000476eba25f}"));
+                            NoCodeIntegrityElement = WinLoadObject.GetElement(0x16000048);
+                            if (NoCodeIntegrityElement != null)
+                            {
+                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
+                            }
+                            else
+                            {
+                                WinLoadObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
                             }
                         }
 
@@ -972,29 +1142,35 @@ namespace WPinternals
                             App.PatchEngine.TargetPath = MainOsImagePath;
                             PatchResult = App.PatchEngine.Patch("SecureBootHack-MainOS");
                             if (!PatchResult)
+                            {
                                 throw new WPinternalsException("Failed to patch MainOS", "An error occured while patching Operating System files on the MainOS partition you provided. Make sure your phone runs a supported Operating System version.");
+                            }
                         }
                         LogFile.Log("Bootloader unlocked on image", LogType.FileAndConsole);
                         break;
                     case "enablerootaccessonmountedimage":
                         LogFile.Log("Command: Enable root access on mounted image", LogType.FileAndConsole);
                         if (args.Length < 4)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -EnableRootAccessOnMountedImage <Directory of mounted EFIESP image file> <Directory of mounted MainOS image file> <Optional: donor-FFU file with supported version of bootfiles>");
+                        }
 
                         FFUFilePath = null;
                         EfiEspImagePath = args[2];
                         MainOsImagePath = args[3];
                         if (args.Length > 4)
+                        {
                             FFUFilePath = args[4];
+                        }
 
                         if (FFUFilePath != null)
                         {
-                            FFU SupportedFFU = new FFU(FFUFilePath);
+                            FFU SupportedFFU = new(FFUFilePath);
                             LogFile.Log("Supported FFU: " + SupportedFFU.Path);
                             byte[] SupportedEFIESP = SupportedFFU.GetPartition("EFIESP");
-                            DiscUtils.Fat.FatFileSystem SupportedEFIESPFileSystem = new DiscUtils.Fat.FatFileSystem(new MemoryStream(SupportedEFIESP));
-                            DiscUtils.SparseStream SupportedMobileStartupStream = SupportedEFIESPFileSystem.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Open);
-                            MemoryStream SupportedMobileStartupMemStream = new MemoryStream();
+                            DiscUtils.Fat.FatFileSystem SupportedEFIESPFileSystem = new(new MemoryStream(SupportedEFIESP));
+                            DiscUtils.Streams.SparseStream SupportedMobileStartupStream = SupportedEFIESPFileSystem.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Open);
+                            MemoryStream SupportedMobileStartupMemStream = new();
                             SupportedMobileStartupStream.CopyTo(SupportedMobileStartupMemStream);
                             byte[] SupportedMobileStartup = SupportedMobileStartupMemStream.ToArray();
                             SupportedMobileStartupMemStream.Close();
@@ -1010,38 +1186,52 @@ namespace WPinternals
                         App.PatchEngine.TargetPath = EfiEspImagePath;
                         PatchResult = App.PatchEngine.Patch("SecureBootHack-V2-EFIESP");
                         if (!PatchResult)
+                        {
                             throw new WPinternalsException("Failed to patch bootloader", "An error occured while patching Operating System files on the EFIESP partition provided. Make sure no boot files have been tampered with and you use the latest version of the tool. This error cannot be caused by an incorrect Operating System version as the tool automatically uses replacement if the version isn't supported, unless the replacement files have been tampered with or are not compatible.");
+                        }
 
                         // Edit BCD
                         LogFile.Log("Edit BCD");
                         using (Stream BCDFileStream = File.Open(Path.Combine(EfiEspImagePath, @"efi\Microsoft\Boot\BCD"), FileMode.Open, FileAccess.ReadWrite))
                         {
-                            using (DiscUtils.Registry.RegistryHive BCDHive = new DiscUtils.Registry.RegistryHive(BCDFileStream))
+                            using DiscUtils.Registry.RegistryHive BCDHive = new(BCDFileStream);
+                            DiscUtils.BootConfig.Store BCDStore = new(BCDHive.Root);
+                            DiscUtils.BootConfig.BcdObject MobileStartupObject = BCDStore.GetObject(new Guid("{01de5a27-8705-40db-bad6-96fa5187d4a6}"));
+                            DiscUtils.BootConfig.Element NoCodeIntegrityElement = MobileStartupObject.GetElement(0x16000048);
+                            if (NoCodeIntegrityElement != null)
                             {
-                                DiscUtils.BootConfig.Store BCDStore = new DiscUtils.BootConfig.Store(BCDHive.Root);
-                                DiscUtils.BootConfig.BcdObject MobileStartupObject = BCDStore.GetObject(new Guid("{01de5a27-8705-40db-bad6-96fa5187d4a6}"));
-                                DiscUtils.BootConfig.Element NoCodeIntegrityElement = MobileStartupObject.GetElement(0x16000048);
-                                if (NoCodeIntegrityElement != null)
-                                    NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
-                                else
-                                    MobileStartupObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
+                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
+                            }
+                            else
+                            {
+                                MobileStartupObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
+                            }
 
-                                DiscUtils.BootConfig.BcdObject WinLoadObject = BCDStore.GetObject(new Guid("{7619dcc9-fafe-11d9-b411-000476eba25f}"));
-                                NoCodeIntegrityElement = WinLoadObject.GetElement(0x16000048);
-                                if (NoCodeIntegrityElement != null)
-                                    NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
-                                else
-                                    WinLoadObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
+                            DiscUtils.BootConfig.BcdObject WinLoadObject = BCDStore.GetObject(new Guid("{7619dcc9-fafe-11d9-b411-000476eba25f}"));
+                            NoCodeIntegrityElement = WinLoadObject.GetElement(0x16000048);
+                            if (NoCodeIntegrityElement != null)
+                            {
+                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
+                            }
+                            else
+                            {
+                                WinLoadObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
                             }
                         }
 
                         App.PatchEngine.TargetPath = MainOsImagePath;
                         PatchResult = App.PatchEngine.Patch("SecureBootHack-MainOS");
                         if (!PatchResult)
+                        {
                             throw new WPinternalsException("Failed to patch MainOS", "An error occured while patching Operating System files on the MainOS partition you provided. Make sure your phone runs a supported Operating System version.");
+                        }
+
                         PatchResult = App.PatchEngine.Patch("RootAccess-MainOS");
                         if (!PatchResult)
+                        {
                             throw new WPinternalsException("Failed to patch MainOS", "An error occured while modifying Operating System files on the MainOS partition you provided for Root Access. Make sure your phone runs a supported Operating System version.");
+                        }
+
                         LogFile.Log("Root access enabled on image", LogType.FileAndConsole);
                         break;
                     case "downloadffu":
@@ -1065,12 +1255,15 @@ namespace WPinternals
                             ProductCode = NormalModel.ExecuteJsonMethodAsString("ReadProductCode", "ProductCode");
                         }
                         URL = LumiaDownloadModel.SearchFFU(null, ProductCode, null, out ProductType);
-                        if (args.Length >= 3)
-                            DownloadFolder = args[4];
-                        else
-                            DownloadFolder = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+                        DownloadFolder = args.Length >= 3
+                            ? args[4]
+                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
                         if (!Directory.Exists(DownloadFolder))
+                        {
                             Directory.CreateDirectory(DownloadFolder);
+                        }
+
                         LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
                         LogFile.Log("URL: " + URL, LogType.FileAndConsole);
                         URI = new Uri(URL);
@@ -1078,7 +1271,7 @@ namespace WPinternals
                         LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
                         FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
                         LogFile.Log("Downloading...", LogType.FileAndConsole);
-                        using (System.Net.WebClient myWebClient = new System.Net.WebClient())
+                        using (System.Net.WebClient myWebClient = new())
                         {
                             await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
                         }
@@ -1089,17 +1282,23 @@ namespace WPinternals
                     case "downloadffubyoperatorcode":
                         LogFile.Log("Command: Download FFU by Operator Code", LogType.FileAndConsole);
                         if (args.Length < 4)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DownloadFFUbyOperatorCode <Product type> <Operator code> <Optional: Download folder>");
+                        }
+
                         ProductType = args[2];
                         LogFile.Log("Product type: " + ProductType, LogType.FileAndConsole);
                         OperatorCode = args[3];
                         LogFile.Log("Operator code: " + OperatorCode, LogType.FileAndConsole);
-                        if (args.Length >= 5)
-                            DownloadFolder = args[4];
-                        else
-                            DownloadFolder = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+                        DownloadFolder = args.Length >= 5
+                            ? args[4]
+                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
                         if (!Directory.Exists(DownloadFolder))
+                        {
                             Directory.CreateDirectory(DownloadFolder);
+                        }
+
                         LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
                         URL = LumiaDownloadModel.SearchFFU(ProductType, null, OperatorCode);
                         LogFile.Log("URL: " + URL, LogType.FileAndConsole);
@@ -1108,7 +1307,7 @@ namespace WPinternals
                         LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
                         FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
                         LogFile.Log("Downloading...", LogType.FileAndConsole);
-                        using (System.Net.WebClient myWebClient = new System.Net.WebClient())
+                        using (System.Net.WebClient myWebClient = new())
                         {
                             await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
                         }
@@ -1118,16 +1317,22 @@ namespace WPinternals
                     case "downloadffubyproductcode":
                         LogFile.Log("Command: Download FFU by Product Code", LogType.FileAndConsole);
                         if (args.Length < 3)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DownloadFFUbyProductCode <Product code> <Optional: Download folder>");
+                        }
+
                         ProductCode = args[2];
                         LogFile.Log("Product code: " + ProductCode, LogType.FileAndConsole);
                         URL = LumiaDownloadModel.SearchFFU(null, ProductCode, null, out ProductType);
-                        if (args.Length >= 4)
-                            DownloadFolder = args[3];
-                        else
-                            DownloadFolder = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+                        DownloadFolder = args.Length >= 4
+                            ? args[3]
+                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
                         if (!Directory.Exists(DownloadFolder))
+                        {
                             Directory.CreateDirectory(DownloadFolder);
+                        }
+
                         LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
                         LogFile.Log("URL: " + URL, LogType.FileAndConsole);
                         URI = new Uri(URL);
@@ -1135,7 +1340,7 @@ namespace WPinternals
                         LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
                         FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
                         LogFile.Log("Downloading...", LogType.FileAndConsole);
-                        using (System.Net.WebClient myWebClient = new System.Net.WebClient())
+                        using (System.Net.WebClient myWebClient = new())
                         {
                             await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
                         }
@@ -1145,15 +1350,21 @@ namespace WPinternals
                     case "downloadffubyproducttype":
                         LogFile.Log("Command: Download FFU by Product Type", LogType.FileAndConsole);
                         if (args.Length < 3)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DownloadFFUbyProductType <Product type> <Optional: Download folder>");
+                        }
+
                         ProductType = args[2];
                         LogFile.Log("Product type: " + ProductType, LogType.FileAndConsole);
-                        if (args.Length >= 4)
-                            DownloadFolder = args[3];
-                        else
-                            DownloadFolder = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+                        DownloadFolder = args.Length >= 4
+                            ? args[3]
+                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
                         if (!Directory.Exists(DownloadFolder))
+                        {
                             Directory.CreateDirectory(DownloadFolder);
+                        }
+
                         LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
                         URL = LumiaDownloadModel.SearchFFU(ProductType, null, null);
                         LogFile.Log("URL: " + URL, LogType.FileAndConsole);
@@ -1162,7 +1373,7 @@ namespace WPinternals
                         LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
                         FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
                         LogFile.Log("Downloading...", LogType.FileAndConsole);
-                        using (System.Net.WebClient myWebClient = new System.Net.WebClient())
+                        using (System.Net.WebClient myWebClient = new())
                         {
                             await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
                         }
@@ -1172,7 +1383,10 @@ namespace WPinternals
                     case "searchffubyproducttype":
                         LogFile.Log("Command: Search FFU by Product Type", LogType.FileAndConsole);
                         if (args.Length < 3)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -SearchFFUbyProductType <Lumia model>");
+                        }
+
                         ProductType = args[2];
                         LogFile.Log("Lumia model: " + ProductType, LogType.FileAndConsole);
                         URL = LumiaDownloadModel.SearchFFU(ProductType, null, null);
@@ -1189,7 +1403,10 @@ namespace WPinternals
                         {
                             NormalModel = (NokiaPhoneModel)Notifier.CurrentModel;
                             ProductType = NormalModel.ExecuteJsonMethodAsString("ReadManufacturerModelName", "ManufacturerModelName");
-                            if (ProductType.IndexOf('_') >= 0) ProductType = ProductType.Substring(0, ProductType.IndexOf('_'));
+                            if (ProductType.Contains('_'))
+                            {
+                                ProductType = ProductType.Substring(0, ProductType.IndexOf('_'));
+                            }
                         }
                         else if ((Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader) || (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Flash))
                         {
@@ -1201,17 +1418,23 @@ namespace WPinternals
                         {
                             NormalModel = (NokiaPhoneModel)(await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Normal));
                             ProductType = NormalModel.ExecuteJsonMethodAsString("ReadManufacturerModelName", "ManufacturerModelName");
-                            if (ProductType.IndexOf('_') >= 0) ProductType = ProductType.Substring(0, ProductType.IndexOf('_'));
+                            if (ProductType.Contains('_'))
+                            {
+                                ProductType = ProductType.Substring(0, ProductType.IndexOf('_'));
+                            }
                         }
                         URLs = LumiaDownloadModel.SearchEmergencyFiles(ProductType);
                         if (URLs != null)
                         {
-                            if (args.Length >= 3)
-                                DownloadFolder = args[2];
-                            else
-                                DownloadFolder = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+                            DownloadFolder = args.Length >= 3
+                                ? args[2]
+                                : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
                             if (!Directory.Exists(DownloadFolder))
+                            {
                                 Directory.CreateDirectory(DownloadFolder);
+                            }
+
                             LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
                             for (int i = 0; i < URLs.Length; i++)
                             {
@@ -1221,11 +1444,16 @@ namespace WPinternals
                                 LogFile.Log("File: " + EmergencyFileName, LogType.FileAndConsole);
                                 EmergencyFilePath = Path.Combine(DownloadFolder, EmergencyFileName);
                                 if (i == 0)
+                                {
                                     ProgrammerPath = EmergencyFilePath;
+                                }
                                 else
+                                {
                                     PayloadPath = EmergencyFilePath;
+                                }
+
                                 LogFile.Log("Downloading...", LogType.FileAndConsole);
-                                using (System.Net.WebClient myWebClient = new System.Net.WebClient())
+                                using (System.Net.WebClient myWebClient = new())
                                 {
                                     await myWebClient.DownloadFileTaskAsync(URLs[i], EmergencyFilePath);
                                 }
@@ -1238,17 +1466,23 @@ namespace WPinternals
                     case "downloademergencybyproducttype":
                         LogFile.Log("Command: Download Emergency files", LogType.FileAndConsole);
                         if (args.Length < 3)
+                        {
                             throw new WPinternalsException("Wrong number of arguments. Usage: WPinternals.exe -DownloadEmergencyByProductType <Product type> <Optional: Download folder>");
+                        }
+
                         ProductType = args[2];
                         URLs = LumiaDownloadModel.SearchEmergencyFiles(ProductType);
                         if (URLs != null)
                         {
-                            if (args.Length >= 4)
-                                DownloadFolder = args[3];
-                            else
-                                DownloadFolder = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+                            DownloadFolder = args.Length >= 4
+                                ? args[3]
+                                : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
                             if (!Directory.Exists(DownloadFolder))
+                            {
                                 Directory.CreateDirectory(DownloadFolder);
+                            }
+
                             LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
                             for (int i = 0; i < URLs.Length; i++)
                             {
@@ -1258,11 +1492,16 @@ namespace WPinternals
                                 LogFile.Log("File: " + EmergencyFileName, LogType.FileAndConsole);
                                 EmergencyFilePath = Path.Combine(DownloadFolder, EmergencyFileName);
                                 if (i == 0)
+                                {
                                     ProgrammerPath = EmergencyFilePath;
+                                }
                                 else
+                                {
                                     PayloadPath = EmergencyFilePath;
+                                }
+
                                 LogFile.Log("Downloading...", LogType.FileAndConsole);
-                                using (System.Net.WebClient myWebClient = new System.Net.WebClient())
+                                using (System.Net.WebClient myWebClient = new())
                                 {
                                     await myWebClient.DownloadFileTaskAsync(URLs[i], EmergencyFilePath);
                                 }
@@ -1292,12 +1531,15 @@ namespace WPinternals
                             ProductCode = NormalModel.ExecuteJsonMethodAsString("ReadProductCode", "ProductCode");
                         }
                         URL = LumiaDownloadModel.SearchFFU(null, ProductCode, null, out ProductType);
-                        if (args.Length >= 3)
-                            DownloadFolder = args[2];
-                        else
-                            DownloadFolder = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+                        DownloadFolder = args.Length >= 3
+                            ? args[2]
+                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
                         if (!Directory.Exists(DownloadFolder))
+                        {
                             Directory.CreateDirectory(DownloadFolder);
+                        }
+
                         LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
                         LogFile.Log("URL: " + URL, LogType.FileAndConsole);
                         URI = new Uri(URL);
@@ -1305,7 +1547,7 @@ namespace WPinternals
                         LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
                         FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
                         LogFile.Log("Downloading...", LogType.FileAndConsole);
-                        using (System.Net.WebClient myWebClient = new System.Net.WebClient())
+                        using (System.Net.WebClient myWebClient = new())
                         {
                             await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
                         }
@@ -1323,11 +1565,16 @@ namespace WPinternals
                                 LogFile.Log("File: " + EmergencyFileName, LogType.FileAndConsole);
                                 EmergencyFilePath = Path.Combine(DownloadFolder, EmergencyFileName);
                                 if (i == 0)
+                                {
                                     ProgrammerPath = EmergencyFilePath;
+                                }
                                 else
+                                {
                                     PayloadPath = EmergencyFilePath;
+                                }
+
                                 LogFile.Log("Downloading...", LogType.FileAndConsole);
-                                using (System.Net.WebClient myWebClient = new System.Net.WebClient())
+                                using (System.Net.WebClient myWebClient = new())
                                 {
                                     await myWebClient.DownloadFileTaskAsync(URLs[i], EmergencyFilePath);
                                 }
@@ -1336,17 +1583,20 @@ namespace WPinternals
                             App.Config.AddEmergencyToRepository(ProductType, ProgrammerPath, PayloadPath);
                         }
 
-                        if (App.Config.FFURepository.Where(e => App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V2-EFIESP").First().TargetVersions.Any(v => v.Description == e.OSVersion)).Count() == 0)
+                        if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
                         {
                             ProductType = "RM-1085";
 
                             URL = LumiaDownloadModel.SearchFFU(ProductType, null, null);
-                            if (args.Length >= 3)
-                                DownloadFolder = args[2];
-                            else
-                                DownloadFolder = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+                            DownloadFolder = args.Length >= 3
+                                ? args[2]
+                                : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
                             if (!Directory.Exists(DownloadFolder))
+                            {
                                 Directory.CreateDirectory(DownloadFolder);
+                            }
+
                             LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
                             LogFile.Log("URL: " + URL, LogType.FileAndConsole);
                             URI = new Uri(URL);
@@ -1354,30 +1604,38 @@ namespace WPinternals
                             LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
                             FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
                             LogFile.Log("Downloading...", LogType.FileAndConsole);
-                            using (System.Net.WebClient myWebClient = new System.Net.WebClient())
+                            using (System.Net.WebClient myWebClient = new())
                             {
                                 await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
                             }
                             LogFile.Log("Download finished", LogType.FileAndConsole);
                             App.Config.AddFfuToRepository(FFUFilePath);
 
-                            if (App.Config.FFURepository.Where(e => App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V2-EFIESP").First().TargetVersions.Any(v => v.Description == e.OSVersion)).Count() == 0)
+                            if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
+                            {
                                 throw new WPinternalsException("Unable to find compatible FFU", "No donor-FFU has been found in the repository with a supported OS version. You can add a donor-FFU within the download section of the tool or by using the command line. A donor-FFU can be for a different device and a different CPU than your device. It is only used to gather Operating System specific binaries to be patched and used as part of the unlock process.");
+                            }
                         }
                         Notifier.Stop();
                         break;
                     case "downloadallbyproducttype":
                         LogFile.Log("Command: Download all by Product Type", LogType.FileAndConsole);
                         if (args.Length < 3)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DownloadAllByProductType <Product type> <Optional: Download folder>");
+                        }
+
                         ProductType = args[2];
                         LogFile.Log("Product type: " + ProductType, LogType.FileAndConsole);
-                        if (args.Length >= 4)
-                            DownloadFolder = args[3];
-                        else
-                            DownloadFolder = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+                        DownloadFolder = args.Length >= 4
+                            ? args[3]
+                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
                         if (!Directory.Exists(DownloadFolder))
+                        {
                             Directory.CreateDirectory(DownloadFolder);
+                        }
+
                         LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
                         URL = LumiaDownloadModel.SearchFFU(ProductType, null, null);
                         LogFile.Log("URL: " + URL, LogType.FileAndConsole);
@@ -1386,7 +1644,7 @@ namespace WPinternals
                         LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
                         FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
                         LogFile.Log("Downloading...", LogType.FileAndConsole);
-                        using (System.Net.WebClient myWebClient = new System.Net.WebClient())
+                        using (System.Net.WebClient myWebClient = new())
                         {
                             await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
                         }
@@ -1404,11 +1662,16 @@ namespace WPinternals
                                 LogFile.Log("File: " + EmergencyFileName, LogType.FileAndConsole);
                                 EmergencyFilePath = Path.Combine(DownloadFolder, EmergencyFileName);
                                 if (i == 0)
+                                {
                                     ProgrammerPath = EmergencyFilePath;
+                                }
                                 else
+                                {
                                     PayloadPath = EmergencyFilePath;
+                                }
+
                                 LogFile.Log("Downloading...", LogType.FileAndConsole);
-                                using (System.Net.WebClient myWebClient = new System.Net.WebClient())
+                                using (System.Net.WebClient myWebClient = new())
                                 {
                                     await myWebClient.DownloadFileTaskAsync(URLs[i], EmergencyFilePath);
                                 }
@@ -1417,17 +1680,20 @@ namespace WPinternals
                             App.Config.AddEmergencyToRepository(ProductType, ProgrammerPath, PayloadPath);
                         }
 
-                        if (App.Config.FFURepository.Where(e => App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V2-EFIESP").First().TargetVersions.Any(v => v.Description == e.OSVersion)).Count() == 0)
+                        if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
                         {
                             ProductType = "RM-1085";
 
                             URL = LumiaDownloadModel.SearchFFU(ProductType, null, null);
-                            if (args.Length >= 4)
-                                DownloadFolder = args[3];
-                            else
-                                DownloadFolder = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+                            DownloadFolder = args.Length >= 4
+                                ? args[3]
+                                : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
                             if (!Directory.Exists(DownloadFolder))
+                            {
                                 Directory.CreateDirectory(DownloadFolder);
+                            }
+
                             LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
                             LogFile.Log("URL: " + URL, LogType.FileAndConsole);
                             URI = new Uri(URL);
@@ -1435,30 +1701,38 @@ namespace WPinternals
                             LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
                             FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
                             LogFile.Log("Downloading...", LogType.FileAndConsole);
-                            using (System.Net.WebClient myWebClient = new System.Net.WebClient())
+                            using (System.Net.WebClient myWebClient = new())
                             {
                                 await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
                             }
                             LogFile.Log("Download finished", LogType.FileAndConsole);
                             App.Config.AddFfuToRepository(FFUFilePath);
 
-                            if (App.Config.FFURepository.Where(e => App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V2-EFIESP").First().TargetVersions.Any(v => v.Description == e.OSVersion)).Count() == 0)
+                            if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
+                            {
                                 throw new WPinternalsException("Unable to find compatible FFU", "No donor-FFU has been found in the repository with a supported OS version. You can add a donor-FFU within the download section of the tool or by using the command line. A donor-FFU can be for a different device and a different CPU than your device. It is only used to gather Operating System specific binaries to be patched and used as part of the unlock process.");
+                            }
                         }
                         break;
                     case "downloadallbyproductcode":
                         LogFile.Log("Command: Download all by Product Code", LogType.FileAndConsole);
                         if (args.Length < 3)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DownloadAllByProductCode <Product code> <Optional: Download folder>");
+                        }
+
                         ProductCode = args[2];
                         LogFile.Log("Product code: " + ProductCode, LogType.FileAndConsole);
                         URL = LumiaDownloadModel.SearchFFU(null, ProductCode, null, out ProductType);
-                        if (args.Length >= 4)
-                            DownloadFolder = args[3];
-                        else
-                            DownloadFolder = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+                        DownloadFolder = args.Length >= 4
+                            ? args[3]
+                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
                         if (!Directory.Exists(DownloadFolder))
+                        {
                             Directory.CreateDirectory(DownloadFolder);
+                        }
+
                         LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
                         LogFile.Log("URL: " + URL, LogType.FileAndConsole);
                         URI = new Uri(URL);
@@ -1466,7 +1740,7 @@ namespace WPinternals
                         LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
                         FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
                         LogFile.Log("Downloading...", LogType.FileAndConsole);
-                        using (System.Net.WebClient myWebClient = new System.Net.WebClient())
+                        using (System.Net.WebClient myWebClient = new())
                         {
                             await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
                         }
@@ -1484,11 +1758,16 @@ namespace WPinternals
                                 LogFile.Log("File: " + EmergencyFileName, LogType.FileAndConsole);
                                 EmergencyFilePath = Path.Combine(DownloadFolder, EmergencyFileName);
                                 if (i == 0)
+                                {
                                     ProgrammerPath = EmergencyFilePath;
+                                }
                                 else
+                                {
                                     PayloadPath = EmergencyFilePath;
+                                }
+
                                 LogFile.Log("Downloading...", LogType.FileAndConsole);
-                                using (System.Net.WebClient myWebClient = new System.Net.WebClient())
+                                using (System.Net.WebClient myWebClient = new())
                                 {
                                     await myWebClient.DownloadFileTaskAsync(URLs[i], EmergencyFilePath);
                                 }
@@ -1497,17 +1776,20 @@ namespace WPinternals
                             App.Config.AddEmergencyToRepository(ProductType, ProgrammerPath, PayloadPath);
                         }
 
-                        if (App.Config.FFURepository.Where(e => App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V2-EFIESP").First().TargetVersions.Any(v => v.Description == e.OSVersion)).Count() == 0)
+                        if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
                         {
                             ProductType = "RM-1085";
 
                             URL = LumiaDownloadModel.SearchFFU(ProductType, null, null);
-                            if (args.Length >= 4)
-                                DownloadFolder = args[3];
-                            else
-                                DownloadFolder = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+                            DownloadFolder = args.Length >= 4
+                                ? args[3]
+                                : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
                             if (!Directory.Exists(DownloadFolder))
+                            {
                                 Directory.CreateDirectory(DownloadFolder);
+                            }
+
                             LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
                             LogFile.Log("URL: " + URL, LogType.FileAndConsole);
                             URI = new Uri(URL);
@@ -1515,31 +1797,39 @@ namespace WPinternals
                             LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
                             FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
                             LogFile.Log("Downloading...", LogType.FileAndConsole);
-                            using (System.Net.WebClient myWebClient = new System.Net.WebClient())
+                            using (System.Net.WebClient myWebClient = new())
                             {
                                 await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
                             }
                             LogFile.Log("Download finished", LogType.FileAndConsole);
                             App.Config.AddFfuToRepository(FFUFilePath);
 
-                            if (App.Config.FFURepository.Where(e => App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V2-EFIESP").First().TargetVersions.Any(v => v.Description == e.OSVersion)).Count() == 0)
+                            if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
+                            {
                                 throw new WPinternalsException("Unable to find compatible FFU", "No donor-FFU has been found in the repository with a supported OS version. You can add a donor-FFU within the download section of the tool or by using the command line. A donor-FFU can be for a different device and a different CPU than your device. It is only used to gather Operating System specific binaries to be patched and used as part of the unlock process.");
+                            }
                         }
                         break;
                     case "downloadallbyoperatorcode":
                         LogFile.Log("Command: Download FFU by Operator Code", LogType.FileAndConsole);
                         if (args.Length < 4)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DownloadFFUbyOperatorCode <Product type> <Operator code> <Optional: Download folder>");
+                        }
+
                         ProductType = args[2];
                         LogFile.Log("Product type: " + ProductType, LogType.FileAndConsole);
                         OperatorCode = args[3];
                         LogFile.Log("Operator code: " + OperatorCode, LogType.FileAndConsole);
-                        if (args.Length >= 5)
-                            DownloadFolder = args[4];
-                        else
-                            DownloadFolder = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+                        DownloadFolder = args.Length >= 5
+                            ? args[4]
+                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
                         if (!Directory.Exists(DownloadFolder))
+                        {
                             Directory.CreateDirectory(DownloadFolder);
+                        }
+
                         LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
                         URL = LumiaDownloadModel.SearchFFU(ProductType, null, OperatorCode);
                         LogFile.Log("URL: " + URL, LogType.FileAndConsole);
@@ -1548,7 +1838,7 @@ namespace WPinternals
                         LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
                         FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
                         LogFile.Log("Downloading...", LogType.FileAndConsole);
-                        using (System.Net.WebClient myWebClient = new System.Net.WebClient())
+                        using (System.Net.WebClient myWebClient = new())
                         {
                             await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
                         }
@@ -1566,11 +1856,16 @@ namespace WPinternals
                                 LogFile.Log("File: " + EmergencyFileName, LogType.FileAndConsole);
                                 EmergencyFilePath = Path.Combine(DownloadFolder, EmergencyFileName);
                                 if (i == 0)
+                                {
                                     ProgrammerPath = EmergencyFilePath;
+                                }
                                 else
+                                {
                                     PayloadPath = EmergencyFilePath;
+                                }
+
                                 LogFile.Log("Downloading...", LogType.FileAndConsole);
-                                using (System.Net.WebClient myWebClient = new System.Net.WebClient())
+                                using (System.Net.WebClient myWebClient = new())
                                 {
                                     await myWebClient.DownloadFileTaskAsync(URLs[i], EmergencyFilePath);
                                 }
@@ -1579,17 +1874,20 @@ namespace WPinternals
                             App.Config.AddEmergencyToRepository(ProductType, ProgrammerPath, PayloadPath);
                         }
 
-                        if (App.Config.FFURepository.Where(e => App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V2-EFIESP").First().TargetVersions.Any(v => v.Description == e.OSVersion)).Count() == 0)
+                        if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
                         {
                             ProductType = "RM-1085";
 
                             URL = LumiaDownloadModel.SearchFFU(ProductType, null, null);
-                            if (args.Length >= 5)
-                                DownloadFolder = args[4];
-                            else
-                                DownloadFolder = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+                            DownloadFolder = args.Length >= 5
+                                ? args[4]
+                                : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
                             if (!Directory.Exists(DownloadFolder))
+                            {
                                 Directory.CreateDirectory(DownloadFolder);
+                            }
+
                             LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
                             LogFile.Log("URL: " + URL, LogType.FileAndConsole);
                             URI = new Uri(URL);
@@ -1597,32 +1895,40 @@ namespace WPinternals
                             LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
                             FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
                             LogFile.Log("Downloading...", LogType.FileAndConsole);
-                            using (System.Net.WebClient myWebClient = new System.Net.WebClient())
+                            using (System.Net.WebClient myWebClient = new())
                             {
                                 await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
                             }
                             LogFile.Log("Download finished", LogType.FileAndConsole);
                             App.Config.AddFfuToRepository(FFUFilePath);
 
-                            if (App.Config.FFURepository.Where(e => App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V2-EFIESP").First().TargetVersions.Any(v => v.Description == e.OSVersion)).Count() == 0)
+                            if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
+                            {
                                 throw new WPinternalsException("Unable to find compatible FFU", "No donor-FFU has been found in the repository with a supported OS version. You can add a donor-FFU within the download section of the tool or by using the command line. A donor-FFU can be for a different device and a different CPU than your device. It is only used to gather Operating System specific binaries to be patched and used as part of the unlock process.");
+                            }
                         }
                         break;
                     case "rewritepartitionsfrommassstorage":
                         if (args.Length < 2)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -RewritePartitionsFromMassStorage <Path to folder containing img partitions> \n The name of the imgs must be the partition names. For example, DPP.img will get written to the DPP partition.");
+                        }
 
                         await TestCode.RewriteParts(args[2]);
                         break;
                     case "restoregptusingedl":
                         if (args.Length < 3)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -RestoreGPTUsingEDL <Path to GPT.bin to be flashed at sector 1 (minus the MBR at sector 0)> <Loaders path>");
+                        }
 
                         await TestCode.RecoverBadGPT(args[2], args[3]);
                         break;
                     case "restoregptusingmassstorage":
                         if (args.Length < 2)
+                        {
                             throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -RestoreGPTUsingMassStorage <Path to GPT.bin to be flashed at sector 1 (minus the MBR at sector 0)>");
+                        }
 
                         await TestCode.RewriteGPT(args[2]);
                         break;
@@ -1700,8 +2006,10 @@ namespace WPinternals
                 LogFile.LogException(Ex);
             }
 
-            if (Environment.GetCommandLineArgs().Count() > 1)
+            if (Environment.GetCommandLineArgs().Length > 1)
+            {
                 CloseConsole();
+            }
         }
 
         // http://stackoverflow.com/questions/472282/show-console-in-windows-application
@@ -1711,7 +2019,9 @@ namespace WPinternals
         internal static void OpenConsole()
         {
             if (IsConsoleVisible)
+            {
                 return;
+            }
 
             if (AttachConsole(-1))
             {
@@ -1742,10 +2052,10 @@ namespace WPinternals
                     // "The standard handles of a process may be redirected by a call to  SetStdHandle, in which case  GetStdHandle returns the redirected handle. If the standard handles have been redirected, you can specify the CONIN$ value in a call to the CreateFile function to get a handle to a console's input buffer. Similarly, you can specify the CONOUT$ value to get a handle to a console's active screen buffer."
                     // Get the handle to CONOUT$.    
                     IntPtr stdHandle = CreateFile("CONOUT$", GENERIC_WRITE, FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, 0);
-                    Microsoft.Win32.SafeHandles.SafeFileHandle safeFileHandle = new Microsoft.Win32.SafeHandles.SafeFileHandle(stdHandle, true);
-                    FileStream fileStream = new FileStream(safeFileHandle, FileAccess.Write);
+                    Microsoft.Win32.SafeHandles.SafeFileHandle safeFileHandle = new(stdHandle, true);
+                    FileStream fileStream = new(safeFileHandle, FileAccess.Write);
                     Encoding encoding = System.Text.Encoding.GetEncoding(MY_CODE_PAGE);
-                    StreamWriter standardOutput = new StreamWriter(fileStream, encoding);
+                    StreamWriter standardOutput = new(fileStream, encoding);
                     standardOutput.AutoFlush = true;
                     Console.SetOut(standardOutput);
                 }
diff --git a/DiscUtils/Block.cs b/DiscUtils/Block.cs
deleted file mode 100644
index 4d98399..0000000
--- a/DiscUtils/Block.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    internal class Block
-    {
-        public Block()
-        {
-        }
-
-        public long Position { get; set; }
-
-        public byte[] Data { get; set; }
-
-        public int Available { get; set; }
-
-        public bool Equals(Block other)
-        {
-            return Position == other.Position;
-        }
-    }
-}
diff --git a/DiscUtils/BlockCache.cs b/DiscUtils/BlockCache.cs
deleted file mode 100644
index 2d54ab7..0000000
--- a/DiscUtils/BlockCache.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System.Collections.Generic;
-
-    internal class BlockCache<T>
-        where T : Block, new()
-    {
-        private int _blockSize;
-        private Dictionary<long, T> _blocks;
-        private LinkedList<T> _lru;
-        private List<T> _freeBlocks;
-        private int _blocksCreated;
-        private int _totalBlocks;
-
-        private int _freeBlockCount;
-
-        public BlockCache(int blockSize, int blockCount)
-        {
-            _blockSize = blockSize;
-            _totalBlocks = blockCount;
-
-            _blocks = new Dictionary<long, T>();
-            _lru = new LinkedList<T>();
-            _freeBlocks = new List<T>(_totalBlocks);
-
-            _freeBlockCount = _totalBlocks;
-        }
-
-        public int FreeBlockCount
-        {
-            get { return _freeBlockCount; }
-        }
-
-        public bool ContainsBlock(long position)
-        {
-            return _blocks.ContainsKey(position);
-        }
-
-        public bool TryGetBlock(long position, out T block)
-        {
-            if (_blocks.TryGetValue(position, out block))
-            {
-                _lru.Remove(block);
-                _lru.AddFirst(block);
-                return true;
-            }
-
-            return false;
-        }
-
-        public T GetBlock(long position)
-        {
-            T result;
-
-            if (TryGetBlock(position, out result))
-            {
-                return result;
-            }
-
-            result = GetFreeBlock();
-            result.Position = position;
-            result.Available = -1;
-            StoreBlock(result);
-
-            return result;
-        }
-
-        public void ReleaseBlock(long position)
-        {
-            T block;
-            if (_blocks.TryGetValue(position, out block))
-            {
-                _blocks.Remove(position);
-                _lru.Remove(block);
-                _freeBlocks.Add(block);
-                _freeBlockCount++;
-            }
-        }
-
-        private void StoreBlock(T block)
-        {
-            _blocks[block.Position] = block;
-            _lru.AddFirst(block);
-        }
-
-        private T GetFreeBlock()
-        {
-            T block;
-
-            if (_freeBlocks.Count > 0)
-            {
-                int idx = _freeBlocks.Count - 1;
-                block = _freeBlocks[idx];
-                _freeBlocks.RemoveAt(idx);
-                _freeBlockCount--;
-            }
-            else if (_blocksCreated < _totalBlocks)
-            {
-                block = new T();
-                block.Data = new byte[_blockSize];
-                _blocksCreated++;
-                _freeBlockCount--;
-            }
-            else
-            {
-                block = _lru.Last.Value;
-                _lru.RemoveLast();
-                _blocks.Remove(block.Position);
-            }
-
-            return block;
-        }
-    }
-}
diff --git a/DiscUtils/BlockCacheSettings.cs b/DiscUtils/BlockCacheSettings.cs
deleted file mode 100644
index ccc3ff6..0000000
--- a/DiscUtils/BlockCacheSettings.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    /// <summary>
-    /// Settings controlling BlockCache instances.
-    /// </summary>
-    public sealed class BlockCacheSettings
-    {
-        /// <summary>
-        /// Initializes a new instance of the BlockCacheSettings class.
-        /// </summary>
-        public BlockCacheSettings()
-        {
-            this.BlockSize = (int)(4 * Sizes.OneKiB);
-            this.ReadCacheSize = 4 * Sizes.OneMiB;
-            this.LargeReadSize = 64 * Sizes.OneKiB;
-            this.OptimumReadSize = (int)(64 * Sizes.OneKiB);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the BlockCacheSettings class.
-        /// </summary>
-        /// <param name="settings">The cache settings.</param>
-        internal BlockCacheSettings(BlockCacheSettings settings)
-        {
-            this.BlockSize = settings.BlockSize;
-            this.ReadCacheSize = settings.ReadCacheSize;
-            this.LargeReadSize = settings.LargeReadSize;
-            this.OptimumReadSize = settings.OptimumReadSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the size (in bytes) of each cached block.
-        /// </summary>
-        public int BlockSize { get; set; }
-
-        /// <summary>
-        /// Gets or sets the size (in bytes) of the read cache.
-        /// </summary>
-        public long ReadCacheSize { get; set; }
-
-        /// <summary>
-        /// Gets or sets the maximum read size that will be cached.
-        /// </summary>
-        /// <remarks>Large reads are not cached, on the assumption they will not
-        /// be repeated.  This setting controls what is considered 'large'.
-        /// Any read that is more than this many bytes will not be cached.</remarks>
-        public long LargeReadSize { get; set; }
-
-        /// <summary>
-        /// Gets or sets the optimum size of a read to the wrapped stream.
-        /// </summary>
-        /// <remarks>This value must be a multiple of BlockSize.</remarks>
-        public int OptimumReadSize { get; set; }
-    }
-}
diff --git a/DiscUtils/BlockCacheStatistics.cs b/DiscUtils/BlockCacheStatistics.cs
deleted file mode 100644
index 97a7d58..0000000
--- a/DiscUtils/BlockCacheStatistics.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    /// <summary>
-    /// Statistical information about the effectiveness of a BlockCache instance.
-    /// </summary>
-    public sealed class BlockCacheStatistics
-    {
-        /// <summary>
-        /// Gets the number of requested 'large' reads, as defined by the LargeReadSize setting.
-        /// </summary>
-        public long LargeReadsIn { get; internal set; }
-
-        /// <summary>
-        /// Gets the number of requested unaligned reads.
-        /// </summary>
-        /// <remarks>Unaligned reads are reads where the read doesn't start on a multiple of
-        /// the block size.</remarks>
-        public long UnalignedReadsIn { get; internal set; }
-
-        /// <summary>
-        /// Gets the total number of requested reads.
-        /// </summary>
-        public long TotalReadsIn { get; internal set; }
-
-        /// <summary>
-        /// Gets the total number of reads passed on by the cache.
-        /// </summary>
-        public long TotalReadsOut { get; internal set; }
-
-        /// <summary>
-        /// Gets the number of times a read request was serviced (in part or whole) from the cache.
-        /// </summary>
-        public long ReadCacheHits { get; internal set; }
-
-        /// <summary>
-        /// Gets the number of time a read request was serviced (in part or whole) from the wrapped stream.
-        /// </summary>
-        public long ReadCacheMisses { get; internal set; }
-
-        /// <summary>
-        /// Gets the number of requested unaligned writes.
-        /// </summary>
-        /// <remarks>Unaligned writes are writes where the write doesn't start on a multiple of
-        /// the block size.</remarks>
-        public long UnalignedWritesIn { get; internal set; }
-
-        /// <summary>
-        /// Gets the total number of requested writes.
-        /// </summary>
-        public long TotalWritesIn { get; internal set; }
-
-        /// <summary>
-        /// Gets the number of free blocks in the read cache.
-        /// </summary>
-        public int FreeReadBlocks { get; internal set; }
-    }
-}
diff --git a/DiscUtils/BlockCacheStream.cs b/DiscUtils/BlockCacheStream.cs
deleted file mode 100644
index 722ce20..0000000
--- a/DiscUtils/BlockCacheStream.cs
+++ /dev/null
@@ -1,472 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    /// <summary>
-    /// A stream implementing a block-oriented read cache.
-    /// </summary>
-    public sealed class BlockCacheStream : SparseStream
-    {
-        private SparseStream _wrappedStream;
-        private Ownership _ownWrapped;
-        private BlockCacheSettings _settings;
-        private BlockCacheStatistics _stats;
-
-        private long _position;
-        private bool _atEof;
-
-        private BlockCache<Block> _cache;
-        private byte[] _readBuffer;
-        private int _blocksInReadBuffer;
-
-        /// <summary>
-        /// Initializes a new instance of the BlockCacheStream class.
-        /// </summary>
-        /// <param name="toWrap">The stream to wrap.</param>
-        /// <param name="ownership">Whether to assume ownership of <c>toWrap</c>.</param>
-        public BlockCacheStream(SparseStream toWrap, Ownership ownership)
-            : this(toWrap, ownership, new BlockCacheSettings())
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the BlockCacheStream class.
-        /// </summary>
-        /// <param name="toWrap">The stream to wrap.</param>
-        /// <param name="ownership">Whether to assume ownership of <c>toWrap</c>.</param>
-        /// <param name="settings">The cache settings.</param>
-        public BlockCacheStream(SparseStream toWrap, Ownership ownership, BlockCacheSettings settings)
-        {
-            if (!toWrap.CanRead)
-            {
-                throw new ArgumentException("The wrapped stream does not support reading", "toWrap");
-            }
-
-            if (!toWrap.CanSeek)
-            {
-                throw new ArgumentException("The wrapped stream does not support seeking", "toWrap");
-            }
-
-            _wrappedStream = toWrap;
-            _ownWrapped = ownership;
-            _settings = new BlockCacheSettings(settings);
-
-            if (_settings.OptimumReadSize % _settings.BlockSize != 0)
-            {
-                throw new ArgumentException("Invalid settings, OptimumReadSize must be a multiple of BlockSize", "settings");
-            }
-
-            _readBuffer = new byte[_settings.OptimumReadSize];
-            _blocksInReadBuffer = _settings.OptimumReadSize / _settings.BlockSize;
-
-            int totalBlocks = (int)(_settings.ReadCacheSize / _settings.BlockSize);
-
-            _cache = new BlockCache<Block>(_settings.BlockSize, totalBlocks);
-            _stats = new BlockCacheStatistics();
-            _stats.FreeReadBlocks = totalBlocks;
-        }
-
-        /// <summary>
-        /// Gets the parts of the stream that are stored.
-        /// </summary>
-        /// <remarks>This may be an empty enumeration if all bytes are zero.</remarks>
-        public override IEnumerable<StreamExtent> Extents
-        {
-            get
-            {
-                CheckDisposed();
-                return _wrappedStream.Extents;
-            }
-        }
-
-        /// <summary>
-        /// Gets an indication as to whether the stream can be read.
-        /// </summary>
-        public override bool CanRead
-        {
-            get { return true; }
-        }
-
-        /// <summary>
-        /// Gets an indication as to whether the stream position can be changed.
-        /// </summary>
-        public override bool CanSeek
-        {
-            get { return true; }
-        }
-
-        /// <summary>
-        /// Gets an indication as to whether the stream can be written to.
-        /// </summary>
-        public override bool CanWrite
-        {
-            get { return _wrappedStream.CanWrite; }
-        }
-
-        /// <summary>
-        /// Gets the length of the stream.
-        /// </summary>
-        public override long Length
-        {
-            get
-            {
-                CheckDisposed();
-                return _wrappedStream.Length;
-            }
-        }
-
-        /// <summary>
-        /// Gets and sets the current stream position.
-        /// </summary>
-        public override long Position
-        {
-            get
-            {
-                CheckDisposed();
-                return _position;
-            }
-
-            set
-            {
-                CheckDisposed();
-                _position = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the performance statistics for this instance.
-        /// </summary>
-        public BlockCacheStatistics Statistics
-        {
-            get
-            {
-                _stats.FreeReadBlocks = _cache.FreeBlockCount;
-                return _stats;
-            }
-        }
-
-        /// <summary>
-        /// Gets the parts of a stream that are stored, within a specified range.
-        /// </summary>
-        /// <param name="start">The offset of the first byte of interest.</param>
-        /// <param name="count">The number of bytes of interest.</param>
-        /// <returns>An enumeration of stream extents, indicating stored bytes.</returns>
-        public override IEnumerable<StreamExtent> GetExtentsInRange(long start, long count)
-        {
-            CheckDisposed();
-            return _wrappedStream.GetExtentsInRange(start, count);
-        }
-
-        /// <summary>
-        /// Reads data from the stream.
-        /// </summary>
-        /// <param name="buffer">The buffer to fill.</param>
-        /// <param name="offset">The buffer offset to start from.</param>
-        /// <param name="count">The number of bytes to read.</param>
-        /// <returns>The number of bytes read.</returns>
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            CheckDisposed();
-
-            if (_position >= Length)
-            {
-                if (_atEof)
-                {
-                    throw new IOException("Attempt to read beyond end of stream");
-                }
-                else
-                {
-                    _atEof = true;
-                    return 0;
-                }
-            }
-
-            _stats.TotalReadsIn++;
-
-            if (count > _settings.LargeReadSize)
-            {
-                _stats.LargeReadsIn++;
-                _stats.TotalReadsOut++;
-                _wrappedStream.Position = _position;
-                int numRead = _wrappedStream.Read(buffer, offset, count);
-                _position = _wrappedStream.Position;
-
-                if (_position >= Length)
-                {
-                    _atEof = true;
-                }
-
-                return numRead;
-            }
-
-            int totalBytesRead = 0;
-            bool servicedFromCache = false;
-            bool servicedOutsideCache = false;
-            int blockSize = _settings.BlockSize;
-
-            long firstBlock = _position / blockSize;
-            int offsetInNextBlock = (int)(_position % blockSize);
-            long endBlock = Utilities.Ceil(Math.Min(_position + count, Length), blockSize);
-            int numBlocks = (int)(endBlock - firstBlock);
-
-            if (offsetInNextBlock != 0)
-            {
-                _stats.UnalignedReadsIn++;
-            }
-
-            int blocksRead = 0;
-            while (blocksRead < numBlocks)
-            {
-                Block block;
-
-                // Read from the cache as much as possible
-                while (blocksRead < numBlocks && _cache.TryGetBlock(firstBlock + blocksRead, out block))
-                {
-                    int bytesToRead = Math.Min(count - totalBytesRead, block.Available - offsetInNextBlock);
-
-                    Array.Copy(block.Data, offsetInNextBlock, buffer, offset + totalBytesRead, bytesToRead);
-                    offsetInNextBlock = 0;
-                    totalBytesRead += bytesToRead;
-                    _position += bytesToRead;
-                    blocksRead++;
-
-                    servicedFromCache = true;
-                }
-
-                // Now handle a sequence of (one or more) blocks that are not cached
-                if (blocksRead < numBlocks && !_cache.ContainsBlock(firstBlock + blocksRead))
-                {
-                    servicedOutsideCache = true;
-
-                    // Figure out how many blocks to read from the wrapped stream
-                    int blocksToRead = 0;
-                    while (blocksRead + blocksToRead < numBlocks
-                        && blocksToRead < _blocksInReadBuffer
-                        && !_cache.ContainsBlock(firstBlock + blocksRead + blocksToRead))
-                    {
-                        ++blocksToRead;
-                    }
-
-                    // Allow for the end of the stream not being block-aligned
-                    long readPosition = (firstBlock + blocksRead) * (long)blockSize;
-                    int bytesToRead = (int)Math.Min(blocksToRead * (long)blockSize, Length - readPosition);
-
-                    // Do the read
-                    _stats.TotalReadsOut++;
-                    _wrappedStream.Position = readPosition;
-                    int bytesRead = Utilities.ReadFully(_wrappedStream, _readBuffer, 0, bytesToRead);
-                    if (bytesRead != bytesToRead)
-                    {
-                        throw new IOException("Short read before end of stream");
-                    }
-
-                    // Cache the read blocks
-                    for (int i = 0; i < blocksToRead; ++i)
-                    {
-                        int copyBytes = Math.Min(blockSize, bytesToRead - (i * blockSize));
-                        block = _cache.GetBlock(firstBlock + blocksRead + i);
-                        Array.Copy(_readBuffer, i * blockSize, block.Data, 0, copyBytes);
-                        block.Available = copyBytes;
-
-                        if (copyBytes < blockSize)
-                        {
-                            Array.Clear(_readBuffer, (i * blockSize) + copyBytes, blockSize - copyBytes);
-                        }
-                    }
-
-                    blocksRead += blocksToRead;
-
-                    // Propogate the data onto the caller
-                    int bytesToCopy = Math.Min(count - totalBytesRead, bytesRead - offsetInNextBlock);
-                    Array.Copy(_readBuffer, offsetInNextBlock, buffer, offset + totalBytesRead, bytesToCopy);
-                    totalBytesRead += bytesToCopy;
-                    _position += bytesToCopy;
-                    offsetInNextBlock = 0;
-                }
-            }
-
-            if (_position >= Length && totalBytesRead == 0)
-            {
-                _atEof = true;
-            }
-
-            if (servicedFromCache)
-            {
-                _stats.ReadCacheHits++;
-            }
-
-            if (servicedOutsideCache)
-            {
-                _stats.ReadCacheMisses++;
-            }
-
-            return totalBytesRead;
-        }
-
-        /// <summary>
-        /// Flushes the stream.
-        /// </summary>
-        public override void Flush()
-        {
-            CheckDisposed();
-            _wrappedStream.Flush();
-        }
-
-        /// <summary>
-        /// Moves the stream position.
-        /// </summary>
-        /// <param name="offset">The origin-relative location.</param>
-        /// <param name="origin">The base location.</param>
-        /// <returns>The new absolute stream position.</returns>
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            CheckDisposed();
-
-            long effectiveOffset = offset;
-            if (origin == SeekOrigin.Current)
-            {
-                effectiveOffset += _position;
-            }
-            else if (origin == SeekOrigin.End)
-            {
-                effectiveOffset += Length;
-            }
-
-            _atEof = false;
-
-            if (effectiveOffset < 0)
-            {
-                throw new IOException("Attempt to move before beginning of disk");
-            }
-            else
-            {
-                _position = effectiveOffset;
-                return _position;
-            }
-        }
-
-        /// <summary>
-        /// Sets the length of the stream.
-        /// </summary>
-        /// <param name="value">The new length.</param>
-        public override void SetLength(long value)
-        {
-            CheckDisposed();
-            _wrappedStream.SetLength(value);
-        }
-
-        /// <summary>
-        /// Writes data to the stream at the current location.
-        /// </summary>
-        /// <param name="buffer">The data to write.</param>
-        /// <param name="offset">The first byte to write from buffer.</param>
-        /// <param name="count">The number of bytes to write.</param>
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            CheckDisposed();
-
-            _stats.TotalWritesIn++;
-
-            int blockSize = _settings.BlockSize;
-            long firstBlock = _position / blockSize;
-            long endBlock = Utilities.Ceil(Math.Min(_position + count, Length), blockSize);
-            int numBlocks = (int)(endBlock - firstBlock);
-
-            try
-            {
-                _wrappedStream.Position = _position;
-                _wrappedStream.Write(buffer, offset, count);
-            }
-            catch
-            {
-                InvalidateBlocks(firstBlock, numBlocks);
-                throw;
-            }
-
-            int offsetInNextBlock = (int)(_position % blockSize);
-            if (offsetInNextBlock != 0)
-            {
-                _stats.UnalignedWritesIn++;
-            }
-
-            // For each block touched, if it's cached, update it
-            int bytesProcessed = 0;
-            for (int i = 0; i < numBlocks; ++i)
-            {
-                int bufferPos = offset + bytesProcessed;
-                int bytesThisBlock = Math.Min(count - bytesProcessed, blockSize - offsetInNextBlock);
-
-                Block block;
-                if (_cache.TryGetBlock(firstBlock + i, out block))
-                {
-                    Array.Copy(buffer, bufferPos, block.Data, offsetInNextBlock, bytesThisBlock);
-                    block.Available = Math.Max(block.Available, offsetInNextBlock + bytesThisBlock);
-                }
-
-                offsetInNextBlock = 0;
-                bytesProcessed += bytesThisBlock;
-            }
-
-            _position += count;
-        }
-
-        /// <summary>
-        /// Disposes of this instance, freeing up associated resources.
-        /// </summary>
-        /// <param name="disposing"><c>true</c> if invoked from <c>Dispose</c>, else <c>false</c>.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                if (_wrappedStream != null && _ownWrapped == Ownership.Dispose)
-                {
-                    _wrappedStream.Dispose();
-                }
-
-                _wrappedStream = null;
-            }
-
-            base.Dispose(disposing);
-        }
-
-        private void CheckDisposed()
-        {
-            if (_wrappedStream == null)
-            {
-                throw new ObjectDisposedException("BlockCacheStream");
-            }
-        }
-
-        private void InvalidateBlocks(long firstBlock, int numBlocks)
-        {
-            for (long i = firstBlock; i < (firstBlock + numBlocks); ++i)
-            {
-                _cache.ReleaseBlock(i);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/BootConfig/ApplicationImageType.cs b/DiscUtils/BootConfig/ApplicationImageType.cs
deleted file mode 100644
index 9725607..0000000
--- a/DiscUtils/BootConfig/ApplicationImageType.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.BootConfig
-{
-    /// <summary>
-    /// Enumeration of known application image types.
-    /// </summary>
-    public enum ApplicationImageType
-    {
-        /// <summary>
-        /// Unknown type.
-        /// </summary>
-        None = 0x0,
-
-        /// <summary>
-        /// Firmware application.
-        /// </summary>
-        Firmware = 0x1,
-
-        /// <summary>
-        /// Windows boot loader.
-        /// </summary>
-        WindowsBoot = 0x2,
-
-        /// <summary>
-        /// Legacy boot loader.
-        /// </summary>
-        LegacyLoader = 0x3,
-
-        /// <summary>
-        /// Real mode boot loader.
-        /// </summary>
-        RealMode = 0x4
-    }
-}
diff --git a/DiscUtils/BootConfig/ApplicationType.cs b/DiscUtils/BootConfig/ApplicationType.cs
deleted file mode 100644
index c6d32a9..0000000
--- a/DiscUtils/BootConfig/ApplicationType.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.BootConfig
-{
-    /// <summary>
-    /// Enumeration of known application types.
-    /// </summary>
-    public enum ApplicationType
-    {
-        /// <summary>
-        /// Unknown type.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// Firmware boot manager (e.g. UEFI).
-        /// </summary>
-        FirmwareBootManager = 1,
-
-        /// <summary>
-        /// Windows boot manager.
-        /// </summary>
-        BootManager = 2,
-
-        /// <summary>
-        /// Operating System Loader.
-        /// </summary>
-        OsLoader = 3,
-
-        /// <summary>
-        /// Resume loader.
-        /// </summary>
-        Resume = 4,
-
-        /// <summary>
-        /// Memory diagnostic application.
-        /// </summary>
-        MemoryDiagnostics = 5,
-
-        /// <summary>
-        /// Legacy NT loader application.
-        /// </summary>
-        NtLoader = 6,
-
-        /// <summary>
-        /// Windows setup application.
-        /// </summary>
-        SetupLoader = 7,
-
-        /// <summary>
-        /// Boot sector application.
-        /// </summary>
-        BootSector = 8,
-
-        /// <summary>
-        /// Startup application.
-        /// </summary>
-        Startup = 9
-    }
-}
diff --git a/DiscUtils/BootConfig/BaseStorage.cs b/DiscUtils/BootConfig/BaseStorage.cs
deleted file mode 100644
index 3322099..0000000
--- a/DiscUtils/BootConfig/BaseStorage.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.BootConfig
-{
-    using System;
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// Base class for BCD storage repositories.
-    /// </summary>
-    internal abstract class BaseStorage
-    {
-        /// <summary>
-        /// Tests if an element is present (i.e. has a value) on an object.
-        /// </summary>
-        /// <param name="obj">The object to inspect.</param>
-        /// <param name="element">The element to inspect.</param>
-        /// <returns><c>true</c> if present, else <c>false</c>.</returns>
-        public abstract bool HasValue(Guid obj, int element);
-
-        /// <summary>
-        /// Gets the value of a string element.
-        /// </summary>
-        /// <param name="obj">The object to inspect.</param>
-        /// <param name="element">The element to retrieve.</param>
-        /// <returns>The value as a string.</returns>
-        public abstract string GetString(Guid obj, int element);
-
-        public abstract byte[] GetBinary(Guid obj, int element);
-
-        public abstract void SetString(Guid obj, int element, string value);
-
-        public abstract void SetBinary(Guid obj, int element, byte[] value);
-
-        public abstract string[] GetMultiString(Guid obj, int element);
-
-        public abstract void SetMultiString(Guid obj, int element, string[] values);
-
-        public abstract IEnumerable<Guid> EnumerateObjects();
-
-        public abstract IEnumerable<int> EnumerateElements(Guid obj);
-
-        public abstract int GetObjectType(Guid obj);
-
-        public abstract bool ObjectExists(Guid obj);
-
-        public abstract Guid CreateObject(Guid obj, int type);
-
-        public abstract void CreateElement(Guid obj, int element);
-
-        public abstract void DeleteObject(Guid obj);
-
-        public abstract void DeleteElement(Guid obj, int element);
-    }
-}
diff --git a/DiscUtils/BootConfig/BcdObject.cs b/DiscUtils/BootConfig/BcdObject.cs
deleted file mode 100644
index 934ea3e..0000000
--- a/DiscUtils/BootConfig/BcdObject.cs
+++ /dev/null
@@ -1,365 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-//
-// Symbolic names of BCD Objects taken from Geoff Chappell's website:
-//  http://www.geoffchappell.com/viewer.htm?doc=notes/windows/boot/bcd/objects.htm
-//
-//
-
-namespace DiscUtils.BootConfig
-{
-    using System;
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// Represents a Boot Configuration Database object (application, device or inherited settings).
-    /// </summary>
-    public class BcdObject
-    {
-        /// <summary>
-        /// Well-known object for Emergency Management Services settings.
-        /// </summary>
-        public const string EmsSettingsGroupId = "{0CE4991B-E6B3-4B16-B23C-5E0D9250E5D9}";
-
-        /// <summary>
-        /// Well-known object for the Resume boot loader.
-        /// </summary>
-        public const string ResumeLoaderSettingsGroupId = "{1AFA9C49-16AB-4A5C-4A90-212802DA9460}";
-
-        /// <summary>
-        /// Alias for the Default boot entry.
-        /// </summary>
-        public const string DefaultBootEntryId = "{1CAE1EB7-A0DF-4D4D-9851-4860E34EF535}";
-
-        /// <summary>
-        /// Well-known object for Emergency Management Services settings.
-        /// </summary>
-        public const string DebuggerSettingsGroupId = "{4636856E-540F-4170-A130-A84776F4C654}";
-
-        /// <summary>
-        /// Well-known object for NTLDR application.
-        /// </summary>
-        public const string WindowsLegacyNtldrId = "{466F5A88-0AF2-4F76-9038-095B170DC21C}";
-
-        /// <summary>
-        /// Well-known object for bad memory settings.
-        /// </summary>
-        public const string BadMemoryGroupId = "{5189B25C-5558-4BF2-BCA4-289B11BD29E2}";
-
-        /// <summary>
-        /// Well-known object for Boot Loader settings.
-        /// </summary>
-        public const string BootLoaderSettingsGroupId = "{6EFB52BF-1766-41DB-A6B3-0EE5EFF72BD7}";
-
-        /// <summary>
-        /// Well-known object for EFI setup.
-        /// </summary>
-        public const string WindowsSetupEfiId = "{7254A080-1510-4E85-AC0F-E7FB3D444736}";
-
-        /// <summary>
-        /// Well-known object for Global settings.
-        /// </summary>
-        public const string GlobalSettingsGroupId = "{7EA2E1AC-2E61-4728-AAA3-896D9D0A9F0E}";
-
-        /// <summary>
-        /// Well-known object for Windows Boot Manager.
-        /// </summary>
-        public const string WindowsBootManagerId = "{9DEA862C-5CDD-4E70-ACC1-F32B344D4795}";
-
-        /// <summary>
-        /// Well-known object for PCAT Template.
-        /// </summary>
-        public const string WindowsOsTargetTemplatePcatId = "{A1943BBC-EA85-487C-97C7-C9EDE908A38A}";
-
-        /// <summary>
-        /// Well-known object for Firmware Boot Manager.
-        /// </summary>
-        public const string FirmwareBootManagerId = "{A5A30FA2-3D06-4E9F-B5F4-A01DF9D1FCBA}";
-
-        /// <summary>
-        /// Well-known object for Windows Setup RAMDISK options.
-        /// </summary>
-        public const string WindowsSetupRamdiskOptionsId = "{AE5534E0-A924-466C-B836-758539A3EE3A}";
-
-        /// <summary>
-        /// Well-known object for EFI template.
-        /// </summary>
-        public const string WindowsOsTargetTemplateEfiId = "{B012B84D-C47C-4ED5-B722-C0C42163E569}";
-
-        /// <summary>
-        /// Well-known object for Windows memory tester application.
-        /// </summary>
-        public const string WindowsMemoryTesterId = "{B2721D73-1DB4-4C62-BF78-C548A880142D}";
-
-        /// <summary>
-        /// Well-known object for Windows PCAT setup.
-        /// </summary>
-        public const string WindowsSetupPcatId = "{CBD971BF-B7B8-4885-951A-FA03044F5D71}";
-
-        /// <summary>
-        /// Alias for the current boot entry.
-        /// </summary>
-        public const string CurrentBootEntryId = "{FA926493-6F1C-4193-A414-58F0B2456D1E}";
-
-        private static Dictionary<string, Guid> s_nameToGuid;
-        private static Dictionary<Guid, string> s_guidToName;
-
-        private BaseStorage _storage;
-        private Guid _id;
-        private int _type;
-
-        static BcdObject()
-        {
-            s_nameToGuid = new Dictionary<string, Guid>();
-            s_guidToName = new Dictionary<Guid, string>();
-
-            AddMapping("{emssettings}", EmsSettingsGroupId);
-            AddMapping("{resumeloadersettings}", ResumeLoaderSettingsGroupId);
-            AddMapping("{default}", DefaultBootEntryId);
-            AddMapping("{dbgsettings}", DebuggerSettingsGroupId);
-            AddMapping("{legacy}", WindowsLegacyNtldrId);
-            AddMapping("{ntldr}", WindowsLegacyNtldrId);
-            AddMapping("{badmemory}", BadMemoryGroupId);
-            AddMapping("{bootloadersettings}", BootLoaderSettingsGroupId);
-            AddMapping("{globalsettings}", GlobalSettingsGroupId);
-            AddMapping("{bootmgr}", WindowsBootManagerId);
-            AddMapping("{fwbootmgr}", FirmwareBootManagerId);
-            AddMapping("{ramdiskoptions}", WindowsSetupRamdiskOptionsId);
-            AddMapping("{memdiag}", WindowsMemoryTesterId);
-            AddMapping("{current}", CurrentBootEntryId);
-        }
-
-        internal BcdObject(BaseStorage store, Guid id)
-        {
-            _storage = store;
-            _id = id;
-            _type = _storage.GetObjectType(id);
-        }
-
-        /// <summary>
-        /// Gets the identity of this object.
-        /// </summary>
-        public Guid Identity
-        {
-            get { return _id; }
-        }
-
-        /// <summary>
-        /// Gets the friendly name for this object, if known.
-        /// </summary>
-        public string FriendlyName
-        {
-            get
-            {
-                string name;
-                if (s_guidToName.TryGetValue(_id, out name))
-                {
-                    return name;
-                }
-
-                return _id.ToString("B");
-            }
-        }
-
-        /// <summary>
-        /// Gets the object type for this object.
-        /// </summary>
-        public ObjectType ObjectType
-        {
-            get { return (ObjectType)((_type >> 28) & 0xF); }
-        }
-
-        /// <summary>
-        /// Gets the image type for this application.
-        /// </summary>
-        public ApplicationImageType ApplicationImageType
-        {
-            get { return IsApplication ? (ApplicationImageType)((_type & 0x00F00000) >> 20) : 0; }
-        }
-
-        /// <summary>
-        /// Gets the application type for this application.
-        /// </summary>
-        public ApplicationType ApplicationType
-        {
-            get { return IsApplication ? (ApplicationType)(_type & 0xFFFFF) : 0; }
-        }
-
-        /// <summary>
-        /// Gets the elements in this object.
-        /// </summary>
-        public IEnumerable<Element> Elements
-        {
-            get
-            {
-                foreach (var el in _storage.EnumerateElements(_id))
-                {
-                    yield return new Element(_storage, _id, ApplicationType, el);
-                }
-            }
-        }
-
-        private bool IsApplication
-        {
-            get { return ObjectType == ObjectType.Application; }
-        }
-
-        /// <summary>
-        /// Indicates if the settings in this object are inheritable by another object.
-        /// </summary>
-        /// <param name="type">The type of the object to test for inheritability.</param>
-        /// <returns><c>true</c> if the settings can be inherited, else <c>false</c>.</returns>
-        public bool IsInheritableBy(ObjectType type)
-        {
-            if (type == ObjectType.Inherit)
-            {
-                throw new ArgumentException("Can not test inheritability by inherit objects", "type");
-            }
-
-            if (ObjectType != ObjectType.Inherit)
-            {
-                return false;
-            }
-
-            InheritType setting = (InheritType)((_type & 0x00F00000) >> 20);
-
-            return setting == InheritType.AnyObject
-                || (setting == InheritType.ApplicationObjects && type == ObjectType.Application)
-                || (setting == InheritType.DeviceObjects && type == ObjectType.Device);
-        }
-
-        /// <summary>
-        /// Indicates if this object has a specific element.
-        /// </summary>
-        /// <param name="id">The identity of the element to look for.</param>
-        /// <returns><c>true</c> if present, else <c>false</c>.</returns>
-        public bool HasElement(int id)
-        {
-            return _storage.HasValue(_id, id);
-        }
-
-        /// <summary>
-        /// Indicates if this object has a specific element.
-        /// </summary>
-        /// <param name="id">The identity of the element to look for.</param>
-        /// <returns><c>true</c> if present, else <c>false</c>.</returns>
-        public bool HasElement(WellKnownElement id)
-        {
-            return HasElement((int)id);
-        }
-
-        /// <summary>
-        /// Gets a specific element in this object.
-        /// </summary>
-        /// <param name="id">The identity of the element to look for.</param>
-        /// <returns>The element object.</returns>
-        public Element GetElement(int id)
-        {
-            if (HasElement(id))
-            {
-                return new Element(_storage, _id, ApplicationType, id);
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Gets a specific element in this object.
-        /// </summary>
-        /// <param name="id">The identity of the element to look for.</param>
-        /// <returns>The element object.</returns>
-        public Element GetElement(WellKnownElement id)
-        {
-            return GetElement((int)id);
-        }
-
-        /// <summary>
-        /// Adds an element in this object.
-        /// </summary>
-        /// <param name="id">The identity of the element to add.</param>
-        /// <param name="initialValue">The initial value of the element.</param>
-        /// <returns>The element object.</returns>
-        public Element AddElement(int id, ElementValue initialValue)
-        {
-            _storage.CreateElement(_id, id);
-            Element el = new Element(_storage, _id, ApplicationType, id);
-            el.Value = initialValue;
-            return el;
-        }
-
-        /// <summary>
-        /// Adds an element in this object.
-        /// </summary>
-        /// <param name="id">The identity of the element to add.</param>
-        /// <param name="initialValue">The initial value of the element.</param>
-        /// <returns>The element object.</returns>
-        public Element AddElement(WellKnownElement id, ElementValue initialValue)
-        {
-            return AddElement((int)id, initialValue);
-        }
-
-        /// <summary>
-        /// Removes a specific element.
-        /// </summary>
-        /// <param name="id">The element to remove.</param>
-        public void RemoveElement(int id)
-        {
-            _storage.DeleteElement(_id, id);
-        }
-
-        /// <summary>
-        /// Removes a specific element.
-        /// </summary>
-        /// <param name="id">The element to remove.</param>
-        public void RemoveElement(WellKnownElement id)
-        {
-            RemoveElement((int)id);
-        }
-
-        /// <summary>
-        /// Returns the object identity as a GUID string.
-        /// </summary>
-        /// <returns>A string representation, with surrounding curly braces.</returns>
-        public override string ToString()
-        {
-            return _id.ToString("B");
-        }
-
-        internal static int MakeApplicationType(ApplicationImageType imageType, ApplicationType appType)
-        {
-            return 0x10000000 | (((int)imageType << 20) & 0x00F00000) | ((int)appType & 0x0000FFFF);
-        }
-
-        internal static int MakeInheritType(InheritType inheritType)
-        {
-            return 0x20000000 | (((int)inheritType << 20) & 0x00F00000);
-        }
-
-        private static void AddMapping(string name, string id)
-        {
-            Guid guid = new Guid(id);
-            s_nameToGuid[name] = guid;
-            s_guidToName[guid] = name;
-        }
-    }
-}
diff --git a/DiscUtils/BootConfig/BooleanElementValue.cs b/DiscUtils/BootConfig/BooleanElementValue.cs
deleted file mode 100644
index 39c2fe8..0000000
--- a/DiscUtils/BootConfig/BooleanElementValue.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.BootConfig
-{
-    internal class BooleanElementValue : ElementValue
-    {
-        private bool _value;
-
-        public BooleanElementValue(byte[] value)
-        {
-            _value = value[0] != 0;
-        }
-
-        public BooleanElementValue(bool value)
-        {
-            _value = value;
-        }
-
-        public override ElementFormat Format
-        {
-            get { return ElementFormat.Boolean; }
-        }
-
-        public override string ToString()
-        {
-            return _value ? "True" : "False";
-        }
-
-        internal byte[] GetBytes()
-        {
-            return new byte[] { (_value ? (byte)1 : (byte)0) };
-        }
-    }
-}
diff --git a/DiscUtils/BootConfig/DeviceAndPathRecord.cs b/DiscUtils/BootConfig/DeviceAndPathRecord.cs
deleted file mode 100644
index c86fe1b..0000000
--- a/DiscUtils/BootConfig/DeviceAndPathRecord.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.BootConfig
-{
-    using System;
-    using System.Text;
-
-    internal class DeviceAndPathRecord : DeviceRecord
-    {
-        private DeviceRecord _container;
-        private string _path;
-
-        public override int Size
-        {
-            get { throw new NotImplementedException(); }
-        }
-
-        public override void GetBytes(byte[] data, int offset)
-        {
-            throw new NotImplementedException();
-        }
-
-        public override string ToString()
-        {
-            return _container.ToString() + ":" + _path;
-        }
-
-        protected override void DoParse(byte[] data, int offset)
-        {
-            base.DoParse(data, offset);
-
-            _container = DeviceRecord.Parse(data, offset + 0x34);
-
-            int pathStart = 0x34 + _container.Size;
-            _path = Encoding.Unicode.GetString(data, offset + pathStart, Length - pathStart);
-        }
-    }
-}
diff --git a/DiscUtils/BootConfig/DeviceElementValue.cs b/DiscUtils/BootConfig/DeviceElementValue.cs
deleted file mode 100644
index 65aff9a..0000000
--- a/DiscUtils/BootConfig/DeviceElementValue.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.BootConfig
-{
-    using System;
-    using System.Globalization;
-
-    internal class DeviceElementValue : ElementValue
-    {
-        private Guid _parentObject;
-        private DeviceRecord _record;
-
-        public DeviceElementValue()
-        {
-            _parentObject = Guid.Empty;
-
-            PartitionRecord record = new PartitionRecord();
-            record.Type = 5;
-            _record = record;
-        }
-
-        public DeviceElementValue(Guid parentObject, PhysicalVolumeInfo pvi)
-        {
-            _parentObject = parentObject;
-
-            PartitionRecord record = new PartitionRecord();
-            record.Type = 6;
-            if (pvi.VolumeType == PhysicalVolumeType.BiosPartition)
-            {
-                record.PartitionType = 1;
-                record.DiskIdentity = new byte[4];
-                Utilities.WriteBytesLittleEndian(pvi.DiskSignature, record.DiskIdentity, 0);
-                record.PartitionIdentity = new byte[8];
-                Utilities.WriteBytesLittleEndian(pvi.PhysicalStartSector * 512, record.PartitionIdentity, 0);
-            }
-            else if (pvi.VolumeType == PhysicalVolumeType.GptPartition)
-            {
-                record.PartitionType = 0;
-                record.DiskIdentity = new byte[16];
-                Utilities.WriteBytesLittleEndian(pvi.DiskIdentity, record.DiskIdentity, 0);
-                record.PartitionIdentity = new byte[16];
-                Utilities.WriteBytesLittleEndian(pvi.PartitionIdentity, record.PartitionIdentity, 0);
-            }
-            else
-            {
-                throw new NotImplementedException(string.Format(CultureInfo.InvariantCulture, "Unknown how to convert volume type {0} to a Device element", pvi.VolumeType));
-            }
-
-            _record = record;
-        }
-
-        public DeviceElementValue(byte[] value)
-        {
-            _parentObject = Utilities.ToGuidLittleEndian(value, 0x00);
-            _record = DeviceRecord.Parse(value, 0x10);
-        }
-
-        public override Guid ParentObject
-        {
-            get { return _parentObject; }
-        }
-
-        public override ElementFormat Format
-        {
-            get { return ElementFormat.Device; }
-        }
-
-        public override string ToString()
-        {
-            if (_parentObject != Guid.Empty)
-            {
-                return _parentObject.ToString() + ":" + _record.ToString();
-            }
-            else if (_record != null)
-            {
-                return _record.ToString();
-            }
-            else
-            {
-                return "<unknown>";
-            }
-        }
-
-        internal byte[] GetBytes()
-        {
-            byte[] buffer = new byte[_record.Size + 0x10];
-
-            Utilities.WriteBytesLittleEndian(_parentObject, buffer, 0);
-            _record.GetBytes(buffer, 0x10);
-
-            return buffer;
-        }
-    }
-}
diff --git a/DiscUtils/BootConfig/DeviceRecord.cs b/DiscUtils/BootConfig/DeviceRecord.cs
deleted file mode 100644
index 2418d39..0000000
--- a/DiscUtils/BootConfig/DeviceRecord.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.BootConfig
-{
-    using System;
-    using System.IO;
-
-    internal abstract class DeviceRecord
-    {
-        public int Type { get; set; }
-
-        public int Length { get; set; }
-
-        public abstract int Size { get; }
-
-        public static DeviceRecord Parse(byte[] data, int offset)
-        {
-            int type = Utilities.ToInt32LittleEndian(data, offset);
-            int length = Utilities.ToInt32LittleEndian(data, offset + 0x8);
-            if (offset + length > data.Length)
-            {
-                throw new InvalidDataException("Device record is truncated");
-            }
-
-            DeviceRecord newRecord = null;
-            switch (type)
-            {
-                case 0:
-                    newRecord = new DeviceAndPathRecord();
-                    break;
-                case 5: // Logical 'boot' device
-                case 6: // Disk partition
-                    newRecord = new PartitionRecord();
-                    break;
-                case 8: // custom:nnnnnn
-                    break;
-                default:
-                    throw new NotImplementedException("Unknown device type: " + type);
-            }
-
-            if (newRecord != null)
-            {
-                newRecord.DoParse(data, offset);
-            }
-
-            return newRecord;
-        }
-
-        public abstract void GetBytes(byte[] data, int offset);
-
-        protected virtual void DoParse(byte[] data, int offset)
-        {
-            Type = Utilities.ToInt32LittleEndian(data, offset);
-            Length = Utilities.ToInt32LittleEndian(data, offset + 0x8);
-        }
-
-        protected void WriteHeader(byte[] data, int offset)
-        {
-            Length = Size;
-            Utilities.WriteBytesLittleEndian(Type, data, offset);
-            Utilities.WriteBytesLittleEndian(Size, data, offset + 0x8);
-        }
-    }
-}
diff --git a/DiscUtils/BootConfig/DiscUtilsRegistryStorage.cs b/DiscUtils/BootConfig/DiscUtilsRegistryStorage.cs
deleted file mode 100644
index 9c65e2b..0000000
--- a/DiscUtils/BootConfig/DiscUtilsRegistryStorage.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.BootConfig
-{
-    using DiscUtils.Registry;
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-
-    internal class DiscUtilsRegistryStorage : BaseStorage
-    {
-        private const string ElementsPathTemplate = @"Objects\{0}\Elements";
-        private const string ElementPathTemplate = @"Objects\{0}\Elements\{1:X8}";
-        private const string ObjectTypePathTemplate = @"Objects\{0}\Description";
-        private const string ObjectsPath = @"Objects";
-
-        private RegistryKey _rootKey;
-
-        public DiscUtilsRegistryStorage(RegistryKey key)
-        {
-            _rootKey = key;
-        }
-
-        public override string GetString(Guid obj, int element)
-        {
-            return GetValue(obj, element) as string;
-        }
-
-        public override void SetString(Guid obj, int element, string value)
-        {
-            SetValue(obj, element, value);
-        }
-
-        public override byte[] GetBinary(Guid obj, int element)
-        {
-            return GetValue(obj, element) as byte[];
-        }
-
-        public override void SetBinary(Guid obj, int element, byte[] value)
-        {
-            SetValue(obj, element, value);
-        }
-
-        public override string[] GetMultiString(Guid obj, int element)
-        {
-            return GetValue(obj, element) as string[];
-        }
-
-        public override void SetMultiString(Guid obj, int element, string[] values)
-        {
-            SetValue(obj, element, values);
-        }
-
-        public override IEnumerable<Guid> EnumerateObjects()
-        {
-            RegistryKey parentKey = _rootKey.OpenSubKey("Objects");
-            foreach (var key in parentKey.GetSubKeyNames())
-            {
-                yield return new Guid(key);
-            }
-        }
-
-        public override IEnumerable<int> EnumerateElements(Guid obj)
-        {
-            string path = string.Format(CultureInfo.InvariantCulture, ElementsPathTemplate, obj.ToString("B"));
-            RegistryKey parentKey = _rootKey.OpenSubKey(path);
-            foreach (var key in parentKey.GetSubKeyNames())
-            {
-                yield return int.Parse(key, NumberStyles.HexNumber);
-            }
-        }
-
-        public override int GetObjectType(Guid obj)
-        {
-            string path = string.Format(CultureInfo.InvariantCulture, ObjectTypePathTemplate, obj.ToString("B"));
-
-            RegistryKey descKey = _rootKey.OpenSubKey(path);
-
-            object val = descKey.GetValue("Type");
-            return (int)val;
-        }
-
-        public override bool HasValue(Guid obj, int element)
-        {
-            string path = string.Format(CultureInfo.InvariantCulture, ElementPathTemplate, obj.ToString("B"), element);
-            return _rootKey.OpenSubKey(path) != null;
-        }
-
-        public override bool ObjectExists(Guid obj)
-        {
-            string path = string.Format(CultureInfo.InvariantCulture, ObjectTypePathTemplate, obj.ToString("B"));
-
-            return _rootKey.OpenSubKey(path) != null;
-        }
-
-        public override Guid CreateObject(Guid obj, int type)
-        {
-            Guid realObj = (obj == Guid.Empty) ? Guid.NewGuid() : obj;
-            string path = string.Format(CultureInfo.InvariantCulture, ObjectTypePathTemplate, realObj.ToString("B"));
-
-            RegistryKey key = _rootKey.CreateSubKey(path);
-            key.SetValue("Type", type, RegistryValueType.Dword);
-
-            return realObj;
-        }
-
-        public override void CreateElement(Guid obj, int element)
-        {
-            string path = string.Format(CultureInfo.InvariantCulture, ElementPathTemplate, obj.ToString("B"), element);
-
-            _rootKey.CreateSubKey(path);
-        }
-
-        public override void DeleteObject(Guid obj)
-        {
-            string path = string.Format(CultureInfo.InvariantCulture, ObjectTypePathTemplate, obj.ToString("B"));
-
-            _rootKey.DeleteSubKeyTree(path);
-        }
-
-        public override void DeleteElement(Guid obj, int element)
-        {
-            string path = string.Format(CultureInfo.InvariantCulture, ElementPathTemplate, obj.ToString("B"), element);
-
-            _rootKey.DeleteSubKeyTree(path);
-        }
-
-        private object GetValue(Guid obj, int element)
-        {
-            string path = string.Format(CultureInfo.InvariantCulture, ElementPathTemplate, obj.ToString("B"), element);
-            RegistryKey key = _rootKey.OpenSubKey(path);
-            return key.GetValue("Element");
-        }
-
-        private void SetValue(Guid obj, int element, object value)
-        {
-            string path = string.Format(CultureInfo.InvariantCulture, ElementPathTemplate, obj.ToString("B"), element);
-            RegistryKey key = _rootKey.OpenSubKey(path);
-            key.SetValue("Element", value);
-        }
-    }
-}
diff --git a/DiscUtils/BootConfig/Element.cs b/DiscUtils/BootConfig/Element.cs
deleted file mode 100644
index a75c4f2..0000000
--- a/DiscUtils/BootConfig/Element.cs
+++ /dev/null
@@ -1,390 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-//
-// Symbolic names of BCD Elements taken from Geoff Chappell's website:
-//  http://www.geoffchappell.com/viewer.htm?doc=notes/windows/boot/bcd/elements.htm
-//
-//
-
-namespace DiscUtils.BootConfig
-{
-    using System;
-    using System.Globalization;
-
-    /// <summary>
-    /// Represents an element in a Boot Configuration Database object.
-    /// </summary>
-    public class Element
-    {
-        private BaseStorage _storage;
-        private Guid _obj;
-        private ApplicationType _appType;
-        private int _identifier;
-        private ElementValue _value;
-
-        internal Element(BaseStorage storage, Guid obj, ApplicationType appType, int identifier)
-        {
-            _storage = storage;
-            _obj = obj;
-            _appType = appType;
-            _identifier = identifier;
-        }
-
-        /// <summary>
-        /// Gets the friendly name of the element, if any.
-        /// </summary>
-        public string FriendlyName
-        {
-            get
-            {
-                return "{" + IdentifierToName(_appType, _identifier) + "}";
-            }
-        }
-
-        /// <summary>
-        /// Gets the class of the element.
-        /// </summary>
-        public ElementClass Class
-        {
-            get { return (ElementClass)((_identifier >> 28) & 0xF); }
-        }
-
-        /// <summary>
-        /// Gets the element's format.
-        /// </summary>
-        public ElementFormat Format
-        {
-            get { return (ElementFormat)((_identifier >> 24) & 0xF); }
-        }
-
-        /// <summary>
-        /// Gets or sets the element's value.
-        /// </summary>
-        public ElementValue Value
-        {
-            get
-            {
-                if (_value == null)
-                {
-                    _value = LoadValue();
-                }
-
-                return _value;
-            }
-
-            set
-            {
-                if (Format != value.Format)
-                {
-                    throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, "Attempt to assign {1} value to {0} format element", Format, value.Format));
-                }
-
-                _value = value;
-                WriteValue();
-            }
-        }
-
-        /// <summary>
-        /// Gets the element's id as a hex string.
-        /// </summary>
-        /// <returns>A hex string.</returns>
-        public override string ToString()
-        {
-            return _identifier.ToString("X8", CultureInfo.InvariantCulture);
-        }
-
-        private static string IdentifierToName(ApplicationType appType, int identifier)
-        {
-            ElementClass idClass = GetClass(identifier);
-            if (idClass == ElementClass.Library)
-            {
-                switch (identifier)
-                {
-                    case 0x11000001: return "device";
-                    case 0x12000002: return "path";
-                    case 0x12000004: return "description";
-                    case 0x12000005: return "locale";
-                    case 0x14000006: return "inherit";
-                    case 0x15000007: return "truncatememory";
-                    case 0x14000008: return "recoverysequence";
-                    case 0x16000009: return "recoveryenabled";
-                    case 0x1700000A: return "badmemorylist";
-                    case 0x1600000B: return "badmemoryaccess";
-                    case 0x1500000C: return "firstmegabytepolicy";
-
-                    case 0x16000010: return "bootdebug";
-                    case 0x15000011: return "debugtype";
-                    case 0x15000012: return "debugaddress";
-                    case 0x15000013: return "debugport";
-                    case 0x15000014: return "baudrate";
-                    case 0x15000015: return "channel";
-                    case 0x12000016: return "targetname";
-                    case 0x16000017: return "noumex";
-                    case 0x15000018: return "debugstart";
-
-                    case 0x16000020: return "bootems";
-                    case 0x15000022: return "emsport";
-                    case 0x15000023: return "emsbaudrate";
-
-                    case 0x12000030: return "loadoptions";
-
-                    case 0x16000040: return "advancedoptions";
-                    case 0x16000041: return "optionsedit";
-                    case 0x15000042: return "keyringaddress";
-                    case 0x16000046: return "graphicsmodedisabled";
-                    case 0x15000047: return "configaccesspolicy";
-                    case 0x16000048: return "nointegritychecks";
-                    case 0x16000049: return "testsigning";
-                    case 0x16000050: return "extendedinput";
-                    case 0x15000051: return "initialconsoleinput";
-                }
-            }
-            else if (idClass == ElementClass.Application)
-            {
-                switch (appType)
-                {
-                    case ApplicationType.FirmwareBootManager:
-                    case ApplicationType.BootManager:
-                        switch (identifier)
-                        {
-                            case 0x24000001: return "displayorder";
-                            case 0x24000002: return "bootsequence";
-                            case 0x23000003: return "default";
-                            case 0x25000004: return "timeout";
-                            case 0x26000005: return "resume";
-                            case 0x23000006: return "resumeobject";
-
-                            case 0x24000010: return "toolsdisplayorder";
-
-                            case 0x26000020: return "displaybootmenu";
-                            case 0x26000021: return "noerrordisplay";
-                            case 0x21000022: return "bcddevice";
-                            case 0x22000023: return "bcdfilepath";
-
-                            case 0x27000030: return "customactions";
-                        }
-
-                        break;
-
-                    case ApplicationType.OsLoader:
-                        switch (identifier)
-                        {
-                            case 0x21000001: return "osdevice";
-                            case 0x22000002: return "systemroot";
-                            case 0x23000003: return "resumeobject";
-
-                            case 0x26000010: return "detecthal";
-                            case 0x22000011: return "kernel";
-                            case 0x22000012: return "hal";
-                            case 0x22000013: return "dbgtransport";
-
-                            case 0x25000020: return "nx";
-                            case 0x25000021: return "pae";
-                            case 0x26000022: return "winpe";
-                            case 0x26000024: return "nocrashautoreboot";
-                            case 0x26000025: return "lastknowngood";
-                            case 0x26000026: return "oslnointegritychecks";
-                            case 0x26000027: return "osltestsigning";
-
-                            case 0x26000030: return "nolowmem";
-                            case 0x25000031: return "removememory";
-                            case 0x25000032: return "increaseuserva";
-                            case 0x25000033: return "perfmem";
-
-                            case 0x26000040: return "vga";
-                            case 0x26000041: return "quietboot";
-                            case 0x26000042: return "novesa";
-
-                            case 0x25000050: return "clustermodeaddressing";
-                            case 0x26000051: return "usephysicaldestination";
-                            case 0x25000052: return "restrictapiccluster";
-
-                            case 0x26000060: return "onecpu";
-                            case 0x25000061: return "numproc";
-                            case 0x26000062: return "maxproc";
-                            case 0x25000063: return "configflags";
-
-                            case 0x26000070: return "usefirmwarepcisettings";
-                            case 0x25000071: return "msi";
-                            case 0x25000072: return "pciexpress";
-
-                            case 0x25000080: return "safeboot";
-                            case 0x26000081: return "safebootalternateshell";
-
-                            case 0x26000090: return "bootlog";
-                            case 0x26000091: return "sos";
-
-                            case 0x260000A0: return "debug";
-                            case 0x260000A1: return "halbreakpoint";
-
-                            case 0x260000B0: return "ems";
-
-                            case 0x250000C0: return "forcefailure";
-                            case 0x250000C1: return "driverloadfailurepolicy";
-
-                            case 0x250000E0: return "bootstatuspolicy";
-                        }
-
-                        break;
-
-                    case ApplicationType.Resume:
-                        switch (identifier)
-                        {
-                            case 0x21000001: return "filedevice";
-                            case 0x22000002: return "filepath";
-                            case 0x26000003: return "customsettings";
-                            case 0x26000004: return "pae";
-                            case 0x21000005: return "associatedosdevice";
-                            case 0x26000006: return "debugoptionenabled";
-                        }
-
-                        break;
-
-                    case ApplicationType.MemoryDiagnostics:
-                        switch (identifier)
-                        {
-                            case 0x25000001: return "passcount";
-                            case 0x25000002: return "testmix";
-                            case 0x25000003: return "failurecount";
-                            case 0x25000004: return "testtofail";
-                        }
-
-                        break;
-
-                    case ApplicationType.NtLoader:
-                    case ApplicationType.SetupLoader:
-                        switch (identifier)
-                        {
-                            case 0x22000001: return "bpbstring";
-                        }
-
-                        break;
-
-                    case ApplicationType.Startup:
-                        switch (identifier)
-                        {
-                            case 0x26000001: return "pxesoftreboot";
-                            case 0x22000002: return "applicationname";
-                        }
-
-                        break;
-                }
-            }
-            else if (idClass == ElementClass.Device)
-            {
-                switch (identifier)
-                {
-                    case 0x35000001: return "ramdiskimageoffset";
-                    case 0x35000002: return "ramdisktftpclientport";
-                    case 0x31000003: return "ramdisksdidevice";
-                    case 0x32000004: return "ramdisksdipath";
-                    case 0x35000005: return "ramdiskimagelength";
-                    case 0x36000006: return "exportascd";
-                    case 0x35000007: return "ramdisktftpblocksize";
-                }
-            }
-            else if (idClass == ElementClass.Hidden)
-            {
-                switch (identifier)
-                {
-                    case 0x45000001: return "devicetype";
-                    case 0x42000002: return "apprelativepath";
-                    case 0x42000003: return "ramdiskdevicerelativepath";
-                    case 0x46000004: return "omitosloaderelements";
-                    case 0x46000010: return "recoveryos";
-                }
-            }
-
-            return identifier.ToString("X8", CultureInfo.InvariantCulture);
-        }
-
-        private static ElementClass GetClass(int identifier)
-        {
-            return (ElementClass)((identifier >> 28) & 0xF);
-        }
-
-        private ElementValue LoadValue()
-        {
-            switch (Format)
-            {
-                case ElementFormat.Boolean:
-                    return new BooleanElementValue(_storage.GetBinary(_obj, _identifier));
-
-                case ElementFormat.Device:
-                    return new DeviceElementValue(_storage.GetBinary(_obj, _identifier));
-
-                case ElementFormat.Guid:
-                    return new GuidElementValue(_storage.GetString(_obj, _identifier));
-
-                case ElementFormat.GuidList:
-                    return new GuidListElementValue(_storage.GetMultiString(_obj, _identifier));
-
-                case ElementFormat.Integer:
-                    return new IntegerElementValue(_storage.GetBinary(_obj, _identifier));
-
-                case ElementFormat.IntegerList:
-                    return new IntegerListElementValue(_storage.GetBinary(_obj, _identifier));
-
-                case ElementFormat.String:
-                    return new StringElementValue(_storage.GetString(_obj, _identifier));
-
-                default:
-                    throw new NotImplementedException("Unknown element format: " + Format);
-            }
-        }
-
-        private void WriteValue()
-        {
-            switch (_value.Format)
-            {
-                case ElementFormat.Boolean:
-                    _storage.SetBinary(_obj, _identifier, ((BooleanElementValue)_value).GetBytes());
-                    break;
-
-                case ElementFormat.Device:
-                    _storage.SetBinary(_obj, _identifier, ((DeviceElementValue)_value).GetBytes());
-                    break;
-
-                case ElementFormat.GuidList:
-                    _storage.SetMultiString(_obj, _identifier, ((GuidListElementValue)_value).GetGuidStrings());
-                    break;
-
-                case ElementFormat.Integer:
-                    _storage.SetBinary(_obj, _identifier, ((IntegerElementValue)_value).GetBytes());
-                    break;
-
-                case ElementFormat.IntegerList:
-                    _storage.SetBinary(_obj, _identifier, ((IntegerListElementValue)_value).GetBytes());
-                    break;
-
-                case ElementFormat.Guid:
-                case ElementFormat.String:
-                    _storage.SetString(_obj, _identifier, _value.ToString());
-                    break;
-
-                default:
-                    throw new NotImplementedException("Unknown element format: " + Format);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/BootConfig/ElementClass.cs b/DiscUtils/BootConfig/ElementClass.cs
deleted file mode 100644
index cf8aecd..0000000
--- a/DiscUtils/BootConfig/ElementClass.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.BootConfig
-{
-    /// <summary>
-    /// The known classes of element.
-    /// </summary>
-    public enum ElementClass
-    {
-        /// <summary>
-        /// Unknown class.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// Common setting.
-        /// </summary>
-        Library = 1,
-
-        /// <summary>
-        /// An application setting.
-        /// </summary>
-        Application = 2,
-
-        /// <summary>
-        /// A device (or partition) setting.
-        /// </summary>
-        Device = 3,
-
-        /// <summary>
-        /// A hidden setting.
-        /// </summary>
-        Hidden = 4
-    }
-}
diff --git a/DiscUtils/BootConfig/ElementFormat.cs b/DiscUtils/BootConfig/ElementFormat.cs
deleted file mode 100644
index 49101e3..0000000
--- a/DiscUtils/BootConfig/ElementFormat.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.BootConfig
-{
-    /// <summary>
-    /// The known formats used to store BCD values.
-    /// </summary>
-    public enum ElementFormat
-    {
-        /// <summary>
-        /// Unknown format.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// A block device, or partition.
-        /// </summary>
-        Device = 1,
-
-        /// <summary>
-        /// A unicode string.
-        /// </summary>
-        String = 2,
-
-        /// <summary>
-        /// A Globally Unique Identifier (GUID).
-        /// </summary>
-        Guid = 3,
-
-        /// <summary>
-        /// A GUID list.
-        /// </summary>
-        GuidList = 4,
-
-        /// <summary>
-        /// An integer.
-        /// </summary>
-        Integer = 5,
-
-        /// <summary>
-        /// A boolean.
-        /// </summary>
-        Boolean = 6,
-
-        /// <summary>
-        /// An integer list.
-        /// </summary>
-        IntegerList = 7
-    }
-}
diff --git a/DiscUtils/BootConfig/ElementValue.cs b/DiscUtils/BootConfig/ElementValue.cs
deleted file mode 100644
index 8b52ea8..0000000
--- a/DiscUtils/BootConfig/ElementValue.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.BootConfig
-{
-    using System;
-
-    /// <summary>
-    /// The value of an element.
-    /// </summary>
-    public abstract class ElementValue
-    {
-        /// <summary>
-        /// Gets the format of the value.
-        /// </summary>
-        public abstract ElementFormat Format { get; }
-
-        /// <summary>
-        /// Gets the parent object (only for Device values).
-        /// </summary>
-        public virtual Guid ParentObject
-        {
-            get { return Guid.Empty; }
-        }
-
-        /// <summary>
-        /// Gets a value representing a device (aka partition).
-        /// </summary>
-        /// <param name="parentObject">Object containing detailed information about the device.</param>
-        /// <param name="physicalVolume">The volume to represent.</param>
-        /// <returns>The value as an object.</returns>
-        public static ElementValue ForDevice(Guid parentObject, PhysicalVolumeInfo physicalVolume)
-        {
-            return new DeviceElementValue(parentObject, physicalVolume);
-        }
-
-        /// <summary>
-        /// Gets a value representing the logical boot device.
-        /// </summary>
-        /// <returns>The boot pseudo-device as an object.</returns>
-        public static ElementValue ForBootDevice()
-        {
-            return new DeviceElementValue();
-        }
-
-        /// <summary>
-        /// Gets a value representing a string value.
-        /// </summary>
-        /// <param name="value">The value to convert.</param>
-        /// <returns>The value as an object.</returns>
-        public static ElementValue ForString(string value)
-        {
-            return new StringElementValue(value);
-        }
-
-        /// <summary>
-        /// Gets a value representing an integer value.
-        /// </summary>
-        /// <param name="value">The value to convert.</param>
-        /// <returns>The value as an object.</returns>
-        public static ElementValue ForInteger(long value)
-        {
-            return new IntegerElementValue((ulong)value);
-        }
-
-        /// <summary>
-        /// Gets a value representing an integer list value.
-        /// </summary>
-        /// <param name="values">The value to convert.</param>
-        /// <returns>The value as an object.</returns>
-        public static ElementValue ForIntegerList(long[] values)
-        {
-            ulong[] ulValues = new ulong[values.Length];
-            for (int i = 0; i < values.Length; ++i)
-            {
-                ulValues[i] = (ulong)values[i];
-            }
-
-            return new IntegerListElementValue(ulValues);
-        }
-
-        /// <summary>
-        /// Gets a value representing a boolean value.
-        /// </summary>
-        /// <param name="value">The value to convert.</param>
-        /// <returns>The value as an object.</returns>
-        public static ElementValue ForBoolean(bool value)
-        {
-            return new BooleanElementValue(value);
-        }
-
-        /// <summary>
-        /// Gets a value representing a GUID value.
-        /// </summary>
-        /// <param name="value">The value to convert.</param>
-        /// <returns>The value as an object.</returns>
-        public static ElementValue ForGuid(Guid value)
-        {
-            return new GuidElementValue(value.ToString("B"));
-        }
-
-        /// <summary>
-        /// Gets a value representing a GUID list value.
-        /// </summary>
-        /// <param name="values">The value to convert.</param>
-        /// <returns>The value as an object.</returns>
-        public static ElementValue ForGuidList(Guid[] values)
-        {
-            string[] strValues = new string[values.Length];
-            for (int i = 0; i < values.Length; ++i)
-            {
-                strValues[i] = values[i].ToString("B");
-            }
-
-            return new GuidListElementValue(strValues);
-        }
-    }
-}
diff --git a/DiscUtils/BootConfig/GuidElementValue.cs b/DiscUtils/BootConfig/GuidElementValue.cs
deleted file mode 100644
index d6d89f7..0000000
--- a/DiscUtils/BootConfig/GuidElementValue.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.BootConfig
-{
-    internal class GuidElementValue : ElementValue
-    {
-        private string _value;
-
-        public GuidElementValue(string value)
-        {
-            _value = value;
-        }
-
-        public override ElementFormat Format
-        {
-            get { return ElementFormat.Guid; }
-        }
-
-        public override string ToString()
-        {
-            if (string.IsNullOrEmpty(_value))
-            {
-                return "<none>";
-            }
-
-            return _value;
-        }
-    }
-}
diff --git a/DiscUtils/BootConfig/GuidListElementValue.cs b/DiscUtils/BootConfig/GuidListElementValue.cs
deleted file mode 100644
index edad6cd..0000000
--- a/DiscUtils/BootConfig/GuidListElementValue.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.BootConfig
-{
-    internal class GuidListElementValue : ElementValue
-    {
-        private string[] _values;
-
-        public GuidListElementValue(string[] values)
-        {
-            _values = values;
-        }
-
-        public override ElementFormat Format
-        {
-            get { return ElementFormat.GuidList; }
-        }
-
-        public override string ToString()
-        {
-            if (_values == null || _values.Length == 0)
-            {
-                return "<none>";
-            }
-
-            string result = _values[0];
-            for (int i = 1; i < _values.Length; ++i)
-            {
-                result += "," + _values[i];
-            }
-
-            return result;
-        }
-
-        internal string[] GetGuidStrings()
-        {
-            return _values;
-        }
-    }
-}
diff --git a/DiscUtils/BootConfig/InheritType.cs b/DiscUtils/BootConfig/InheritType.cs
deleted file mode 100644
index bc8747a..0000000
--- a/DiscUtils/BootConfig/InheritType.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.BootConfig
-{
-    /// <summary>
-    /// Indicates the type of objects that can inherit from an object.
-    /// </summary>
-    public enum InheritType
-    {
-        /// <summary>
-        /// Undefined value.
-        /// </summary>
-        None = 0x0,
-
-        /// <summary>
-        /// Any type of object may inherit from this object.
-        /// </summary>
-        AnyObject = 0x1,
-
-        /// <summary>
-        /// Only Application objects may inherit from this object.
-        /// </summary>
-        ApplicationObjects = 0x2,
-
-        /// <summary>
-        /// Only Device objects may inherit from this object.
-        /// </summary>
-        DeviceObjects = 0x3
-    }
-}
diff --git a/DiscUtils/BootConfig/IntegerElementValue.cs b/DiscUtils/BootConfig/IntegerElementValue.cs
deleted file mode 100644
index 8deea77..0000000
--- a/DiscUtils/BootConfig/IntegerElementValue.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.BootConfig
-{
-    using System;
-    using System.Globalization;
-
-    internal class IntegerElementValue : ElementValue
-    {
-        private ulong _value;
-
-        public IntegerElementValue(byte[] value)
-        {
-            // Actual bytes stored may be less than 8
-            byte[] buffer = new byte[8];
-            Array.Copy(value, buffer, value.Length);
-
-            _value = Utilities.ToUInt64LittleEndian(buffer, 0);
-        }
-
-        public IntegerElementValue(ulong value)
-        {
-            _value = value;
-        }
-
-        public override ElementFormat Format
-        {
-            get { return ElementFormat.Integer; }
-        }
-
-        public override string ToString()
-        {
-            return string.Format(CultureInfo.InvariantCulture, "{0}", _value);
-        }
-
-        internal byte[] GetBytes()
-        {
-            byte[] bytes = new byte[8];
-            Utilities.WriteBytesLittleEndian(_value, bytes, 0);
-            return bytes;
-        }
-    }
-}
diff --git a/DiscUtils/BootConfig/IntegerListElementValue.cs b/DiscUtils/BootConfig/IntegerListElementValue.cs
deleted file mode 100644
index ab2fb11..0000000
--- a/DiscUtils/BootConfig/IntegerListElementValue.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.BootConfig
-{
-    using System.Globalization;
-
-    internal class IntegerListElementValue : ElementValue
-    {
-        private ulong[] _values;
-
-        public IntegerListElementValue(byte[] value)
-        {
-            _values = new ulong[value.Length / 8];
-            for (int i = 0; i < _values.Length; ++i)
-            {
-                _values[i] = Utilities.ToUInt64LittleEndian(value, i * 8);
-            }
-        }
-
-        public IntegerListElementValue(ulong[] values)
-        {
-            _values = values;
-        }
-
-        public override ElementFormat Format
-        {
-            get { return ElementFormat.IntegerList; }
-        }
-
-        public override string ToString()
-        {
-            if (_values == null || _values.Length == 0)
-            {
-                return "<none>";
-            }
-
-            string result = string.Empty;
-            for (int i = 0; i < _values.Length; ++i)
-            {
-                if (i != 0)
-                {
-                    result += " ";
-                }
-
-                result += _values[i].ToString("X16", CultureInfo.InvariantCulture);
-            }
-
-            return result;
-        }
-
-        internal byte[] GetBytes()
-        {
-            byte[] bytes = new byte[_values.Length * 8];
-            for (int i = 0; i < _values.Length; ++i)
-            {
-                Utilities.WriteBytesLittleEndian(_values[i], bytes, i * 8);
-            }
-
-            return bytes;
-        }
-    }
-}
diff --git a/DiscUtils/BootConfig/ObjectType.cs b/DiscUtils/BootConfig/ObjectType.cs
deleted file mode 100644
index 89db8b8..0000000
--- a/DiscUtils/BootConfig/ObjectType.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.BootConfig
-{
-    /// <summary>
-    /// Enumeration of known object types.
-    /// </summary>
-    public enum ObjectType
-    {
-        /// <summary>
-        /// An unknown type.
-        /// </summary>
-        None = 0x0,
-
-        /// <summary>
-        /// An application object.
-        /// </summary>
-        Application = 0x1,
-
-        /// <summary>
-        /// Inheritable common settings.
-        /// </summary>
-        Inherit = 0x2,
-
-        /// <summary>
-        /// Device (or partition) object.
-        /// </summary>
-        Device = 0x3
-    }
-}
diff --git a/DiscUtils/BootConfig/PartitionRecord.cs b/DiscUtils/BootConfig/PartitionRecord.cs
deleted file mode 100644
index 537084b..0000000
--- a/DiscUtils/BootConfig/PartitionRecord.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.BootConfig
-{
-    using System;
-    using System.Globalization;
-
-    internal class PartitionRecord : DeviceRecord
-    {
-        public int PartitionType { get; set; }
-
-        public byte[] DiskIdentity { get; set; }
-
-        public byte[] PartitionIdentity { get; set; }
-
-        public override int Size
-        {
-            get { return 0x48; }
-        }
-
-        public override void GetBytes(byte[] data, int offset)
-        {
-            WriteHeader(data, offset);
-
-            if (Type == 5)
-            {
-                Array.Clear(data, offset + 0x10, 0x38);
-            }
-            else if (Type == 6)
-            {
-                Utilities.WriteBytesLittleEndian(PartitionType, data, offset + 0x24);
-
-                if (PartitionType == 1)
-                {
-                    Array.Copy(DiskIdentity, 0, data, offset + 0x28, 4);
-                    Array.Copy(PartitionIdentity, 0, data, offset + 0x10, 8);
-                }
-                else if (PartitionType == 0)
-                {
-                    Array.Copy(DiskIdentity, 0, data, offset + 0x28, 16);
-                    Array.Copy(PartitionIdentity, 0, data, offset + 0x10, 16);
-                }
-                else
-                {
-                    throw new NotImplementedException("Unknown partition type: " + PartitionType);
-                }
-            }
-            else
-            {
-                throw new NotImplementedException("Unknown device type: " + Type);
-            }
-        }
-
-        public override string ToString()
-        {
-            if (Type == 5)
-            {
-                return "<boot device>";
-            }
-            else if (Type == 6)
-            {
-                if (PartitionType == 1)
-                {
-                    return string.Format(
-                        CultureInfo.InvariantCulture,
-                        "(disk:{0:X2}{1:X2}{2:X2}{3:X2} part-offset:{4})",
-                        DiskIdentity[0],
-                        DiskIdentity[1],
-                        DiskIdentity[2],
-                        DiskIdentity[3],
-                        Utilities.ToUInt64LittleEndian(PartitionIdentity, 0));
-                }
-                else
-                {
-                    Guid diskGuid = Utilities.ToGuidLittleEndian(DiskIdentity, 0);
-                    Guid partitionGuid = Utilities.ToGuidLittleEndian(PartitionIdentity, 0);
-                    return string.Format(CultureInfo.InvariantCulture, "(disk:{0} partition:{1})", diskGuid, partitionGuid);
-                }
-            }
-            else if (Type == 8)
-            {
-                return "custom:<unknown>";
-            }
-            else
-            {
-                return "<unknown>";
-            }
-        }
-
-        protected override void DoParse(byte[] data, int offset)
-        {
-            base.DoParse(data, offset);
-
-            if (Type == 5)
-            {
-                // Nothing to do - just empty...
-            }
-            else if (Type == 6)
-            {
-                PartitionType = Utilities.ToInt32LittleEndian(data, offset + 0x24);
-
-                if (PartitionType == 1)
-                {
-                    // BIOS disk
-                    DiskIdentity = new byte[4];
-                    Array.Copy(data, offset + 0x28, DiskIdentity, 0, 4);
-                    PartitionIdentity = new byte[8];
-                    Array.Copy(data, offset + 0x10, PartitionIdentity, 0, 8);
-                }
-                else if (PartitionType == 0)
-                {
-                    // GPT disk
-                    DiskIdentity = new byte[16];
-                    Array.Copy(data, offset + 0x28, DiskIdentity, 0, 16);
-                    PartitionIdentity = new byte[16];
-                    Array.Copy(data, offset + 0x10, PartitionIdentity, 0, 16);
-                }
-                else
-                {
-                    throw new NotImplementedException("Unknown partition type: " + PartitionType);
-                }
-            }
-            else
-            {
-                throw new NotImplementedException("Unknown device type: " + Type);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/BootConfig/Store.cs b/DiscUtils/BootConfig/Store.cs
deleted file mode 100644
index 2ee939a..0000000
--- a/DiscUtils/BootConfig/Store.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.BootConfig
-{
-    using DiscUtils.Registry;
-    using System;
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// Represents a Boot Configuration Database store (i.e. a BCD file).
-    /// </summary>
-    public class Store
-    {
-        private BaseStorage _store;
-
-        /// <summary>
-        /// Initializes a new instance of the Store class.
-        /// </summary>
-        /// <param name="key">The registry key that is the root of the configuration database.</param>
-        public Store(RegistryKey key)
-        {
-            _store = new DiscUtilsRegistryStorage(key);
-        }
-
-        /// <summary>
-        /// Gets the objects within the store.
-        /// </summary>
-        public IEnumerable<BcdObject> Objects
-        {
-            get
-            {
-                foreach (var obj in _store.EnumerateObjects())
-                {
-                    yield return new BcdObject(_store, obj);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Initializes a new Boot Configuration Database.
-        /// </summary>
-        /// <param name="root">The registry key at the root of the database.</param>
-        /// <returns>The BCD store.</returns>
-        public static Store Initialize(RegistryKey root)
-        {
-            RegistryKey descKey = root.CreateSubKey("Description");
-            descKey.SetValue("KeyName", "BCD00000001");
-            root.CreateSubKey("Objects");
-            return new Store(root);
-        }
-
-        /// <summary>
-        /// Gets an object from the store.
-        /// </summary>
-        /// <param name="id">The identity of the object.</param>
-        /// <returns>The requested object, or <c>null</c>.</returns>
-        public BcdObject GetObject(Guid id)
-        {
-            if (_store.ObjectExists(id))
-            {
-                return new BcdObject(_store, id);
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Creates a specific object.
-        /// </summary>
-        /// <param name="id">The identity of the object to create.</param>
-        /// <param name="type">The object's type.</param>
-        /// <returns>The object representing the new application.</returns>
-        public BcdObject CreateObject(Guid id, int type)
-        {
-            _store.CreateObject(id, type);
-            return new BcdObject(_store, id);
-        }
-
-        /// <summary>
-        /// Creates an application object.
-        /// </summary>
-        /// <param name="imageType">The image type of the application.</param>
-        /// <param name="appType">The application's type.</param>
-        /// <returns>The object representing the new application.</returns>
-        public BcdObject CreateApplication(ApplicationImageType imageType, ApplicationType appType)
-        {
-            Guid obj = _store.CreateObject(Guid.NewGuid(), BcdObject.MakeApplicationType(imageType, appType));
-            return new BcdObject(_store, obj);
-        }
-
-        /// <summary>
-        /// Creates an application object.
-        /// </summary>
-        /// <param name="id">The identity of the object to create.</param>
-        /// <param name="imageType">The image type of the application.</param>
-        /// <param name="appType">The application's type.</param>
-        /// <returns>The object representing the new application.</returns>
-        public BcdObject CreateApplication(Guid id, ApplicationImageType imageType, ApplicationType appType)
-        {
-            Guid obj = _store.CreateObject(id, BcdObject.MakeApplicationType(imageType, appType));
-            return new BcdObject(_store, obj);
-        }
-
-        /// <summary>
-        /// Creates an 'inherit' object that contains common settings.
-        /// </summary>
-        /// <param name="inheritType">The type of object the settings apply to.</param>
-        /// <returns>The object representing the new settings.</returns>
-        public BcdObject CreateInherit(InheritType inheritType)
-        {
-            Guid obj = _store.CreateObject(Guid.NewGuid(), BcdObject.MakeInheritType(inheritType));
-            return new BcdObject(_store, obj);
-        }
-
-        /// <summary>
-        /// Creates an 'inherit' object that contains common settings.
-        /// </summary>
-        /// <param name="id">The identity of the object to create.</param>
-        /// <param name="inheritType">The type of object the settings apply to.</param>
-        /// <returns>The object representing the new settings.</returns>
-        public BcdObject CreateInherit(Guid id, InheritType inheritType)
-        {
-            Guid obj = _store.CreateObject(id, BcdObject.MakeInheritType(inheritType));
-            return new BcdObject(_store, obj);
-        }
-
-        /// <summary>
-        /// Creates a new device object, representing a partition.
-        /// </summary>
-        /// <returns>The object representing the new device.</returns>
-        public BcdObject CreateDevice()
-        {
-            Guid obj = _store.CreateObject(Guid.NewGuid(), 0x30000000);
-            return new BcdObject(_store, obj);
-        }
-
-        /// <summary>
-        /// Removes an object.
-        /// </summary>
-        /// <param name="id">The identity of the object to remove.</param>
-        public void RemoveObject(Guid id)
-        {
-            _store.DeleteObject(id);
-        }
-    }
-}
diff --git a/DiscUtils/BootConfig/StringElementValue.cs b/DiscUtils/BootConfig/StringElementValue.cs
deleted file mode 100644
index 39ff24e..0000000
--- a/DiscUtils/BootConfig/StringElementValue.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.BootConfig
-{
-    internal class StringElementValue : ElementValue
-    {
-        private string _value;
-
-        public StringElementValue(string value)
-        {
-            _value = value;
-        }
-
-        public override ElementFormat Format
-        {
-            get { return ElementFormat.String; }
-        }
-
-        public override string ToString()
-        {
-            return _value;
-        }
-    }
-}
diff --git a/DiscUtils/BootConfig/WellKnownElement.cs b/DiscUtils/BootConfig/WellKnownElement.cs
deleted file mode 100644
index 84ae8b5..0000000
--- a/DiscUtils/BootConfig/WellKnownElement.cs
+++ /dev/null
@@ -1,618 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-//
-// Symbolic names of BCD Elements taken from Geoff Chappell's website:
-//  http://www.geoffchappell.com/viewer.htm?doc=notes/windows/boot/bcd/elements.htm
-//
-//
-
-namespace DiscUtils.BootConfig
-{
-    /// <summary>
-    /// Enumeration of known BCD elements.
-    /// </summary>
-    public enum WellKnownElement : int
-    {
-        /// <summary>
-        /// Not specified.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// Device containing the application.
-        /// </summary>
-        LibraryApplicationDevice = 0x11000001,
-
-        /// <summary>
-        /// Path to the application.
-        /// </summary>
-        LibraryApplicationPath = 0x12000002,
-
-        /// <summary>
-        /// Description of the object.
-        /// </summary>
-        LibraryDescription = 0x12000004,
-
-        /// <summary>
-        /// Preferred locale of the object.
-        /// </summary>
-        LibraryPreferredLocale = 0x12000005,
-
-        /// <summary>
-        /// Objects containing elements inherited by the object.
-        /// </summary>
-        LibraryInheritedObjects = 0x14000006,
-
-        /// <summary>
-        /// Upper bound on physical addresses used by Windows.
-        /// </summary>
-        LibraryTruncatePhysicalMemory = 0x15000007,
-
-        /// <summary>
-        /// List of objects, indicating recovery sequence.
-        /// </summary>
-        LibraryRecoverySequence = 0x14000008,
-
-        /// <summary>
-        /// Enables auto recovery.
-        /// </summary>
-        LibraryAutoRecoveryEnabled = 0x16000009,
-
-        /// <summary>
-        /// List of bad memory regions.
-        /// </summary>
-        LibraryBadMemoryList = 0x1700000A,
-
-        /// <summary>
-        /// Allow use of bad memory regions.
-        /// </summary>
-        LibraryAllowBadMemoryAccess = 0x1600000B,
-
-        /// <summary>
-        /// Policy on use of first mega-byte of physical RAM.
-        /// </summary>
-        /// <remarks>0 = UseNone, 1 = UseAll, 2 = UsePrivate.</remarks>
-        LibraryFirstMegaBytePolicy = 0x1500000C,
-
-        /// <summary>
-        /// Debugger enabled.
-        /// </summary>
-        LibraryDebuggerEnabled = 0x16000010,
-
-        /// <summary>
-        /// Debugger type.
-        /// </summary>
-        /// <remarks>0 = Serial, 1 = 1394, 2 = USB.</remarks>
-        LibraryDebuggerType = 0x15000011,
-
-        /// <summary>
-        /// Debugger serial port address.
-        /// </summary>
-        LibraryDebuggerSerialAddress = 0x15000012,
-
-        /// <summary>
-        /// Debugger serial port.
-        /// </summary>
-        LibraryDebuggerSerialPort = 0x15000013,
-
-        /// <summary>
-        /// Debugger serial port baud rate.
-        /// </summary>
-        LibraryDebuggerSerialBaudRate = 0x15000014,
-
-        /// <summary>
-        /// Debugger 1394 channel.
-        /// </summary>
-        LibraryDebugger1394Channel = 0x15000015,
-
-        /// <summary>
-        /// Debugger USB target name.
-        /// </summary>
-        LibraryDebuggerUsbTargetName = 0x12000016,
-
-        /// <summary>
-        /// Debugger ignores user mode exceptions.
-        /// </summary>
-        LibraryDebuggerIgnoreUserModeExceptions = 0x16000017,
-
-        /// <summary>
-        /// Debugger start policy.
-        /// </summary>
-        /// <remarks>0 = Active, 1 = AutoEnable, 2 = Disable.</remarks>
-        LibraryDebuggerStartPolicy = 0x15000018,
-
-        /// <summary>
-        /// Emergency Management System enabled.
-        /// </summary>
-        LibraryEmergencyManagementSystemEnabled = 0x16000020,
-
-        /// <summary>
-        /// Emergency Management System serial port.
-        /// </summary>
-        LibraryEmergencyManagementSystemPort = 0x15000022,
-
-        /// <summary>
-        /// Emergency Management System baud rate.
-        /// </summary>
-        LibraryEmergencyManagementSystemBaudRate = 0x15000023,
-
-        /// <summary>
-        /// Load options.
-        /// </summary>
-        LibraryLoadOptions = 0x12000030,
-
-        /// <summary>
-        /// Displays advanced options.
-        /// </summary>
-        LibraryDisplayAdvancedOptions = 0x16000040,
-
-        /// <summary>
-        /// Displays UI to edit advanced options.
-        /// </summary>
-        LibraryDisplayOptionsEdit = 0x16000041,
-
-        /// <summary>
-        /// FVE (Full Volume Encryption - aka BitLocker?) KeyRing address.
-        /// </summary>
-        LibraryFveKeyRingAddress = 0x16000042,
-
-        /// <summary>
-        /// Device to contain Boot Status Log.
-        /// </summary>
-        LibraryBootStatusLogDevice = 0x11000043,
-
-        /// <summary>
-        /// Path to Boot Status Log.
-        /// </summary>
-        LibraryBootStatusLogFile = 0x12000044,
-
-        /// <summary>
-        /// Whether to append to the existing Boot Status Log.
-        /// </summary>
-        LibraryBootStatusLogAppend = 0x12000045,
-
-        /// <summary>
-        /// Disables graphics mode.
-        /// </summary>
-        LibraryGraphicsModeDisabled = 0x16000046,
-
-        /// <summary>
-        /// Configure access policy.
-        /// </summary>
-        /// <remarks>0 = default, 1 = DisallowMmConfig.</remarks>
-        LibraryConfigAccessPolicy = 0x15000047,
-
-        /// <summary>
-        /// Disables integrity checks.
-        /// </summary>
-        LibraryDisableIntegrityChecks = 0x16000048,
-
-        /// <summary>
-        /// Allows pre-release signatures (test signing).
-        /// </summary>
-        LibraryAllowPrereleaseSignatures = 0x16000049,
-
-        /// <summary>
-        /// Console extended input.
-        /// </summary>
-        LibraryConsoleExtendedInput = 0x16000050,
-
-        /// <summary>
-        /// Initial console input.
-        /// </summary>
-        LibraryInitialConsoleInput = 0x15000051,
-
-        /// <summary>
-        /// Application display order.
-        /// </summary>
-        BootMgrDisplayOrder = 0x24000001,
-
-        /// <summary>
-        /// Application boot sequence.
-        /// </summary>
-        BootMgrBootSequence = 0x24000002,
-
-        /// <summary>
-        /// Default application.
-        /// </summary>
-        BootMgrDefaultObject = 0x23000003,
-
-        /// <summary>
-        /// User input timeout.
-        /// </summary>
-        BootMgrTimeout = 0x25000004,
-
-        /// <summary>
-        /// Attempt to resume from hibernated state.
-        /// </summary>
-        BootMgrAttemptResume = 0x26000005,
-
-        /// <summary>
-        /// The resume application.
-        /// </summary>
-        BootMgrResumeObject = 0x23000006,
-
-        /// <summary>
-        /// The tools display order.
-        /// </summary>
-        BootMgrToolsDisplayOrder = 0x24000010,
-
-        /// <summary>
-        /// Displays the boot menu.
-        /// </summary>
-        BootMgrDisplayBootMenu = 0x26000020,
-
-        /// <summary>
-        /// No error display.
-        /// </summary>
-        BootMgrNoErrorDisplay = 0x26000021,
-
-        /// <summary>
-        /// The BCD device.
-        /// </summary>
-        BootMgrBcdDevice = 0x21000022,
-
-        /// <summary>
-        /// The BCD file path.
-        /// </summary>
-        BootMgrBcdFilePath = 0x22000023,
-
-        /// <summary>
-        /// The custom actions list.
-        /// </summary>
-        BootMgrCustomActionsList = 0x27000030,
-
-        /// <summary>
-        /// Device containing the Operating System.
-        /// </summary>
-        OsLoaderOsDevice = 0x21000001,
-
-        /// <summary>
-        /// System root on the OS device.
-        /// </summary>
-        OsLoaderSystemRoot = 0x22000002,
-
-        /// <summary>
-        /// The resume application associated with this OS.
-        /// </summary>
-        OsLoaderAssociatedResumeObject = 0x23000003,
-
-        /// <summary>
-        /// Auto-detect the correct kernel &amp; HAL.
-        /// </summary>
-        OsLoaderDetectKernelAndHal = 0x26000010,
-
-        /// <summary>
-        /// The filename of the kernel.
-        /// </summary>
-        OsLoaderKernelPath = 0x22000011,
-
-        /// <summary>
-        /// The filename of the HAL.
-        /// </summary>
-        OsLoaderHalPath = 0x22000012,
-
-        /// <summary>
-        /// The debug transport path.
-        /// </summary>
-        OsLoaderDebugTransportPath = 0x22000013,
-
-        /// <summary>
-        /// NX (No-Execute) policy.
-        /// </summary>
-        /// <remarks>0 = OptIn, 1 = OptOut, 2 = AlwaysOff, 3 = AlwaysOn.</remarks>
-        OsLoaderNxPolicy = 0x25000020,
-
-        /// <summary>
-        /// PAE policy.
-        /// </summary>
-        /// <remarks>0 = default, 1 = ForceEnable, 2 = ForceDisable.</remarks>
-        OsLoaderPaePolicy = 0x25000021,
-
-        /// <summary>
-        /// WinPE mode.
-        /// </summary>
-        OsLoaderWinPeMode = 0x26000022,
-
-        /// <summary>
-        /// Disable automatic reboot on OS crash.
-        /// </summary>
-        OsLoaderDisableCrashAutoReboot = 0x26000024,
-
-        /// <summary>
-        /// Use the last known good settings.
-        /// </summary>
-        OsLoaderUseLastGoodSettings = 0x26000025,
-
-        /// <summary>
-        /// Disable integrity checks.
-        /// </summary>
-        OsLoaderDisableIntegrityChecks = 0x26000026,
-
-        /// <summary>
-        /// Allows pre-release signatures (test signing).
-        /// </summary>
-        OsLoaderAllowPrereleaseSignatures = 0x26000027,
-
-        /// <summary>
-        /// Loads all executables above 4GB boundary.
-        /// </summary>
-        OsLoaderNoLowMemory = 0x26000030,
-
-        /// <summary>
-        /// Excludes a given amount of memory from use by Windows.
-        /// </summary>
-        OsLoaderRemoveMemory = 0x25000031,
-
-        /// <summary>
-        /// Increases the User Mode virtual address space.
-        /// </summary>
-        OsLoaderIncreaseUserVa = 0x25000032,
-
-        /// <summary>
-        /// Size of buffer (in MB) for perfomance data logging.
-        /// </summary>
-        OsLoaderPerformanceDataMemory = 0x25000033,
-
-        /// <summary>
-        /// Uses the VGA display driver.
-        /// </summary>
-        OsLoaderUseVgaDriver = 0x26000040,
-
-        /// <summary>
-        /// Quiet boot.
-        /// </summary>
-        OsLoaderDisableBootDisplay = 0x26000041,
-
-        /// <summary>
-        /// Disables use of the VESA BIOS.
-        /// </summary>
-        OsLoaderDisableVesaBios = 0x26000042,
-
-        /// <summary>
-        /// Maximum processors in a single APIC cluster.
-        /// </summary>
-        OsLoaderClusterModeAddressing = 0x25000050,
-
-        /// <summary>
-        /// Forces the physical APIC to be used.
-        /// </summary>
-        OsLoaderUsePhysicalDestination = 0x26000051,
-
-        /// <summary>
-        /// The largest APIC cluster number the system can use.
-        /// </summary>
-        OsLoaderRestrictApicCluster = 0x25000052,
-
-        /// <summary>
-        /// Forces only the boot processor to be used.
-        /// </summary>
-        OsLoaderUseBootProcessorOnly = 0x26000060,
-
-        /// <summary>
-        /// The number of processors to be used.
-        /// </summary>
-        OsLoaderNumberOfProcessors = 0x25000061,
-
-        /// <summary>
-        /// Use maximum number of processors.
-        /// </summary>
-        OsLoaderForceMaxProcessors = 0x26000062,
-
-        /// <summary>
-        /// Processor specific configuration flags.
-        /// </summary>
-        OsLoaderProcessorConfigurationFlags = 0x25000063,
-
-        /// <summary>
-        /// Uses BIOS-configured PCI resources.
-        /// </summary>
-        OsLoaderUseFirmwarePciSettings = 0x26000070,
-
-        /// <summary>
-        /// Message Signalled Interrupt setting.
-        /// </summary>
-        OsLoaderMsiPolicy = 0x25000071,
-
-        /// <summary>
-        /// PCE Express Policy.
-        /// </summary>
-        OsLoaderPciExpressPolicy = 0x25000072,
-
-        /// <summary>
-        /// The safe boot option.
-        /// </summary>
-        /// <remarks>0 = Minimal, 1 = Network, 2 = DsRepair.</remarks>
-        OsLoaderSafeBoot = 0x25000080,
-
-        /// <summary>
-        /// Loads the configured alternate shell during a safe boot.
-        /// </summary>
-        OsLoaderSafeBootAlternateShell = 0x26000081,
-
-        /// <summary>
-        /// Enables boot log.
-        /// </summary>
-        OsLoaderBootLogInitialization = 0x26000090,
-
-        /// <summary>
-        /// Displays diagnostic information during boot.
-        /// </summary>
-        OsLoaderVerboseObjectLoadMode = 0x26000091,
-
-        /// <summary>
-        /// Enables the kernel debugger.
-        /// </summary>
-        OsLoaderKernelDebuggerEnabled = 0x260000A0,
-
-        /// <summary>
-        /// Causes the kernal to halt early during boot.
-        /// </summary>
-        OsLoaderDebuggerHalBreakpoint = 0x260000A1,
-
-        /// <summary>
-        /// Enables Windows Emergency Management System.
-        /// </summary>
-        OsLoaderEmsEnabled = 0x260000B0,
-
-        /// <summary>
-        /// Forces a failure on boot.
-        /// </summary>
-        OsLoaderForceFailure = 0x250000C0,
-
-        /// <summary>
-        /// The OS failure policy.
-        /// </summary>
-        OsLoaderDriverLoadFailurePolicy = 0x250000C1,
-
-        /// <summary>
-        /// The OS boot status policy.
-        /// </summary>
-        OsLoaderBootStatusPolicy = 0x250000E0,
-
-        /// <summary>
-        /// The device containing the hibernation file.
-        /// </summary>
-        ResumeHiberFileDevice = 0x21000001,
-
-        /// <summary>
-        /// The path to the hibernation file.
-        /// </summary>
-        ResumeHiberFilePath = 0x22000002,
-
-        /// <summary>
-        /// Allows resume loader to use custom settings.
-        /// </summary>
-        ResumeUseCustomSettings = 0x26000003,
-
-        /// <summary>
-        /// PAE settings for resume application.
-        /// </summary>
-        ResumePaeMode = 0x26000004,
-
-        /// <summary>
-        /// An MS-DOS device with containing resume application.
-        /// </summary>
-        ResumeAssociatedDosDevice = 0x21000005,
-
-        /// <summary>
-        /// Enables debug option.
-        /// </summary>
-        ResumeDebugOptionEnabled = 0x26000006,
-
-        /// <summary>
-        /// The number of iterations to run.
-        /// </summary>
-        MemDiagPassCount = 0x25000001,
-
-        /// <summary>
-        /// The test mix.
-        /// </summary>
-        MemDiagTestMix = 0x25000002,
-
-        /// <summary>
-        /// The failure count.
-        /// </summary>
-        MemDiagFailureCount = 0x25000003,
-
-        /// <summary>
-        /// The tests to fail.
-        /// </summary>
-        MemDiagTestToFail = 0x25000004,
-
-        /// <summary>
-        /// BPB string.
-        /// </summary>
-        LoaderBpbString = 0x22000001,
-
-        /// <summary>
-        /// Causes a soft PXE reboot.
-        /// </summary>
-        StartupPxeSoftReboot = 0x26000001,
-
-        /// <summary>
-        /// PXE application name.
-        /// </summary>
-        StartupPxeApplicationName = 0x22000002,
-
-        /// <summary>
-        /// Offset of the RAM disk image.
-        /// </summary>
-        DeviceRamDiskImageOffset = 0x35000001,
-
-        /// <summary>
-        /// Client port for TFTP.
-        /// </summary>
-        DeviceRamDiskTftpClientPort = 0x35000002,
-
-        /// <summary>
-        /// Device containing the SDI file.
-        /// </summary>
-        DeviceRamDiskSdiDevice = 0x31000003,
-
-        /// <summary>
-        /// Path to the SDI file.
-        /// </summary>
-        DeviceRamDiskSdiPath = 0x32000004,
-
-        /// <summary>
-        /// Length of the RAM disk image.
-        /// </summary>
-        DeviceRamDiskRamDiskImageLength = 0x35000005,
-
-        /// <summary>
-        /// Exports the image as a CD.
-        /// </summary>
-        DeviceRamDiskExportAsCd = 0x36000006,
-
-        /// <summary>
-        /// The TFTP transfer block size.
-        /// </summary>
-        DeviceRamDiskTftpBlockSize = 0x35000007,
-
-        /// <summary>
-        /// The device type.
-        /// </summary>
-        SetupDeviceType = 0x45000001,
-
-        /// <summary>
-        /// The application relative path.
-        /// </summary>
-        SetupAppRelativePath = 0x42000002,
-
-        /// <summary>
-        /// The device relative path.
-        /// </summary>
-        SetupRamDiskDeviceRelativePath = 0x42000003,
-
-        /// <summary>
-        /// Omit OS loader elements.
-        /// </summary>
-        SetupOmitOsLoaderElements = 0x46000004,
-
-        /// <summary>
-        /// Recovery OS flag.
-        /// </summary>
-        SetupRecoveryOs = 0x46000010,
-    }
-}
diff --git a/DiscUtils/Buffer.cs b/DiscUtils/Buffer.cs
deleted file mode 100644
index 26e2cec..0000000
--- a/DiscUtils/Buffer.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// Abstract base class for implementations of IBuffer.
-    /// </summary>
-    public abstract class Buffer : MarshalByRefObject, IBuffer
-    {
-        /// <summary>
-        /// Gets a value indicating whether this buffer can be read.
-        /// </summary>
-        public abstract bool CanRead { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether this buffer can be modified.
-        /// </summary>
-        public abstract bool CanWrite { get; }
-
-        /// <summary>
-        /// Gets the current capacity of the buffer, in bytes.
-        /// </summary>
-        public abstract long Capacity { get; }
-
-        /// <summary>
-        /// Gets the parts of the stream that are stored.
-        /// </summary>
-        /// <remarks>This may be an empty enumeration if all bytes are zero.</remarks>
-        public virtual IEnumerable<StreamExtent> Extents
-        {
-            get
-            {
-                return GetExtentsInRange(0, Capacity);
-            }
-        }
-
-        /// <summary>
-        /// Reads from the buffer into a byte array.
-        /// </summary>
-        /// <param name="pos">The offset within the buffer to start reading.</param>
-        /// <param name="buffer">The destination byte array.</param>
-        /// <param name="offset">The start offset within the destination buffer.</param>
-        /// <param name="count">The number of bytes to read.</param>
-        /// <returns>The actual number of bytes read.</returns>
-        public abstract int Read(long pos, byte[] buffer, int offset, int count);
-
-        /// <summary>
-        /// Writes a byte array into the buffer.
-        /// </summary>
-        /// <param name="pos">The start offset within the buffer.</param>
-        /// <param name="buffer">The source byte array.</param>
-        /// <param name="offset">The start offset within the source byte array.</param>
-        /// <param name="count">The number of bytes to write.</param>
-        public abstract void Write(long pos, byte[] buffer, int offset, int count);
-
-        /// <summary>
-        /// Clears bytes from the buffer.
-        /// </summary>
-        /// <param name="pos">The start offset within the buffer.</param>
-        /// <param name="count">The number of bytes to clear.</param>
-        /// <remarks>
-        /// <para>Logically equivalent to writing <c>count</c> null/zero bytes to the buffer, some
-        /// implementations determine that some (or all) of the range indicated is not actually
-        /// stored.  There is no direct, automatic, correspondence to clearing bytes and them
-        /// not being represented as an 'extent' - for example, the implementation of the underlying
-        /// stream may not permit fine-grained extent storage.</para>
-        /// <para>It is always safe to call this method to 'zero-out' a section of a buffer, regardless of
-        /// the underlying buffer implementation.</para>
-        /// </remarks>
-        public virtual void Clear(long pos, int count)
-        {
-            Write(pos, new byte[count], 0, count);
-        }
-
-        /// <summary>
-        /// Flushes all data to the underlying storage.
-        /// </summary>
-        /// <remarks>The default behaviour, implemented by this class, is to take no action.</remarks>
-        public virtual void Flush()
-        {
-        }
-
-        /// <summary>
-        /// Sets the capacity of the buffer, truncating if appropriate.
-        /// </summary>
-        /// <param name="value">The desired capacity of the buffer.</param>
-        public abstract void SetCapacity(long value);
-
-        /// <summary>
-        /// Gets the parts of a buffer that are stored, within a specified range.
-        /// </summary>
-        /// <param name="start">The offset of the first byte of interest.</param>
-        /// <param name="count">The number of bytes of interest.</param>
-        /// <returns>An enumeration of stream extents, indicating stored bytes.</returns>
-        public abstract IEnumerable<StreamExtent> GetExtentsInRange(long start, long count);
-    }
-}
diff --git a/DiscUtils/BufferStream.cs b/DiscUtils/BufferStream.cs
deleted file mode 100644
index 260e033..0000000
--- a/DiscUtils/BufferStream.cs
+++ /dev/null
@@ -1,218 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System.Collections.Generic;
-    using System.IO;
-
-    /// <summary>
-    /// Converts a Buffer into a Stream.
-    /// </summary>
-    public class BufferStream : SparseStream
-    {
-        private IBuffer _buffer;
-        private FileAccess _access;
-
-        private long _position;
-
-        /// <summary>
-        /// Initializes a new instance of the BufferStream class.
-        /// </summary>
-        /// <param name="buffer">The buffer to use.</param>
-        /// <param name="access">The access permitted to clients.</param>
-        public BufferStream(IBuffer buffer, FileAccess access)
-        {
-            _buffer = buffer;
-            _access = access;
-        }
-
-        /// <summary>
-        /// Gets an indication of whether read access is permitted.
-        /// </summary>
-        public override bool CanRead
-        {
-            get { return _access != FileAccess.Write; }
-        }
-
-        /// <summary>
-        /// Gets an indication of whether seeking is permitted.
-        /// </summary>
-        public override bool CanSeek
-        {
-            get { return true; }
-        }
-
-        /// <summary>
-        /// Gets an indication of whether write access is permitted.
-        /// </summary>
-        public override bool CanWrite
-        {
-            get { return _access != FileAccess.Read; }
-        }
-
-        /// <summary>
-        /// Gets the length of the stream (the capacity of the underlying buffer).
-        /// </summary>
-        public override long Length
-        {
-            get { return _buffer.Capacity; }
-        }
-
-        /// <summary>
-        /// Gets and sets the current position within the stream.
-        /// </summary>
-        public override long Position
-        {
-            get { return _position; }
-            set { _position = value; }
-        }
-
-        /// <summary>
-        /// Gets the stored extents within the sparse stream.
-        /// </summary>
-        public override IEnumerable<StreamExtent> Extents
-        {
-            get { return _buffer.Extents; }
-        }
-
-        /// <summary>
-        /// Flushes all data to the underlying storage.
-        /// </summary>
-        public override void Flush()
-        {
-        }
-
-        /// <summary>
-        /// Reads a number of bytes from the stream.
-        /// </summary>
-        /// <param name="buffer">The destination buffer.</param>
-        /// <param name="offset">The start offset within the destination buffer.</param>
-        /// <param name="count">The number of bytes to read.</param>
-        /// <returns>The number of bytes read.</returns>
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            if (!CanRead)
-            {
-                throw new IOException("Attempt to read from write-only stream");
-            }
-
-            Utilities.AssertBufferParameters(buffer, offset, count);
-
-            int numRead = _buffer.Read(_position, buffer, offset, count);
-            _position += numRead;
-            return numRead;
-        }
-
-        /// <summary>
-        /// Changes the current stream position.
-        /// </summary>
-        /// <param name="offset">The origin-relative stream position.</param>
-        /// <param name="origin">The origin for the stream position.</param>
-        /// <returns>The new stream position.</returns>
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            long effectiveOffset = offset;
-            if (origin == SeekOrigin.Current)
-            {
-                effectiveOffset += _position;
-            }
-            else if (origin == SeekOrigin.End)
-            {
-                effectiveOffset += _buffer.Capacity;
-            }
-
-            if (effectiveOffset < 0)
-            {
-                throw new IOException("Attempt to move before beginning of disk");
-            }
-            else
-            {
-                _position = effectiveOffset;
-                return _position;
-            }
-        }
-
-        /// <summary>
-        /// Sets the length of the stream (the underlying buffer's capacity).
-        /// </summary>
-        /// <param name="value">The new length of the stream.</param>
-        public override void SetLength(long value)
-        {
-            _buffer.SetCapacity(value);
-        }
-
-        /// <summary>
-        /// Writes a buffer to the stream.
-        /// </summary>
-        /// <param name="buffer">The buffer to write.</param>
-        /// <param name="offset">The starting offset within buffer.</param>
-        /// <param name="count">The number of bytes to write.</param>
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            if (!CanWrite)
-            {
-                throw new IOException("Attempt to write to read-only stream");
-            }
-
-            Utilities.AssertBufferParameters(buffer, offset, count);
-
-            _buffer.Write(_position, buffer, offset, count);
-            _position += count;
-        }
-
-        /// <summary>
-        /// Clears bytes from the stream.
-        /// </summary>
-        /// <param name="count">The number of bytes (from the current position) to clear.</param>
-        /// <remarks>
-        /// <para>Logically equivalent to writing <c>count</c> null/zero bytes to the stream, some
-        /// implementations determine that some (or all) of the range indicated is not actually
-        /// stored.  There is no direct, automatic, correspondence to clearing bytes and them
-        /// not being represented as an 'extent' - for example, the implementation of the underlying
-        /// stream may not permit fine-grained extent storage.</para>
-        /// <para>It is always safe to call this method to 'zero-out' a section of a stream, regardless of
-        /// the underlying stream implementation.</para>
-        /// </remarks>
-        public override void Clear(int count)
-        {
-            if (!CanWrite)
-            {
-                throw new IOException("Attempt to erase bytes in a read-only stream");
-            }
-
-            _buffer.Clear(_position, count);
-            _position += count;
-        }
-
-        /// <summary>
-        /// Gets the parts of a stream that are stored, within a specified range.
-        /// </summary>
-        /// <param name="start">The offset of the first byte of interest.</param>
-        /// <param name="count">The number of bytes of interest.</param>
-        /// <returns>An enumeration of stream extents, indicating stored bytes.</returns>
-        public override IEnumerable<StreamExtent> GetExtentsInRange(long start, long count)
-        {
-            return _buffer.GetExtentsInRange(start, count);
-        }
-    }
-}
diff --git a/DiscUtils/BuilderBufferExtent.cs b/DiscUtils/BuilderBufferExtent.cs
deleted file mode 100644
index 0d43f62..0000000
--- a/DiscUtils/BuilderBufferExtent.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-
-    internal class BuilderBufferExtent : BuilderExtent
-    {
-        private bool _fixedBuffer;
-        private byte[] _buffer;
-
-        public BuilderBufferExtent(long start, long length)
-            : base(start, length)
-        {
-        }
-
-        public BuilderBufferExtent(long start, byte[] buffer)
-            : base(start, buffer.Length)
-        {
-            _fixedBuffer = true;
-            _buffer = buffer;
-        }
-
-        public override void Dispose()
-        {
-        }
-
-        internal override void PrepareForRead()
-        {
-            if (!_fixedBuffer)
-            {
-                _buffer = GetBuffer();
-            }
-        }
-
-        internal override int Read(long diskOffset, byte[] block, int offset, int count)
-        {
-            int startOffset = (int)(diskOffset - Start);
-            int numBytes = (int)Math.Min(Length - startOffset, count);
-            Array.Copy(_buffer, startOffset, block, offset, numBytes);
-            return numBytes;
-        }
-
-        internal override void DisposeReadState()
-        {
-            if (!_fixedBuffer)
-            {
-                _buffer = null;
-            }
-        }
-
-        protected virtual byte[] GetBuffer()
-        {
-            throw new NotSupportedException("Derived class should implement");
-        }
-    }
-}
diff --git a/DiscUtils/BuilderExtent.cs b/DiscUtils/BuilderExtent.cs
deleted file mode 100644
index a6e6a44..0000000
--- a/DiscUtils/BuilderExtent.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.Collections.Generic;
-
-    internal abstract class BuilderExtent : IDisposable
-    {
-        private long _start;
-        private long _length;
-
-        public BuilderExtent(long start, long length)
-        {
-            _start = start;
-            _length = length;
-        }
-
-        /// <summary>
-        /// Gets the parts of the stream that are stored.
-        /// </summary>
-        /// <remarks>This may be an empty enumeration if all bytes are zero.</remarks>
-        public virtual IEnumerable<StreamExtent> StreamExtents
-        {
-            get
-            {
-                return new StreamExtent[] { new StreamExtent(Start, Length) };
-            }
-        }
-
-        internal long Start
-        {
-            get { return _start; }
-        }
-
-        internal long Length
-        {
-            get { return _length; }
-        }
-
-        public abstract void Dispose();
-
-        internal abstract void PrepareForRead();
-
-        internal abstract int Read(long diskOffset, byte[] block, int offset, int count);
-
-        internal abstract void DisposeReadState();
-    }
-}
diff --git a/DiscUtils/BuilderSparseStreamExtent.cs b/DiscUtils/BuilderSparseStreamExtent.cs
deleted file mode 100644
index 416bf3d..0000000
--- a/DiscUtils/BuilderSparseStreamExtent.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System.Collections.Generic;
-
-    internal class BuilderSparseStreamExtent : BuilderExtent
-    {
-        private SparseStream _stream;
-        private Ownership _ownership;
-
-        public BuilderSparseStreamExtent(long start, SparseStream stream)
-            : this(start, stream, Ownership.None)
-        {
-        }
-
-        public BuilderSparseStreamExtent(long start, SparseStream stream, Ownership ownership)
-            : base(start, stream.Length)
-        {
-            _stream = stream;
-            _ownership = ownership;
-        }
-
-        public override IEnumerable<StreamExtent> StreamExtents
-        {
-            get { return StreamExtent.Offset(_stream.Extents, Start); }
-        }
-
-        public override void Dispose()
-        {
-            if (_stream != null && _ownership == Ownership.Dispose)
-            {
-                _stream.Dispose();
-                _stream = null;
-            }
-        }
-
-        internal override void PrepareForRead()
-        {
-        }
-
-        internal override int Read(long diskOffset, byte[] block, int offset, int count)
-        {
-            _stream.Position = diskOffset - Start;
-            return _stream.Read(block, offset, count);
-        }
-
-        internal override void DisposeReadState()
-        {
-        }
-    }
-}
diff --git a/DiscUtils/BuiltStream.cs b/DiscUtils/BuiltStream.cs
deleted file mode 100644
index 33eef09..0000000
--- a/DiscUtils/BuiltStream.cs
+++ /dev/null
@@ -1,327 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal class BuiltStream : SparseStream
-    {
-        private Stream _baseStream;
-        private long _length;
-        private List<BuilderExtent> _extents;
-
-        private BuilderExtent _currentExtent;
-        private long _position;
-
-        public BuiltStream(long length, List<BuilderExtent> extents)
-        {
-            _baseStream = new ZeroStream(length);
-            _length = length;
-            _extents = extents;
-
-            // Make sure the extents are sorted, so binary searches will work.
-            _extents.Sort(new ExtentStartComparer());
-        }
-
-        public override bool CanRead
-        {
-            get { return true; }
-        }
-
-        public override bool CanSeek
-        {
-            get { return true; }
-        }
-
-        public override bool CanWrite
-        {
-            get { return false; }
-        }
-
-        public override long Length
-        {
-            get { return _length; }
-        }
-
-        public override long Position
-        {
-            get { return _position; }
-            set { _position = value; }
-        }
-
-        public override IEnumerable<StreamExtent> Extents
-        {
-            get
-            {
-                foreach (var extent in _extents)
-                {
-                    foreach (var streamExtent in extent.StreamExtents)
-                    {
-                        yield return streamExtent;
-                    }
-                }
-            }
-        }
-
-        public override void Flush()
-        {
-            return;
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            if (_position >= _length)
-            {
-                return 0;
-            }
-
-            int totalRead = 0;
-            while (totalRead < count && _position < _length)
-            {
-                // If current region is outside the area of interest, clean it up
-                if (_currentExtent != null && (_position < _currentExtent.Start || _position >= _currentExtent.Start + _currentExtent.Length))
-                {
-                    _currentExtent.DisposeReadState();
-                    _currentExtent = null;
-                }
-
-                // If we need to find a new region, look for it
-                if (_currentExtent == null)
-                {
-                    using (SearchExtent searchExtent = new SearchExtent(_position))
-                    {
-                        int idx = _extents.BinarySearch(searchExtent, new ExtentRangeComparer());
-                        if (idx >= 0)
-                        {
-                            BuilderExtent extent = _extents[idx];
-                            extent.PrepareForRead();
-                            _currentExtent = extent;
-                        }
-                    }
-                }
-
-                int numRead = 0;
-
-                // If the block is outside any known extent, defer to base stream.
-                if (_currentExtent == null)
-                {
-                    _baseStream.Position = _position;
-                    BuilderExtent nextExtent = FindNext(_position);
-                    if (nextExtent != null)
-                    {
-                        numRead = _baseStream.Read(buffer, offset + totalRead, (int)Math.Min(count - totalRead, nextExtent.Start - _position));
-                    }
-                    else
-                    {
-                        numRead = _baseStream.Read(buffer, offset + totalRead, count - totalRead);
-                    }
-                }
-                else
-                {
-                    numRead = _currentExtent.Read(_position, buffer, offset + totalRead, count - totalRead);
-                }
-
-                _position += numRead;
-                totalRead += numRead;
-            }
-
-            return totalRead;
-        }
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            long newPos = offset;
-            if (origin == SeekOrigin.Current)
-            {
-                newPos += _position;
-            }
-            else if (origin == SeekOrigin.End)
-            {
-                newPos += _length;
-            }
-
-            _position = newPos;
-            return newPos;
-        }
-
-        public override void SetLength(long value)
-        {
-            throw new NotSupportedException();
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            throw new NotSupportedException();
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            try
-            {
-                if (disposing)
-                {
-                    if (_currentExtent != null)
-                    {
-                        _currentExtent.DisposeReadState();
-                        _currentExtent = null;
-                    }
-
-                    if (_baseStream != null)
-                    {
-                        _baseStream.Dispose();
-                        _baseStream = null;
-                    }
-                }
-            }
-            finally
-            {
-                base.Dispose(disposing);
-            }
-        }
-
-        private BuilderExtent FindNext(long pos)
-        {
-            int min = 0;
-            int max = _extents.Count - 1;
-
-            if (_extents.Count == 0 || (_extents[_extents.Count - 1].Start + _extents[_extents.Count - 1].Length) <= pos)
-            {
-                return null;
-            }
-
-            while (true)
-            {
-                if (min >= max)
-                {
-                    return _extents[min];
-                }
-
-                int mid = (max + min) / 2;
-                if (_extents[mid].Start < pos)
-                {
-                    min = mid + 1;
-                }
-                else if (_extents[mid].Start > pos)
-                {
-                    max = mid;
-                }
-                else
-                {
-                    return _extents[mid];
-                }
-            }
-        }
-
-        private class SearchExtent : BuilderExtent
-        {
-            public SearchExtent(long pos)
-                : base(pos, 1)
-            {
-            }
-
-            public override void Dispose()
-            {
-            }
-
-            internal override void PrepareForRead()
-            {
-                // Not valid to use this 'dummy' extent for actual construction
-                throw new NotSupportedException();
-            }
-
-            internal override int Read(long diskOffset, byte[] block, int offset, int count)
-            {
-                // Not valid to use this 'dummy' extent for actual construction
-                throw new NotSupportedException();
-            }
-
-            internal override void DisposeReadState()
-            {
-                // Not valid to use this 'dummy' extent for actual construction
-                throw new NotSupportedException();
-            }
-        }
-
-        private class ExtentRangeComparer : IComparer<BuilderExtent>
-        {
-            public int Compare(BuilderExtent x, BuilderExtent y)
-            {
-                if (x == null)
-                {
-                    throw new ArgumentNullException("x");
-                }
-
-                if (y == null)
-                {
-                    throw new ArgumentNullException("y");
-                }
-
-                if (x.Start + x.Length <= y.Start)
-                {
-                    // x < y, with no intersection
-                    return -1;
-                }
-                else if (x.Start >= y.Start + y.Length)
-                {
-                    // x > y, with no intersection
-                    return 1;
-                }
-
-                // x intersects y
-                return 0;
-            }
-        }
-
-        private class ExtentStartComparer : IComparer<BuilderExtent>
-        {
-            public int Compare(BuilderExtent x, BuilderExtent y)
-            {
-                if (x == null)
-                {
-                    throw new ArgumentNullException("x");
-                }
-
-                if (y == null)
-                {
-                    throw new ArgumentNullException("y");
-                }
-
-                long val = x.Start - y.Start;
-                if (val < 0)
-                {
-                    return -1;
-                }
-                else if (val > 0)
-                {
-                    return 1;
-                }
-                else
-                {
-                    return 0;
-                }
-            }
-        }
-    }
-}
diff --git a/DiscUtils/ChsAddress.cs b/DiscUtils/ChsAddress.cs
deleted file mode 100644
index 126fa4f..0000000
--- a/DiscUtils/ChsAddress.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    /// <summary>
-    /// Class whose instances represent a CHS (Cylinder, Head, Sector) address on a disk.
-    /// </summary>
-    /// <remarks>Instances of this class are immutable.</remarks>
-    public sealed class ChsAddress
-    {
-        /// <summary>
-        /// The address of the first sector on any disk.
-        /// </summary>
-        public static readonly ChsAddress First = new ChsAddress(0, 0, 1);
-
-        private int _cylinder;
-        private int _head;
-        private int _sector;
-
-        /// <summary>
-        /// Initializes a new instance of the ChsAddress class.
-        /// </summary>
-        /// <param name="cylinder">The number of cylinders of the disk.</param>
-        /// <param name="head">The number of heads (aka platters) of the disk.</param>
-        /// <param name="sector">The number of sectors per track/cylinder of the disk.</param>
-        public ChsAddress(int cylinder, int head, int sector)
-        {
-            _cylinder = cylinder;
-            _head = head;
-            _sector = sector;
-        }
-
-        /// <summary>
-        /// Gets the cylinder number (zero-based).
-        /// </summary>
-        public int Cylinder
-        {
-            get { return _cylinder; }
-        }
-
-        /// <summary>
-        /// Gets the head (zero-based).
-        /// </summary>
-        public int Head
-        {
-            get { return _head; }
-        }
-
-        /// <summary>
-        /// Gets the sector number (one-based).
-        /// </summary>
-        public int Sector
-        {
-            get { return _sector; }
-        }
-
-        /// <summary>
-        /// Determines if this object is equivalent to another.
-        /// </summary>
-        /// <param name="obj">The object to test against.</param>
-        /// <returns><c>true</c> if the <paramref name="obj"/> is equivalent, else <c>false</c>.</returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null || obj.GetType() != GetType())
-            {
-                return false;
-            }
-
-            ChsAddress other = (ChsAddress)obj;
-
-            return _cylinder == other._cylinder && _head == other._head && _sector == other._sector;
-        }
-
-        /// <summary>
-        /// Calculates the hash code for this object.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            return _cylinder.GetHashCode() ^ _head.GetHashCode() ^ _sector.GetHashCode();
-        }
-
-        /// <summary>
-        /// Gets a string representation of this object, in the form (C/H/S).
-        /// </summary>
-        /// <returns>The string representation.</returns>
-        public override string ToString()
-        {
-            return "(" + _cylinder + "/" + _head + "/" + _sector + ")";
-        }
-    }
-}
diff --git a/DiscUtils/ClusterMap.cs b/DiscUtils/ClusterMap.cs
deleted file mode 100644
index 845e9a1..0000000
--- a/DiscUtils/ClusterMap.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// Enumeration of possible cluster roles.
-    /// </summary>
-    /// <remarks>A cluster may be in more than one role.</remarks>
-    [Flags]
-    public enum ClusterRoles
-    {
-        /// <summary>
-        /// Unknown, or unspecified role.
-        /// </summary>
-        None = 0x00,
-
-        /// <summary>
-        /// Cluster is free.
-        /// </summary>
-        Free = 0x01,
-
-        /// <summary>
-        /// Cluster is in use by a normal file.
-        /// </summary>
-        DataFile = 0x02,
-
-        /// <summary>
-        /// Cluster is in use by a system file.
-        /// </summary>
-        /// <remarks>This isn't a file marked with the 'system' attribute,
-        /// rather files that form part of the file system namespace but also
-        /// form part of the file system meta-data.</remarks>
-        SystemFile = 0x04,
-
-        /// <summary>
-        /// Cluster is in use for meta-data.
-        /// </summary>
-        Metadata = 0x08,
-
-        /// <summary>
-        /// Cluster contains the boot region.
-        /// </summary>
-        BootArea = 0x10,
-
-        /// <summary>
-        /// Cluster is marked bad.
-        /// </summary>
-        Bad = 0x20,
-    }
-
-    /// <summary>
-    /// Class that identifies the role of each cluster in a file system.
-    /// </summary>
-    public sealed class ClusterMap
-    {
-        private ClusterRoles[] _clusterToRole;
-        private object[] _clusterToFileId;
-        private Dictionary<object, string[]> _fileIdToPaths;
-
-        internal ClusterMap(ClusterRoles[] clusterToRole, object[] clusterToFileId, Dictionary<object, string[]> fileIdToPaths)
-        {
-            _clusterToRole = clusterToRole;
-            _clusterToFileId = clusterToFileId;
-            _fileIdToPaths = fileIdToPaths;
-        }
-
-        /// <summary>
-        /// Gets the role of a cluster within the file system.
-        /// </summary>
-        /// <param name="cluster">The cluster to inspect.</param>
-        /// <returns>The clusters role (or roles).</returns>
-        public ClusterRoles GetRole(long cluster)
-        {
-            if (_clusterToRole == null || _clusterToRole.Length < cluster)
-            {
-                return ClusterRoles.None;
-            }
-            else
-            {
-                return _clusterToRole[cluster];
-            }
-        }
-
-        /// <summary>
-        /// Converts a cluster to a list of file names.
-        /// </summary>
-        /// <param name="cluster">The cluster to inspect.</param>
-        /// <returns>A list of paths that map to the cluster.</returns>
-        /// <remarks>A list is returned because on file systems with the notion of
-        /// hard links, a cluster may correspond to multiple directory entries.</remarks>
-        public string[] ClusterToPaths(long cluster)
-        {
-            if ((GetRole(cluster) & (ClusterRoles.DataFile | ClusterRoles.SystemFile)) != 0)
-            {
-                object fileId = _clusterToFileId[cluster];
-                return _fileIdToPaths[fileId];
-            }
-            else
-            {
-                return new string[0];
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Compression/Adler32.cs b/DiscUtils/Compression/Adler32.cs
deleted file mode 100644
index 8a22297..0000000
--- a/DiscUtils/Compression/Adler32.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Compression
-{
-    using System;
-
-    /// <summary>
-    /// Implementation of the Adler-32 checksum algorithm.
-    /// </summary>
-    public class Adler32
-    {
-        private uint _a;
-        private uint _b;
-
-        /// <summary>
-        /// Initializes a new instance of the Adler32 class.
-        /// </summary>
-        public Adler32()
-        {
-            _a = 1;
-        }
-
-        /// <summary>
-        /// Gets the checksum of all data processed so far.
-        /// </summary>
-        public int Value
-        {
-            get { return (int)(_b << 16 | _a); }
-        }
-
-        /// <summary>
-        /// Provides data that should be checksummed.
-        /// </summary>
-        /// <param name="buffer">Buffer containing the data to checksum.</param>
-        /// <param name="offset">Offset of the first byte to checksum.</param>
-        /// <param name="count">The number of bytes to checksum.</param>
-        /// <remarks>
-        /// Call this method repeatedly until all checksummed
-        /// data has been processed.
-        /// </remarks>
-        public void Process(byte[] buffer, int offset, int count)
-        {
-            if (buffer == null)
-            {
-                throw new ArgumentNullException("buffer");
-            }
-
-            if (offset < 0 || offset > buffer.Length)
-            {
-                throw new ArgumentException("Offset outside of array bounds", "offset");
-            }
-
-            if (count < 0 || offset + count > buffer.Length)
-            {
-                throw new ArgumentException("Array index out of bounds", "count");
-            }
-
-            int processed = 0;
-            while (processed < count)
-            {
-                int innerEnd = Math.Min(count, processed + 2000);
-                while (processed < innerEnd)
-                {
-                    _a += buffer[processed++];
-                    _b += _a;
-                }
-
-                _a %= 65521;
-                _b %= 65521;
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Compression/BZip2BlockDecoder.cs b/DiscUtils/Compression/BZip2BlockDecoder.cs
deleted file mode 100644
index 6b53405..0000000
--- a/DiscUtils/Compression/BZip2BlockDecoder.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-//
-// Based on "libbzip2", Copyright (C) 1996-2007 Julian R Seward.
-//
-
-namespace DiscUtils.Compression
-{
-    using System.IO;
-
-    internal class BZip2BlockDecoder
-    {
-        private InverseBurrowsWheeler _inverseBurrowsWheeler;
-        private uint _crc;
-
-        public BZip2BlockDecoder(int blockSize)
-        {
-            _inverseBurrowsWheeler = new InverseBurrowsWheeler(blockSize);
-        }
-
-        public uint Crc
-        {
-            get { return _crc; }
-        }
-
-        public int Process(BitStream bitstream, byte[] outputBuffer, int outputBufferOffset)
-        {
-            _crc = 0;
-            for (int i = 0; i < 4; ++i)
-            {
-                _crc = (_crc << 8) | bitstream.Read(8);
-            }
-
-            bool rand = bitstream.Read(1) != 0;
-            int origPtr = (int)bitstream.Read(24);
-
-            int thisBlockSize = ReadBuffer(bitstream, outputBuffer, outputBufferOffset);
-
-            _inverseBurrowsWheeler.OriginalIndex = origPtr;
-            _inverseBurrowsWheeler.Process(outputBuffer, outputBufferOffset, thisBlockSize, outputBuffer, outputBufferOffset);
-
-            if (rand)
-            {
-                BZip2Randomizer randomizer = new BZip2Randomizer();
-                randomizer.Process(outputBuffer, outputBufferOffset, thisBlockSize, outputBuffer, outputBufferOffset);
-            }
-
-            return thisBlockSize;
-        }
-
-        private static int ReadBuffer(BitStream bitstream, byte[] buffer, int offset)
-        {
-            // The MTF state
-            int numInUse = 0;
-            MoveToFront moveFrontTransform = new MoveToFront();
-            bool[] inUseGroups = new bool[16];
-            for (int i = 0; i < 16; ++i)
-            {
-                inUseGroups[i] = bitstream.Read(1) != 0;
-            }
-
-            for (int i = 0; i < 256; ++i)
-            {
-                if (inUseGroups[i / 16])
-                {
-                    if (bitstream.Read(1) != 0)
-                    {
-                        moveFrontTransform.Set(numInUse, (byte)i);
-                        numInUse++;
-                    }
-                }
-            }
-
-            // Initialize 'virtual' Huffman tree from bitstream
-            BZip2CombinedHuffmanTrees huffmanTree = new BZip2CombinedHuffmanTrees(bitstream, numInUse + 2);
-
-            // Main loop reading data
-            int readBytes = 0;
-            while (true)
-            {
-                uint symbol = huffmanTree.NextSymbol();
-
-                if (symbol < 2)
-                {
-                    // RLE, with length stored in a binary-style format
-                    uint runLength = 0;
-                    int bitShift = 0;
-                    while (symbol < 2)
-                    {
-                        runLength += (symbol + 1) << bitShift;
-                        bitShift++;
-
-                        symbol = huffmanTree.NextSymbol();
-                    }
-
-                    byte b = moveFrontTransform.Head;
-                    while (runLength > 0)
-                    {
-                        buffer[offset + readBytes] = b;
-                        ++readBytes;
-                        --runLength;
-                    }
-                }
-
-                if (symbol <= numInUse)
-                {
-                    // Single byte
-                    byte b = moveFrontTransform.GetAndMove((int)symbol - 1);
-                    buffer[offset + readBytes] = b;
-                    ++readBytes;
-                }
-                else if (symbol == numInUse + 1)
-                {
-                    // End of block marker
-                    return readBytes;
-                }
-                else
-                {
-                    throw new InvalidDataException("Invalid symbol from Huffman table");
-                }
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Compression/BZip2CombinedHuffmanTrees.cs b/DiscUtils/Compression/BZip2CombinedHuffmanTrees.cs
deleted file mode 100644
index 78d4915..0000000
--- a/DiscUtils/Compression/BZip2CombinedHuffmanTrees.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-//
-// Based on "libbzip2", Copyright (C) 1996-2007 Julian R Seward.
-//
-
-namespace DiscUtils.Compression
-{
-    using System.IO;
-
-    /// <summary>
-    /// Represents scheme used by BZip2 where multiple Huffman trees are used as a
-    /// virtual Huffman tree, with a logical selector every 50 bits in the bit stream.
-    /// </summary>
-    internal class BZip2CombinedHuffmanTrees
-    {
-        private BitStream _bitstream;
-        private byte[] _selectors;
-        private HuffmanTree[] _trees;
-
-        private HuffmanTree _activeTree;
-        private int _symbolsToNextSelector;
-        private int _nextSelector;
-
-        public BZip2CombinedHuffmanTrees(BitStream bitstream, int maxSymbols)
-        {
-            _bitstream = bitstream;
-
-            Initialize(maxSymbols);
-        }
-
-        public uint NextSymbol()
-        {
-            if (_symbolsToNextSelector == 0)
-            {
-                _symbolsToNextSelector = 50;
-                _activeTree = _trees[_selectors[_nextSelector]];
-                _nextSelector++;
-            }
-
-            _symbolsToNextSelector--;
-
-            return _activeTree.NextSymbol(_bitstream);
-        }
-
-        private void Initialize(int maxSymbols)
-        {
-            int numTrees = (int)_bitstream.Read(3);
-            if (numTrees < 2 || numTrees > 6)
-            {
-                throw new InvalidDataException("Invalid number of tables");
-            }
-
-            int numSelectors = (int)_bitstream.Read(15);
-            if (numSelectors < 1)
-            {
-                throw new InvalidDataException("Invalid number of selectors");
-            }
-
-            _selectors = new byte[numSelectors];
-            MoveToFront mtf = new MoveToFront(numTrees, true);
-            for (int i = 0; i < numSelectors; ++i)
-            {
-                _selectors[i] = mtf.GetAndMove(CountSetBits(numTrees));
-            }
-
-            _trees = new HuffmanTree[numTrees];
-            for (int t = 0; t < numTrees; ++t)
-            {
-                uint[] lengths = new uint[maxSymbols];
-
-                uint len = _bitstream.Read(5);
-                for (int i = 0; i < maxSymbols; ++i)
-                {
-                    if (len < 1 || len > 20)
-                    {
-                        throw new InvalidDataException("Invalid length constructing Huffman tree");
-                    }
-
-                    while (_bitstream.Read(1) != 0)
-                    {
-                        len = (_bitstream.Read(1) == 0) ? len + 1 : len - 1;
-
-                        if (len < 1 || len > 20)
-                        {
-                            throw new InvalidDataException("Invalid length constructing Huffman tree");
-                        }
-                    }
-
-                    lengths[i] = len;
-                }
-
-                _trees[t] = new HuffmanTree(lengths);
-            }
-
-            _symbolsToNextSelector = 0;
-            _nextSelector = 0;
-        }
-
-        private byte CountSetBits(int max)
-        {
-            byte val = 0;
-            while (_bitstream.Read(1) != 0)
-            {
-                val++;
-                if (val >= max)
-                {
-                    throw new InvalidDataException("Exceeded max number of consecutive bits");
-                }
-            }
-
-            return val;
-        }
-    }
-}
diff --git a/DiscUtils/Compression/BZip2DecoderStream.cs b/DiscUtils/Compression/BZip2DecoderStream.cs
deleted file mode 100644
index 2a48975..0000000
--- a/DiscUtils/Compression/BZip2DecoderStream.cs
+++ /dev/null
@@ -1,349 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-//
-// Based on "libbzip2", Copyright (C) 1996-2007 Julian R Seward.
-//
-
-namespace DiscUtils.Compression
-{
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Implementation of a BZip2 decoder.
-    /// </summary>
-    public sealed class BZip2DecoderStream : Stream
-    {
-        private long _position;
-        private Stream _compressedStream;
-        private Ownership _ownsCompressed;
-        private BitStream _bitstream;
-        private BZip2RleStream _rleStream;
-        private BZip2BlockDecoder _blockDecoder;
-        private Crc32 _calcBlockCrc;
-
-        private byte[] _blockBuffer;
-        private uint _blockCrc;
-        private uint _compoundCrc;
-        private uint _calcCompoundCrc;
-
-        private bool _eof;
-
-        /// <summary>
-        /// Initializes a new instance of the BZip2DecoderStream class.
-        /// </summary>
-        /// <param name="stream">The compressed input stream.</param>
-        /// <param name="ownsStream">Whether ownership of stream passes to the new instance.</param>
-        public BZip2DecoderStream(Stream stream, Ownership ownsStream)
-        {
-            _compressedStream = stream;
-            _ownsCompressed = ownsStream;
-
-            _bitstream = new BigEndianBitStream(new BufferedStream(stream));
-
-            // The Magic BZh
-            byte[] magic = new byte[3];
-            magic[0] = (byte)_bitstream.Read(8);
-            magic[1] = (byte)_bitstream.Read(8);
-            magic[2] = (byte)_bitstream.Read(8);
-            if (magic[0] != 0x42 || magic[1] != 0x5A || magic[2] != 0x68)
-            {
-                throw new InvalidDataException("Bad magic at start of stream");
-            }
-
-            // The size of the decompression blocks in multiples of 100,000
-            int blockSize = (int)_bitstream.Read(8) - 0x30;
-            if (blockSize < 1 || blockSize > 9)
-            {
-                throw new InvalidDataException("Unexpected block size in header: " + blockSize);
-            }
-
-            blockSize *= 100000;
-
-            _rleStream = new BZip2RleStream();
-            _blockDecoder = new BZip2BlockDecoder(blockSize);
-            _blockBuffer = new byte[blockSize];
-
-            if (ReadBlock() == 0)
-            {
-                _eof = true;
-            }
-        }
-
-        /// <summary>
-        /// Gets an indication of whether read access is permitted.
-        /// </summary>
-        public override bool CanRead
-        {
-            get { return true; }
-        }
-
-        /// <summary>
-        /// Gets an indication of whether seeking is permitted.
-        /// </summary>
-        public override bool CanSeek
-        {
-            get { return false; }
-        }
-
-        /// <summary>
-        /// Gets an indication of whether write access is permitted.
-        /// </summary>
-        public override bool CanWrite
-        {
-            get { return false; }
-        }
-
-        /// <summary>
-        /// Gets the length of the stream (the capacity of the underlying buffer).
-        /// </summary>
-        public override long Length
-        {
-            get { throw new NotSupportedException(); }
-        }
-
-        /// <summary>
-        /// Gets and sets the current position within the stream.
-        /// </summary>
-        public override long Position
-        {
-            get { return _position; }
-            set { throw new NotSupportedException(); }
-        }
-
-        /// <summary>
-        /// Flushes all data to the underlying storage.
-        /// </summary>
-        public override void Flush()
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <summary>
-        /// Reads a number of bytes from the stream.
-        /// </summary>
-        /// <param name="buffer">The destination buffer.</param>
-        /// <param name="offset">The start offset within the destination buffer.</param>
-        /// <param name="count">The number of bytes to read.</param>
-        /// <returns>The number of bytes read.</returns>
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            if (buffer == null)
-            {
-                throw new ArgumentNullException("buffer");
-            }
-
-            if (buffer.Length < offset + count)
-            {
-                throw new ArgumentException("Buffer smaller than declared");
-            }
-
-            if (offset < 0)
-            {
-                throw new ArgumentException("Offset less than zero", "offset");
-            }
-
-            if (count < 0)
-            {
-                throw new ArgumentException("Count less than zero", "count");
-            }
-
-            if (_eof)
-            {
-                throw new IOException("Attempt to read beyond end of stream");
-            }
-
-            if (count == 0)
-            {
-                return 0;
-            }
-
-            int numRead = _rleStream.Read(buffer, offset, count);
-            if (numRead == 0)
-            {
-                // If there was an existing block, check it's crc.
-                if (_calcBlockCrc != null)
-                {
-                    if (_blockCrc != _calcBlockCrc.Value)
-                    {
-                        throw new InvalidDataException("Decompression failed - block CRC mismatch");
-                    }
-
-                    _calcCompoundCrc = ((_calcCompoundCrc << 1) | (_calcCompoundCrc >> 31)) ^ _blockCrc;
-                }
-
-                // Read a new block (if any), if none - check the overall CRC before returning
-                if (ReadBlock() == 0)
-                {
-                    _eof = true;
-                    if (_calcCompoundCrc != _compoundCrc)
-                    {
-                        throw new InvalidDataException("Decompression failed - compound CRC");
-                    }
-
-                    return 0;
-                }
-
-                numRead = _rleStream.Read(buffer, offset, count);
-            }
-
-            _calcBlockCrc.Process(buffer, offset, numRead);
-
-            // Pre-read next block, so a client that knows the decompressed length will still
-            // have the overall CRC calculated.
-            if (_rleStream.AtEof)
-            {
-                // If there was an existing block, check it's crc.
-                if (_calcBlockCrc != null)
-                {
-                    if (_blockCrc != _calcBlockCrc.Value)
-                    {
-                        throw new InvalidDataException("Decompression failed - block CRC mismatch");
-                    }
-                }
-
-                _calcCompoundCrc = ((_calcCompoundCrc << 1) | (_calcCompoundCrc >> 31)) ^ _blockCrc;
-                if (ReadBlock() == 0)
-                {
-                    _eof = true;
-                    if (_calcCompoundCrc != _compoundCrc)
-                    {
-                        throw new InvalidDataException("Decompression failed - compound CRC mismatch");
-                    }
-
-                    return numRead;
-                }
-            }
-
-            _position += numRead;
-            return numRead;
-        }
-
-        /// <summary>
-        /// Changes the current stream position.
-        /// </summary>
-        /// <param name="offset">The origin-relative stream position.</param>
-        /// <param name="origin">The origin for the stream position.</param>
-        /// <returns>The new stream position.</returns>
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <summary>
-        /// Sets the length of the stream (the underlying buffer's capacity).
-        /// </summary>
-        /// <param name="value">The new length of the stream.</param>
-        public override void SetLength(long value)
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <summary>
-        /// Writes a buffer to the stream.
-        /// </summary>
-        /// <param name="buffer">The buffer to write.</param>
-        /// <param name="offset">The starting offset within buffer.</param>
-        /// <param name="count">The number of bytes to write.</param>
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <summary>
-        /// Releases underlying resources.
-        /// </summary>
-        /// <param name="disposing">Whether this method is called from Dispose.</param>
-        protected override void Dispose(bool disposing)
-        {
-            try
-            {
-                if (disposing)
-                {
-                    if (_compressedStream != null && _ownsCompressed == Ownership.Dispose)
-                    {
-                        _compressedStream.Dispose();
-                    }
-
-                    _compressedStream = null;
-
-                    if (_rleStream != null)
-                    {
-                        _rleStream.Dispose();
-                        _rleStream = null;
-                    }
-                }
-            }
-            finally
-            {
-                base.Dispose(disposing);
-            }
-        }
-
-        private int ReadBlock()
-        {
-            ulong marker = ReadMarker();
-            if (marker == 0x314159265359)
-            {
-                int blockSize = _blockDecoder.Process(_bitstream, _blockBuffer, 0);
-                _rleStream.Reset(_blockBuffer, 0, blockSize);
-                _blockCrc = _blockDecoder.Crc;
-                _calcBlockCrc = new Crc32BigEndian(Crc32Algorithm.Common);
-                return blockSize;
-            }
-            else if (marker == 0x177245385090)
-            {
-                _compoundCrc = ReadUint();
-                return 0;
-            }
-            else
-            {
-                throw new InvalidDataException("Found invalid marker in stream");
-            }
-        }
-
-        private uint ReadUint()
-        {
-            uint val = 0;
-
-            for (int i = 0; i < 4; ++i)
-            {
-                val = (val << 8) | _bitstream.Read(8);
-            }
-
-            return val;
-        }
-
-        private ulong ReadMarker()
-        {
-            ulong marker = 0;
-
-            for (int i = 0; i < 6; ++i)
-            {
-                marker = (marker << 8) | _bitstream.Read(8);
-            }
-
-            return marker;
-        }
-    }
-}
diff --git a/DiscUtils/Compression/BZip2Randomizer.cs b/DiscUtils/Compression/BZip2Randomizer.cs
deleted file mode 100644
index 65a6808..0000000
--- a/DiscUtils/Compression/BZip2Randomizer.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-//
-// Based on "libbzip2", Copyright (C) 1996-2007 Julian R Seward.
-//
-
-namespace DiscUtils.Compression
-{
-    using System;
-
-    internal class BZip2Randomizer : DataBlockTransform
-    {
-        private static readonly int[] RandomVals =
-        {
-            619, 720, 127, 481, 931, 816, 813, 233, 566, 247,
-            985, 724, 205, 454, 863, 491, 741, 242, 949, 214,
-            733, 859, 335, 708, 621, 574, 73, 654, 730, 472,
-            419, 436, 278, 496, 867, 210, 399, 680, 480, 51,
-            878, 465, 811, 169, 869, 675, 611, 697, 867, 561,
-            862, 687, 507, 283, 482, 129, 807, 591, 733, 623,
-            150, 238, 59, 379, 684, 877, 625, 169, 643, 105,
-            170, 607, 520, 932, 727, 476, 693, 425, 174, 647,
-            73, 122, 335, 530, 442, 853, 695, 249, 445, 515,
-            909, 545, 703, 919, 874, 474, 882, 500, 594, 612,
-            641, 801, 220, 162, 819, 984, 589, 513, 495, 799,
-            161, 604, 958, 533, 221, 400, 386, 867, 600, 782,
-            382, 596, 414, 171, 516, 375, 682, 485, 911, 276,
-            98, 553, 163, 354, 666, 933, 424, 341, 533, 870,
-            227, 730, 475, 186, 263, 647, 537, 686, 600, 224,
-            469, 68, 770, 919, 190, 373, 294, 822, 808, 206,
-            184, 943, 795, 384, 383, 461, 404, 758, 839, 887,
-            715, 67, 618, 276, 204, 918, 873, 777, 604, 560,
-            951, 160, 578, 722, 79, 804, 96, 409, 713, 940,
-            652, 934, 970, 447, 318, 353, 859, 672, 112, 785,
-            645, 863, 803, 350, 139, 93, 354, 99, 820, 908,
-            609, 772, 154, 274, 580, 184, 79, 626, 630, 742,
-            653, 282, 762, 623, 680, 81, 927, 626, 789, 125,
-            411, 521, 938, 300, 821, 78, 343, 175, 128, 250,
-            170, 774, 972, 275, 999, 639, 495, 78, 352, 126,
-            857, 956, 358, 619, 580, 124, 737, 594, 701, 612,
-            669, 112, 134, 694, 363, 992, 809, 743, 168, 974,
-            944, 375, 748, 52, 600, 747, 642, 182, 862, 81,
-            344, 805, 988, 739, 511, 655, 814, 334, 249, 515,
-            897, 955, 664, 981, 649, 113, 974, 459, 893, 228,
-            433, 837, 553, 268, 926, 240, 102, 654, 459, 51,
-            686, 754, 806, 760, 493, 403, 415, 394, 687, 700,
-            946, 670, 656, 610, 738, 392, 760, 799, 887, 653,
-            978, 321, 576, 617, 626, 502, 894, 679, 243, 440,
-            680, 879, 194, 572, 640, 724, 926, 56, 204, 700,
-            707, 151, 457, 449, 797, 195, 791, 558, 945, 679,
-            297, 59, 87, 824, 713, 663, 412, 693, 342, 606,
-            134, 108, 571, 364, 631, 212, 174, 643, 304, 329,
-            343, 97, 430, 751, 497, 314, 983, 374, 822, 928,
-            140, 206, 73, 263, 980, 736, 876, 478, 430, 305,
-            170, 514, 364, 692, 829, 82, 855, 953, 676, 246,
-            369, 970, 294, 750, 807, 827, 150, 790, 288, 923,
-            804, 378, 215, 828, 592, 281, 565, 555, 710, 82,
-            896, 831, 547, 261, 524, 462, 293, 465, 502, 56,
-            661, 821, 976, 991, 658, 869, 905, 758, 745, 193,
-            768, 550, 608, 933, 378, 286, 215, 979, 792, 961,
-            61, 688, 793, 644, 986, 403, 106, 366, 905, 644,
-            372, 567, 466, 434, 645, 210, 389, 550, 919, 135,
-            780, 773, 635, 389, 707, 100, 626, 958, 165, 504,
-            920, 176, 193, 713, 857, 265, 203, 50, 668, 108,
-            645, 990, 626, 197, 510, 357, 358, 850, 858, 364,
-            936, 638
-            };
-
-        protected override bool BuffersMustNotOverlap
-        {
-            get { return false; }
-        }
-
-        protected override int DoProcess(byte[] input, int inputOffset, int inputCount, byte[] output, int outputOffset)
-        {
-            if (input != output || inputOffset != outputOffset)
-            {
-                Array.Copy(input, inputOffset, output, outputOffset, inputCount);
-            }
-
-            int randIndex = 1;
-            int nextByte = RandomVals[0] - 2;
-
-            while (nextByte < inputCount)
-            {
-                output[nextByte] ^= 1;
-                nextByte += RandomVals[randIndex++];
-                randIndex &= 0x1FF;
-            }
-
-            return inputCount;
-        }
-
-        protected override int MaxOutputCount(int inputCount)
-        {
-            return inputCount;
-        }
-
-        protected override int MinOutputCount(int inputCount)
-        {
-            return inputCount;
-        }
-    }
-}
diff --git a/DiscUtils/Compression/BZip2RleStream.cs b/DiscUtils/Compression/BZip2RleStream.cs
deleted file mode 100644
index 004d265..0000000
--- a/DiscUtils/Compression/BZip2RleStream.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-//
-// Based on "libbzip2", Copyright (C) 1996-2007 Julian R Seward.
-//
-
-namespace DiscUtils.Compression
-{
-    using System;
-    using System.IO;
-
-    internal class BZip2RleStream : Stream
-    {
-        private long _position;
-        private byte[] _blockBuffer;
-        private int _blockOffset;
-        private int _blockRemaining;
-
-        private int _numSame;
-        private byte _lastByte;
-        private int _runBytesOutstanding;
-
-        public BZip2RleStream()
-        {
-        }
-
-        public bool AtEof
-        {
-            get { return _runBytesOutstanding == 0 && _blockRemaining == 0; }
-        }
-
-        public override bool CanRead
-        {
-            get { return true; }
-        }
-
-        public override bool CanSeek
-        {
-            get { return false; }
-        }
-
-        public override bool CanWrite
-        {
-            get { return false; }
-        }
-
-        public override long Length
-        {
-            get { throw new NotSupportedException(); }
-        }
-
-        public override long Position
-        {
-            get { return _position; }
-            set { throw new NotSupportedException(); }
-        }
-
-        public void Reset(byte[] buffer, int offset, int count)
-        {
-            _position = 0;
-            _blockBuffer = buffer;
-            _blockOffset = offset;
-            _blockRemaining = count;
-            _numSame = -1;
-            _lastByte = 0;
-            _runBytesOutstanding = 0;
-        }
-
-        public override void Flush()
-        {
-            throw new NotSupportedException();
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            int numRead = 0;
-
-            while (numRead < count && _runBytesOutstanding > 0)
-            {
-                int runCount = Math.Min(_runBytesOutstanding, count);
-                for (int i = 0; i < runCount; ++i)
-                {
-                    buffer[offset + numRead] = _lastByte;
-                }
-
-                _runBytesOutstanding -= runCount;
-                numRead += runCount;
-            }
-
-            while (numRead < count && _blockRemaining > 0)
-            {
-                byte b = _blockBuffer[_blockOffset];
-                ++_blockOffset;
-                --_blockRemaining;
-
-                if (_numSame == 4)
-                {
-                    int runCount = Math.Min(b, count - numRead);
-                    for (int i = 0; i < runCount; ++i)
-                    {
-                        buffer[offset + numRead] = _lastByte;
-                        numRead++;
-                    }
-
-                    _runBytesOutstanding = b - runCount;
-                    _numSame = 0;
-                }
-                else
-                {
-                    if (b != _lastByte || _numSame <= 0)
-                    {
-                        _lastByte = b;
-                        _numSame = 0;
-                    }
-
-                    buffer[offset + numRead] = b;
-                    numRead++;
-                    _numSame++;
-                }
-            }
-
-            _position += numRead;
-            return numRead;
-        }
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            throw new NotSupportedException();
-        }
-
-        public override void SetLength(long value)
-        {
-            throw new NotSupportedException();
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            throw new NotSupportedException();
-        }
-    }
-}
diff --git a/DiscUtils/Compression/BigEndianBitStream.cs b/DiscUtils/Compression/BigEndianBitStream.cs
deleted file mode 100644
index 389d376..0000000
--- a/DiscUtils/Compression/BigEndianBitStream.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Compression
-{
-    using System.IO;
-
-    /// <summary>
-    /// Converts a byte stream into a bit stream.
-    /// </summary>
-    internal class BigEndianBitStream : BitStream
-    {
-        private Stream _byteStream;
-
-        private uint _buffer;
-        private int _bufferAvailable;
-
-        private byte[] _readBuffer = new byte[2];
-
-        public BigEndianBitStream(Stream byteStream)
-        {
-            _byteStream = byteStream;
-        }
-
-        public override int MaxReadAhead
-        {
-            get { return 16; }
-        }
-
-        public override uint Read(int count)
-        {
-            if (count > 16)
-            {
-                uint result = Read(16) << (count - 16);
-                return result | Read(count - 16);
-            }
-
-            EnsureBufferFilled();
-
-            _bufferAvailable -= count;
-
-            uint mask = (uint)((1 << count) - 1);
-
-            return (uint)((_buffer >> _bufferAvailable) & mask);
-        }
-
-        public override uint Peek(int count)
-        {
-            EnsureBufferFilled();
-
-            uint mask = (uint)((1 << count) - 1);
-
-            return (uint)((_buffer >> (_bufferAvailable - count)) & mask);
-        }
-
-        public override void Consume(int count)
-        {
-            EnsureBufferFilled();
-
-            _bufferAvailable -= count;
-        }
-
-        private void EnsureBufferFilled()
-        {
-            if (_bufferAvailable < 16)
-            {
-                _readBuffer[0] = 0;
-                _readBuffer[1] = 0;
-                _byteStream.Read(_readBuffer, 0, 2);
-
-                _buffer = (uint)((uint)(_buffer << 16) | (uint)(_readBuffer[0] << 8) | (uint)_readBuffer[1]);
-                _bufferAvailable += 16;
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Compression/BitStream.cs b/DiscUtils/Compression/BitStream.cs
deleted file mode 100644
index 62c0306..0000000
--- a/DiscUtils/Compression/BitStream.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Compression
-{
-    /// <summary>
-    /// Base class for bit streams.
-    /// </summary>
-    /// <remarks>
-    /// The rules for conversion of a byte stream to a bit stream vary
-    /// between implementations.
-    /// </remarks>
-    internal abstract class BitStream
-    {
-        /// <summary>
-        /// Gets the maximum number of bits that can be peeked on the stream.
-        /// </summary>
-        public abstract int MaxReadAhead { get; }
-
-        /// <summary>
-        /// Reads bits from the stream.
-        /// </summary>
-        /// <param name="count">The number of bits to read.</param>
-        /// <returns>The bits as a UInt32.</returns>
-        public abstract uint Read(int count);
-
-        /// <summary>
-        /// Queries data from the stream.
-        /// </summary>
-        /// <param name="count">The number of bits to query.</param>
-        /// <returns>The bits as a UInt32.</returns>
-        /// <remarks>This method does not consume the bits (i.e. move the file pointer).</remarks>
-        public abstract uint Peek(int count);
-
-        /// <summary>
-        /// Consumes bits from the stream without returning them.
-        /// </summary>
-        /// <param name="count">The number of bits to consume.</param>
-        public abstract void Consume(int count);
-    }
-}
diff --git a/DiscUtils/Compression/BlockCompressor.cs b/DiscUtils/Compression/BlockCompressor.cs
deleted file mode 100644
index 34fba7c..0000000
--- a/DiscUtils/Compression/BlockCompressor.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Compression
-{
-    /// <summary>
-    /// Base class for block compression algorithms.
-    /// </summary>
-    public abstract class BlockCompressor
-    {
-        /// <summary>
-        /// Gets or sets the block size parameter to the algorithm.
-        /// </summary>
-        /// <remarks>
-        /// Some algorithms may use this to control both compression and decompression, others may
-        /// only use it to control compression.  Some may ignore it entirely.
-        /// </remarks>
-        public int BlockSize { get; set; }
-
-        /// <summary>
-        /// Compresses some data.
-        /// </summary>
-        /// <param name="source">The uncompressed input.</param>
-        /// <param name="sourceOffset">Offset of the input data in <c>source</c>.</param>
-        /// <param name="sourceLength">The amount of uncompressed data.</param>
-        /// <param name="compressed">The destination for the output compressed data.</param>
-        /// <param name="compressedOffset">Offset for the output data in <c>compressed</c>.</param>
-        /// <param name="compressedLength">The maximum size of the compressed data on input, and the actual size on output.</param>
-        /// <returns>Indication of success, or indication the data could not compress into the requested space.</returns>
-        public abstract CompressionResult Compress(byte[] source, int sourceOffset, int sourceLength, byte[] compressed, int compressedOffset, ref int compressedLength);
-
-        /// <summary>
-        /// Decompresses some data.
-        /// </summary>
-        /// <param name="source">The compressed input.</param>
-        /// <param name="sourceOffset">Offset of the input data in <c>source</c>.</param>
-        /// <param name="sourceLength">The amount of compressed data.</param>
-        /// <param name="decompressed">The destination for the output decompressed data.</param>
-        /// <param name="decompressedOffset">Offset for the output data in <c>decompressed</c>.</param>
-        /// <returns>The amount of decompressed data.</returns>
-        public abstract int Decompress(byte[] source, int sourceOffset, int sourceLength, byte[] decompressed, int decompressedOffset);
-    }
-}
diff --git a/DiscUtils/Compression/CompressionResult.cs b/DiscUtils/Compression/CompressionResult.cs
deleted file mode 100644
index 4df13b7..0000000
--- a/DiscUtils/Compression/CompressionResult.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Compression
-{
-    /// <summary>
-    /// Possible results of attempting to compress data.
-    /// </summary>
-    /// <remarks>
-    /// A compression routine <i>may</i> return <c>Compressed</c>, even if the data
-    /// was 'all zeros' or increased in size.  The <c>AllZeros</c> and <c>Incompressible</c>
-    /// values are for algorithms that include special detection for these cases.
-    /// </remarks>
-    public enum CompressionResult
-    {
-        /// <summary>
-        /// The data compressed succesfully.
-        /// </summary>
-        Compressed,
-
-        /// <summary>
-        /// The data was all-zero's.
-        /// </summary>
-        AllZeros,
-
-        /// <summary>
-        /// The data was incompressible (could not fit into destination buffer).
-        /// </summary>
-        Incompressible
-    }
-}
diff --git a/DiscUtils/Compression/DataBlockTransform.cs b/DiscUtils/Compression/DataBlockTransform.cs
deleted file mode 100644
index 8cb2f2a..0000000
--- a/DiscUtils/Compression/DataBlockTransform.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Compression
-{
-    using System;
-    using System.Globalization;
-
-    internal abstract class DataBlockTransform
-    {
-        protected abstract bool BuffersMustNotOverlap { get; }
-
-        public int Process(byte[] input, int inputOffset, int inputCount, byte[] output, int outputOffset)
-        {
-            if (output.Length < outputOffset + (long)MinOutputCount(inputCount))
-            {
-                throw new ArgumentException(
-                    string.Format(
-                    CultureInfo.InvariantCulture,
-                    "Output buffer to small, must be at least {0} bytes may need to be {1} bytes",
-                    MinOutputCount(inputCount),
-                    MaxOutputCount(inputCount)));
-            }
-
-            if (BuffersMustNotOverlap)
-            {
-                int maxOut = MaxOutputCount(inputCount);
-
-                if (input == output
-                    && (inputOffset + (long)inputCount > outputOffset)
-                    && (inputOffset <= outputOffset + (long)maxOut))
-                {
-                    byte[] tempBuffer = new byte[maxOut];
-
-                    int outCount = DoProcess(input, inputOffset, inputCount, tempBuffer, 0);
-                    Array.Copy(tempBuffer, 0, output, outputOffset, outCount);
-
-                    return outCount;
-                }
-            }
-
-            return DoProcess(input, inputOffset, inputCount, output, outputOffset);
-        }
-
-        protected abstract int DoProcess(byte[] input, int inputOffset, int inputCount, byte[] output, int outputOffset);
-
-        protected abstract int MaxOutputCount(int inputCount);
-
-        protected abstract int MinOutputCount(int inputCount);
-    }
-}
diff --git a/DiscUtils/Compression/HuffmanTree.cs b/DiscUtils/Compression/HuffmanTree.cs
deleted file mode 100644
index 2459cf1..0000000
--- a/DiscUtils/Compression/HuffmanTree.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Compression
-{
-    /// <summary>
-    /// A canonical Huffman tree implementation.
-    /// </summary>
-    /// <remarks>
-    /// A lookup table is created that will take any bit sequence (max tree depth in length),
-    /// indicating the output symbol.  In WIM files, in practice, no chunk exceeds 32768 bytes
-    /// in length, so we often end up generating a bigger lookup table than the data it's
-    /// encoding. This makes for exceptionally fast symbol lookups O(1), but is inefficient
-    /// overall.
-    /// </remarks>
-    internal sealed class HuffmanTree
-    {
-        private int _numBits; // Max bits per symbol
-        private int _numSymbols; // Max symbols
-        private uint[] _lengths;
-        private uint[] _buffer;
-
-        public HuffmanTree(uint[] lengths)
-        {
-            _lengths = lengths;
-            _numSymbols = lengths.Length;
-
-            uint maxLength = 0;
-            for (int i = 0; i < _lengths.Length; ++i)
-            {
-                if (_lengths[i] > maxLength)
-                {
-                    maxLength = _lengths[i];
-                }
-            }
-
-            _numBits = (int)maxLength;
-            _buffer = new uint[1 << _numBits];
-
-            Build();
-        }
-
-        public uint[] Lengths
-        {
-            get
-            {
-                return _lengths;
-            }
-        }
-
-        public uint NextSymbol(BitStream bitStream)
-        {
-            uint symbol = _buffer[bitStream.Peek(_numBits)];
-
-            // We may have over-read, reset bitstream position
-            bitStream.Consume((int)_lengths[symbol]);
-
-            return symbol;
-        }
-
-        private void Build()
-        {
-            int position = 0;
-
-            // For each bit-length...
-            for (int i = 1; i <= _numBits; ++i)
-            {
-                // Check each symbol
-                for (uint symbol = 0; symbol < _numSymbols; ++symbol)
-                {
-                    if (_lengths[symbol] == i)
-                    {
-                        int numToFill = 1 << (_numBits - i);
-                        for (int n = 0; n < numToFill; ++n)
-                        {
-                            _buffer[position + n] = symbol;
-                        }
-
-                        position += numToFill;
-                    }
-                }
-            }
-
-            for (int i = position; i < _buffer.Length; ++i)
-            {
-                _buffer[i] = uint.MaxValue;
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Compression/InverseBurrowsWheeler.cs b/DiscUtils/Compression/InverseBurrowsWheeler.cs
deleted file mode 100644
index c3d6a25..0000000
--- a/DiscUtils/Compression/InverseBurrowsWheeler.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Compression
-{
-    using System;
-
-    internal sealed class InverseBurrowsWheeler : DataBlockTransform
-    {
-        private int[] _pointers;
-        private int[] _nextPos;
-
-        public InverseBurrowsWheeler(int bufferSize)
-        {
-            _pointers = new int[bufferSize];
-            _nextPos = new int[256];
-        }
-
-        public int OriginalIndex { get; set; }
-
-        protected override bool BuffersMustNotOverlap
-        {
-            get { return true; }
-        }
-
-        protected override int DoProcess(byte[] input, int inputOffset, int inputCount, byte[] output, int outputOffset)
-        {
-            int outputCount = inputCount;
-
-            // First find the frequency of each value
-            Array.Clear(_nextPos, 0, _nextPos.Length);
-            for (int i = inputOffset; i < inputOffset + inputCount; ++i)
-            {
-                _nextPos[input[i]]++;
-            }
-
-            // We know they're 'sorted' in the first column, so now can figure
-            // out the position of the first instance of each.
-            int sum = 0;
-            for (int i = 0; i < 256; ++i)
-            {
-                int tempSum = sum;
-                sum += _nextPos[i];
-                _nextPos[i] = tempSum;
-            }
-
-            // For each value in the final column, put a pointer to to the
-            // 'next' character in the first (sorted) column.
-            for (int i = 0; i < inputCount; ++i)
-            {
-                _pointers[_nextPos[input[inputOffset + i]]++] = i;
-            }
-
-            // The 'next' character after the end of the original string is the
-            // first character of the original string.
-            int focus = _pointers[OriginalIndex];
-
-            // We can now just walk the pointers to reconstruct the original string
-            for (int i = 0; i < outputCount; ++i)
-            {
-                output[outputOffset + i] = input[inputOffset + focus];
-                focus = _pointers[focus];
-            }
-
-            return outputCount;
-        }
-
-        protected override int MaxOutputCount(int inputCount)
-        {
-            return inputCount;
-        }
-
-        protected override int MinOutputCount(int inputCount)
-        {
-            return inputCount;
-        }
-    }
-}
diff --git a/DiscUtils/Compression/MoveToFront.cs b/DiscUtils/Compression/MoveToFront.cs
deleted file mode 100644
index 32a43de..0000000
--- a/DiscUtils/Compression/MoveToFront.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Compression
-{
-    internal class MoveToFront
-    {
-        private byte[] _buffer;
-
-        public MoveToFront()
-            : this(256, false)
-        {
-        }
-
-        public MoveToFront(int size, bool autoInit)
-        {
-            _buffer = new byte[size];
-
-            if (autoInit)
-            {
-                for (byte i = 0; i < size; ++i)
-                {
-                    _buffer[i] = i;
-                }
-            }
-        }
-
-        public byte Head
-        {
-            get { return _buffer[0]; }
-        }
-
-        public void Set(int pos, byte val)
-        {
-            _buffer[pos] = val;
-        }
-
-        public byte GetAndMove(int pos)
-        {
-            byte val = _buffer[pos];
-
-            for (int i = pos; i > 0; --i)
-            {
-                _buffer[i] = _buffer[i - 1];
-            }
-
-            _buffer[0] = val;
-            return val;
-        }
-    }
-}
diff --git a/DiscUtils/Compression/ZlibStream.cs b/DiscUtils/Compression/ZlibStream.cs
deleted file mode 100644
index 1a0b87b..0000000
--- a/DiscUtils/Compression/ZlibStream.cs
+++ /dev/null
@@ -1,237 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Compression
-{
-    using System;
-    using System.IO;
-    using System.IO.Compression;
-
-    /// <summary>
-    /// Implementation of the Zlib compression algorithm.
-    /// </summary>
-    /// <remarks>Only decompression is currently implemented.</remarks>
-    public class ZlibStream : Stream
-    {
-        private Stream _stream;
-        private CompressionMode _mode;
-        private DeflateStream _deflateStream;
-        private Adler32 _adler32;
-
-        /// <summary>
-        /// Initializes a new instance of the ZlibStream class.
-        /// </summary>
-        /// <param name="stream">The stream to compress of decompress.</param>
-        /// <param name="mode">Whether to compress or decompress.</param>
-        /// <param name="leaveOpen">Whether closing this stream should leave <c>stream</c> open.</param>
-        public ZlibStream(Stream stream, CompressionMode mode, bool leaveOpen)
-        {
-            _stream = stream;
-            _mode = mode;
-
-            if (mode == CompressionMode.Decompress)
-            {
-                // We just sanity check against expected header values...
-                byte[] headerBuffer = Utilities.ReadFully(stream, 2);
-                ushort header = Utilities.ToUInt16BigEndian(headerBuffer, 0);
-
-                if ((header % 31) != 0)
-                {
-                    throw new IOException("Invalid Zlib header found");
-                }
-
-                if ((header & 0x0F00) != (8 << 8))
-                {
-                    throw new NotSupportedException("Zlib compression not using DEFLATE algorithm");
-                }
-
-                if ((header & 0x0020) != 0)
-                {
-                    throw new NotSupportedException("Zlib compression using preset dictionary");
-                }
-            }
-            else
-            {
-                ushort header =
-                    (8 << 8)    // DEFLATE
-                    | (7 << 12) // 32K window size
-                    | 0x80;     // Default algorithm
-                header |= (ushort)(31 - (header % 31));
-
-                byte[] headerBuffer = new byte[2];
-                Utilities.WriteBytesBigEndian(header, headerBuffer, 0);
-                stream.Write(headerBuffer, 0, 2);
-            }
-
-            _deflateStream = new DeflateStream(stream, mode, leaveOpen);
-            _adler32 = new Adler32();
-        }
-
-        /// <summary>
-        /// Gets whether the stream can be read.
-        /// </summary>
-        public override bool CanRead
-        {
-            get { return _deflateStream.CanRead; }
-        }
-
-        /// <summary>
-        /// Gets whether the stream pointer can be changed.
-        /// </summary>
-        public override bool CanSeek
-        {
-            get { return false; }
-        }
-
-        /// <summary>
-        /// Gets whether the stream can be written to.
-        /// </summary>
-        public override bool CanWrite
-        {
-            get { return _deflateStream.CanWrite; }
-        }
-
-        /// <summary>
-        /// Gets the length of the stream.
-        /// </summary>
-        public override long Length
-        {
-            get { throw new NotSupportedException(); }
-        }
-
-        /// <summary>
-        /// Gets and sets the stream position.
-        /// </summary>
-        public override long Position
-        {
-            get { throw new NotSupportedException(); }
-            set { throw new NotSupportedException(); }
-        }
-
-        /// <summary>
-        /// Closes the stream.
-        /// </summary>
-        public override void Close()
-        {
-            if (_mode == CompressionMode.Decompress)
-            {
-                // Can only check Adler checksum on seekable streams.  Since DeflateStream
-                // aggresively caches input, it normally has already consumed the footer.
-                if (_stream.CanSeek)
-                {
-                    _stream.Seek(-4, SeekOrigin.End);
-                    byte[] footerBuffer = Utilities.ReadFully(_stream, 4);
-                    if (Utilities.ToInt32BigEndian(footerBuffer, 0) != _adler32.Value)
-                    {
-                        throw new InvalidDataException("Corrupt decompressed data detected");
-                    }
-                }
-
-                _deflateStream.Close();
-            }
-            else
-            {
-                _deflateStream.Close();
-
-                byte[] footerBuffer = new byte[4];
-                Utilities.WriteBytesBigEndian(_adler32.Value, footerBuffer, 0);
-                _stream.Write(footerBuffer, 0, 4);
-            }
-        }
-
-        /// <summary>
-        /// Flushes the stream.
-        /// </summary>
-        public override void Flush()
-        {
-            _deflateStream.Flush();
-        }
-
-        /// <summary>
-        /// Reads data from the stream.
-        /// </summary>
-        /// <param name="buffer">The buffer to populate.</param>
-        /// <param name="offset">The first byte to write.</param>
-        /// <param name="count">The number of bytes requested.</param>
-        /// <returns>The number of bytes read.</returns>
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            CheckParams(buffer, offset, count);
-
-            int numRead = _deflateStream.Read(buffer, offset, count);
-            _adler32.Process(buffer, offset, numRead);
-            return numRead;
-        }
-
-        /// <summary>
-        /// Seeks to a new position.
-        /// </summary>
-        /// <param name="offset">Relative position to seek to.</param>
-        /// <param name="origin">The origin of the seek.</param>
-        /// <returns>The new position.</returns>
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <summary>
-        /// Changes the length of the stream.
-        /// </summary>
-        /// <param name="value">The new desired length of the stream.</param>
-        public override void SetLength(long value)
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <summary>
-        /// Writes data to the stream.
-        /// </summary>
-        /// <param name="buffer">Buffer containing the data to write.</param>
-        /// <param name="offset">Offset of the first byte to write.</param>
-        /// <param name="count">Number of bytes to write.</param>
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            CheckParams(buffer, offset, count);
-
-            _adler32.Process(buffer, offset, count);
-            _deflateStream.Write(buffer, offset, count);
-        }
-
-        private static void CheckParams(byte[] buffer, int offset, int count)
-        {
-            if (buffer == null)
-            {
-                throw new ArgumentNullException("buffer");
-            }
-
-            if (offset < 0 || offset > buffer.Length)
-            {
-                throw new ArgumentException("Offset outside of array bounds", "offset");
-            }
-
-            if (count < 0 || offset + count > buffer.Length)
-            {
-                throw new ArgumentException("Array index out of bounds", "count");
-            }
-        }
-    }
-}
diff --git a/DiscUtils/ConcatStream.cs b/DiscUtils/ConcatStream.cs
deleted file mode 100644
index 96fb057..0000000
--- a/DiscUtils/ConcatStream.cs
+++ /dev/null
@@ -1,289 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-
-    /// <summary>
-    /// The concatenation of multiple streams (read-only, for now).
-    /// </summary>
-    internal class ConcatStream : SparseStream
-    {
-        private SparseStream[] _streams;
-        private Ownership _ownsStreams;
-        private bool _canWrite;
-
-        private long _position;
-
-        public ConcatStream(Ownership ownsStreams, params SparseStream[] streams)
-        {
-            _ownsStreams = ownsStreams;
-            _streams = streams;
-
-            // Only allow writes if all streams can be written
-            _canWrite = true;
-            foreach (var stream in streams)
-            {
-                if (!stream.CanWrite)
-                {
-                    _canWrite = false;
-                }
-            }
-        }
-
-        public override bool CanRead
-        {
-            get
-            {
-                CheckDisposed();
-                return true;
-            }
-        }
-
-        public override bool CanSeek
-        {
-            get
-            {
-                CheckDisposed();
-                return true;
-            }
-        }
-
-        public override bool CanWrite
-        {
-            get
-            {
-                CheckDisposed();
-                return _canWrite;
-            }
-        }
-
-        public override long Length
-        {
-            get
-            {
-                CheckDisposed();
-                long length = 0;
-                for (int i = 0; i < _streams.Length; ++i)
-                {
-                    length += _streams[i].Length;
-                }
-
-                return length;
-            }
-        }
-
-        public override long Position
-        {
-            get
-            {
-                CheckDisposed();
-                return _position;
-            }
-
-            set
-            {
-                CheckDisposed();
-                _position = value;
-            }
-        }
-
-        public override IEnumerable<StreamExtent> Extents
-        {
-            get
-            {
-                CheckDisposed();
-                List<StreamExtent> extents = new List<StreamExtent>();
-
-                long pos = 0;
-                for (int i = 0; i < _streams.Length; ++i)
-                {
-                    foreach (StreamExtent extent in _streams[i].Extents)
-                    {
-                        extents.Add(new StreamExtent(extent.Start + pos, extent.Length));
-                    }
-
-                    pos += _streams[i].Length;
-                }
-
-                return extents;
-            }
-        }
-
-        public override void Flush()
-        {
-            CheckDisposed();
-            for (int i = 0; i < _streams.Length; ++i)
-            {
-                _streams[i].Flush();
-            }
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            CheckDisposed();
-
-            int totalRead = 0;
-            int numRead = 0;
-
-            do
-            {
-                long activeStreamStartPos;
-                int activeStream = GetActiveStream(out activeStreamStartPos);
-
-                _streams[activeStream].Position = _position - activeStreamStartPos;
-
-                numRead = _streams[activeStream].Read(buffer, offset + totalRead, count - totalRead);
-
-                totalRead += numRead;
-                _position += numRead;
-            }
-            while (numRead != 0);
-
-            return totalRead;
-        }
-
-        public override long Seek(long offset, System.IO.SeekOrigin origin)
-        {
-            CheckDisposed();
-
-            long effectiveOffset = offset;
-            if (origin == SeekOrigin.Current)
-            {
-                effectiveOffset += _position;
-            }
-            else if (origin == SeekOrigin.End)
-            {
-                effectiveOffset += Length;
-            }
-
-            if (effectiveOffset < 0)
-            {
-                throw new IOException("Attempt to move before beginning of disk");
-            }
-            else
-            {
-                Position = effectiveOffset;
-                return Position;
-            }
-        }
-
-        public override void SetLength(long value)
-        {
-            CheckDisposed();
-
-            long lastStreamOffset;
-            int lastStream = GetStream(Length, out lastStreamOffset);
-            if (value < lastStreamOffset)
-            {
-                throw new IOException(string.Format(CultureInfo.InvariantCulture, "Unable to reduce stream length to less than {0}", lastStreamOffset));
-            }
-
-            _streams[lastStream].SetLength(value - lastStreamOffset);
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            CheckDisposed();
-
-            int totalWritten = 0;
-            while (totalWritten != count)
-            {
-                // Offset of the stream = streamOffset
-                long streamOffset;
-                int streamIdx = GetActiveStream(out streamOffset);
-
-                // Offset within the stream = streamPos
-                long streamPos = _position - streamOffset;
-                _streams[streamIdx].Position = streamPos;
-
-                // Write (limited to the stream's length), except for final stream - that may be
-                // extendable
-                int numToWrite;
-                if (streamIdx == _streams.Length - 1)
-                {
-                    numToWrite = count - totalWritten;
-                }
-                else
-                {
-                    numToWrite = (int)Math.Min(count - totalWritten, _streams[streamIdx].Length - streamPos);
-                }
-
-                _streams[streamIdx].Write(buffer, offset + totalWritten, numToWrite);
-
-                totalWritten += numToWrite;
-                _position += numToWrite;
-            }
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            try
-            {
-                if (disposing && _ownsStreams == Ownership.Dispose && _streams != null)
-                {
-                    foreach (var stream in _streams)
-                    {
-                        stream.Dispose();
-                    }
-
-                    _streams = null;
-                }
-            }
-            finally
-            {
-                base.Dispose(disposing);
-            }
-        }
-
-        private int GetActiveStream(out long startPos)
-        {
-            return GetStream(_position, out startPos);
-        }
-
-        private int GetStream(long targetPos, out long streamStartPos)
-        {
-            // Find the stream that _position is within
-            streamStartPos = 0;
-            int focusStream = 0;
-            while (focusStream < _streams.Length - 1 && streamStartPos + _streams[focusStream].Length <= targetPos)
-            {
-                streamStartPos += _streams[focusStream].Length;
-                focusStream++;
-            }
-
-            return focusStream;
-        }
-
-        private void CheckDisposed()
-        {
-            if (_streams == null)
-            {
-                throw new ObjectDisposedException("ConcatStream");
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Crc32.cs b/DiscUtils/Crc32.cs
deleted file mode 100644
index c6a2ec7..0000000
--- a/DiscUtils/Crc32.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    internal abstract class Crc32
-    {
-        protected readonly uint[] Table;
-        protected uint _value;
-
-        protected Crc32(uint[] table)
-        {
-            Table = table;
-            _value = 0xFFFFFFFF;
-        }
-
-        public uint Value
-        {
-            get { return _value ^ 0xFFFFFFFF; }
-        }
-
-        public abstract void Process(byte[] buffer, int offset, int count);
-    }
-}
diff --git a/DiscUtils/Crc32Algorithm.cs b/DiscUtils/Crc32Algorithm.cs
deleted file mode 100644
index bda8573..0000000
--- a/DiscUtils/Crc32Algorithm.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    internal enum Crc32Algorithm
-    {
-        /// <summary>
-        /// Used in Ethernet, PKZIP, BZIP2, Gzip, PNG, etc. (aka CRC32).
-        /// </summary>
-        Common = 0,
-
-        /// <summary>
-        /// Used in iSCSI, SCTP, Btrfs, Vhdx. (aka CRC32C).
-        /// </summary>
-        Castagnoli = 1,
-
-        /// <summary>
-        /// Unknown usage. (aka CRC32K).
-        /// </summary>
-        Koopman = 2,
-
-        /// <summary>
-        /// Used in AIXM.  (aka CRC32Q).
-        /// </summary>
-        Aeronautical = 3
-    }
-}
diff --git a/DiscUtils/Crc32BigEndian.cs b/DiscUtils/Crc32BigEndian.cs
deleted file mode 100644
index 6811aea..0000000
--- a/DiscUtils/Crc32BigEndian.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    /// <summary>
-    /// Calculates CRC32 of buffers.
-    /// </summary>
-    internal sealed class Crc32BigEndian : Crc32
-    {
-        private static readonly uint[][] Tables;
-
-        static Crc32BigEndian()
-        {
-            Tables = new uint[4][];
-
-            Tables[(int)Crc32Algorithm.Common] = CalcTable(0x04C11DB7);
-            Tables[(int)Crc32Algorithm.Castagnoli] = CalcTable(0x1EDC6F41);
-            Tables[(int)Crc32Algorithm.Koopman] = CalcTable(0x741B8CD7);
-            Tables[(int)Crc32Algorithm.Aeronautical] = CalcTable(0x814141AB);
-        }
-
-        public Crc32BigEndian(Crc32Algorithm algorithm)
-            : base(Tables[(int)algorithm])
-        {
-        }
-
-        public static uint Compute(Crc32Algorithm algorithm, byte[] buffer, int offset, int count)
-        {
-            return Process(Tables[(int)algorithm], 0xFFFFFFFF, buffer, offset, count) ^ 0xFFFFFFFF;
-        }
-
-        public override void Process(byte[] buffer, int offset, int count)
-        {
-            _value = Process(Table, _value, buffer, offset, count);
-        }
-
-        private static uint[] CalcTable(uint polynomial)
-        {
-            uint[] table = new uint[256];
-
-            for (uint i = 0; i < 256; ++i)
-            {
-                uint crc = i << 24;
-
-                for (int j = 8; j > 0; --j)
-                {
-                    if ((crc & 0x80000000) != 0)
-                    {
-                        crc = (crc << 1) ^ polynomial;
-                    }
-                    else
-                    {
-                        crc <<= 1;
-                    }
-                }
-
-                table[i] = crc;
-            }
-
-            return table;
-        }
-
-        private static uint Process(uint[] table, uint accumulator, byte[] buffer, int offset, int count)
-        {
-            uint value = accumulator;
-
-            for (int i = 0; i < count; ++i)
-            {
-                byte b = buffer[offset + i];
-                value = table[(value >> 24) ^ b] ^ (value << 8);
-            }
-
-            return value;
-        }
-    }
-}
diff --git a/DiscUtils/Crc32LittleEndian.cs b/DiscUtils/Crc32LittleEndian.cs
deleted file mode 100644
index ee23270..0000000
--- a/DiscUtils/Crc32LittleEndian.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    /// <summary>
-    /// Calculates CRC32 of buffers.
-    /// </summary>
-    internal sealed class Crc32LittleEndian : Crc32
-    {
-        private static readonly uint[][] Tables;
-
-        static Crc32LittleEndian()
-        {
-            Tables = new uint[4][];
-
-            Tables[(int)Crc32Algorithm.Common] = CalcTable(0xEDB88320);
-            Tables[(int)Crc32Algorithm.Castagnoli] = CalcTable(0x82F63B78);
-            Tables[(int)Crc32Algorithm.Koopman] = CalcTable(0xEB31D82E);
-            Tables[(int)Crc32Algorithm.Aeronautical] = CalcTable(0xD5828281);
-        }
-
-        public Crc32LittleEndian(Crc32Algorithm algorithm)
-            : base(Tables[(int)algorithm])
-        {
-        }
-
-        public static uint Compute(Crc32Algorithm algorithm, byte[] buffer, int offset, int count)
-        {
-            return Process(Tables[(int)algorithm], 0xFFFFFFFF, buffer, offset, count) ^ 0xFFFFFFFF;
-        }
-
-        public override void Process(byte[] buffer, int offset, int count)
-        {
-            _value = Process(Table, _value, buffer, offset, count);
-        }
-
-        private static uint[] CalcTable(uint polynomial)
-        {
-            uint[] table = new uint[256];
-
-            table[0] = 0;
-            for (uint i = 0; i <= 255; ++i)
-            {
-                uint crc = i;
-
-                for (int j = 8; j > 0; --j)
-                {
-                    if ((crc & 1) != 0)
-                    {
-                        crc = (crc >> 1) ^ polynomial;
-                    }
-                    else
-                    {
-                        crc >>= 1;
-                    }
-                }
-
-                table[i] = crc;
-            }
-
-            return table;
-        }
-
-        private static uint Process(uint[] table, uint accumulator, byte[] buffer, int offset, int count)
-        {
-            uint value = accumulator;
-
-            for (int i = 0; i < count; ++i)
-            {
-                byte b = buffer[offset + i];
-
-                uint temp1 = (value >> 8) & 0x00FFFFFF;
-                uint temp2 = table[(value ^ b) & 0xFF];
-                value = temp1 ^ temp2;
-            }
-
-            return value;
-        }
-    }
-}
diff --git a/DiscUtils/DiscDirectoryInfo.cs b/DiscUtils/DiscDirectoryInfo.cs
deleted file mode 100644
index c84a7fd..0000000
--- a/DiscUtils/DiscDirectoryInfo.cs
+++ /dev/null
@@ -1,186 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System.IO;
-
-    /// <summary>
-    /// Provides information about a directory on a disc.
-    /// </summary>
-    /// <remarks>
-    /// This class allows navigation of the disc directory/file hierarchy.
-    /// </remarks>
-    public sealed class DiscDirectoryInfo : DiscFileSystemInfo
-    {
-        /// <summary>
-        /// Initializes a new instance of the DiscDirectoryInfo class.
-        /// </summary>
-        /// <param name="fileSystem">The file system the directory info relates to.</param>
-        /// <param name="path">The path within the file system of the directory.</param>
-        internal DiscDirectoryInfo(DiscFileSystem fileSystem, string path)
-            : base(fileSystem, path)
-        {
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the directory exists.
-        /// </summary>
-        public override bool Exists
-        {
-            get { return FileSystem.DirectoryExists(Path); }
-        }
-
-        /// <summary>
-        /// Gets the full path of the directory.
-        /// </summary>
-        public override string FullName
-        {
-            get { return base.FullName + @"\"; }
-        }
-
-        /// <summary>
-        /// Creates a directory.
-        /// </summary>
-        public void Create()
-        {
-            FileSystem.CreateDirectory(Path);
-        }
-
-        /// <summary>
-        /// Deletes a directory, even if it's not empty.
-        /// </summary>
-        public override void Delete()
-        {
-            FileSystem.DeleteDirectory(Path, false);
-        }
-
-        /// <summary>
-        /// Deletes a directory, with the caller choosing whether to recurse.
-        /// </summary>
-        /// <param name="recursive"><c>true</c> to delete all child node, <c>false</c> to fail if the directory is not empty.</param>
-        public void Delete(bool recursive)
-        {
-            FileSystem.DeleteDirectory(Path, recursive);
-        }
-
-        /// <summary>
-        /// Moves a directory and it's contents to a new path.
-        /// </summary>
-        /// <param name="destinationDirName">The destination directory name.</param>
-        public void MoveTo(string destinationDirName)
-        {
-            FileSystem.MoveDirectory(Path, destinationDirName);
-        }
-
-        /// <summary>
-        /// Gets all child directories.
-        /// </summary>
-        /// <returns>An array of child directories.</returns>
-        public DiscDirectoryInfo[] GetDirectories()
-        {
-            return Utilities.Map<string, DiscDirectoryInfo>(FileSystem.GetDirectories(Path), (p) => new DiscDirectoryInfo(FileSystem, p));
-        }
-
-        /// <summary>
-        /// Gets all child directories matching a search pattern.
-        /// </summary>
-        /// <param name="pattern">The search pattern.</param>
-        /// <returns>An array of child directories, or empty if none match.</returns>
-        /// <remarks>The search pattern can include the wildcards * (matching 0 or more characters)
-        /// and ? (matching 1 character).</remarks>
-        public DiscDirectoryInfo[] GetDirectories(string pattern)
-        {
-            return GetDirectories(pattern, SearchOption.TopDirectoryOnly);
-        }
-
-        /// <summary>
-        /// Gets all descendant directories matching a search pattern.
-        /// </summary>
-        /// <param name="pattern">The search pattern.</param>
-        /// <param name="searchOption">Whether to search just this directory, or all children.</param>
-        /// <returns>An array of descendant directories, or empty if none match.</returns>
-        /// <remarks>The search pattern can include the wildcards * (matching 0 or more characters)
-        /// and ? (matching 1 character).  The option parameter determines whether only immediate
-        /// children, or all children are returned.</remarks>
-        public DiscDirectoryInfo[] GetDirectories(string pattern, SearchOption searchOption)
-        {
-            return Utilities.Map<string, DiscDirectoryInfo>(FileSystem.GetDirectories(Path, pattern, searchOption), (p) => new DiscDirectoryInfo(FileSystem, p));
-        }
-
-        /// <summary>
-        /// Gets all files.
-        /// </summary>
-        /// <returns>An array of files.</returns>
-        public DiscFileInfo[] GetFiles()
-        {
-            return Utilities.Map<string, DiscFileInfo>(FileSystem.GetFiles(Path), (p) => new DiscFileInfo(FileSystem, p));
-        }
-
-        /// <summary>
-        /// Gets all files matching a search pattern.
-        /// </summary>
-        /// <param name="pattern">The search pattern.</param>
-        /// <returns>An array of files, or empty if none match.</returns>
-        /// <remarks>The search pattern can include the wildcards * (matching 0 or more characters)
-        /// and ? (matching 1 character).</remarks>
-        public DiscFileInfo[] GetFiles(string pattern)
-        {
-            return GetFiles(pattern, SearchOption.TopDirectoryOnly);
-        }
-
-        /// <summary>
-        /// Gets all descendant files matching a search pattern.
-        /// </summary>
-        /// <param name="pattern">The search pattern.</param>
-        /// <param name="searchOption">Whether to search just this directory, or all children.</param>
-        /// <returns>An array of descendant files, or empty if none match.</returns>
-        /// <remarks>The search pattern can include the wildcards * (matching 0 or more characters)
-        /// and ? (matching 1 character).  The option parameter determines whether only immediate
-        /// children, or all children are returned.</remarks>
-        public DiscFileInfo[] GetFiles(string pattern, SearchOption searchOption)
-        {
-            return Utilities.Map<string, DiscFileInfo>(FileSystem.GetFiles(Path, pattern, searchOption), (p) => new DiscFileInfo(FileSystem, p));
-        }
-
-        /// <summary>
-        /// Gets all files and directories in this directory.
-        /// </summary>
-        /// <returns>An array of files and directories.</returns>
-        public DiscFileSystemInfo[] GetFileSystemInfos()
-        {
-            return Utilities.Map<string, DiscFileSystemInfo>(FileSystem.GetFileSystemEntries(Path), (p) => new DiscFileSystemInfo(FileSystem, p));
-        }
-
-        /// <summary>
-        /// Gets all files and directories in this directory.
-        /// </summary>
-        /// <param name="pattern">The search pattern.</param>
-        /// <returns>An array of files and directories.</returns>
-        /// <remarks>The search pattern can include the wildcards * (matching 0 or more characters)
-        /// and ? (matching 1 character).</remarks>
-        public DiscFileSystemInfo[] GetFileSystemInfos(string pattern)
-        {
-            return Utilities.Map<string, DiscFileSystemInfo>(FileSystem.GetFileSystemEntries(Path, pattern), (p) => new DiscFileSystemInfo(FileSystem, p));
-        }
-    }
-}
diff --git a/DiscUtils/DiscFileInfo.cs b/DiscUtils/DiscFileInfo.cs
deleted file mode 100644
index afe5697..0000000
--- a/DiscUtils/DiscFileInfo.cs
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System.IO;
-
-    /// <summary>
-    /// Provides information about a file on a disc.
-    /// </summary>
-    public sealed class DiscFileInfo : DiscFileSystemInfo
-    {
-        internal DiscFileInfo(DiscFileSystem fileSystem, string path)
-            : base(fileSystem, path)
-        {
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the file exists.
-        /// </summary>
-        public override bool Exists
-        {
-            get { return FileSystem.FileExists(Path); }
-        }
-
-        /// <summary>
-        /// Gets an instance of the parent directory.
-        /// </summary>
-        public DiscDirectoryInfo Directory
-        {
-            get { return Parent; }
-        }
-
-        /// <summary>
-        /// Gets a string representing the directory's full path.
-        /// </summary>
-        public string DirectoryName
-        {
-            get { return Directory.FullName; }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the file is read-only.
-        /// </summary>
-        public bool IsReadOnly
-        {
-            get
-            {
-                return (Attributes & FileAttributes.ReadOnly) != 0;
-            }
-
-            set
-            {
-                if (value)
-                {
-                    Attributes = Attributes | FileAttributes.ReadOnly;
-                }
-                else
-                {
-                    Attributes = Attributes & ~FileAttributes.ReadOnly;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the length of the current file in bytes.
-        /// </summary>
-        public long Length
-        {
-            get { return FileSystem.GetFileLength(Path); }
-        }
-
-        /// <summary>
-        /// Deletes a file.
-        /// </summary>
-        public override void Delete()
-        {
-            FileSystem.DeleteFile(Path);
-        }
-
-        /// <summary>
-        /// Creates a <see cref="StreamWriter" /> that appends text to the file represented by this <see cref="DiscFileInfo"/>.
-        /// </summary>
-        /// <returns>The newly created writer.</returns>
-        public StreamWriter AppendText()
-        {
-            return new StreamWriter(Open(FileMode.Append));
-        }
-
-        /// <summary>
-        /// Copies an existing file to a new file.
-        /// </summary>
-        /// <param name="destinationFileName">The destination file.</param>
-        public void CopyTo(string destinationFileName)
-        {
-            CopyTo(destinationFileName, false);
-        }
-
-        /// <summary>
-        /// Copies an existing file to a new file, allowing overwriting of an existing file.
-        /// </summary>
-        /// <param name="destinationFileName">The destination file.</param>
-        /// <param name="overwrite">Whether to permit over-writing of an existing file.</param>
-        public void CopyTo(string destinationFileName, bool overwrite)
-        {
-            FileSystem.CopyFile(Path, destinationFileName, overwrite);
-        }
-
-        /// <summary>
-        /// Creates a new file for reading and writing.
-        /// </summary>
-        /// <returns>The newly created stream.</returns>
-        public Stream Create()
-        {
-            return Open(FileMode.Create);
-        }
-
-        /// <summary>
-        /// Creates a new <see cref="StreamWriter"/> that writes a new text file.
-        /// </summary>
-        /// <returns>A new stream writer that can write to the file contents.</returns>
-        public StreamWriter CreateText()
-        {
-            return new StreamWriter(Open(FileMode.Create));
-        }
-
-        /// <summary>
-        /// Moves a file to a new location.
-        /// </summary>
-        /// <param name="destinationFileName">The new name of the file.</param>
-        public void MoveTo(string destinationFileName)
-        {
-            FileSystem.MoveFile(Path, destinationFileName);
-        }
-
-        /// <summary>
-        /// Opens the current file.
-        /// </summary>
-        /// <param name="mode">The file mode for the created stream.</param>
-        /// <returns>The newly created stream.</returns>
-        /// <remarks>Read-only file systems only support <c>FileMode.Open</c>.</remarks>
-        public Stream Open(FileMode mode)
-        {
-            return FileSystem.OpenFile(Path, mode);
-        }
-
-        /// <summary>
-        /// Opens the current file.
-        /// </summary>
-        /// <param name="mode">The file mode for the created stream.</param>
-        /// <param name="access">The access permissions for the created stream.</param>
-        /// <returns>The newly created stream.</returns>
-        /// <remarks>Read-only file systems only support <c>FileMode.Open</c> and <c>FileAccess.Read</c>.</remarks>
-        public Stream Open(FileMode mode, FileAccess access)
-        {
-            return FileSystem.OpenFile(Path, mode, access);
-        }
-
-        /// <summary>
-        /// Opens an existing file for read-only access.
-        /// </summary>
-        /// <returns>The newly created stream.</returns>
-        public Stream OpenRead()
-        {
-            return Open(FileMode.Open, FileAccess.Read);
-        }
-
-        /// <summary>
-        /// Opens an existing file for reading as UTF-8 text.
-        /// </summary>
-        /// <returns>The newly created reader.</returns>
-        public StreamReader OpenText()
-        {
-            return new StreamReader(OpenRead());
-        }
-
-        /// <summary>
-        /// Opens a file for writing.
-        /// </summary>
-        /// <returns>The newly created stream.</returns>
-        public Stream OpenWrite()
-        {
-            return Open(FileMode.Open, FileAccess.Write);
-        }
-    }
-}
diff --git a/DiscUtils/DiscFileLocator.cs b/DiscUtils/DiscFileLocator.cs
deleted file mode 100644
index f0a8161..0000000
--- a/DiscUtils/DiscFileLocator.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.IO;
-
-    internal sealed class DiscFileLocator : FileLocator
-    {
-        private DiscFileSystem _fileSystem;
-        private string _basePath;
-
-        public DiscFileLocator(DiscFileSystem fileSystem, string basePath)
-        {
-            _fileSystem = fileSystem;
-            _basePath = basePath;
-        }
-
-        public override bool Exists(string fileName)
-        {
-            return _fileSystem.FileExists(Utilities.CombinePaths(_basePath, fileName));
-        }
-
-        public override Stream Open(string fileName, FileMode mode, FileAccess access, FileShare share)
-        {
-            return _fileSystem.OpenFile(Utilities.CombinePaths(_basePath, fileName), mode, access);
-        }
-
-        public override FileLocator GetRelativeLocator(string path)
-        {
-            return new DiscFileLocator(_fileSystem, Utilities.CombinePaths(_basePath, path));
-        }
-
-        public override string GetFullPath(string path)
-        {
-            return Utilities.CombinePaths(_basePath, path);
-        }
-
-        public override string GetDirectoryFromPath(string path)
-        {
-            return Utilities.GetDirectoryFromPath(path);
-        }
-
-        public override string GetFileFromPath(string path)
-        {
-            return Utilities.GetFileFromPath(path);
-        }
-
-        public override DateTime GetLastWriteTimeUtc(string path)
-        {
-            return _fileSystem.GetLastWriteTimeUtc(Utilities.CombinePaths(_basePath, path));
-        }
-
-        public override bool HasCommonRoot(FileLocator other)
-        {
-            DiscFileLocator otherDiscLocator = other as DiscFileLocator;
-
-            if (otherDiscLocator == null)
-            {
-                return false;
-            }
-
-            // Common root if the same file system instance.
-            return Object.ReferenceEquals(otherDiscLocator._fileSystem, _fileSystem);
-        }
-
-        public override string ResolveRelativePath(string path)
-        {
-            return Utilities.ResolveRelativePath(_basePath, path);
-        }
-    }
-}
diff --git a/DiscUtils/DiscFileSystem.cs b/DiscUtils/DiscFileSystem.cs
deleted file mode 100644
index 1b1eaf9..0000000
--- a/DiscUtils/DiscFileSystem.cs
+++ /dev/null
@@ -1,499 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Provides the base class for all file systems.
-    /// </summary>
-    public abstract class DiscFileSystem : MarshalByRefObject, IFileSystem, IDisposable
-    {
-        private DiscFileSystemOptions _options;
-
-        /// <summary>
-        /// Initializes a new instance of the DiscFileSystem class.
-        /// </summary>
-        protected DiscFileSystem()
-        {
-            _options = new DiscFileSystemOptions();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the DiscFileSystem class.
-        /// </summary>
-        /// <param name="defaultOptions">The options instance to use for this file system instance.</param>
-        protected DiscFileSystem(DiscFileSystemOptions defaultOptions)
-        {
-            _options = defaultOptions;
-        }
-
-        /// <summary>
-        /// Finalizes an instance of the DiscFileSystem class.
-        /// </summary>
-        ~DiscFileSystem()
-        {
-            Dispose(false);
-        }
-
-        /// <summary>
-        /// Gets the file system options, which can be modified.
-        /// </summary>
-        public virtual DiscFileSystemOptions Options
-        {
-            get { return _options; }
-        }
-
-        /// <summary>
-        /// Gets a friendly description of the file system type.
-        /// </summary>
-        public abstract string FriendlyName
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the file system is read-only or read-write.
-        /// </summary>
-        /// <returns>true if the file system is read-write.</returns>
-        public abstract bool CanWrite { get; }
-
-        /// <summary>
-        /// Gets the root directory of the file system.
-        /// </summary>
-        public virtual DiscDirectoryInfo Root
-        {
-            get { return new DiscDirectoryInfo(this, string.Empty); }
-        }
-
-        /// <summary>
-        /// Gets the volume label.
-        /// </summary>
-        public virtual string VolumeLabel
-        {
-            get { return string.Empty; }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the file system is thread-safe.
-        /// </summary>
-        public virtual bool IsThreadSafe
-        {
-            get { return false; }
-        }
-
-        /// <summary>
-        /// Copies an existing file to a new file.
-        /// </summary>
-        /// <param name="sourceFile">The source file.</param>
-        /// <param name="destinationFile">The destination file.</param>
-        public virtual void CopyFile(string sourceFile, string destinationFile)
-        {
-            CopyFile(sourceFile, destinationFile, false);
-        }
-
-        /// <summary>
-        /// Copies an existing file to a new file, allowing overwriting of an existing file.
-        /// </summary>
-        /// <param name="sourceFile">The source file.</param>
-        /// <param name="destinationFile">The destination file.</param>
-        /// <param name="overwrite">Whether to permit over-writing of an existing file.</param>
-        public abstract void CopyFile(string sourceFile, string destinationFile, bool overwrite);
-
-        /// <summary>
-        /// Creates a directory.
-        /// </summary>
-        /// <param name="path">The path of the new directory.</param>
-        public abstract void CreateDirectory(string path);
-
-        /// <summary>
-        /// Deletes a directory.
-        /// </summary>
-        /// <param name="path">The path of the directory to delete.</param>
-        public abstract void DeleteDirectory(string path);
-
-        /// <summary>
-        /// Deletes a directory, optionally with all descendants.
-        /// </summary>
-        /// <param name="path">The path of the directory to delete.</param>
-        /// <param name="recursive">Determines if the all descendants should be deleted.</param>
-        public virtual void DeleteDirectory(string path, bool recursive)
-        {
-            if (recursive)
-            {
-                foreach (string dir in GetDirectories(path))
-                {
-                    DeleteDirectory(dir, true);
-                }
-
-                foreach (string file in GetFiles(path))
-                {
-                    DeleteFile(file);
-                }
-            }
-
-            DeleteDirectory(path);
-        }
-
-        /// <summary>
-        /// Deletes a file.
-        /// </summary>
-        /// <param name="path">The path of the file to delete.</param>
-        public abstract void DeleteFile(string path);
-
-        /// <summary>
-        /// Indicates if a directory exists.
-        /// </summary>
-        /// <param name="path">The path to test.</param>
-        /// <returns>true if the directory exists.</returns>
-        public abstract bool DirectoryExists(string path);
-
-        /// <summary>
-        /// Indicates if a file exists.
-        /// </summary>
-        /// <param name="path">The path to test.</param>
-        /// <returns>true if the file exists.</returns>
-        public abstract bool FileExists(string path);
-
-        /// <summary>
-        /// Indicates if a file or directory exists.
-        /// </summary>
-        /// <param name="path">The path to test.</param>
-        /// <returns>true if the file or directory exists.</returns>
-        public virtual bool Exists(string path)
-        {
-            return FileExists(path) || DirectoryExists(path);
-        }
-
-        /// <summary>
-        /// Gets the names of subdirectories in a specified directory.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <returns>Array of directories.</returns>
-        public virtual string[] GetDirectories(string path)
-        {
-            return GetDirectories(path, "*.*", SearchOption.TopDirectoryOnly);
-        }
-
-        /// <summary>
-        /// Gets the names of subdirectories in a specified directory matching a specified
-        /// search pattern.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <returns>Array of directories matching the search pattern.</returns>
-        public virtual string[] GetDirectories(string path, string searchPattern)
-        {
-            return GetDirectories(path, searchPattern, SearchOption.TopDirectoryOnly);
-        }
-
-        /// <summary>
-        /// Gets the names of subdirectories in a specified directory matching a specified
-        /// search pattern, using a value to determine whether to search subdirectories.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <param name="searchOption">Indicates whether to search subdirectories.</param>
-        /// <returns>Array of directories matching the search pattern.</returns>
-        public abstract string[] GetDirectories(string path, string searchPattern, SearchOption searchOption);
-
-        /// <summary>
-        /// Gets the names of files in a specified directory.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <returns>Array of files.</returns>
-        public virtual string[] GetFiles(string path)
-        {
-            return GetFiles(path, "*.*", SearchOption.TopDirectoryOnly);
-        }
-
-        /// <summary>
-        /// Gets the names of files in a specified directory.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <returns>Array of files matching the search pattern.</returns>
-        public virtual string[] GetFiles(string path, string searchPattern)
-        {
-            return GetFiles(path, searchPattern, SearchOption.TopDirectoryOnly);
-        }
-
-        /// <summary>
-        /// Gets the names of files in a specified directory matching a specified
-        /// search pattern, using a value to determine whether to search subdirectories.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <param name="searchOption">Indicates whether to search subdirectories.</param>
-        /// <returns>Array of files matching the search pattern.</returns>
-        public abstract string[] GetFiles(string path, string searchPattern, SearchOption searchOption);
-
-        /// <summary>
-        /// Gets the names of all files and subdirectories in a specified directory.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <returns>Array of files and subdirectories matching the search pattern.</returns>
-        public abstract string[] GetFileSystemEntries(string path);
-
-        /// <summary>
-        /// Gets the names of files and subdirectories in a specified directory matching a specified
-        /// search pattern.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <returns>Array of files and subdirectories matching the search pattern.</returns>
-        public abstract string[] GetFileSystemEntries(string path, string searchPattern);
-
-        /// <summary>
-        /// Moves a directory.
-        /// </summary>
-        /// <param name="sourceDirectoryName">The directory to move.</param>
-        /// <param name="destinationDirectoryName">The target directory name.</param>
-        public abstract void MoveDirectory(string sourceDirectoryName, string destinationDirectoryName);
-
-        /// <summary>
-        /// Moves a file.
-        /// </summary>
-        /// <param name="sourceName">The file to move.</param>
-        /// <param name="destinationName">The target file name.</param>
-        public virtual void MoveFile(string sourceName, string destinationName)
-        {
-            MoveFile(sourceName, destinationName, false);
-        }
-
-        /// <summary>
-        /// Moves a file, allowing an existing file to be overwritten.
-        /// </summary>
-        /// <param name="sourceName">The file to move.</param>
-        /// <param name="destinationName">The target file name.</param>
-        /// <param name="overwrite">Whether to permit a destination file to be overwritten.</param>
-        public abstract void MoveFile(string sourceName, string destinationName, bool overwrite);
-
-        /// <summary>
-        /// Opens the specified file.
-        /// </summary>
-        /// <param name="path">The full path of the file to open.</param>
-        /// <param name="mode">The file mode for the created stream.</param>
-        /// <returns>The new stream.</returns>
-        public virtual SparseStream OpenFile(string path, FileMode mode)
-        {
-            return OpenFile(path, mode, FileAccess.ReadWrite);
-        }
-
-        /// <summary>
-        /// Opens the specified file.
-        /// </summary>
-        /// <param name="path">The full path of the file to open.</param>
-        /// <param name="mode">The file mode for the created stream.</param>
-        /// <param name="access">The access permissions for the created stream.</param>
-        /// <returns>The new stream.</returns>
-        public abstract SparseStream OpenFile(string path, FileMode mode, FileAccess access);
-
-        /// <summary>
-        /// Gets the attributes of a file or directory.
-        /// </summary>
-        /// <param name="path">The file or directory to inspect.</param>
-        /// <returns>The attributes of the file or directory.</returns>
-        public abstract FileAttributes GetAttributes(string path);
-
-        /// <summary>
-        /// Sets the attributes of a file or directory.
-        /// </summary>
-        /// <param name="path">The file or directory to change.</param>
-        /// <param name="newValue">The new attributes of the file or directory.</param>
-        public abstract void SetAttributes(string path, FileAttributes newValue);
-
-        /// <summary>
-        /// Gets the creation time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The creation time.</returns>
-        public virtual DateTime GetCreationTime(string path)
-        {
-            return GetCreationTimeUtc(path).ToLocalTime();
-        }
-
-        /// <summary>
-        /// Sets the creation time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public virtual void SetCreationTime(string path, DateTime newTime)
-        {
-            SetCreationTimeUtc(path, newTime.ToUniversalTime());
-        }
-
-        /// <summary>
-        /// Gets the creation time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The creation time.</returns>
-        public abstract DateTime GetCreationTimeUtc(string path);
-
-        /// <summary>
-        /// Sets the creation time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public abstract void SetCreationTimeUtc(string path, DateTime newTime);
-
-        /// <summary>
-        /// Gets the last access time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The last access time.</returns>
-        public virtual DateTime GetLastAccessTime(string path)
-        {
-            return GetLastAccessTimeUtc(path).ToLocalTime();
-        }
-
-        /// <summary>
-        /// Sets the last access time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public virtual void SetLastAccessTime(string path, DateTime newTime)
-        {
-            SetLastAccessTimeUtc(path, newTime.ToUniversalTime());
-        }
-
-        /// <summary>
-        /// Gets the last access time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The last access time.</returns>
-        public abstract DateTime GetLastAccessTimeUtc(string path);
-
-        /// <summary>
-        /// Sets the last access time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public abstract void SetLastAccessTimeUtc(string path, DateTime newTime);
-
-        /// <summary>
-        /// Gets the last modification time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The last write time.</returns>
-        public virtual DateTime GetLastWriteTime(string path)
-        {
-            return GetLastWriteTimeUtc(path).ToLocalTime();
-        }
-
-        /// <summary>
-        /// Sets the last modification time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public virtual void SetLastWriteTime(string path, DateTime newTime)
-        {
-            SetLastWriteTimeUtc(path, newTime.ToUniversalTime());
-        }
-
-        /// <summary>
-        /// Gets the last modification time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The last write time.</returns>
-        public abstract DateTime GetLastWriteTimeUtc(string path);
-
-        /// <summary>
-        /// Sets the last modification time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public abstract void SetLastWriteTimeUtc(string path, DateTime newTime);
-
-        /// <summary>
-        /// Gets the length of a file.
-        /// </summary>
-        /// <param name="path">The path to the file.</param>
-        /// <returns>The length in bytes.</returns>
-        public abstract long GetFileLength(string path);
-
-        /// <summary>
-        /// Gets an object representing a possible file.
-        /// </summary>
-        /// <param name="path">The file path.</param>
-        /// <returns>The representing object.</returns>
-        /// <remarks>The file does not need to exist.</remarks>
-        public virtual DiscFileInfo GetFileInfo(string path)
-        {
-            return new DiscFileInfo(this, path);
-        }
-
-        /// <summary>
-        /// Gets an object representing a possible directory.
-        /// </summary>
-        /// <param name="path">The directory path.</param>
-        /// <returns>The representing object.</returns>
-        /// <remarks>The directory does not need to exist.</remarks>
-        public virtual DiscDirectoryInfo GetDirectoryInfo(string path)
-        {
-            return new DiscDirectoryInfo(this, path);
-        }
-
-        /// <summary>
-        /// Gets an object representing a possible file system object (file or directory).
-        /// </summary>
-        /// <param name="path">The file system path.</param>
-        /// <returns>The representing object.</returns>
-        /// <remarks>The file system object does not need to exist.</remarks>
-        public virtual DiscFileSystemInfo GetFileSystemInfo(string path)
-        {
-            return new DiscFileSystemInfo(this, path);
-        }
-
-        /// <summary>
-        /// Reads the boot code of the file system into a byte array.
-        /// </summary>
-        /// <returns>The boot code, or <c>null</c> if not available.</returns>
-        public virtual byte[] ReadBootCode()
-        {
-            return null;
-        }
-
-        #region IDisposable Members
-
-        /// <summary>
-        /// Disposes of this instance, releasing all resources.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Disposes of this instance.
-        /// </summary>
-        /// <param name="disposing">The value <c>true</c> if Disposing.</param>
-        protected virtual void Dispose(bool disposing)
-        {
-        }
-
-        #endregion
-    }
-}
diff --git a/DiscUtils/DiscFileSystemChecker.cs b/DiscUtils/DiscFileSystemChecker.cs
deleted file mode 100644
index 919b1fb..0000000
--- a/DiscUtils/DiscFileSystemChecker.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Flags for the amount of detail to include in a report.
-    /// </summary>
-    [Flags]
-    public enum ReportLevels
-    {
-        /// <summary>
-        /// Report no information.
-        /// </summary>
-        None = 0x00,
-
-        /// <summary>
-        /// Report informational level items.
-        /// </summary>
-        Information = 0x01,
-
-        /// <summary>
-        /// Report warning level items.
-        /// </summary>
-        Warnings = 0x02,
-
-        /// <summary>
-        /// Report error level items.
-        /// </summary>
-        Errors = 0x04,
-
-        /// <summary>
-        /// Report all items.
-        /// </summary>
-        All = 0x07
-    }
-
-    /// <summary>
-    /// Base class for objects that validate file system integrity.
-    /// </summary>
-    /// <remarks>Instances of this class do not offer the ability to fix/correct
-    /// file system issues, just to perform a limited number of checks on
-    /// integrity of the file system.</remarks>
-    public abstract class DiscFileSystemChecker
-    {
-        /// <summary>
-        /// Checks the integrity of a file system held in a stream.
-        /// </summary>
-        /// <param name="reportOutput">A report on issues found.</param>
-        /// <param name="levels">The amount of detail to report.</param>
-        /// <returns><c>true</c> if the file system appears valid, else <c>false</c>.</returns>
-        public abstract bool Check(TextWriter reportOutput, ReportLevels levels);
-    }
-}
diff --git a/DiscUtils/DiscFileSystemInfo.cs b/DiscUtils/DiscFileSystemInfo.cs
deleted file mode 100644
index 8812577..0000000
--- a/DiscUtils/DiscFileSystemInfo.cs
+++ /dev/null
@@ -1,226 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Provides the base class for both <see cref="DiscFileInfo"/> and <see cref="DiscDirectoryInfo"/> objects.
-    /// </summary>
-    public class DiscFileSystemInfo
-    {
-        private DiscFileSystem _fileSystem;
-        private string _path;
-
-        internal DiscFileSystemInfo(DiscFileSystem fileSystem, string path)
-        {
-            if (path == null)
-            {
-                throw new ArgumentNullException("path");
-            }
-
-            _fileSystem = fileSystem;
-            _path = path.Trim('\\');
-        }
-
-        /// <summary>
-        /// Gets the file system the referenced file or directory exists on.
-        /// </summary>
-        public DiscFileSystem FileSystem
-        {
-            get { return _fileSystem; }
-        }
-
-        /// <summary>
-        /// Gets the name of the file or directory.
-        /// </summary>
-        public virtual string Name
-        {
-            get { return Utilities.GetFileFromPath(_path); }
-        }
-
-        /// <summary>
-        /// Gets the full path of the file or directory.
-        /// </summary>
-        public virtual string FullName
-        {
-            get { return _path; }
-        }
-
-        /// <summary>
-        /// Gets the extension part of the file or directory name.
-        /// </summary>
-        public virtual string Extension
-        {
-            get
-            {
-                string name = Name;
-                int sepIdx = name.LastIndexOf('.');
-                if (sepIdx >= 0)
-                {
-                    return name.Substring(sepIdx + 1);
-                }
-
-                return string.Empty;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the <see cref="System.IO.FileAttributes"/> of the current <see cref="DiscFileSystemInfo"/> object.
-        /// </summary>
-        public virtual FileAttributes Attributes
-        {
-            get { return FileSystem.GetAttributes(_path); }
-            set { FileSystem.SetAttributes(_path, value); }
-        }
-
-        /// <summary>
-        /// Gets the <see cref="DiscDirectoryInfo"/> of the directory containing the current <see cref="DiscFileSystemInfo"/> object.
-        /// </summary>
-        public virtual DiscDirectoryInfo Parent
-        {
-            get
-            {
-                if (string.IsNullOrEmpty(_path))
-                {
-                    return null;
-                }
-
-                return new DiscDirectoryInfo(FileSystem, Utilities.GetDirectoryFromPath(_path));
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the file system object exists.
-        /// </summary>
-        public virtual bool Exists
-        {
-            get { return FileSystem.Exists(_path); }
-        }
-
-        /// <summary>
-        /// Gets or sets the creation time (in local time) of the current <see cref="DiscFileSystemInfo"/> object.
-        /// </summary>
-        public virtual DateTime CreationTime
-        {
-            get { return CreationTimeUtc.ToLocalTime(); }
-            set { CreationTimeUtc = value.ToUniversalTime(); }
-        }
-
-        /// <summary>
-        /// Gets or sets the creation time (in UTC) of the current <see cref="DiscFileSystemInfo"/> object.
-        /// </summary>
-        public virtual DateTime CreationTimeUtc
-        {
-            get { return FileSystem.GetCreationTimeUtc(_path); }
-            set { FileSystem.SetCreationTimeUtc(_path, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the last time (in local time) the file or directory was accessed.
-        /// </summary>
-        /// <remarks>Read-only file systems will never update this value, it will remain at a fixed value.</remarks>
-        public virtual DateTime LastAccessTime
-        {
-            get { return LastAccessTimeUtc.ToLocalTime(); }
-            set { LastAccessTimeUtc = value.ToUniversalTime(); }
-        }
-
-        /// <summary>
-        /// Gets or sets the last time (in UTC) the file or directory was accessed.
-        /// </summary>
-        /// <remarks>Read-only file systems will never update this value, it will remain at a fixed value.</remarks>
-        public virtual DateTime LastAccessTimeUtc
-        {
-            get { return FileSystem.GetLastAccessTimeUtc(_path); }
-            set { FileSystem.SetLastAccessTimeUtc(_path, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the last time (in local time) the file or directory was written to.
-        /// </summary>
-        public virtual DateTime LastWriteTime
-        {
-            get { return LastWriteTimeUtc.ToLocalTime(); }
-            set { LastWriteTimeUtc = value.ToUniversalTime(); }
-        }
-
-        /// <summary>
-        /// Gets or sets the last time (in UTC) the file or directory was written to.
-        /// </summary>
-        public virtual DateTime LastWriteTimeUtc
-        {
-            get { return FileSystem.GetLastWriteTimeUtc(_path); }
-            set { FileSystem.SetLastWriteTimeUtc(_path, value); }
-        }
-
-        /// <summary>
-        /// Gets the path to the referenced file.
-        /// </summary>
-        protected string Path
-        {
-            get { return _path; }
-        }
-
-        /// <summary>
-        /// Deletes a file or directory.
-        /// </summary>
-        public virtual void Delete()
-        {
-            if ((Attributes & FileAttributes.Directory) != 0)
-            {
-                FileSystem.DeleteDirectory(_path);
-            }
-            else
-            {
-                FileSystem.DeleteFile(_path);
-            }
-        }
-
-        /// <summary>
-        /// Indicates if <paramref name="obj"/> is equivalent to this object.
-        /// </summary>
-        /// <param name="obj">The object to compare.</param>
-        /// <returns><c>true</c> if <paramref name="obj"/> is equivalent, else <c>false</c>.</returns>
-        public override bool Equals(object obj)
-        {
-            DiscFileSystemInfo asInfo = obj as DiscFileSystemInfo;
-            if (obj == null)
-            {
-                return false;
-            }
-
-            return string.Compare(Path, asInfo.Path, StringComparison.Ordinal) == 0 && DiscFileSystem.Equals(FileSystem, asInfo.FileSystem);
-        }
-
-        /// <summary>
-        /// Gets the hash code for this object.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            return _path.GetHashCode() ^ _fileSystem.GetHashCode();
-        }
-    }
-}
diff --git a/DiscUtils/DiscFileSystemOptions.cs b/DiscUtils/DiscFileSystemOptions.cs
deleted file mode 100644
index 8bd5fb4..0000000
--- a/DiscUtils/DiscFileSystemOptions.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-
-    /// <summary>
-    /// Common file system options.
-    /// </summary>
-    /// <remarks>Not all options are honoured by all file systems.</remarks>
-    public class DiscFileSystemOptions
-    {
-        private Random _rng;
-
-        /// <summary>
-        /// Initializes a new instance of the DiscFileSystemOptions class.
-        /// </summary>
-        /// <remarks>You shouldn't normally create a new instance.  File systems will provide
-        /// an instance of the correct derived type.</remarks>
-        public DiscFileSystemOptions()
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the random number generator the file system should use.
-        /// </summary>
-        /// <remarks>This option is normally <c>null</c>, which is fine for most purposes.
-        /// Use this option when you need to finely control the filesystem for
-        /// reproducibility of behaviour (for example in a test harness).</remarks>
-        public Random RandomNumberGenerator
-        {
-            get { return _rng; }
-            set { _rng = value; }
-        }
-    }
-}
diff --git a/DiscUtils/DiskImageBuilder.cs b/DiscUtils/DiskImageBuilder.cs
deleted file mode 100644
index b51a964..0000000
--- a/DiscUtils/DiskImageBuilder.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-
-    /// <summary>
-    /// Base class for all disk image builders.
-    /// </summary>
-    public abstract class DiskImageBuilder
-    {
-        private static Dictionary<string, VirtualDiskFactory> s_typeMap;
-
-        private SparseStream _content;
-        private Geometry _geometry;
-        private Geometry _biosGeometry;
-        private GenericDiskAdapterType _adaptorType;
-
-        /// <summary>
-        /// Gets or sets the content for this disk, implying the size of the disk.
-        /// </summary>
-        public SparseStream Content
-        {
-            get { return _content; }
-            set { _content = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the geometry of this disk, will be implied from the content stream if not set.
-        /// </summary>
-        public Geometry Geometry
-        {
-            get { return _geometry; }
-            set { _geometry = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the geometry of this disk, as reported by the BIOS, will be implied from the content stream if not set.
-        /// </summary>
-        public Geometry BiosGeometry
-        {
-            get { return _biosGeometry; }
-            set { _biosGeometry = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the adapter type for created virtual disk, for file formats that encode this information.
-        /// </summary>
-        public virtual GenericDiskAdapterType GenericAdapterType
-        {
-            get { return _adaptorType; }
-            set { _adaptorType = value; }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this file format preserves BIOS geometry information.
-        /// </summary>
-        public virtual bool PreservesBiosGeometry
-        {
-            get { return false; }
-        }
-
-        private static Dictionary<string, VirtualDiskFactory> TypeMap
-        {
-            get
-            {
-                if (s_typeMap == null)
-                {
-                    InitializeMaps();
-                }
-
-                return s_typeMap;
-            }
-        }
-
-        /// <summary>
-        /// Gets an instance that constructs the specified type (and variant) of virtual disk image.
-        /// </summary>
-        /// <param name="type">The type of image to build (VHD, VMDK, etc).</param>
-        /// <param name="variant">The variant type (differencing/dynamic, fixed/static, etc).</param>
-        /// <returns>The builder instance.</returns>
-        public static DiskImageBuilder GetBuilder(string type, string variant)
-        {
-            VirtualDiskFactory factory;
-            if (!TypeMap.TryGetValue(type, out factory))
-            {
-                throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, "Unknown disk type '{0}'", type), "type");
-            }
-
-            return factory.GetImageBuilder(variant);
-        }
-
-        /// <summary>
-        /// Initiates the construction of the disk image.
-        /// </summary>
-        /// <param name="baseName">The base name for the disk images.</param>
-        /// <returns>A set of one or more logical files that constitute the
-        /// disk image.  The first file is the 'primary' file that is normally attached to VMs.</returns>
-        /// <remarks>The supplied <c>baseName</c> is the start of the file name, with no file
-        /// extension.  The set of file specifications will indicate the actual name corresponding
-        /// to each logical file that comprises the disk image.  For example, given a base name
-        /// 'foo', the files 'foo.vmdk' and 'foo-flat.vmdk' could be returned.</remarks>
-        public abstract DiskImageFileSpecification[] Build(string baseName);
-
-        private static void InitializeMaps()
-        {
-            Dictionary<string, VirtualDiskFactory> typeMap = new Dictionary<string, VirtualDiskFactory>();
-
-            foreach (var type in typeof(VirtualDisk).Assembly.GetTypes())
-            {
-                VirtualDiskFactoryAttribute attr = (VirtualDiskFactoryAttribute)Attribute.GetCustomAttribute(type, typeof(VirtualDiskFactoryAttribute), false);
-                if (attr != null)
-                {
-                    VirtualDiskFactory factory = (VirtualDiskFactory)Activator.CreateInstance(type);
-                    typeMap.Add(attr.Type, factory);
-                }
-            }
-
-            s_typeMap = typeMap;
-        }
-    }
-}
diff --git a/DiscUtils/DiskImageFileSpecification.cs b/DiscUtils/DiskImageFileSpecification.cs
deleted file mode 100644
index 2cabc48..0000000
--- a/DiscUtils/DiskImageFileSpecification.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    /// <summary>
-    /// Describes a particular file that is a constituent part of a virtual disk.
-    /// </summary>
-    public sealed class DiskImageFileSpecification
-    {
-        private string _name;
-        private StreamBuilder _builder;
-
-        internal DiskImageFileSpecification(string name, StreamBuilder builder)
-        {
-            _name = name;
-            _builder = builder;
-        }
-
-        /// <summary>
-        /// Gets name of the file.
-        /// </summary>
-        public string Name
-        {
-            get { return _name; }
-        }
-
-        /// <summary>
-        /// Gets the object that provides access to the file's content.
-        /// </summary>
-        /// <returns>A stream object that contains the file's content.</returns>
-        public SparseStream OpenStream()
-        {
-            return _builder.Build();
-        }
-    }
-}
diff --git a/DiscUtils/Fat/ClusterReader.cs b/DiscUtils/Fat/ClusterReader.cs
deleted file mode 100644
index e999af9..0000000
--- a/DiscUtils/Fat/ClusterReader.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Fat
-{
-    using System;
-    using System.IO;
-
-    internal sealed class ClusterReader
-    {
-        private Stream _stream;
-        private int _firstDataSector;
-        private int _sectorsPerCluster;
-        private int _bytesPerSector;
-
-        /// <summary>
-        /// Pre-calculated value because of number of uses of this externally.
-        /// </summary>
-        private int _clusterSize;
-
-        public ClusterReader(Stream stream, int firstDataSector, int sectorsPerCluster, int bytesPerSector)
-        {
-            _stream = stream;
-            _firstDataSector = firstDataSector;
-            _sectorsPerCluster = sectorsPerCluster;
-            _bytesPerSector = bytesPerSector;
-
-            _clusterSize = _sectorsPerCluster * _bytesPerSector;
-        }
-
-        public int ClusterSize
-        {
-            get { return _clusterSize; }
-        }
-
-        public void ReadCluster(uint cluster, byte[] buffer, int offset)
-        {
-            if (offset + ClusterSize > buffer.Length)
-            {
-                throw new ArgumentOutOfRangeException("offset", "buffer is too small - cluster would overflow buffer");
-            }
-
-            uint firstSector = (uint)(((cluster - 2) * _sectorsPerCluster) + _firstDataSector);
-
-            _stream.Position = firstSector * _bytesPerSector;
-            if (Utilities.ReadFully(_stream, buffer, offset, _clusterSize) != _clusterSize)
-            {
-                throw new IOException("Failed to read cluster " + cluster);
-            }
-        }
-
-        internal void WriteCluster(uint cluster, byte[] buffer, int offset)
-        {
-            if (offset + ClusterSize > buffer.Length)
-            {
-                throw new ArgumentOutOfRangeException("offset", "buffer is too small - cluster would overflow buffer");
-            }
-
-            uint firstSector = (uint)(((cluster - 2) * _sectorsPerCluster) + _firstDataSector);
-
-            _stream.Position = firstSector * _bytesPerSector;
-
-            _stream.Write(buffer, offset, _clusterSize);
-        }
-
-        internal void WipeCluster(uint cluster)
-        {
-            uint firstSector = (uint)(((cluster - 2) * _sectorsPerCluster) + _firstDataSector);
-
-            _stream.Position = firstSector * _bytesPerSector;
-
-            _stream.Write(new byte[_clusterSize], 0, _clusterSize);
-        }
-    }
-}
diff --git a/DiscUtils/Fat/ClusterStream.cs b/DiscUtils/Fat/ClusterStream.cs
deleted file mode 100644
index 9a3b071..0000000
--- a/DiscUtils/Fat/ClusterStream.cs
+++ /dev/null
@@ -1,475 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Fat
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal delegate void FirstClusterChangedDelegate(uint cluster);
-
-    internal class ClusterStream : Stream
-    {
-        private FileAccess _access;
-        private ClusterReader _reader;
-        private FileAllocationTable _fat;
-        private uint _length;
-
-        private List<uint> _knownClusters;
-        private long _position;
-
-        private uint _currentCluster = 0;
-        private byte[] _clusterBuffer;
-
-        private bool _atEOF;
-
-        internal ClusterStream(FatFileSystem fileSystem, FileAccess access, uint firstCluster, uint length)
-        {
-            _access = access;
-            _reader = fileSystem.ClusterReader;
-            _fat = fileSystem.Fat;
-            _length = length;
-
-            _knownClusters = new List<uint>();
-            if (firstCluster != 0)
-            {
-                _knownClusters.Add(firstCluster);
-            }
-            else
-            {
-                _knownClusters.Add(FatBuffer.EndOfChain);
-            }
-
-            if (_length == uint.MaxValue)
-            {
-                _length = DetectLength();
-            }
-
-            _currentCluster = uint.MaxValue;
-            _clusterBuffer = new byte[_reader.ClusterSize];
-        }
-
-        public event FirstClusterChangedDelegate FirstClusterChanged;
-
-        public override bool CanRead
-        {
-            get { return _access == FileAccess.Read || _access == FileAccess.ReadWrite; }
-        }
-
-        public override bool CanSeek
-        {
-            get { return true; }
-        }
-
-        public override bool CanWrite
-        {
-            get { return _access == FileAccess.ReadWrite || _access == FileAccess.Write; }
-        }
-
-        public override long Length
-        {
-            get { return _length; }
-        }
-
-        public override long Position
-        {
-            get
-            {
-                return _position;
-            }
-
-            set
-            {
-                if (value >= 0)
-                {
-                    _position = value;
-                    _atEOF = false;
-                }
-                else
-                {
-                    throw new ArgumentOutOfRangeException("value", "Attempt to move before beginning of stream");
-                }
-            }
-        }
-
-        public override void Flush()
-        {
-            return;
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            if (!CanRead)
-            {
-                throw new IOException("Attempt to read from file not opened for read");
-            }
-
-            if (_position > _length)
-            {
-                throw new IOException("Attempt to read beyond end of file");
-            }
-
-            if (count < 0)
-            {
-                throw new ArgumentOutOfRangeException("count", "Attempt to read negative number of bytes");
-            }
-
-            int target = count;
-            if (_length - _position < count)
-            {
-                target = (int)(_length - _position);
-            }
-
-            if (!TryLoadCurrentCluster())
-            {
-                if ((_position == _length || _position == DetectLength()) && !_atEOF)
-                {
-                    _atEOF = true;
-                    return 0;
-                }
-                else
-                {
-                    throw new IOException("Attempt to read beyond known clusters");
-                }
-            }
-
-            int numRead = 0;
-            while (numRead < target)
-            {
-                int clusterOffset = (int)(_position % _reader.ClusterSize);
-                int toCopy = Math.Min(_reader.ClusterSize - clusterOffset, target - numRead);
-                Array.Copy(_clusterBuffer, clusterOffset, buffer, offset + numRead, toCopy);
-
-                // Remember how many we've read in total
-                numRead += toCopy;
-
-                // Increment the position
-                _position += toCopy;
-
-                // Abort if we've hit the end of the file
-                if (!TryLoadCurrentCluster())
-                {
-                    break;
-                }
-            }
-
-            if (numRead == 0)
-            {
-                _atEOF = true;
-            }
-
-            return numRead;
-        }
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            long newPos = offset;
-            if (origin == SeekOrigin.Current)
-            {
-                newPos += _position;
-            }
-            else if (origin == SeekOrigin.End)
-            {
-                newPos += Length;
-            }
-
-            _position = newPos;
-            _atEOF = false;
-            return newPos;
-        }
-
-        public override void SetLength(long value)
-        {
-            long desiredNumClusters = (value + _reader.ClusterSize - 1) / _reader.ClusterSize;
-            long actualNumClusters = (_length + _reader.ClusterSize - 1) / _reader.ClusterSize;
-
-            if (desiredNumClusters < actualNumClusters)
-            {
-                uint cluster;
-                if (!TryGetClusterByPosition(value, out cluster))
-                {
-                    throw new IOException("Internal state corrupt - unable to find cluster");
-                }
-
-                uint firstToFree = _fat.GetNext(cluster);
-                _fat.SetEndOfChain(cluster);
-                _fat.FreeChain(firstToFree);
-
-                while (_knownClusters.Count > desiredNumClusters)
-                {
-                    _knownClusters.RemoveAt(_knownClusters.Count - 1);
-                }
-
-                _knownClusters.Add(FatBuffer.EndOfChain);
-
-                if (desiredNumClusters == 0)
-                {
-                    FireFirstClusterAllocated(0);
-                }
-            }
-            else if (desiredNumClusters > actualNumClusters)
-            {
-                uint cluster;
-                while (!TryGetClusterByPosition(value, out cluster))
-                {
-                    cluster = ExtendChain();
-                    _reader.WipeCluster(cluster);
-                }
-            }
-
-            if (_length != value)
-            {
-                _length = (uint)value;
-                if (_position > _length)
-                {
-                    _position = _length;
-                }
-            }
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            int bytesRemaining = count;
-
-            if (!CanWrite)
-            {
-                throw new IOException("Attempting to write to file not opened for writing");
-            }
-
-            if (count < 0)
-            {
-                throw new ArgumentOutOfRangeException("count", count, "Attempting to write negative number of bytes");
-            }
-
-            if (offset > buffer.Length || (offset + count) > buffer.Length)
-            {
-                throw new ArgumentException("Attempt to write bytes outside of the buffer");
-            }
-
-            // TODO: Free space check...
-            try
-            {
-                while (bytesRemaining > 0)
-                {
-                    // Extend the stream until it encompasses _position
-                    uint cluster;
-                    while (!TryGetClusterByPosition(_position, out cluster))
-                    {
-                        cluster = ExtendChain();
-                        _reader.WipeCluster(cluster);
-                    }
-
-                    // Fill this cluster with as much data as we can (WriteToCluster preserves existing cluster
-                    // data, if necessary)
-                    int numWritten = WriteToCluster(cluster, (int)(_position % _reader.ClusterSize), buffer, offset, bytesRemaining);
-                    offset += numWritten;
-                    bytesRemaining -= numWritten;
-                    _position += numWritten;
-                }
-
-                _length = (uint)Math.Max(_length, _position);
-            }
-            finally
-            {
-                _fat.Flush();
-            }
-
-            _atEOF = false;
-        }
-
-        /// <summary>
-        /// Writes up to the next cluster boundary, making sure to preserve existing data in the cluster
-        /// that falls outside of the updated range.
-        /// </summary>
-        /// <param name="cluster">The cluster to write to.</param>
-        /// <param name="pos">The file position of the write (within the cluster).</param>
-        /// <param name="buffer">The buffer with the new data.</param>
-        /// <param name="offset">Offset into buffer of the first byte to write.</param>
-        /// <param name="count">The maximum number of bytes to write.</param>
-        /// <returns>The number of bytes written - either count, or the number that fit up to
-        /// the cluster boundary.</returns>
-        private int WriteToCluster(uint cluster, int pos, byte[] buffer, int offset, int count)
-        {
-            if (pos == 0 && count >= _reader.ClusterSize)
-            {
-                _currentCluster = cluster;
-                Array.Copy(buffer, offset, _clusterBuffer, 0, _reader.ClusterSize);
-
-                WriteCurrentCluster();
-
-                return _reader.ClusterSize;
-            }
-            else
-            {
-                // Partial cluster, so need to read existing cluster data first
-                LoadCluster(cluster);
-
-                int copyLength = Math.Min(count, (int)(_reader.ClusterSize - (pos % _reader.ClusterSize)));
-                Array.Copy(buffer, offset, _clusterBuffer, pos, copyLength);
-
-                WriteCurrentCluster();
-
-                return copyLength;
-            }
-        }
-
-        /// <summary>
-        /// Adds a new cluster to the end of the existing chain, by allocating a free cluster.
-        /// </summary>
-        /// <returns>The cluster allocated.</returns>
-        /// <remarks>This method does not initialize the data in the cluster, the caller should
-        /// perform a write to ensure the cluster data is in known state.</remarks>
-        private uint ExtendChain()
-        {
-            // Sanity check - make sure the final known cluster is the EOC marker
-            if (!_fat.IsEndOfChain(_knownClusters[_knownClusters.Count - 1]))
-            {
-                throw new IOException("Corrupt file system: final cluster isn't End-of-Chain");
-            }
-
-            uint cluster;
-            if (!_fat.TryGetFreeCluster(out cluster))
-            {
-                throw new IOException("Out of disk space");
-            }
-
-            _fat.SetEndOfChain(cluster);
-            if (_knownClusters.Count == 1)
-            {
-                FireFirstClusterAllocated(cluster);
-            }
-            else
-            {
-                _fat.SetNext(_knownClusters[_knownClusters.Count - 2], cluster);
-            }
-
-            _knownClusters[_knownClusters.Count - 1] = cluster;
-            _knownClusters.Add(_fat.GetNext(cluster));
-
-            return cluster;
-        }
-
-        private void FireFirstClusterAllocated(uint cluster)
-        {
-            if (FirstClusterChanged != null)
-            {
-                FirstClusterChanged(cluster);
-            }
-        }
-
-        private bool TryLoadCurrentCluster()
-        {
-            return TryLoadClusterByPosition(_position);
-        }
-
-        private bool TryLoadClusterByPosition(long pos)
-        {
-            uint cluster;
-            if (!TryGetClusterByPosition(pos, out cluster))
-            {
-                return false;
-            }
-
-            // Read the cluster, it's different to the one currently loaded
-            if (cluster != _currentCluster)
-            {
-                _reader.ReadCluster(cluster, _clusterBuffer, 0);
-                _currentCluster = cluster;
-            }
-
-            return true;
-        }
-
-        private void LoadCluster(uint cluster)
-        {
-            // Read the cluster, it's different to the one currently loaded
-            if (cluster != _currentCluster)
-            {
-                _reader.ReadCluster(cluster, _clusterBuffer, 0);
-                _currentCluster = cluster;
-            }
-        }
-
-        private void WriteCurrentCluster()
-        {
-            _reader.WriteCluster(_currentCluster, _clusterBuffer, 0);
-        }
-
-        private bool TryGetClusterByPosition(long pos, out uint cluster)
-        {
-            int index = (int)(pos / _reader.ClusterSize);
-
-            if (_knownClusters.Count <= index)
-            {
-                if (!TryPopulateKnownClusters(index))
-                {
-                    cluster = uint.MaxValue;
-                    return false;
-                }
-            }
-
-            // Chain is shorter than the current stream position
-            if (_knownClusters.Count <= index)
-            {
-                cluster = uint.MaxValue;
-                return false;
-            }
-
-            cluster = _knownClusters[(int)index];
-
-            // This is the 'special' End-of-chain cluster identifer, so the stream position
-            // is greater than the actual file length.
-            if (_fat.IsEndOfChain(cluster))
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        private bool TryPopulateKnownClusters(int index)
-        {
-            uint lastKnown = _knownClusters[_knownClusters.Count - 1];
-            while (!_fat.IsEndOfChain(lastKnown) && _knownClusters.Count <= index)
-            {
-                lastKnown = _fat.GetNext(lastKnown);
-                _knownClusters.Add(lastKnown);
-            }
-
-            return _knownClusters.Count > index;
-        }
-
-        private uint DetectLength()
-        {
-            while (!_fat.IsEndOfChain(_knownClusters[_knownClusters.Count - 1]))
-            {
-                if (!TryPopulateKnownClusters(_knownClusters.Count))
-                {
-                    throw new IOException("Corrupt file stream - unable to discover end of cluster chain");
-                }
-            }
-
-            return (uint)((long)(_knownClusters.Count - 1) * (long)_reader.ClusterSize);
-        }
-    }
-}
diff --git a/DiscUtils/Fat/Directory.cs b/DiscUtils/Fat/Directory.cs
deleted file mode 100644
index 4460c09..0000000
--- a/DiscUtils/Fat/Directory.cs
+++ /dev/null
@@ -1,568 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Fat
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal class Directory : IDisposable
-    {
-        private FatFileSystem _fileSystem;
-        private Directory _parent;
-        private long _parentId;
-        private Stream _dirStream;
-
-        private Dictionary<long, DirectoryEntry> _entries;
-        private List<long> _freeEntries;
-        private long _endOfEntries;
-
-        private DirectoryEntry _selfEntry;
-        private long _selfEntryLocation;
-        private DirectoryEntry _parentEntry;
-        private long _parentEntryLocation;
-
-        internal Dictionary<string, string> LongFileNames_ShortKey = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-        internal Dictionary<string, string> LongFileNames_LongKey = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-
-        /// <summary>
-        /// Initializes a new instance of the Directory class.  Use this constructor to represent non-root directories.
-        /// </summary>
-        /// <param name="parent">The parent directory.</param>
-        /// <param name="parentId">The identity of the entry representing this directory in the parent.</param>
-        internal Directory(Directory parent, long parentId)
-        {
-            _fileSystem = parent._fileSystem;
-            _parent = parent;
-            _parentId = parentId;
-
-            DirectoryEntry dirEntry = ParentsChildEntry;
-            _dirStream = new ClusterStream(_fileSystem, FileAccess.ReadWrite, dirEntry.FirstCluster, uint.MaxValue);
-
-            LoadEntries();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the Directory class.  Use this constructor to represent the root directory.
-        /// </summary>
-        /// <param name="fileSystem">The file system.</param>
-        /// <param name="dirStream">The stream containing the directory info.</param>
-        internal Directory(FatFileSystem fileSystem, Stream dirStream)
-        {
-            _fileSystem = fileSystem;
-            _dirStream = dirStream;
-
-            LoadEntries();
-        }
-
-        private static string GetLfnChunk(byte[] buffer)
-        {
-            // see http://home.teleport.com/~brainy/lfn.htm
-            // NOTE: we assume ordinals are ok here.
-            char[] chars = new char[13];
-            chars[0] = (char)(256 * buffer[2] + buffer[1]);
-            chars[1] = (char)(256 * buffer[4] + buffer[3]);
-            chars[2] = (char)(256 * buffer[6] + buffer[5]);
-            chars[3] = (char)(256 * buffer[8] + buffer[7]);
-            chars[4] = (char)(256 * buffer[10] + buffer[9]);
-
-            chars[5] = (char)(256 * buffer[15] + buffer[14]);
-            chars[6] = (char)(256 * buffer[17] + buffer[16]);
-            chars[7] = (char)(256 * buffer[19] + buffer[18]);
-            chars[8] = (char)(256 * buffer[21] + buffer[20]);
-            chars[9] = (char)(256 * buffer[23] + buffer[22]);
-            chars[10] = (char)(256 * buffer[25] + buffer[24]);
-
-            chars[11] = (char)(256 * buffer[29] + buffer[28]);
-            chars[12] = (char)(256 * buffer[31] + buffer[30]);
-            string chunk = new string(chars);
-            int zero = chunk.IndexOf('\0');
-            return zero >= 0 ? chunk.Substring(0, zero) : chunk;
-        }
-
-        public FatFileSystem FileSystem
-        {
-            get { return _fileSystem; }
-        }
-
-        public bool IsEmpty
-        {
-            get { return _entries.Count == 0; }
-        }
-
-        public DirectoryEntry[] Entries
-        {
-            get { return new List<DirectoryEntry>(_entries.Values).ToArray(); }
-        }
-
-        #region Convenient accessors for special entries
-        internal DirectoryEntry ParentsChildEntry
-        {
-            get
-            {
-                if (_parent == null)
-                {
-                    return new DirectoryEntry(_fileSystem.FatOptions, FileName.ParentEntryName, FatAttributes.Directory, _fileSystem.FatVariant);
-                }
-                else
-                {
-                    return _parent.GetEntry(_parentId);
-                }
-            }
-
-            set
-            {
-                if (_parent != null)
-                {
-                    _parent.UpdateEntry(_parentId, value);
-                }
-            }
-        }
-
-        internal DirectoryEntry SelfEntry
-        {
-            get
-            {
-                if (_parent == null)
-                {
-                    // If we're the root directory, simulate the parent entry with a dummy record
-                    return new DirectoryEntry(_fileSystem.FatOptions, FileName.Null, FatAttributes.Directory, _fileSystem.FatVariant);
-                }
-                else
-                {
-                    return _selfEntry;
-                }
-            }
-
-            set
-            {
-                if (_selfEntryLocation >= 0)
-                {
-                    _dirStream.Position = _selfEntryLocation;
-                    value.WriteTo(_dirStream);
-                    _selfEntry = value;
-                }
-            }
-        }
-
-        internal DirectoryEntry ParentEntry
-        {
-            get
-            {
-                return _parentEntry;
-            }
-
-            set
-            {
-                if (_parentEntryLocation < 0)
-                {
-                    throw new IOException("No parent entry on disk to update");
-                }
-
-                _dirStream.Position = _parentEntryLocation;
-                value.WriteTo(_dirStream);
-                _parentEntry = value;
-            }
-        }
-        #endregion
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        public DirectoryEntry[] GetDirectories()
-        {
-            List<DirectoryEntry> dirs = new List<DirectoryEntry>(_entries.Count);
-            foreach (DirectoryEntry dirEntry in _entries.Values)
-            {
-                if ((dirEntry.Attributes & FatAttributes.Directory) != 0)
-                {
-                    dirs.Add(dirEntry);
-                }
-            }
-
-            return dirs.ToArray();
-        }
-
-        public DirectoryEntry[] GetFiles()
-        {
-            List<DirectoryEntry> files = new List<DirectoryEntry>(_entries.Count);
-            foreach (DirectoryEntry dirEntry in _entries.Values)
-            {
-                if ((dirEntry.Attributes & (FatAttributes.Directory | FatAttributes.VolumeId)) == 0)
-                {
-                    files.Add(dirEntry);
-                }
-            }
-
-            return files.ToArray();
-        }
-
-        public DirectoryEntry GetEntry(long id)
-        {
-            return (id < 0) ? null : _entries[id];
-        }
-
-        public Directory GetChildDirectory(FileName name)
-        {
-            long id = FindEntry(name);
-            if (id < 0)
-            {
-                return null;
-            }
-            else if ((_entries[id].Attributes & FatAttributes.Directory) == 0)
-            {
-                return null;
-            }
-            else
-            {
-                return _fileSystem.GetDirectory(this, id);
-            }
-        }
-
-        internal Directory CreateChildDirectory(FileName name)
-        {
-            long id = FindEntry(name);
-            if (id >= 0)
-            {
-                if ((_entries[id].Attributes & FatAttributes.Directory) == 0)
-                {
-                    throw new IOException("A file exists with the same name");
-                }
-                else
-                {
-                    return _fileSystem.GetDirectory(this, id);
-                }
-            }
-            else
-            {
-                try
-                {
-                    uint firstCluster;
-                    if (!_fileSystem.Fat.TryGetFreeCluster(out firstCluster))
-                    {
-                        throw new IOException("Failed to allocate first cluster for new directory");
-                    }
-
-                    _fileSystem.Fat.SetEndOfChain(firstCluster);
-
-                    DirectoryEntry newEntry = new DirectoryEntry(_fileSystem.FatOptions, name, FatAttributes.Directory, _fileSystem.FatVariant);
-                    newEntry.FirstCluster = firstCluster;
-                    newEntry.CreationTime = _fileSystem.ConvertFromUtc(DateTime.UtcNow);
-                    newEntry.LastWriteTime = newEntry.CreationTime;
-
-                    id = AddEntry(newEntry);
-
-                    PopulateNewChildDirectory(newEntry);
-
-                    // Rather than just creating a new instance, pull it through the fileSystem cache
-                    // to ensure the cache model is preserved.
-                    return _fileSystem.GetDirectory(this, id);
-                }
-                finally
-                {
-                    _fileSystem.Fat.Flush();
-                }
-            }
-        }
-
-        internal void AttachChildDirectory(FileName name, Directory newChild)
-        {
-            long id = FindEntry(name);
-            if (id >= 0)
-            {
-                throw new IOException("Directory entry already exists");
-            }
-
-            DirectoryEntry newEntry = new DirectoryEntry(newChild.ParentsChildEntry);
-            newEntry.Name = name;
-            AddEntry(newEntry);
-
-            DirectoryEntry newParentEntry = new DirectoryEntry(SelfEntry);
-            newParentEntry.Name = FileName.ParentEntryName;
-            newChild.ParentEntry = newParentEntry;
-        }
-
-        internal long FindVolumeId()
-        {
-            foreach (long id in _entries.Keys)
-            {
-                DirectoryEntry focus = _entries[id];
-                if ((focus.Attributes & FatAttributes.VolumeId) != 0)
-                {
-                    return id;
-                }
-            }
-
-            return -1;
-        }
-
-        internal long FindEntry(FileName name)
-        {
-            foreach (long id in _entries.Keys)
-            {
-                DirectoryEntry focus = _entries[id];
-                if (focus.Name == name && (focus.Attributes & FatAttributes.VolumeId) == 0)
-                {
-                    return id;
-                }
-            }
-
-            return -1;
-        }
-
-        internal SparseStream OpenFile(FileName name, FileMode mode, FileAccess fileAccess)
-        {
-            if (mode == FileMode.Append || mode == FileMode.Truncate)
-            {
-                throw new NotImplementedException();
-            }
-
-            long fileId = FindEntry(name);
-            bool exists = fileId != -1;
-
-            if (mode == FileMode.CreateNew && exists)
-            {
-                throw new IOException("File already exists");
-            }
-            else if (mode == FileMode.Open && !exists)
-            {
-                throw new FileNotFoundException("File not found", name.GetDisplayName(_fileSystem.FatOptions.FileNameEncoding));
-            }
-            else if ((mode == FileMode.Open || mode == FileMode.OpenOrCreate || mode == FileMode.Create) && exists)
-            {
-                SparseStream stream = new FatFileStream(_fileSystem, this, fileId, fileAccess);
-                if (mode == FileMode.Create)
-                {
-                    stream.SetLength(0);
-                }
-
-                HandleAccessed(false);
-
-                return stream;
-            }
-            else if ((mode == FileMode.OpenOrCreate || mode == FileMode.CreateNew || mode == FileMode.Create) && !exists)
-            {
-                // Create new file
-                DirectoryEntry newEntry = new DirectoryEntry(_fileSystem.FatOptions, name, FatAttributes.Archive, _fileSystem.FatVariant);
-                newEntry.FirstCluster = 0; // i.e. Zero-length
-                newEntry.CreationTime = _fileSystem.ConvertFromUtc(DateTime.UtcNow);
-                newEntry.LastWriteTime = newEntry.CreationTime;
-
-                fileId = AddEntry(newEntry);
-
-                return new FatFileStream(_fileSystem, this, fileId, fileAccess);
-            }
-            else
-            {
-                // Should never get here...
-                throw new NotImplementedException();
-            }
-        }
-
-        internal long AddEntry(DirectoryEntry newEntry)
-        {
-            // Unlink an entry from the free list (or add to the end of the existing directory)
-            long pos;
-            if (_freeEntries.Count > 0)
-            {
-                pos = _freeEntries[0];
-                _freeEntries.RemoveAt(0);
-            }
-            else
-            {
-                pos = _endOfEntries;
-                _endOfEntries += 32;
-            }
-
-            // Put the new entry into it's slot
-            _dirStream.Position = pos;
-            newEntry.WriteTo(_dirStream);
-
-            // Update internal structures to reflect new entry (as if read from disk)
-            _entries.Add(pos, newEntry);
-
-            HandleAccessed(true);
-
-            return pos;
-        }
-
-        internal void DeleteEntry(long id, bool releaseContents)
-        {
-            if (id < 0)
-            {
-                throw new IOException("Attempt to delete unknown directory entry");
-            }
-
-            try
-            {
-                DirectoryEntry entry = _entries[id];
-
-                DirectoryEntry copy = new DirectoryEntry(entry);
-                copy.Name = entry.Name.Deleted();
-                _dirStream.Position = id;
-                copy.WriteTo(_dirStream);
-
-                if (releaseContents)
-                {
-                    _fileSystem.Fat.FreeChain(entry.FirstCluster);
-                }
-
-                _entries.Remove(id);
-                _freeEntries.Add(id);
-
-                HandleAccessed(true);
-            }
-            finally
-            {
-                _fileSystem.Fat.Flush();
-            }
-        }
-
-        internal void UpdateEntry(long id, DirectoryEntry entry)
-        {
-            if (id < 0)
-            {
-                throw new IOException("Attempt to update unknown directory entry");
-            }
-
-            _dirStream.Position = id;
-            entry.WriteTo(_dirStream);
-            _entries[id] = entry;
-        }
-
-        private void LoadEntries()
-        {
-            _entries = new Dictionary<long, DirectoryEntry>();
-            _freeEntries = new List<long>();
-
-            _selfEntryLocation = -1;
-            _parentEntryLocation = -1;
-
-            string lfn = null;  //+++
-            while (_dirStream.Position < _dirStream.Length)
-            {
-                long streamPos = _dirStream.Position;
-                DirectoryEntry entry = new DirectoryEntry(_fileSystem.FatOptions, _dirStream, _fileSystem.FatVariant);
-
-                if (entry.Attributes == (FatAttributes.ReadOnly | FatAttributes.Hidden | FatAttributes.System | FatAttributes.VolumeId))
-                {
-                    // Long File Name entry
-                    _dirStream.Position = streamPos;  //+++
-                    lfn = GetLfnChunk(Utilities.ReadFully(_dirStream, 32)) + lfn;  //+++
-                }
-                else if (entry.Name.IsDeleted())
-                {
-                    // E5 = Free Entry
-                    _freeEntries.Add(streamPos);
-                    lfn = null; //+++
-                }
-                else if (entry.Name == FileName.SelfEntryName)
-                {
-                    _selfEntry = entry;
-                    _selfEntryLocation = streamPos;
-                    lfn = null; //+++
-                }
-                else if (entry.Name == FileName.ParentEntryName)
-                {
-                    _parentEntry = entry;
-                    _parentEntryLocation = streamPos;
-                    lfn = null; //+++
-                }
-                else if (entry.Name.IsEndMarker())
-                {
-                    // Free Entry, no more entries available
-                    _endOfEntries = streamPos;
-                    break;
-                }
-                else
-                {
-                    if (lfn != null) //+++
-                    { //+++
-                        LongFileNames_ShortKey.Add(entry.Name.GetDisplayName(_fileSystem.FatOptions.FileNameEncoding), lfn); //+++
-                        LongFileNames_LongKey.Add(lfn, entry.Name.GetDisplayName(_fileSystem.FatOptions.FileNameEncoding)); //+++
-                    } //+++
-                    _entries.Add(streamPos, entry);
-                    lfn = null; //+++
-                }
-            }
-        }
-
-        private void HandleAccessed(bool forWrite)
-        {
-            if (_fileSystem.CanWrite && _parent != null)
-            {
-                DateTime now = DateTime.Now;
-                DirectoryEntry entry = SelfEntry;
-
-                DateTime oldAccessTime = entry.LastAccessTime;
-                DateTime oldWriteTime = entry.LastWriteTime;
-
-                entry.LastAccessTime = now;
-                if (forWrite)
-                {
-                    entry.LastWriteTime = now;
-                }
-
-                if (entry.LastAccessTime != oldAccessTime || entry.LastWriteTime != oldWriteTime)
-                {
-                    SelfEntry = entry;
-
-                    DirectoryEntry parentEntry = ParentsChildEntry;
-                    parentEntry.LastAccessTime = entry.LastAccessTime;
-                    parentEntry.LastWriteTime = entry.LastWriteTime;
-                    ParentsChildEntry = parentEntry;
-                }
-            }
-        }
-
-        private void PopulateNewChildDirectory(DirectoryEntry newEntry)
-        {
-            // Populate new directory with initial (special) entries.  First one is easy, just change the name!
-            using (ClusterStream stream = new ClusterStream(_fileSystem, FileAccess.Write, newEntry.FirstCluster, uint.MaxValue))
-            {
-                // First is the self-referencing entry...
-                DirectoryEntry selfEntry = new DirectoryEntry(newEntry);
-                selfEntry.Name = FileName.SelfEntryName;
-                selfEntry.WriteTo(stream);
-
-                // Second is a clone of our self entry (i.e. parent) - though dates are odd...
-                DirectoryEntry parentEntry = new DirectoryEntry(SelfEntry);
-                parentEntry.Name = FileName.ParentEntryName;
-                parentEntry.CreationTime = newEntry.CreationTime;
-                parentEntry.LastWriteTime = newEntry.LastWriteTime;
-                parentEntry.WriteTo(stream);
-            }
-        }
-
-        private void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                _dirStream.Dispose();
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Fat/DirectoryEntry.cs b/DiscUtils/Fat/DirectoryEntry.cs
deleted file mode 100644
index 73db154..0000000
--- a/DiscUtils/Fat/DirectoryEntry.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Fat
-{
-    using System;
-    using System.IO;
-
-    internal class DirectoryEntry
-    {
-        private FatFileSystemOptions _options;
-        private FatType _fatVariant;
-        private FileName _name;
-        private byte _attr;
-        private byte _creationTimeTenth;
-        private ushort _creationTime;
-        private ushort _creationDate;
-        private ushort _lastAccessDate;
-        private ushort _firstClusterHi;
-        private ushort _lastWriteTime;
-        private ushort _lastWriteDate;
-        private ushort _firstClusterLo;
-        private uint _fileSize;
-
-        internal DirectoryEntry(FatFileSystemOptions options, Stream stream, FatType fatVariant)
-        {
-            _options = options;
-            _fatVariant = fatVariant;
-            byte[] buffer = Utilities.ReadFully(stream, 32);
-            Load(buffer, 0);
-        }
-
-        internal DirectoryEntry(FatFileSystemOptions options, FileName name, FatAttributes attrs, FatType fatVariant)
-        {
-            _options = options;
-            _fatVariant = fatVariant;
-            _name = name;
-            _attr = (byte)attrs;
-        }
-
-        internal DirectoryEntry(DirectoryEntry toCopy)
-        {
-            _options = toCopy._options;
-            _fatVariant = toCopy._fatVariant;
-            _name = toCopy._name;
-            _attr = toCopy._attr;
-            _creationTimeTenth = toCopy._creationTimeTenth;
-            _creationTime = toCopy._creationTime;
-            _creationDate = toCopy._creationDate;
-            _lastAccessDate = toCopy._lastAccessDate;
-            _firstClusterHi = toCopy._firstClusterHi;
-            _lastWriteTime = toCopy._lastWriteTime;
-            _firstClusterLo = toCopy._firstClusterLo;
-            _fileSize = toCopy._fileSize;
-        }
-
-        public FileName Name
-        {
-            get
-            {
-                return _name;
-            }
-
-            set
-            {
-                _name = value;
-            }
-        }
-
-        public FatAttributes Attributes
-        {
-            get { return (FatAttributes)_attr; }
-            set { _attr = (byte)value; }
-        }
-
-        public DateTime CreationTime
-        {
-            get { return FileTimeToDateTime(_creationDate, _creationTime, _creationTimeTenth); }
-            set { DateTimeToFileTime(value, out _creationDate, out _creationTime, out _creationTimeTenth); }
-        }
-
-        public DateTime LastAccessTime
-        {
-            get { return FileTimeToDateTime(_lastAccessDate, 0, 0); }
-            set { DateTimeToFileTime(value, out _lastAccessDate); }
-        }
-
-        public DateTime LastWriteTime
-        {
-            get { return FileTimeToDateTime(_lastWriteDate, _lastWriteTime, 0); }
-            set { DateTimeToFileTime(value, out _lastWriteDate, out _lastWriteTime); }
-        }
-
-        public int FileSize
-        {
-            get { return (int)_fileSize; }
-            set { _fileSize = (uint)value; }
-        }
-
-        public uint FirstCluster
-        {
-            get
-            {
-                if (_fatVariant == FatType.Fat32)
-                {
-                    return (uint)(_firstClusterHi << 16) | _firstClusterLo;
-                }
-                else
-                {
-                    return _firstClusterLo;
-                }
-            }
-
-            set
-            {
-                if (_fatVariant == FatType.Fat32)
-                {
-                    _firstClusterHi = (ushort)((value >> 16) & 0xFFFF);
-                }
-
-                _firstClusterLo = (ushort)(value & 0xFFFF);
-            }
-        }
-
-        internal void WriteTo(Stream stream)
-        {
-            byte[] buffer = new byte[32];
-
-            _name.GetBytes(buffer, 0);
-            buffer[11] = _attr;
-            buffer[13] = _creationTimeTenth;
-            Utilities.WriteBytesLittleEndian((ushort)_creationTime, buffer, 14);
-            Utilities.WriteBytesLittleEndian((ushort)_creationDate, buffer, 16);
-            Utilities.WriteBytesLittleEndian((ushort)_lastAccessDate, buffer, 18);
-            Utilities.WriteBytesLittleEndian((ushort)_firstClusterHi, buffer, 20);
-            Utilities.WriteBytesLittleEndian((ushort)_lastWriteTime, buffer, 22);
-            Utilities.WriteBytesLittleEndian((ushort)_lastWriteDate, buffer, 24);
-            Utilities.WriteBytesLittleEndian((ushort)_firstClusterLo, buffer, 26);
-            Utilities.WriteBytesLittleEndian((uint)_fileSize, buffer, 28);
-
-            stream.Write(buffer, 0, buffer.Length);
-        }
-
-        private static DateTime FileTimeToDateTime(ushort date, ushort time, byte tenths)
-        {
-            if (date == 0 || date == 0xFFFF)
-            {
-                // Return Epoch - this is an invalid date
-                return FatFileSystem.Epoch;
-            }
-
-            int year = 1980 + ((date & 0xFE00) >> 9);
-            int month = (date & 0x01E0) >> 5;
-            int day = date & 0x001F;
-            int hour = (time & 0xF800) >> 11;
-            int minute = (time & 0x07E0) >> 5;
-            int second = ((time & 0x001F) * 2) + (tenths / 100);
-            int millis = (tenths % 100) * 10;
-
-            return new DateTime(year, month, day, hour, minute, second, millis);
-        }
-
-        private static void DateTimeToFileTime(DateTime value, out ushort date)
-        {
-            byte tenths;
-            ushort time;
-            DateTimeToFileTime(value, out date, out time, out tenths);
-        }
-
-        private static void DateTimeToFileTime(DateTime value, out ushort date, out ushort time)
-        {
-            byte tenths;
-            DateTimeToFileTime(value, out date, out time, out tenths);
-        }
-
-        private static void DateTimeToFileTime(DateTime value, out ushort date, out ushort time, out byte tenths)
-        {
-            if (value.Year < 1980)
-            {
-                value = FatFileSystem.Epoch;
-            }
-
-            date = (ushort)((((value.Year - 1980) << 9) & 0xFE00) | ((value.Month << 5) & 0x01E0) | (value.Day & 0x001F));
-            time = (ushort)(((value.Hour << 11) & 0xF800) | ((value.Minute << 5) & 0x07E0) | ((value.Second / 2) & 0x001F));
-            tenths = (byte)(((value.Second % 2) * 100) + (value.Millisecond / 10));
-        }
-
-        private void Load(byte[] data, int offset)
-        {
-            _name = new FileName(data, offset);
-            _attr = data[offset + 11];
-            _creationTimeTenth = data[offset + 13];
-            _creationTime = Utilities.ToUInt16LittleEndian(data, offset + 14);
-            _creationDate = Utilities.ToUInt16LittleEndian(data, offset + 16);
-            _lastAccessDate = Utilities.ToUInt16LittleEndian(data, offset + 18);
-            _firstClusterHi = Utilities.ToUInt16LittleEndian(data, offset + 20);
-            _lastWriteTime = Utilities.ToUInt16LittleEndian(data, offset + 22);
-            _lastWriteDate = Utilities.ToUInt16LittleEndian(data, offset + 24);
-            _firstClusterLo = Utilities.ToUInt16LittleEndian(data, offset + 26);
-            _fileSize = Utilities.ToUInt32LittleEndian(data, offset + 28);
-        }
-    }
-}
diff --git a/DiscUtils/Fat/FatAttributes.cs b/DiscUtils/Fat/FatAttributes.cs
deleted file mode 100644
index b3043c4..0000000
--- a/DiscUtils/Fat/FatAttributes.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Fat
-{
-    using System;
-
-    [Flags]
-    internal enum FatAttributes : byte
-    {
-        ReadOnly = 0x01,
-        Hidden = 0x02,
-        System = 0x04,
-        VolumeId = 0x08,
-        Directory = 0x10,
-        Archive = 0x20,
-    }
-}
diff --git a/DiscUtils/Fat/FatBuffer.cs b/DiscUtils/Fat/FatBuffer.cs
deleted file mode 100644
index b84a658..0000000
--- a/DiscUtils/Fat/FatBuffer.cs
+++ /dev/null
@@ -1,262 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Fat
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal class FatBuffer
-    {
-        /// <summary>
-        /// The End-of-chain marker to WRITE (SetNext).  Don't use this value to test for end of chain.
-        /// </summary>
-        /// <remarks>
-        /// The actual end-of-chain marker bits on disk vary by FAT type, and can end ...F8 through ...FF.
-        /// </remarks>
-        public const uint EndOfChain = 0xFFFFFFFF;
-
-        /// <summary>
-        /// The Bad-Cluster marker to WRITE (SetNext).  Don't use this value to test for bad clusters.
-        /// </summary>
-        /// <remarks>
-        /// The actual bad-cluster marker bits on disk vary by FAT type.
-        /// </remarks>
-        public const uint BadCluster = 0xFFFFFFF7;
-
-        /// <summary>
-        /// The Free-Cluster marker to WRITE (SetNext).  Don't use this value to test for free clusters.
-        /// </summary>
-        /// <remarks>
-        /// The actual free-cluster marker bits on disk vary by FAT type.
-        /// </remarks>
-        public const uint FreeCluster = 0;
-
-        private const uint DirtyRegionSize = 512;
-
-        private FatType _type;
-        private byte[] _buffer;
-        private uint _nextFreeCandidate;
-        private Dictionary<uint, uint> _dirtySectors;
-
-        public FatBuffer(FatType type, byte[] buffer)
-        {
-            _type = type;
-            _buffer = buffer;
-            _dirtySectors = new Dictionary<uint, uint>();
-        }
-
-        internal int NumEntries
-        {
-            get
-            {
-                switch (_type)
-                {
-                    case FatType.Fat12:
-                        return (_buffer.Length / 3) * 2;
-                    case FatType.Fat16:
-                        return _buffer.Length / 2;
-                    default: // FAT32
-                        return _buffer.Length / 4;
-                }
-            }
-        }
-
-        internal int Size
-        {
-            get { return _buffer.Length; }
-        }
-
-        internal bool IsFree(uint val)
-        {
-            return val == 0;
-        }
-
-        internal bool IsEndOfChain(uint val)
-        {
-            switch (_type)
-            {
-                case FatType.Fat12: return (val & 0x0FFF) >= 0x0FF8;
-                case FatType.Fat16: return (val & 0xFFFF) >= 0xFFF8;
-                case FatType.Fat32: return (val & 0x0FFFFFF8) >= 0x0FFFFFF8;
-                default: throw new ArgumentException("Unknown FAT type");
-            }
-        }
-
-        internal bool IsBadCluster(uint val)
-        {
-            switch (_type)
-            {
-                case FatType.Fat12: return (val & 0x0FFF) == 0x0FF7;
-                case FatType.Fat16: return (val & 0xFFFF) == 0xFFF7;
-                case FatType.Fat32: return (val & 0x0FFFFFF8) == 0x0FFFFFF7;
-                default: throw new ArgumentException("Unknown FAT type");
-            }
-        }
-
-        internal uint GetNext(uint cluster)
-        {
-            if (_type == FatType.Fat16)
-            {
-                return Utilities.ToUInt16LittleEndian(_buffer, (int)(cluster * 2));
-            }
-            else if (_type == FatType.Fat32)
-            {
-                return Utilities.ToUInt32LittleEndian(_buffer, (int)(cluster * 4)) & 0x0FFFFFFF;
-            }
-            else
-            {
-                // FAT12
-                if ((cluster & 1) != 0)
-                {
-                    return (uint)((Utilities.ToUInt16LittleEndian(_buffer, (int)(cluster + (cluster / 2))) >> 4) & 0x0FFF);
-                }
-                else
-                {
-                    return (uint)(Utilities.ToUInt16LittleEndian(_buffer, (int)(cluster + (cluster / 2))) & 0x0FFF);
-                }
-            }
-        }
-
-        internal void SetEndOfChain(uint cluster)
-        {
-            SetNext(cluster, EndOfChain);
-        }
-
-        internal void SetBadCluster(uint cluster)
-        {
-            SetNext(cluster, BadCluster);
-        }
-
-        internal void SetFree(uint cluster)
-        {
-            if (cluster < _nextFreeCandidate)
-            {
-                _nextFreeCandidate = cluster;
-            }
-
-            SetNext(cluster, FreeCluster);
-        }
-
-        internal void SetNext(uint cluster, uint next)
-        {
-            if (_type == FatType.Fat16)
-            {
-                MarkDirty(cluster * 2);
-                Utilities.WriteBytesLittleEndian((ushort)next, _buffer, (int)(cluster * 2));
-            }
-            else if (_type == FatType.Fat32)
-            {
-                MarkDirty(cluster * 4);
-                uint oldVal = Utilities.ToUInt32LittleEndian(_buffer, (int)(cluster * 4));
-                uint newVal = (oldVal & 0xF0000000) | (next & 0x0FFFFFFF);
-                Utilities.WriteBytesLittleEndian((uint)newVal, _buffer, (int)(cluster * 4));
-            }
-            else
-            {
-                uint offset = cluster + (cluster / 2);
-                MarkDirty(offset);
-                MarkDirty(offset + 1); // On alternate sector boundaries, cluster info crosses two sectors
-
-                ushort maskedOldVal;
-                if ((cluster & 1) != 0)
-                {
-                    next = next << 4;
-                    maskedOldVal = (ushort)(Utilities.ToUInt16LittleEndian(_buffer, (int)offset) & 0x000F);
-                }
-                else
-                {
-                    next = next & 0x0FFF;
-                    maskedOldVal = (ushort)(Utilities.ToUInt16LittleEndian(_buffer, (int)offset) & 0xF000);
-                }
-
-                ushort newVal = (ushort)(maskedOldVal | next);
-
-                Utilities.WriteBytesLittleEndian(newVal, _buffer, (int)offset);
-            }
-        }
-
-        internal bool TryGetFreeCluster(out uint cluster)
-        {
-            // Simple scan - don't hold a free list...
-            uint numEntries = (uint)NumEntries;
-            for (uint i = 0; i < numEntries; i++)
-            {
-                uint candidate = (i + _nextFreeCandidate) % numEntries;
-                if (IsFree(GetNext(candidate)))
-                {
-                    cluster = candidate;
-                    _nextFreeCandidate = candidate + 1;
-                    return true;
-                }
-            }
-
-            cluster = 0;
-            return false;
-        }
-
-        internal void FreeChain(uint head)
-        {
-            foreach (uint cluster in GetChain(head))
-            {
-                SetFree(cluster);
-            }
-        }
-
-        internal List<uint> GetChain(uint head)
-        {
-            List<uint> result = new List<uint>();
-
-            if (head != 0)
-            {
-                uint focus = head;
-                while (!IsEndOfChain(focus))
-                {
-                    result.Add(focus);
-                    focus = GetNext(focus);
-                }
-            }
-
-            return result;
-        }
-
-        internal void MarkDirty(uint offset)
-        {
-            _dirtySectors[offset / DirtyRegionSize] = offset / DirtyRegionSize;
-        }
-
-        internal void WriteDirtyRegions(Stream stream, long position)
-        {
-            foreach (uint val in _dirtySectors.Values)
-            {
-                stream.Position = position + (val * DirtyRegionSize);
-                stream.Write(_buffer, (int)(val * DirtyRegionSize), (int)DirtyRegionSize);
-            }
-        }
-
-        internal void ClearDirtyRegions()
-        {
-            _dirtySectors.Clear();
-        }
-    }
-}
diff --git a/DiscUtils/Fat/FatFileStream.cs b/DiscUtils/Fat/FatFileStream.cs
deleted file mode 100644
index e609881..0000000
--- a/DiscUtils/Fat/FatFileStream.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Fat
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal class FatFileStream : SparseStream
-    {
-        private Directory _dir;
-        private long _dirId;
-        private ClusterStream _stream;
-
-        private bool didWrite = false;
-
-        public FatFileStream(FatFileSystem fileSystem, Directory dir, long fileId, FileAccess access)
-        {
-            _dir = dir;
-            _dirId = fileId;
-
-            DirectoryEntry dirEntry = _dir.GetEntry(_dirId);
-            _stream = new ClusterStream(fileSystem, access, (uint)dirEntry.FirstCluster, (uint)dirEntry.FileSize);
-            _stream.FirstClusterChanged += FirstClusterAllocatedHandler;
-        }
-
-        public override long Position
-        {
-            get { return _stream.Position; }
-            set { _stream.Position = value; }
-        }
-
-        public override bool CanRead
-        {
-            get { return _stream.CanRead; }
-        }
-
-        public override bool CanSeek
-        {
-            get { return _stream.CanSeek; }
-        }
-
-        public override bool CanWrite
-        {
-            get { return _stream.CanWrite; }
-        }
-
-        public override long Length
-        {
-            get { return _stream.Length; }
-        }
-
-        public override IEnumerable<StreamExtent> Extents
-        {
-            get
-            {
-                return new StreamExtent[] { new StreamExtent(0, Length) };
-            }
-        }
-
-        public override void Close()
-        {
-            if (_dir.FileSystem.CanWrite)
-            {
-                try
-                {
-                    DateTime now = _dir.FileSystem.ConvertFromUtc(DateTime.UtcNow);
-
-                    DirectoryEntry dirEntry = _dir.GetEntry(_dirId);
-                    dirEntry.LastAccessTime = now;
-                    if (didWrite)
-                    {
-                        dirEntry.FileSize = (int)_stream.Length;
-                        dirEntry.LastWriteTime = now;
-                    }
-
-                    _dir.UpdateEntry(_dirId, dirEntry);
-                }
-                finally
-                {
-                    base.Close();
-                }
-            }
-        }
-
-        public override void SetLength(long value)
-        {
-            didWrite = true;
-            _stream.SetLength(value);
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            didWrite = true;
-            _stream.Write(buffer, offset, count);
-        }
-
-        public override void Flush()
-        {
-            _stream.Flush();
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            return _stream.Read(buffer, offset, count);
-        }
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            return _stream.Seek(offset, origin);
-        }
-
-        private void FirstClusterAllocatedHandler(uint cluster)
-        {
-            DirectoryEntry dirEntry = _dir.GetEntry(_dirId);
-            dirEntry.FirstCluster = cluster;
-            _dir.UpdateEntry(_dirId, dirEntry);
-        }
-    }
-}
diff --git a/DiscUtils/Fat/FatFileSystem.cs b/DiscUtils/Fat/FatFileSystem.cs
deleted file mode 100644
index 639367e..0000000
--- a/DiscUtils/Fat/FatFileSystem.cs
+++ /dev/null
@@ -1,2016 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Fat
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using System.Text;
-    using System.Text.RegularExpressions;
-
-    /// <summary>
-    /// Class for accessing FAT file systems.
-    /// </summary>
-    public sealed class FatFileSystem : DiscFileSystem
-    {
-        /// <summary>
-        /// The Epoch for FAT file systems (1st Jan, 1980).
-        /// </summary>
-        public static readonly DateTime Epoch = new DateTime(1980, 1, 1);
-
-        private TimeConverter _timeConverter;
-        private Stream _data;
-        private Ownership _ownsData;
-        private byte[] _bootSector;
-        private FileAllocationTable _fat;
-        private ClusterReader _clusterReader;
-        private Directory _rootDir;
-        private Dictionary<uint, Directory> _dirCache;
-
-        private FatType _type;
-        private string _bpbOEMName;
-        private ushort _bpbBytesPerSec;
-        private byte _bpbSecPerClus;
-        private ushort _bpbRsvdSecCnt;
-        private byte _bpbNumFATs;
-        private ushort _bpbRootEntCnt;
-        private ushort _bpbTotSec16;
-        private byte _bpbMedia;
-        private ushort _bpbFATSz16;
-        private ushort _bpbSecPerTrk;
-        private ushort _bpbNumHeads;
-        private uint _bpbHiddSec;
-        private uint _bpbTotSec32;
-
-        private byte _bsDrvNum;
-        private byte _bsBootSig;
-        private uint _bsVolId;
-        private string _bsVolLab;
-        private string _bsFilSysType;
-
-        private uint _bpbFATSz32;
-        private ushort _bpbExtFlags;
-        private ushort _bpbFSVer;
-        private uint _bpbRootClus;
-        private ushort _bpbFSInfo;
-        private ushort _bpbBkBootSec;
-
-        /// <summary>
-        /// Initializes a new instance of the FatFileSystem class.
-        /// </summary>
-        /// <param name="data">The stream containing the file system.</param>
-        /// <remarks>
-        /// Local time is the effective timezone of the new instance.
-        /// </remarks>
-        public FatFileSystem(Stream data)
-            : base(new FatFileSystemOptions())
-        {
-            _dirCache = new Dictionary<uint, Directory>();
-            _timeConverter = DefaultTimeConverter;
-            Initialize(data);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the FatFileSystem class.
-        /// </summary>
-        /// <param name="data">The stream containing the file system.</param>
-        /// <param name="ownsData">Indicates if the new instance should take ownership
-        /// of <paramref name="data"/>.</param>
-        /// <remarks>
-        /// Local time is the effective timezone of the new instance.
-        /// </remarks>
-        public FatFileSystem(Stream data, Ownership ownsData)
-            : base(new FatFileSystemOptions())
-        {
-            _dirCache = new Dictionary<uint, Directory>();
-            _timeConverter = DefaultTimeConverter;
-            Initialize(data);
-            _ownsData = ownsData;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the FatFileSystem class.
-        /// </summary>
-        /// <param name="data">The stream containing the file system.</param>
-        /// <param name="timeConverter">A delegate to convert to/from the file system's timezone.</param>
-        public FatFileSystem(Stream data, TimeConverter timeConverter)
-            : base(new FatFileSystemOptions())
-        {
-            _dirCache = new Dictionary<uint, Directory>();
-            _timeConverter = timeConverter;
-            Initialize(data);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the FatFileSystem class.
-        /// </summary>
-        /// <param name="data">The stream containing the file system.</param>
-        /// <param name="ownsData">Indicates if the new instance should take ownership
-        /// of <paramref name="data"/>.</param>
-        /// <param name="timeConverter">A delegate to convert to/from the file system's timezone.</param>
-        public FatFileSystem(Stream data, Ownership ownsData, TimeConverter timeConverter)
-            : base(new FatFileSystemOptions())
-        {
-            _dirCache = new Dictionary<uint, Directory>();
-            _timeConverter = timeConverter;
-            Initialize(data);
-            _ownsData = ownsData;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the FatFileSystem class.
-        /// </summary>
-        /// <param name="data">The stream containing the file system.</param>
-        /// <param name="ownsData">Indicates if the new instance should take ownership
-        /// of <paramref name="data"/>.</param>
-        /// <param name="parameters">The parameters for the file system.</param>
-        public FatFileSystem(Stream data, Ownership ownsData, FileSystemParameters parameters)
-            : base(new FatFileSystemOptions(parameters))
-        {
-            _dirCache = new Dictionary<uint, Directory>();
-
-            if (parameters != null && parameters.TimeConverter != null)
-            {
-                _timeConverter = parameters.TimeConverter;
-            }
-            else
-            {
-                _timeConverter = DefaultTimeConverter;
-            }
-
-            Initialize(data);
-            _ownsData = ownsData;
-        }
-
-        private delegate void EntryUpdateAction(DirectoryEntry entry);
-
-        /// <summary>
-        /// Gets the FAT file system options, which can be modified.
-        /// </summary>
-        public FatFileSystemOptions FatOptions
-        {
-            get { return (FatFileSystemOptions)Options; }
-        }
-
-        /// <summary>
-        /// Gets the FAT variant of the file system.
-        /// </summary>
-        public FatType FatVariant
-        {
-            get { return _type; }
-        }
-
-        /// <summary>
-        /// Gets the friendly name for the file system, including FAT variant.
-        /// </summary>
-        public override string FriendlyName
-        {
-            get
-            {
-                switch (_type)
-                {
-                    case FatType.Fat12: return "Microsoft FAT12";
-                    case FatType.Fat16: return "Microsoft FAT16";
-                    case FatType.Fat32: return "Microsoft FAT32";
-                    default: return "Unknown FAT";
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the OEM name from the file system.
-        /// </summary>
-        public string OemName
-        {
-            get { return _bpbOEMName; }
-        }
-
-        /// <summary>
-        /// Gets the number of bytes per sector (as stored in the file-system meta data).
-        /// </summary>
-        public int BytesPerSector
-        {
-            get { return _bpbBytesPerSec; }
-        }
-
-        /// <summary>
-        /// Gets the number of contiguous sectors that make up one cluster.
-        /// </summary>
-        public byte SectorsPerCluster
-        {
-            get { return _bpbSecPerClus; }
-        }
-
-        /// <summary>
-        /// Gets the number of reserved sectors at the start of the disk.
-        /// </summary>
-        public int ReservedSectorCount
-        {
-            get { return _bpbRsvdSecCnt; }
-        }
-
-        /// <summary>
-        /// Gets the number of FATs present.
-        /// </summary>
-        public byte FatCount
-        {
-            get { return _bpbNumFATs; }
-        }
-
-        /// <summary>
-        /// Gets the maximum number of root directory entries (on FAT variants that have a limit).
-        /// </summary>
-        public int MaxRootDirectoryEntries
-        {
-            get { return _bpbRootEntCnt; }
-        }
-
-        /// <summary>
-        /// Gets the total number of sectors on the disk.
-        /// </summary>
-        public long TotalSectors
-        {
-            get { return (_bpbTotSec16 != 0) ? _bpbTotSec16 : _bpbTotSec32; }
-        }
-
-        /// <summary>
-        /// Gets the Media marker byte, which indicates fixed or removable media.
-        /// </summary>
-        public byte Media
-        {
-            get { return _bpbMedia; }
-        }
-
-        /// <summary>
-        /// Gets the size of a single FAT, in sectors.
-        /// </summary>
-        public long FatSize
-        {
-            get { return (_bpbFATSz16 != 0) ? _bpbFATSz16 : _bpbFATSz32; }
-        }
-
-        /// <summary>
-        /// Gets the number of sectors per logical track.
-        /// </summary>
-        public int SectorsPerTrack
-        {
-            get { return _bpbSecPerTrk; }
-        }
-
-        /// <summary>
-        /// Gets the number of logical heads.
-        /// </summary>
-        public int Heads
-        {
-            get { return _bpbNumHeads; }
-        }
-
-        /// <summary>
-        /// Gets the number of hidden sectors, hiding partition tables, etc.
-        /// </summary>
-        public long HiddenSectors
-        {
-            get { return _bpbHiddSec; }
-        }
-
-        /// <summary>
-        /// Gets the BIOS drive number for BIOS Int 13h calls.
-        /// </summary>
-        public byte BiosDriveNumber
-        {
-            get { return _bsDrvNum; }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the VolumeId, VolumeLabel and FileSystemType fields are valid.
-        /// </summary>
-        public bool ExtendedBootSignaturePresent
-        {
-            get { return _bsBootSig == 0x29; }
-        }
-
-        /// <summary>
-        /// Gets the volume serial number.
-        /// </summary>
-        public int VolumeId
-        {
-            get { return (int)_bsVolId; }
-        }
-
-        /// <summary>
-        /// Gets the volume label.
-        /// </summary>
-        public override string VolumeLabel
-        {
-            get
-            {
-                long volId = _rootDir.FindVolumeId();
-                if (volId < 0)
-                {
-                    return _bsVolLab;
-                }
-                else
-                {
-                    return _rootDir.GetEntry(volId).Name.GetRawName(FatOptions.FileNameEncoding);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the (informational only) file system type recorded in the meta-data.
-        /// </summary>
-        public string FileSystemType
-        {
-            get { return _bsFilSysType; }
-        }
-
-        /// <summary>
-        /// Gets the active FAT (zero-based index).
-        /// </summary>
-        public byte ActiveFat
-        {
-            get { return (byte)(((_bpbExtFlags & 0x08) != 0) ? _bpbExtFlags & 0x7 : 0); }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether FAT changes are mirrored to all copies of the FAT.
-        /// </summary>
-        public bool MirrorFat
-        {
-            get { return (_bpbExtFlags & 0x08) == 0; }
-        }
-
-        /// <summary>
-        /// Gets the file-system version (usually 0).
-        /// </summary>
-        public int Version
-        {
-            get { return _bpbFSVer; }
-        }
-
-        /// <summary>
-        /// Gets the cluster number of the first cluster of the root directory (FAT32 only).
-        /// </summary>
-        public long RootDirectoryCluster
-        {
-            get { return _bpbRootClus; }
-        }
-
-        /// <summary>
-        /// Gets the sector location of the FSINFO structure (FAT32 only).
-        /// </summary>
-        public int FSInfoSector
-        {
-            get { return _bpbFSInfo; }
-        }
-
-        /// <summary>
-        /// Gets the Sector location of the backup boot sector (FAT32 only).
-        /// </summary>
-        public int BackupBootSector
-        {
-            get { return _bpbBkBootSec; }
-        }
-
-        /// <summary>
-        /// Indicates if this file system is read-only or read-write.
-        /// </summary>
-        /// <returns>.</returns>
-        public override bool CanWrite
-        {
-            get { return _data.CanWrite; }
-        }
-
-        internal FileAllocationTable Fat
-        {
-            get { return _fat; }
-        }
-
-        internal ClusterReader ClusterReader
-        {
-            get { return _clusterReader; }
-        }
-
-        #region Disk Formatting
-        /// <summary>
-        /// Creates a formatted floppy disk image in a stream.
-        /// </summary>
-        /// <param name="stream">The stream to write the blank image to.</param>
-        /// <param name="type">The type of floppy to create.</param>
-        /// <param name="label">The volume label for the floppy (or null).</param>
-        /// <returns>An object that provides access to the newly created floppy disk image.</returns>
-        public static FatFileSystem FormatFloppy(Stream stream, FloppyDiskType type, string label)
-        {
-            long pos = stream.Position;
-
-            long ticks = DateTime.UtcNow.Ticks;
-            uint volId = (uint)((ticks & 0xFFFF) | (ticks >> 32));
-
-            // Write the BIOS Parameter Block (BPB) - a single sector
-            byte[] bpb = new byte[512];
-            uint sectors;
-            if (type == FloppyDiskType.DoubleDensity)
-            {
-                sectors = 1440;
-                WriteBPB(bpb, sectors, FatType.Fat12, 224, 0, 1, 1, new Geometry(80, 2, 9), true, volId, label);
-            }
-            else if (type == FloppyDiskType.HighDensity)
-            {
-                sectors = 2880;
-                WriteBPB(bpb, sectors, FatType.Fat12, 224, 0, 1, 1, new Geometry(80, 2, 18), true, volId, label);
-            }
-            else if (type == FloppyDiskType.Extended)
-            {
-                sectors = 5760;
-                WriteBPB(bpb, sectors, FatType.Fat12, 224, 0, 1, 1, new Geometry(80, 2, 36), true, volId, label);
-            }
-            else
-            {
-                throw new ArgumentException("Unrecognised Floppy Disk type", "type");
-            }
-
-            stream.Write(bpb, 0, bpb.Length);
-
-            // Write both FAT copies
-            uint fatSize = CalcFatSize(sectors, FatType.Fat12, 1);
-            byte[] fat = new byte[fatSize * Utilities.SectorSize];
-            FatBuffer fatBuffer = new FatBuffer(FatType.Fat12, fat);
-            fatBuffer.SetNext(0, 0xFFFFFFF0);
-            fatBuffer.SetEndOfChain(1);
-            stream.Write(fat, 0, fat.Length);
-            stream.Write(fat, 0, fat.Length);
-
-            // Write the (empty) root directory
-            uint rootDirSectors = ((224 * 32) + Utilities.SectorSize - 1) / Utilities.SectorSize;
-            byte[] rootDir = new byte[rootDirSectors * Utilities.SectorSize];
-            stream.Write(rootDir, 0, rootDir.Length);
-
-            // Write a single byte at the end of the disk to ensure the stream is at least as big
-            // as needed for this disk image.
-            stream.Position = pos + (sectors * Utilities.SectorSize) - 1;
-            stream.WriteByte(0);
-
-            // Give the caller access to the new file system
-            stream.Position = pos;
-            return new FatFileSystem(stream);
-        }
-
-        /// <summary>
-        /// Formats a virtual hard disk partition.
-        /// </summary>
-        /// <param name="disk">The disk containing the partition.</param>
-        /// <param name="partitionIndex">The index of the partition on the disk.</param>
-        /// <param name="label">The volume label for the partition (or null).</param>
-        /// <returns>An object that provides access to the newly created partition file system.</returns>
-        public static FatFileSystem FormatPartition(VirtualDisk disk, int partitionIndex, string label)
-        {
-            using (Stream partitionStream = disk.Partitions[partitionIndex].Open())
-            {
-                return FormatPartition(
-                    partitionStream,
-                    label,
-                    disk.Geometry,
-                    (int)disk.Partitions[partitionIndex].FirstSector,
-                    (int)(1 + disk.Partitions[partitionIndex].LastSector - disk.Partitions[partitionIndex].FirstSector),
-                    0);
-            }
-        }
-
-        /// <summary>
-        /// Creates a formatted hard disk partition in a stream.
-        /// </summary>
-        /// <param name="stream">The stream to write the new file system to.</param>
-        /// <param name="label">The volume label for the partition (or null).</param>
-        /// <param name="diskGeometry">The geometry of the disk containing the partition.</param>
-        /// <param name="firstSector">The starting sector number of this partition (hide's sectors in other partitions).</param>
-        /// <param name="sectorCount">The number of sectors in this partition.</param>
-        /// <param name="reservedSectors">The number of reserved sectors at the start of the partition.</param>
-        /// <returns>An object that provides access to the newly created partition file system.</returns>
-        public static FatFileSystem FormatPartition(
-            Stream stream,
-            string label,
-            Geometry diskGeometry,
-            int firstSector,
-            int sectorCount,
-            short reservedSectors)
-        {
-            long pos = stream.Position;
-
-            long ticks = DateTime.UtcNow.Ticks;
-            uint volId = (uint)((ticks & 0xFFFF) | (ticks >> 32));
-
-            byte sectorsPerCluster;
-            FatType fatType;
-            ushort maxRootEntries;
-
-            /*
-             * Write the BIOS Parameter Block (BPB) - a single sector
-             */
-
-            byte[] bpb = new byte[512];
-            if (sectorCount <= 8400)
-            {
-                throw new ArgumentException("Requested size is too small for a partition");
-            }
-            else if (sectorCount < 1024 * 1024)
-            {
-                fatType = FatType.Fat16;
-                maxRootEntries = 512;
-                if (sectorCount <= 32680)
-                {
-                    sectorsPerCluster = 2;
-                }
-                else if (sectorCount <= 262144)
-                {
-                    sectorsPerCluster = 4;
-                }
-                else if (sectorCount <= 524288)
-                {
-                    sectorsPerCluster = 8;
-                }
-                else
-                {
-                    sectorsPerCluster = 16;
-                }
-
-                if (reservedSectors < 1)
-                {
-                    reservedSectors = 1;
-                }
-            }
-            else
-            {
-                fatType = FatType.Fat32;
-                maxRootEntries = 0;
-                if (sectorCount <= 532480)
-                {
-                    sectorsPerCluster = 1;
-                }
-                else if (sectorCount <= 16777216)
-                {
-                    sectorsPerCluster = 8;
-                }
-                else if (sectorCount <= 33554432)
-                {
-                    sectorsPerCluster = 16;
-                }
-                else if (sectorCount <= 67108864)
-                {
-                    sectorsPerCluster = 32;
-                }
-                else
-                {
-                    sectorsPerCluster = 64;
-                }
-
-                if (reservedSectors < 32)
-                {
-                    reservedSectors = 32;
-                }
-            }
-
-            WriteBPB(bpb, (uint)sectorCount, fatType, maxRootEntries, (uint)firstSector, (ushort)reservedSectors, sectorsPerCluster, diskGeometry, false, volId, label);
-            stream.Write(bpb, 0, bpb.Length);
-
-            /*
-             * Skip the reserved sectors
-             */
-
-            stream.Position = pos + (((ushort)reservedSectors) * Utilities.SectorSize);
-
-            /*
-             * Write both FAT copies
-             */
-
-            byte[] fat = new byte[CalcFatSize((uint)sectorCount, fatType, sectorsPerCluster) * Utilities.SectorSize];
-            FatBuffer fatBuffer = new FatBuffer(fatType, fat);
-            fatBuffer.SetNext(0, 0xFFFFFFF8);
-            fatBuffer.SetEndOfChain(1);
-            if (fatType >= FatType.Fat32)
-            {
-                // Mark cluster 2 as End-of-chain (i.e. root directory
-                // is a single cluster in length)
-                fatBuffer.SetEndOfChain(2);
-            }
-
-            stream.Write(fat, 0, fat.Length);
-            stream.Write(fat, 0, fat.Length);
-
-            /*
-             * Write the (empty) root directory
-             */
-
-            uint rootDirSectors;
-            if (fatType < FatType.Fat32)
-            {
-                rootDirSectors = (uint)(((maxRootEntries * 32) + Utilities.SectorSize - 1) / Utilities.SectorSize);
-            }
-            else
-            {
-                rootDirSectors = sectorsPerCluster;
-            }
-
-            byte[] rootDir = new byte[rootDirSectors * Utilities.SectorSize];
-            stream.Write(rootDir, 0, rootDir.Length);
-
-            /*
-             * Make sure the stream is at least as large as the partition requires.
-             */
-
-            if (stream.Length < pos + (sectorCount * Utilities.SectorSize))
-            {
-                stream.SetLength(pos + (sectorCount * Utilities.SectorSize));
-            }
-
-            /*
-             * Give the caller access to the new file system
-             */
-
-            stream.Position = pos;
-            return new FatFileSystem(stream);
-        }
-        #endregion
-
-        /// <summary>
-        /// Detects if a stream contains a FAT file system.
-        /// </summary>
-        /// <param name="stream">The stream to inspect.</param>
-        /// <returns><c>true</c> if the stream appears to be a FAT file system, else <c>false</c>.</returns>
-        public static bool Detect(Stream stream)
-        {
-            if (stream.Length < 512)
-            {
-                return false;
-            }
-
-            stream.Position = 0;
-            byte[] bytes = Utilities.ReadFully(stream, 512);
-            ushort bpbBytesPerSec = Utilities.ToUInt16LittleEndian(bytes, 11);
-            if (bpbBytesPerSec != 512)
-            {
-                return false;
-            }
-
-            byte bpbNumFATs = bytes[16];
-            if (bpbNumFATs == 0 || bpbNumFATs > 2)
-            {
-                return false;
-            }
-
-            ushort bpbTotSec16 = Utilities.ToUInt16LittleEndian(bytes, 19);
-            uint bpbTotSec32 = Utilities.ToUInt32LittleEndian(bytes, 32);
-
-            if (!((bpbTotSec16 == 0) ^ (bpbTotSec32 == 0)))
-            {
-                return false;
-            }
-
-            uint totalSectors = bpbTotSec16 + bpbTotSec32;
-            return totalSectors * (long)bpbBytesPerSec <= stream.Length;
-        }
-
-        /// <summary>
-        /// Opens a file for reading and/or writing.
-        /// </summary>
-        /// <param name="path">The full path to the file.</param>
-        /// <param name="mode">The file mode.</param>
-        /// <param name="access">The desired access.</param>
-        /// <returns>The stream to the opened file.</returns>
-        public override SparseStream OpenFile(string path, FileMode mode, FileAccess access)
-        {
-            Directory parent;
-            long entryId;
-            try
-            {
-                entryId = GetDirectoryEntry(_rootDir, path, out parent);
-            }
-            catch (ArgumentException)
-            {
-                throw new IOException("Invalid path: " + path);
-            }
-
-            if (parent == null)
-            {
-                throw new FileNotFoundException("Could not locate file", path);
-            }
-
-            if (entryId < 0)
-            {
-                return parent.OpenFile(FileName.FromPath(path, FatOptions.FileNameEncoding), mode, access);
-            }
-
-            DirectoryEntry dirEntry = parent.GetEntry(entryId);
-
-            if ((dirEntry.Attributes & FatAttributes.Directory) != 0)
-            {
-                throw new IOException("Attempt to open directory as a file");
-            }
-            else
-            {
-                return parent.OpenFile(dirEntry.Name, mode, access);
-            }
-        }
-
-        /// <summary>
-        /// Gets the attributes of a file or directory.
-        /// </summary>
-        /// <param name="path">The file or directory to inspect.</param>
-        /// <returns>The attributes of the file or directory.</returns>
-        public override FileAttributes GetAttributes(string path)
-        {
-            // Simulate a root directory entry - doesn't really exist though
-            if (IsRootPath(path))
-            {
-                return FileAttributes.Directory;
-            }
-
-            DirectoryEntry dirEntry = GetDirectoryEntry(path);
-            if (dirEntry == null)
-            {
-                throw new FileNotFoundException("No such file", path);
-            }
-
-            // Luckily, FAT and .NET FileAttributes match, bit-for-bit
-            return (FileAttributes)dirEntry.Attributes;
-        }
-
-        /// <summary>
-        /// Sets the attributes of a file or directory.
-        /// </summary>
-        /// <param name="path">The file or directory to change.</param>
-        /// <param name="newValue">The new attributes of the file or directory.</param>
-        public override void SetAttributes(string path, FileAttributes newValue)
-        {
-            if (IsRootPath(path))
-            {
-                if (newValue != FileAttributes.Directory)
-                {
-                    throw new NotSupportedException("The attributes of the root directory cannot be modified");
-                }
-
-                return;
-            }
-
-            Directory parent;
-            long id = GetDirectoryEntry(path, out parent);
-            DirectoryEntry dirEntry = parent.GetEntry(id);
-
-            FatAttributes newFatAttr = (FatAttributes)newValue;
-
-            if ((newFatAttr & FatAttributes.Directory) != (dirEntry.Attributes & FatAttributes.Directory))
-            {
-                throw new ArgumentException("Attempted to change the directory attribute");
-            }
-
-            dirEntry.Attributes = newFatAttr;
-            parent.UpdateEntry(id, dirEntry);
-
-            // For directories, need to update their 'self' entry also
-            if ((dirEntry.Attributes & FatAttributes.Directory) != 0)
-            {
-                Directory dir = GetDirectory(path);
-                dirEntry = dir.SelfEntry;
-                dirEntry.Attributes = newFatAttr;
-                dir.SelfEntry = dirEntry;
-            }
-        }
-
-        /// <summary>
-        /// Gets the creation time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The creation time.</returns>
-        public override DateTime GetCreationTime(string path)
-        {
-            if (IsRootPath(path))
-            {
-                return Epoch;
-            }
-
-            return GetDirectoryEntry(path).CreationTime;
-        }
-
-        /// <summary>
-        /// Sets the creation time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public override void SetCreationTime(string path, DateTime newTime)
-        {
-            if (IsRootPath(path))
-            {
-                if (newTime != Epoch)
-                {
-                    throw new NotSupportedException("The creation time of the root directory cannot be modified");
-                }
-
-                return;
-            }
-
-            UpdateDirEntry(path, (e) => { e.CreationTime = newTime; });
-        }
-
-        /// <summary>
-        /// Gets the creation time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The creation time.</returns>
-        public override DateTime GetCreationTimeUtc(string path)
-        {
-            if (IsRootPath(path))
-            {
-                return ConvertToUtc(Epoch);
-            }
-
-            return ConvertToUtc(GetDirectoryEntry(path).CreationTime);
-        }
-
-        /// <summary>
-        /// Sets the creation time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public override void SetCreationTimeUtc(string path, DateTime newTime)
-        {
-            if (IsRootPath(path))
-            {
-                if (ConvertFromUtc(newTime) != Epoch)
-                {
-                    throw new NotSupportedException("The last write time of the root directory cannot be modified");
-                }
-
-                return;
-            }
-
-            UpdateDirEntry(path, (e) => { e.CreationTime = ConvertFromUtc(newTime); });
-        }
-
-        /// <summary>
-        /// Gets the last access time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The time the file or directory was last accessed.</returns>
-        public override DateTime GetLastAccessTime(string path)
-        {
-            if (IsRootPath(path))
-            {
-                return Epoch;
-            }
-
-            return GetDirectoryEntry(path).LastAccessTime;
-        }
-
-        /// <summary>
-        /// Sets the last access time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public override void SetLastAccessTime(string path, DateTime newTime)
-        {
-            if (IsRootPath(path))
-            {
-                if (newTime != Epoch)
-                {
-                    throw new NotSupportedException("The last access time of the root directory cannot be modified");
-                }
-
-                return;
-            }
-
-            UpdateDirEntry(path, (e) => { e.LastAccessTime = newTime; });
-        }
-
-        /// <summary>
-        /// Gets the last access time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The time the file or directory was last accessed.</returns>
-        public override DateTime GetLastAccessTimeUtc(string path)
-        {
-            if (IsRootPath(path))
-            {
-                return ConvertToUtc(Epoch);
-            }
-
-            return ConvertToUtc(GetDirectoryEntry(path).LastAccessTime);
-        }
-
-        /// <summary>
-        /// Sets the last access time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public override void SetLastAccessTimeUtc(string path, DateTime newTime)
-        {
-            if (IsRootPath(path))
-            {
-                if (ConvertFromUtc(newTime) != Epoch)
-                {
-                    throw new NotSupportedException("The last write time of the root directory cannot be modified");
-                }
-
-                return;
-            }
-
-            UpdateDirEntry(path, (e) => { e.LastAccessTime = ConvertFromUtc(newTime); });
-        }
-
-        /// <summary>
-        /// Gets the last modification time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The time the file or directory was last modified.</returns>
-        public override DateTime GetLastWriteTime(string path)
-        {
-            if (IsRootPath(path))
-            {
-                return Epoch;
-            }
-
-            return GetDirectoryEntry(path).LastWriteTime;
-        }
-
-        /// <summary>
-        /// Sets the last modification time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public override void SetLastWriteTime(string path, DateTime newTime)
-        {
-            if (IsRootPath(path))
-            {
-                if (newTime != Epoch)
-                {
-                    throw new NotSupportedException("The last write time of the root directory cannot be modified");
-                }
-
-                return;
-            }
-
-            UpdateDirEntry(path, (e) => { e.LastWriteTime = newTime; });
-        }
-
-        /// <summary>
-        /// Gets the last modification time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The time the file or directory was last modified.</returns>
-        public override DateTime GetLastWriteTimeUtc(string path)
-        {
-            if (IsRootPath(path))
-            {
-                return ConvertToUtc(Epoch);
-            }
-
-            return ConvertToUtc(GetDirectoryEntry(path).LastWriteTime);
-        }
-
-        /// <summary>
-        /// Sets the last modification time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public override void SetLastWriteTimeUtc(string path, DateTime newTime)
-        {
-            if (IsRootPath(path))
-            {
-                if (ConvertFromUtc(newTime) != Epoch)
-                {
-                    throw new NotSupportedException("The last write time of the root directory cannot be modified");
-                }
-
-                return;
-            }
-
-            UpdateDirEntry(path, (e) => { e.LastWriteTime = ConvertFromUtc(newTime); });
-        }
-
-        /// <summary>
-        /// Gets the length of a file.
-        /// </summary>
-        /// <param name="path">The path to the file.</param>
-        /// <returns>The length in bytes.</returns>
-        public override long GetFileLength(string path)
-        {
-            return GetDirectoryEntry(path).FileSize;
-        }
-
-        /// <summary>
-        /// Copies an existing file to a new file, allowing overwriting of an existing file.
-        /// </summary>
-        /// <param name="sourceFile">The source file.</param>
-        /// <param name="destinationFile">The destination file.</param>
-        /// <param name="overwrite">Whether to permit over-writing of an existing file.</param>
-        public override void CopyFile(string sourceFile, string destinationFile, bool overwrite)
-        {
-            Directory sourceDir;
-            long sourceEntryId = GetDirectoryEntry(sourceFile, out sourceDir);
-
-            if (sourceDir == null || sourceEntryId < 0)
-            {
-                throw new FileNotFoundException(string.Format(CultureInfo.InvariantCulture, "The source file '{0}' was not found", sourceFile));
-            }
-
-            DirectoryEntry sourceEntry = sourceDir.GetEntry(sourceEntryId);
-
-            if ((sourceEntry.Attributes & FatAttributes.Directory) != 0)
-            {
-                throw new IOException("The source file is a directory");
-            }
-
-            DirectoryEntry newEntry = new DirectoryEntry(sourceEntry);
-            newEntry.Name = FileName.FromPath(destinationFile, FatOptions.FileNameEncoding);
-            newEntry.FirstCluster = 0;
-
-            Directory destDir;
-            long destEntryId = GetDirectoryEntry(destinationFile, out destDir);
-
-            if (destDir == null)
-            {
-                throw new DirectoryNotFoundException(string.Format(CultureInfo.InvariantCulture, "The destination directory for '{0}' was not found", destinationFile));
-            }
-
-            // If the destination is a directory, use the old file name to construct a full path.
-            if (destEntryId >= 0)
-            {
-                DirectoryEntry destEntry = destDir.GetEntry(destEntryId);
-                if ((destEntry.Attributes & FatAttributes.Directory) != 0)
-                {
-                    newEntry.Name = FileName.FromPath(sourceFile, FatOptions.FileNameEncoding);
-                    destinationFile = Utilities.CombinePaths(destinationFile, Utilities.GetFileFromPath(sourceFile));
-
-                    destEntryId = GetDirectoryEntry(destinationFile, out destDir);
-                }
-            }
-
-            // If there's an existing entry...
-            if (destEntryId >= 0)
-            {
-                DirectoryEntry destEntry = destDir.GetEntry(destEntryId);
-
-                if ((destEntry.Attributes & FatAttributes.Directory) != 0)
-                {
-                    throw new IOException("Destination file is an existing directory");
-                }
-
-                if (!overwrite)
-                {
-                    throw new IOException("Destination file already exists");
-                }
-
-                // Remove the old file
-                destDir.DeleteEntry(destEntryId, true);
-            }
-
-            // Add the new file's entry
-            destEntryId = destDir.AddEntry(newEntry);
-
-            // Copy the contents...
-            using (Stream sourceStream = new FatFileStream(this, sourceDir, sourceEntryId, FileAccess.Read),
-                destStream = new FatFileStream(this, destDir, destEntryId, FileAccess.Write))
-            {
-                Utilities.PumpStreams(sourceStream, destStream);
-            }
-        }
-
-        /// <summary>
-        /// Creates a directory.
-        /// </summary>
-        /// <param name="path">The directory to create.</param>
-        public override void CreateDirectory(string path)
-        {
-            string[] pathElements = path.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries);
-
-            Directory focusDir = _rootDir;
-
-            for (int i = 0; i < pathElements.Length; ++i)
-            {
-                FileName name;
-                try
-                {
-                    name = new FileName(pathElements[i], FatOptions.FileNameEncoding);
-                }
-                catch (ArgumentException ae)
-                {
-                    throw new IOException("Invalid path", ae);
-                }
-
-                Directory child = focusDir.GetChildDirectory(name);
-                if (child == null)
-                {
-                    child = focusDir.CreateChildDirectory(name);
-                }
-
-                focusDir = child;
-            }
-        }
-
-        /// <summary>
-        /// Deletes a directory, optionally with all descendants.
-        /// </summary>
-        /// <param name="path">The path of the directory to delete.</param>
-        public override void DeleteDirectory(string path)
-        {
-            Directory dir = GetDirectory(path);
-            if (dir == null)
-            {
-                throw new DirectoryNotFoundException(String.Format(CultureInfo.InvariantCulture, "No such directory: {0}", path));
-            }
-
-            if (!dir.IsEmpty)
-            {
-                throw new IOException("Unable to delete non-empty directory");
-            }
-
-            Directory parent;
-            long id = GetDirectoryEntry(path, out parent);
-            if (parent == null && id == 0)
-            {
-                throw new IOException("Unable to delete root directory");
-            }
-            else if (parent != null && id >= 0)
-            {
-                DirectoryEntry deadEntry = parent.GetEntry(id);
-                parent.DeleteEntry(id, true);
-                ForgetDirectory(deadEntry);
-            }
-            else
-            {
-                throw new DirectoryNotFoundException("No such directory: " + path);
-            }
-        }
-
-        /// <summary>
-        /// Deletes a file.
-        /// </summary>
-        /// <param name="path">The path of the file to delete.</param>
-        public override void DeleteFile(string path)
-        {
-            Directory parent;
-            long id = GetDirectoryEntry(path, out parent);
-            if (parent == null || id < 0)
-            {
-                throw new FileNotFoundException("No such file", path);
-            }
-
-            DirectoryEntry entry = parent.GetEntry(id);
-            if (entry == null || (entry.Attributes & FatAttributes.Directory) != 0)
-            {
-                throw new FileNotFoundException("No such file", path);
-            }
-
-            parent.DeleteEntry(id, true);
-        }
-
-        /// <summary>
-        /// Indicates if a directory exists.
-        /// </summary>
-        /// <param name="path">The path to test.</param>
-        /// <returns>true if the directory exists.</returns>
-        public override bool DirectoryExists(string path)
-        {
-            // Special case - root directory
-            if (String.IsNullOrEmpty(path))
-            {
-                return true;
-            }
-            else
-            {
-                DirectoryEntry dirEntry = GetDirectoryEntry(path);
-                return dirEntry != null && (dirEntry.Attributes & FatAttributes.Directory) != 0;
-            }
-        }
-
-        /// <summary>
-        /// Indicates if a file exists.
-        /// </summary>
-        /// <param name="path">The path to test.</param>
-        /// <returns>true if the file exists.</returns>
-        public override bool FileExists(string path)
-        {
-            // Special case - root directory
-            if (String.IsNullOrEmpty(path))
-            {
-                return true;
-            }
-            else
-            {
-                DirectoryEntry dirEntry = GetDirectoryEntry(path);
-                return dirEntry != null && (dirEntry.Attributes & FatAttributes.Directory) == 0;
-            }
-        }
-
-        /// <summary>
-        /// Indicates if a file or directory exists.
-        /// </summary>
-        /// <param name="path">The path to test.</param>
-        /// <returns>true if the file or directory exists.</returns>
-        public override bool Exists(string path)
-        {
-            // Special case - root directory
-            if (String.IsNullOrEmpty(path))
-            {
-                return true;
-            }
-            else
-            {
-                return GetDirectoryEntry(path) != null;
-            }
-        }
-
-        /// <summary>
-        /// Gets the names of subdirectories in a specified directory.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <returns>Array of directories.</returns>
-        public override string[] GetDirectories(string path)
-        {
-            Directory dir = GetDirectory(path);
-            if (dir == null)
-            {
-                throw new DirectoryNotFoundException(string.Format(CultureInfo.InvariantCulture, "The directory '{0}' was not found", path));
-            }
-
-            DirectoryEntry[] entries = dir.GetDirectories();
-            List<string> dirs = new List<string>(entries.Length);
-            foreach (DirectoryEntry dirEntry in entries)
-            {
-                dirs.Add(Utilities.CombinePaths(path, dirEntry.Name.GetDisplayName(FatOptions.FileNameEncoding)));
-            }
-
-            return dirs.ToArray();
-        }
-
-        /// <summary>
-        /// Gets the names of subdirectories in a specified directory matching a specified
-        /// search pattern, using a value to determine whether to search subdirectories.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <param name="searchOption">Indicates whether to search subdirectories.</param>
-        /// <returns>Array of directories matching the search pattern.</returns>
-        public override string[] GetDirectories(string path, string searchPattern, SearchOption searchOption)
-        {
-            Regex re = Utilities.ConvertWildcardsToRegEx(searchPattern);
-
-            List<string> dirs = new List<string>();
-            DoSearch(dirs, path, re, searchOption == SearchOption.AllDirectories, true, false);
-            return dirs.ToArray();
-        }
-
-        /// <summary>
-        /// Gets the names of files in a specified directory.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <returns>Array of files.</returns>
-        public override string[] GetFiles(string path)
-        {
-            Directory dir = GetDirectory(path);
-            DirectoryEntry[] entries = dir.GetFiles();
-
-            List<string> files = new List<string>(entries.Length);
-            foreach (DirectoryEntry dirEntry in entries)
-            {
-                files.Add(Utilities.CombinePaths(path, dirEntry.Name.GetDisplayName(FatOptions.FileNameEncoding)));
-            }
-
-            return files.ToArray();
-        }
-
-        /// <summary>
-        /// Gets the names of files in a specified directory matching a specified
-        /// search pattern, using a value to determine whether to search subdirectories.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <param name="searchOption">Indicates whether to search subdirectories.</param>
-        /// <returns>Array of files matching the search pattern.</returns>
-        public override string[] GetFiles(string path, string searchPattern, SearchOption searchOption)
-        {
-            Regex re = Utilities.ConvertWildcardsToRegEx(searchPattern);
-
-            List<string> results = new List<string>();
-            DoSearch(results, path, re, searchOption == SearchOption.AllDirectories, false, true);
-            return results.ToArray();
-        }
-
-        /// <summary>
-        /// Gets the names of all files and subdirectories in a specified directory.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <returns>Array of files and subdirectories matching the search pattern.</returns>
-        public override string[] GetFileSystemEntries(string path)
-        {
-            Directory dir = GetDirectory(path);
-            DirectoryEntry[] entries = dir.Entries;
-
-            List<string> result = new List<string>(entries.Length);
-            foreach (DirectoryEntry dirEntry in entries)
-            {
-                result.Add(Utilities.CombinePaths(path, dirEntry.Name.GetDisplayName(FatOptions.FileNameEncoding)));
-            }
-
-            return result.ToArray();
-        }
-
-        /// <summary>
-        /// Gets the names of files and subdirectories in a specified directory matching a specified
-        /// search pattern.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <returns>Array of files and subdirectories matching the search pattern.</returns>
-        public override string[] GetFileSystemEntries(string path, string searchPattern)
-        {
-            Regex re = Utilities.ConvertWildcardsToRegEx(searchPattern);
-
-            Directory dir = GetDirectory(path);
-            DirectoryEntry[] entries = dir.Entries;
-
-            List<string> result = new List<string>(entries.Length);
-            foreach (DirectoryEntry dirEntry in entries)
-            {
-                if (re.IsMatch(dirEntry.Name.GetSearchName(FatOptions.FileNameEncoding)))
-                {
-                    result.Add(Utilities.CombinePaths(path, dirEntry.Name.GetDisplayName(FatOptions.FileNameEncoding)));
-                }
-            }
-
-            return result.ToArray();
-        }
-
-        /// <summary>
-        /// Moves a directory.
-        /// </summary>
-        /// <param name="sourceDirectoryName">The directory to move.</param>
-        /// <param name="destinationDirectoryName">The target directory name.</param>
-        public override void MoveDirectory(string sourceDirectoryName, string destinationDirectoryName)
-        {
-            if (string.IsNullOrEmpty(destinationDirectoryName))
-            {
-                if (destinationDirectoryName == null)
-                {
-                    throw new ArgumentNullException("destinationDirectoryName");
-                }
-                else
-                {
-                    throw new ArgumentException("Invalid destination name (empty string)");
-                }
-            }
-
-            Directory destParent;
-            long destId = GetDirectoryEntry(destinationDirectoryName, out destParent);
-            if (destParent == null)
-            {
-                throw new DirectoryNotFoundException("Target directory doesn't exist");
-            }
-            else if (destId >= 0)
-            {
-                throw new IOException("Target directory already exists");
-            }
-
-            Directory sourceParent;
-            long sourceId = GetDirectoryEntry(sourceDirectoryName, out sourceParent);
-            if (sourceParent == null || sourceId < 0)
-            {
-                throw new IOException("Source directory doesn't exist");
-            }
-
-            destParent.AttachChildDirectory(FileName.FromPath(destinationDirectoryName, FatOptions.FileNameEncoding), GetDirectory(sourceDirectoryName));
-            sourceParent.DeleteEntry(sourceId, false);
-        }
-
-        /// <summary>
-        /// Moves a file, allowing an existing file to be overwritten.
-        /// </summary>
-        /// <param name="sourceName">The file to move.</param>
-        /// <param name="destinationName">The target file name.</param>
-        /// <param name="overwrite">Whether to permit a destination file to be overwritten.</param>
-        public override void MoveFile(string sourceName, string destinationName, bool overwrite)
-        {
-            Directory sourceDir;
-            long sourceEntryId = GetDirectoryEntry(sourceName, out sourceDir);
-
-            if (sourceDir == null || sourceEntryId < 0)
-            {
-                throw new FileNotFoundException(string.Format(CultureInfo.InvariantCulture, "The source file '{0}' was not found", sourceName));
-            }
-
-            DirectoryEntry sourceEntry = sourceDir.GetEntry(sourceEntryId);
-
-            if ((sourceEntry.Attributes & FatAttributes.Directory) != 0)
-            {
-                throw new IOException("The source file is a directory");
-            }
-
-            DirectoryEntry newEntry = new DirectoryEntry(sourceEntry);
-            newEntry.Name = FileName.FromPath(destinationName, FatOptions.FileNameEncoding);
-
-            Directory destDir;
-            long destEntryId = GetDirectoryEntry(destinationName, out destDir);
-
-            if (destDir == null)
-            {
-                throw new DirectoryNotFoundException(string.Format(CultureInfo.InvariantCulture, "The destination directory for '{0}' was not found", destinationName));
-            }
-
-            // If the destination is a directory, use the old file name to construct a full path.
-            if (destEntryId >= 0)
-            {
-                DirectoryEntry destEntry = destDir.GetEntry(destEntryId);
-                if ((destEntry.Attributes & FatAttributes.Directory) != 0)
-                {
-                    newEntry.Name = FileName.FromPath(sourceName, FatOptions.FileNameEncoding);
-                    destinationName = Utilities.CombinePaths(destinationName, Utilities.GetFileFromPath(sourceName));
-
-                    destEntryId = GetDirectoryEntry(destinationName, out destDir);
-                }
-            }
-
-            // If there's an existing entry...
-            if (destEntryId >= 0)
-            {
-                DirectoryEntry destEntry = destDir.GetEntry(destEntryId);
-
-                if ((destEntry.Attributes & FatAttributes.Directory) != 0)
-                {
-                    throw new IOException("Destination file is an existing directory");
-                }
-
-                if (!overwrite)
-                {
-                    throw new IOException("Destination file already exists");
-                }
-
-                // Remove the old file
-                destDir.DeleteEntry(destEntryId, true);
-            }
-
-            // Add the new file's entry and remove the old link to the file's contents
-            destDir.AddEntry(newEntry);
-            sourceDir.DeleteEntry(sourceEntryId, false);
-        }
-
-        internal DateTime ConvertToUtc(DateTime dateTime)
-        {
-            return _timeConverter(dateTime, true);
-        }
-
-        internal DateTime ConvertFromUtc(DateTime dateTime)
-        {
-            return _timeConverter(dateTime, false);
-        }
-
-        internal Directory GetDirectory(string path)
-        {
-            Directory parent;
-
-            if (string.IsNullOrEmpty(path) || path == "\\")
-            {
-                return _rootDir;
-            }
-
-            long id = GetDirectoryEntry(_rootDir, path, out parent);
-            if (id >= 0)
-            {
-                return GetDirectory(parent, id);
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        internal Directory GetDirectory(Directory parent, long parentId)
-        {
-            if (parent == null)
-            {
-                return _rootDir;
-            }
-
-            DirectoryEntry dirEntry = parent.GetEntry(parentId);
-            if ((dirEntry.Attributes & FatAttributes.Directory) == 0)
-            {
-                throw new DirectoryNotFoundException();
-            }
-
-            // If we have this one cached, return it
-            Directory result;
-            if (_dirCache.TryGetValue(dirEntry.FirstCluster, out result))
-            {
-                return result;
-            }
-
-            // Not cached - create a new one.
-            result = new Directory(parent, parentId);
-            _dirCache[dirEntry.FirstCluster] = result;
-            return result;
-        }
-
-        internal void ForgetDirectory(DirectoryEntry entry)
-        {
-            uint index = entry.FirstCluster;
-            if (index != 0 && _dirCache.ContainsKey(index))
-            {
-                Directory dir = _dirCache[index];
-                _dirCache.Remove(index);
-                dir.Dispose();
-            }
-        }
-
-        internal DirectoryEntry GetDirectoryEntry(string path)
-        {
-            Directory parent;
-
-            long id = GetDirectoryEntry(_rootDir, path, out parent);
-            if (parent == null || id < 0)
-            {
-                return null;
-            }
-
-            return parent.GetEntry(id);
-        }
-
-        internal long GetDirectoryEntry(string path, out Directory parent)
-        {
-            return GetDirectoryEntry(_rootDir, path, out parent);
-        }
-
-        /// <summary>
-        /// Disposes of this instance.
-        /// </summary>
-        /// <param name="disposing">The value <c>true</c> if Disposing.</param>
-        protected override void Dispose(bool disposing)
-        {
-            try
-            {
-                if (disposing)
-                {
-                    foreach (Directory dir in _dirCache.Values)
-                    {
-                        dir.Dispose();
-                    }
-
-                    _rootDir.Dispose();
-
-                    if (_ownsData == Ownership.Dispose)
-                    {
-                        _data.Dispose();
-                        _data = null;
-                    }
-                }
-            }
-            finally
-            {
-                base.Dispose(disposing);
-            }
-        }
-
-        /// <summary>
-        /// Writes a FAT12/FAT16 BPB.
-        /// </summary>
-        /// <param name="bootSector">The buffer to fill.</param>
-        /// <param name="sectors">The total capacity of the disk (in sectors).</param>
-        /// <param name="fatType">The number of bits in each FAT entry.</param>
-        /// <param name="maxRootEntries">The maximum number of root directory entries.</param>
-        /// <param name="hiddenSectors">The number of hidden sectors before this file system (i.e. partition offset).</param>
-        /// <param name="reservedSectors">The number of reserved sectors before the FAT.</param>
-        /// <param name="sectorsPerCluster">The number of sectors per cluster.</param>
-        /// <param name="diskGeometry">The geometry of the disk containing the Fat file system.</param>
-        /// <param name="isFloppy">Indicates if the disk is a removable media (a floppy disk).</param>
-        /// <param name="volId">The disk's volume Id.</param>
-        /// <param name="label">The disk's label (or null).</param>
-        private static void WriteBPB(
-            byte[] bootSector,
-            uint sectors,
-            FatType fatType,
-            ushort maxRootEntries,
-            uint hiddenSectors,
-            ushort reservedSectors,
-            byte sectorsPerCluster,
-            Geometry diskGeometry,
-            bool isFloppy,
-            uint volId,
-            string label)
-        {
-            uint fatSectors = CalcFatSize(sectors, fatType, sectorsPerCluster);
-
-            bootSector[0] = 0xEB;
-            bootSector[1] = 0x3C;
-            bootSector[2] = 0x90;
-
-            // OEM Name
-            Utilities.StringToBytes("DISCUTIL", bootSector, 3, 8);
-
-            // Bytes Per Sector (512)
-            bootSector[11] = 0;
-            bootSector[12] = 2;
-
-            // Sectors Per Cluster
-            bootSector[13] = sectorsPerCluster;
-
-            // Reserved Sector Count
-            Utilities.WriteBytesLittleEndian(reservedSectors, bootSector, 14);
-
-            // Number of FATs
-            bootSector[16] = 2;
-
-            // Number of Entries in the root directory
-            Utilities.WriteBytesLittleEndian((ushort)maxRootEntries, bootSector, 17);
-
-            // Total number of sectors (small)
-            Utilities.WriteBytesLittleEndian((ushort)(sectors < 0x10000 ? sectors : 0), bootSector, 19);
-
-            // Media
-            bootSector[21] = (byte)(isFloppy ? 0xF0 : 0xF8);
-
-            // FAT size (FAT12/FAT16)
-            Utilities.WriteBytesLittleEndian((ushort)(fatType < FatType.Fat32 ? fatSectors : 0), bootSector, 22);
-
-            // Sectors Per Track
-            Utilities.WriteBytesLittleEndian((ushort)diskGeometry.SectorsPerTrack, bootSector, 24);
-
-            // Heads Per Cylinder
-            Utilities.WriteBytesLittleEndian((ushort)diskGeometry.HeadsPerCylinder, bootSector, 26);
-
-            // Hidden Sectors
-            Utilities.WriteBytesLittleEndian((uint)hiddenSectors, bootSector, 28);
-
-            // Total number of sectors (large)
-            Utilities.WriteBytesLittleEndian((uint)(sectors >= 0x10000 ? sectors : 0), bootSector, 32);
-
-            if (fatType < FatType.Fat32)
-            {
-                WriteBS(bootSector, 36, isFloppy, volId, label, fatType);
-            }
-            else
-            {
-                // FAT size (FAT32)
-                Utilities.WriteBytesLittleEndian((uint)fatSectors, bootSector, 36);
-
-                // Ext flags: 0x80 = FAT 1 (i.e. Zero) active, mirroring
-                bootSector[40] = 0x00;
-                bootSector[41] = 0x00;
-
-                // Filesystem version (0.0)
-                bootSector[42] = 0;
-                bootSector[43] = 0;
-
-                // First cluster of the root directory, always 2 since we don't do bad sectors...
-                Utilities.WriteBytesLittleEndian((uint)2, bootSector, 44);
-
-                // Sector number of FSINFO
-                Utilities.WriteBytesLittleEndian((uint)1, bootSector, 48);
-
-                // Sector number of the Backup Boot Sector
-                Utilities.WriteBytesLittleEndian((uint)6, bootSector, 50);
-
-                // Reserved area - must be set to 0
-                Array.Clear(bootSector, 52, 12);
-
-                WriteBS(bootSector, 64, isFloppy, volId, label, fatType);
-            }
-
-            bootSector[510] = 0x55;
-            bootSector[511] = 0xAA;
-        }
-
-        private static uint CalcFatSize(uint sectors, FatType fatType, byte sectorsPerCluster)
-        {
-            uint numClusters = (uint)(sectors / sectorsPerCluster);
-            uint fatBytes = (numClusters * (ushort)fatType) / 8;
-            return (fatBytes + Utilities.SectorSize - 1) / Utilities.SectorSize;
-        }
-
-        private static void WriteBS(byte[] bootSector, int offset, bool isFloppy, uint volId, string label, FatType fatType)
-        {
-            if (string.IsNullOrEmpty(label))
-            {
-                label = "NO NAME    ";
-            }
-
-            string fsType = "FAT32   ";
-            if (fatType == FatType.Fat12)
-            {
-                fsType = "FAT12   ";
-            }
-            else if (fatType == FatType.Fat16)
-            {
-                fsType = "FAT16   ";
-            }
-
-            // Drive Number (for BIOS)
-            bootSector[offset + 0] = (byte)(isFloppy ? 0x00 : 0x80);
-
-            // Reserved
-            bootSector[offset + 1] = 0;
-
-            // Boot Signature (indicates next 3 fields present)
-            bootSector[offset + 2] = 0x29;
-
-            // Volume Id
-            Utilities.WriteBytesLittleEndian(volId, bootSector, offset + 3);
-
-            // Volume Label
-            Utilities.StringToBytes(label + "           ", bootSector, offset + 7, 11);
-
-            // File System Type
-            Utilities.StringToBytes(fsType, bootSector, offset + 18, 8);
-        }
-
-        private static FatType DetectFATType(byte[] bpb)
-        {
-            uint bpbBytesPerSec = Utilities.ToUInt16LittleEndian(bpb, 11);
-            uint bpbRootEntCnt = Utilities.ToUInt16LittleEndian(bpb, 17);
-            uint bpbFATSz16 = Utilities.ToUInt16LittleEndian(bpb, 22);
-            uint bpbFATSz32 = Utilities.ToUInt32LittleEndian(bpb, 36);
-            uint bpbTotSec16 = Utilities.ToUInt16LittleEndian(bpb, 19);
-            uint bpbTotSec32 = Utilities.ToUInt32LittleEndian(bpb, 32);
-            uint bpbResvdSecCnt = Utilities.ToUInt16LittleEndian(bpb, 14);
-            uint bpbNumFATs = bpb[16];
-            uint bpbSecPerClus = bpb[13];
-
-            uint rootDirSectors = ((bpbRootEntCnt * 32) + bpbBytesPerSec - 1) / bpbBytesPerSec;
-            uint fatSz = (bpbFATSz16 != 0) ? (uint)bpbFATSz16 : bpbFATSz32;
-            uint totalSec = (bpbTotSec16 != 0) ? (uint)bpbTotSec16 : bpbTotSec32;
-
-            uint dataSec = totalSec - (bpbResvdSecCnt + (bpbNumFATs * fatSz) + rootDirSectors);
-            uint countOfClusters = dataSec / bpbSecPerClus;
-
-            if (countOfClusters < 4085)
-            {
-                return FatType.Fat12;
-            }
-            else if (countOfClusters < 65525)
-            {
-                return FatType.Fat16;
-            }
-            else
-            {
-                return FatType.Fat32;
-            }
-        }
-
-        private static bool IsRootPath(string path)
-        {
-            return string.IsNullOrEmpty(path) || path == @"\";
-        }
-
-        private static DateTime DefaultTimeConverter(DateTime time, bool toUtc)
-        {
-            return toUtc ? time.ToUniversalTime() : time.ToLocalTime();
-        }
-
-        private void Initialize(Stream data)
-        {
-            _data = data;
-            _data.Position = 0;
-            _bootSector = Utilities.ReadSector(_data);
-
-            _type = DetectFATType(_bootSector);
-
-            ReadBPB();
-
-            LoadFAT();
-
-            LoadClusterReader();
-
-            LoadRootDirectory();
-        }
-
-        private void LoadClusterReader()
-        {
-            int rootDirSectors = ((_bpbRootEntCnt * 32) + (_bpbBytesPerSec - 1)) / _bpbBytesPerSec;
-            int firstDataSector = (int)(_bpbRsvdSecCnt + (_bpbNumFATs * FatSize) + rootDirSectors);
-            _clusterReader = new ClusterReader(_data, firstDataSector, _bpbSecPerClus, _bpbBytesPerSec);
-        }
-
-        private void LoadRootDirectory()
-        {
-            Stream fatStream;
-            if (_type != FatType.Fat32)
-            {
-                fatStream = new SubStream(_data, (_bpbRsvdSecCnt + (_bpbNumFATs * _bpbFATSz16)) * _bpbBytesPerSec, _bpbRootEntCnt * 32);
-            }
-            else
-            {
-                fatStream = new ClusterStream(this, FileAccess.ReadWrite, _bpbRootClus, uint.MaxValue);
-            }
-
-            _rootDir = new Directory(this, fatStream);
-        }
-
-        private void LoadFAT()
-        {
-            _fat = new FileAllocationTable(_type, _data, _bpbRsvdSecCnt, (uint)FatSize, (byte)FatCount, ActiveFat);
-        }
-
-        private void ReadBPB()
-        {
-            _bpbOEMName = Encoding.ASCII.GetString(_bootSector, 3, 8).TrimEnd('\0');
-            _bpbBytesPerSec = Utilities.ToUInt16LittleEndian(_bootSector, 11);
-            _bpbSecPerClus = _bootSector[13];
-            _bpbRsvdSecCnt = Utilities.ToUInt16LittleEndian(_bootSector, 14);
-            _bpbNumFATs = _bootSector[16];
-            _bpbRootEntCnt = Utilities.ToUInt16LittleEndian(_bootSector, 17);
-            _bpbTotSec16 = Utilities.ToUInt16LittleEndian(_bootSector, 19);
-            _bpbMedia = _bootSector[21];
-            _bpbFATSz16 = Utilities.ToUInt16LittleEndian(_bootSector, 22);
-            _bpbSecPerTrk = Utilities.ToUInt16LittleEndian(_bootSector, 24);
-            _bpbNumHeads = Utilities.ToUInt16LittleEndian(_bootSector, 26);
-            _bpbHiddSec = Utilities.ToUInt32LittleEndian(_bootSector, 28);
-            _bpbTotSec32 = Utilities.ToUInt32LittleEndian(_bootSector, 32);
-
-            if (_type != FatType.Fat32)
-            {
-                ReadBS(36);
-            }
-            else
-            {
-                _bpbFATSz32 = Utilities.ToUInt32LittleEndian(_bootSector, 36);
-                _bpbExtFlags = Utilities.ToUInt16LittleEndian(_bootSector, 40);
-                _bpbFSVer = Utilities.ToUInt16LittleEndian(_bootSector, 42);
-                _bpbRootClus = Utilities.ToUInt32LittleEndian(_bootSector, 44);
-                _bpbFSInfo = Utilities.ToUInt16LittleEndian(_bootSector, 48);
-                _bpbBkBootSec = Utilities.ToUInt16LittleEndian(_bootSector, 50);
-                ReadBS(64);
-            }
-        }
-
-        private void ReadBS(int offset)
-        {
-            _bsDrvNum = _bootSector[offset];
-            _bsBootSig = _bootSector[offset + 2];
-            _bsVolId = Utilities.ToUInt32LittleEndian(_bootSector, offset + 3);
-            _bsVolLab = Encoding.ASCII.GetString(_bootSector, offset + 7, 11);
-            _bsFilSysType = Encoding.ASCII.GetString(_bootSector, offset + 18, 8);
-        }
-
-        private long GetDirectoryEntry(Directory dir, string path, out Directory parent)
-        {
-            string[] pathElements = path.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries);
-            return GetDirectoryEntry(dir, pathElements, 0, out parent);
-        }
-
-        private long GetDirectoryEntry(Directory dir, string[] pathEntries, int pathOffset, out Directory parent)
-        {
-            long entryId;
-
-            if (pathEntries.Length == 0)
-            {
-                // Looking for root directory, simulate the directory entry in its parent...
-                parent = null;
-                return 0;
-            }
-            else
-            {
-                // Long filename support - translate long filename lookup to short filename
-                string ShortName;
-                if (dir.LongFileNames_LongKey.TryGetValue(pathEntries[pathOffset], out ShortName))
-                    pathEntries[pathOffset] = ShortName;
-
-                entryId = dir.FindEntry(new FileName(pathEntries[pathOffset], FatOptions.FileNameEncoding));
-                if (entryId >= 0)
-                {
-                    if (pathOffset == pathEntries.Length - 1)
-                    {
-                        parent = dir;
-                        return entryId;
-                    }
-                    else
-                    {
-                        return GetDirectoryEntry(GetDirectory(dir, entryId), pathEntries, pathOffset + 1, out parent);
-                    }
-                }
-                else if (pathOffset == pathEntries.Length - 1)
-                {
-                    parent = dir;
-                    return -1;
-                }
-                else
-                {
-                    parent = null;
-                    return -1;
-                }
-            }
-        }
-
-        private void DoSearch(List<string> results, string path, Regex regex, bool subFolders, bool dirs, bool files)
-        {
-            Directory dir = GetDirectory(path);
-            if (dir == null)
-            {
-                throw new DirectoryNotFoundException(string.Format(CultureInfo.InvariantCulture, "The directory '{0}' was not found", path));
-            }
-
-            DirectoryEntry[] entries = dir.Entries;
-
-            foreach (DirectoryEntry de in entries)
-            {
-                bool isDir = (de.Attributes & FatAttributes.Directory) != 0;
-
-                if ((isDir && dirs) || (!isDir && files))
-                {
-                    if (regex.IsMatch(de.Name.GetSearchName(FatOptions.FileNameEncoding)))
-                    {
-                        results.Add(Utilities.CombinePaths(path, de.Name.GetDisplayName(FatOptions.FileNameEncoding)));
-                    }
-                }
-
-                if (subFolders && isDir)
-                {
-                    DoSearch(results, Utilities.CombinePaths(path, de.Name.GetDisplayName(FatOptions.FileNameEncoding)), regex, subFolders, dirs, files);
-                }
-            }
-        }
-
-        private void UpdateDirEntry(string path, EntryUpdateAction action)
-        {
-            Directory parent;
-            long id = GetDirectoryEntry(path, out parent);
-            DirectoryEntry entry = parent.GetEntry(id);
-            action(entry);
-            parent.UpdateEntry(id, entry);
-
-            if ((entry.Attributes & FatAttributes.Directory) != 0)
-            {
-                Directory dir = GetDirectory(path);
-                DirectoryEntry selfEntry = dir.SelfEntry;
-                action(selfEntry);
-                dir.SelfEntry = selfEntry;
-            }
-        }
-
-        /// <summary>
-        /// Gets the long name of a given file.
-        /// </summary>
-        /// <param name="shortFullPath">The short full path to the file. Input path segments must be short names.</param>
-        /// <returns>The corresponding long file name.</returns>
-        public string GetLongFileName(string shortFullPath)
-        {
-            if (shortFullPath == null)
-                throw new ArgumentNullException("shortFullPath");
-
-            string dirPath = Path.GetDirectoryName(shortFullPath);
-            string fileName = Path.GetFileName(shortFullPath);
-            Directory dir = GetDirectory(dirPath);
-            if (dir == null)
-                return fileName;
-
-            string lfn;
-            if (dir.LongFileNames_ShortKey.TryGetValue(Path.GetFileName(shortFullPath), out lfn))
-                return lfn;
-
-            return fileName;
-        }
-
-        /// <summary>
-        /// Gets the long path to a given file.
-        /// </summary>
-        /// <param name="shortFullPath">The short full path to the file. Input path segments must be short names.</param>
-        /// <returns>The corresponding long file path to the file or null if not found.</returns>
-        public string GetLongFilePath(string shortFullPath)
-        {
-            if (shortFullPath == null)
-                throw new ArgumentNullException("shortFullPath");
-
-            string path = null;
-            string current = null;
-            foreach (string segment in shortFullPath.Split(Path.DirectorySeparatorChar))
-            {
-                if (current == null)
-                {
-                    current = segment;
-                    path = GetLongFileName(current);
-                }
-                else
-                {
-                    current = Path.Combine(current, segment);
-                    path = Path.Combine(path, GetLongFileName(current));
-                }
-            }
-            return path;
-        }
-    }
-}
diff --git a/DiscUtils/Fat/FatFileSystemOptions.cs b/DiscUtils/Fat/FatFileSystemOptions.cs
deleted file mode 100644
index efc732d..0000000
--- a/DiscUtils/Fat/FatFileSystemOptions.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Fat
-{
-    using System;
-    using System.Text;
-
-    /// <summary>
-    /// FAT file system options.
-    /// </summary>
-    public sealed class FatFileSystemOptions : DiscFileSystemOptions
-    {
-        private Encoding _encoding;
-
-        internal FatFileSystemOptions()
-        {
-            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
-            FileNameEncoding = Encoding.GetEncoding(437);
-        }
-
-        internal FatFileSystemOptions(FileSystemParameters parameters)
-        {
-            if (parameters != null && parameters.FileNameEncoding != null)
-            {
-                FileNameEncoding = parameters.FileNameEncoding;
-            }
-            else
-            {
-                Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
-                FileNameEncoding = Encoding.GetEncoding(437);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the character encoding used for file names.
-        /// </summary>
-        public Encoding FileNameEncoding
-        {
-            get
-            {
-                return _encoding;
-            }
-
-            set
-            {
-                if (!value.IsSingleByte)
-                {
-                    throw new ArgumentException(value.EncodingName + " is not a single byte encoding");
-                }
-
-                _encoding = value;
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Fat/FatType.cs b/DiscUtils/Fat/FatType.cs
deleted file mode 100644
index 2e7e57e..0000000
--- a/DiscUtils/Fat/FatType.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Fat
-{
-    /// <summary>
-    /// Enumeration of known FAT types.
-    /// </summary>
-    public enum FatType
-    {
-        /// <summary>
-        /// Represents no known FAT type.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// Represents a 12-bit FAT.
-        /// </summary>
-        Fat12 = 12,
-
-        /// <summary>
-        /// Represents a 16-bit FAT.
-        /// </summary>
-        Fat16 = 16,
-
-        /// <summary>
-        /// Represents a 32-bit FAT.
-        /// </summary>
-        Fat32 = 32
-    }
-}
diff --git a/DiscUtils/Fat/FileAllocationTable.cs b/DiscUtils/Fat/FileAllocationTable.cs
deleted file mode 100644
index 03dca48..0000000
--- a/DiscUtils/Fat/FileAllocationTable.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Fat
-{
-    using System.IO;
-
-    internal class FileAllocationTable
-    {
-        private Stream _stream;
-        private ushort _firstFatSector;
-        private byte _numFats;
-
-        private FatBuffer _buffer;
-
-        public FileAllocationTable(FatType type, Stream stream, ushort firstFatSector, uint fatSize, byte numFats, byte activeFat)
-        {
-            _stream = stream;
-            _firstFatSector = firstFatSector;
-            _numFats = numFats;
-
-            _stream.Position = (firstFatSector + (fatSize * activeFat)) * Utilities.SectorSize;
-            _buffer = new FatBuffer(type, Utilities.ReadFully(_stream, (int)(fatSize * Utilities.SectorSize)));
-        }
-
-        internal bool IsFree(uint val)
-        {
-            return _buffer.IsFree(val);
-        }
-
-        internal bool IsEndOfChain(uint val)
-        {
-            return _buffer.IsEndOfChain(val);
-        }
-
-        internal bool IsBadCluster(uint val)
-        {
-            return _buffer.IsBadCluster(val);
-        }
-
-        internal uint GetNext(uint cluster)
-        {
-            return _buffer.GetNext(cluster);
-        }
-
-        internal void SetEndOfChain(uint cluster)
-        {
-            _buffer.SetEndOfChain(cluster);
-        }
-
-        internal void SetBadCluster(uint cluster)
-        {
-            _buffer.SetBadCluster(cluster);
-        }
-
-        internal void SetNext(uint cluster, uint next)
-        {
-            _buffer.SetNext(cluster, next);
-        }
-
-        internal void Flush()
-        {
-            for (int i = 0; i < _numFats; ++i)
-            {
-                _buffer.WriteDirtyRegions(_stream, (_firstFatSector * Utilities.SectorSize) + (_buffer.Size * i));
-            }
-
-            _buffer.ClearDirtyRegions();
-        }
-
-        internal bool TryGetFreeCluster(out uint cluster)
-        {
-            return _buffer.TryGetFreeCluster(out cluster);
-        }
-
-        internal void FreeChain(uint head)
-        {
-            _buffer.FreeChain(head);
-        }
-    }
-}
diff --git a/DiscUtils/Fat/FileName.cs b/DiscUtils/Fat/FileName.cs
deleted file mode 100644
index 8c5df36..0000000
--- a/DiscUtils/Fat/FileName.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Fat
-{
-    using System;
-    using System.Text;
-
-    internal sealed class FileName : IEquatable<FileName>
-    {
-        public static readonly FileName SelfEntryName = new FileName(new byte[] { 0x2E, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20 }, 0);
-        public static readonly FileName ParentEntryName = new FileName(new byte[] { 0x2E, 0x2E, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20 }, 0);
-        public static readonly FileName Null = new FileName(new byte[] { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0);
-
-        private const byte SpaceByte = 0x20;
-
-        private static readonly byte[] InvalidBytes = new byte[] { 0x22, 0x2A, 0x2B, 0x2C, 0x2E, 0x2F, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x5B, 0x5C, 0x5D, 0x7C };
-
-        private byte[] _raw;
-
-        public FileName(byte[] data, int offset)
-        {
-            _raw = new byte[11];
-            Array.Copy(data, offset, _raw, 0, 11);
-        }
-
-        public FileName(string name, Encoding encoding)
-        {
-            _raw = new byte[11];
-            byte[] bytes = encoding.GetBytes(name.ToUpperInvariant());
-
-            int nameIdx = 0;
-            int rawIdx = 0;
-            while (nameIdx < bytes.Length && bytes[nameIdx] != '.' && rawIdx < _raw.Length)
-            {
-                byte b = bytes[nameIdx++];
-                if (b < 0x20 || Contains(InvalidBytes, b))
-                {
-                    throw new ArgumentException("Invalid character in file name '" + (char)b + "'", "name");
-                }
-
-                _raw[rawIdx++] = b;
-            }
-
-            if (rawIdx > 8)
-            {
-                throw new ArgumentException("File name too long '" + name + "'", "name");
-            }
-            else if (rawIdx == 0)
-            {
-                throw new ArgumentException("File name too short '" + name + "'", "name");
-            }
-
-            while (rawIdx < 8)
-            {
-                _raw[rawIdx++] = SpaceByte;
-            }
-
-            if (nameIdx < bytes.Length && bytes[nameIdx] == '.')
-            {
-                ++nameIdx;
-            }
-
-            while (nameIdx < bytes.Length && rawIdx < _raw.Length)
-            {
-                byte b = bytes[nameIdx++];
-                if (b < 0x20 || Contains(InvalidBytes, b))
-                {
-                    throw new ArgumentException("Invalid character in file extension '" + (char)b + "'", "name");
-                }
-
-                _raw[rawIdx++] = b;
-            }
-
-            while (rawIdx < 11)
-            {
-                _raw[rawIdx++] = SpaceByte;
-            }
-
-            if (nameIdx != bytes.Length)
-            {
-                throw new ArgumentException("File extension too long '" + name + "'", "name");
-            }
-        }
-
-        public static FileName FromPath(string path, Encoding encoding)
-        {
-            return new FileName(Utilities.GetFileFromPath(path), encoding);
-        }
-
-        public static bool operator ==(FileName a, FileName b)
-        {
-            return CompareRawNames(a, b) == 0;
-        }
-
-        public static bool operator !=(FileName a, FileName b)
-        {
-            return CompareRawNames(a, b) != 0;
-        }
-
-        public string GetDisplayName(Encoding encoding)
-        {
-            return GetSearchName(encoding).TrimEnd('.');
-        }
-
-        public string GetSearchName(Encoding encoding)
-        {
-            return encoding.GetString(_raw, 0, 8).TrimEnd() + "." + encoding.GetString(_raw, 8, 3).TrimEnd();
-        }
-
-        public string GetRawName(Encoding encoding)
-        {
-            return encoding.GetString(_raw, 0, 11).TrimEnd();
-        }
-
-        public FileName Deleted()
-        {
-            byte[] data = new byte[11];
-            Array.Copy(_raw, data, 11);
-            data[0] = 0xE5;
-
-            return new FileName(data, 0);
-        }
-
-        public bool IsDeleted()
-        {
-            return _raw[0] == 0xE5;
-        }
-
-        public bool IsEndMarker()
-        {
-            return _raw[0] == 0x00;
-        }
-
-        public void GetBytes(byte[] data, int offset)
-        {
-            Array.Copy(_raw, 0, data, offset, 11);
-        }
-
-        public override bool Equals(object other)
-        {
-            return Equals(other as FileName);
-        }
-
-        public bool Equals(FileName other)
-        {
-            if (other == null)
-            {
-                return false;
-            }
-
-            return CompareRawNames(this, other) == 0;
-        }
-
-        public override int GetHashCode()
-        {
-            int val = 0x1A8D3C4E;
-
-            for (int i = 0; i < 11; ++i)
-            {
-                val = (val << 2) ^ _raw[i];
-            }
-
-            return val;
-        }
-
-        private static int CompareRawNames(FileName a, FileName b)
-        {
-            for (int i = 0; i < 11; ++i)
-            {
-                if (a._raw[i] != b._raw[i])
-                {
-                    return (int)a._raw[i] - (int)b._raw[i];
-                }
-            }
-
-            return 0;
-        }
-
-        private static bool Contains(byte[] array, byte val)
-        {
-            foreach (byte b in array)
-            {
-                if (b == val)
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/DiscUtils/Fat/FileSystemFactory.cs b/DiscUtils/Fat/FileSystemFactory.cs
deleted file mode 100644
index e41460c..0000000
--- a/DiscUtils/Fat/FileSystemFactory.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Fat
-{
-    using DiscUtils.Vfs;
-    using System.IO;
-
-    [VfsFileSystemFactory]
-    internal class FileSystemFactory : VfsFileSystemFactory
-    {
-        public override DiscUtils.FileSystemInfo[] Detect(Stream stream, VolumeInfo volume)
-        {
-            if (FatFileSystem.Detect(stream))
-            {
-                return new DiscUtils.FileSystemInfo[] { new VfsFileSystemInfo("FAT", "Microsoft FAT", Open) };
-            }
-
-            return new DiscUtils.FileSystemInfo[0];
-        }
-
-        private DiscFileSystem Open(Stream stream, VolumeInfo volumeInfo, FileSystemParameters parameters)
-        {
-            return new FatFileSystem(stream, Ownership.None, parameters);
-        }
-    }
-}
diff --git a/DiscUtils/FileLocator.cs b/DiscUtils/FileLocator.cs
deleted file mode 100644
index 5fac093..0000000
--- a/DiscUtils/FileLocator.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.IO;
-
-    internal abstract class FileLocator
-    {
-        public abstract bool Exists(string fileName);
-
-        public abstract Stream Open(string fileName, FileMode mode, FileAccess access, FileShare share);
-
-        public abstract FileLocator GetRelativeLocator(string path);
-
-        public abstract string GetFullPath(string path);
-
-        public abstract string GetDirectoryFromPath(string path);
-
-        public abstract string GetFileFromPath(string path);
-
-        public abstract DateTime GetLastWriteTimeUtc(string path);
-
-        public abstract bool HasCommonRoot(FileLocator other);
-
-        public abstract string ResolveRelativePath(string path);
-
-        internal string MakeRelativePath(FileLocator fileLocator, string path)
-        {
-            if (!HasCommonRoot(fileLocator))
-            {
-                return null;
-            }
-
-            string ourFullPath = GetFullPath(string.Empty) + @"\";
-            string otherFullPath = fileLocator.GetFullPath(path);
-
-            return Utilities.MakeRelativePath(otherFullPath, ourFullPath);
-        }
-    }
-}
diff --git a/DiscUtils/FileSystemInfo.cs b/DiscUtils/FileSystemInfo.cs
deleted file mode 100644
index de3d5de..0000000
--- a/DiscUtils/FileSystemInfo.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System.IO;
-
-    /// <summary>
-    /// Base class holding information about a file system.
-    /// </summary>
-    /// <remarks>
-    /// File system implementations derive from this class, to provide information about the file system.
-    /// </remarks>
-    public abstract class FileSystemInfo
-    {
-        /// <summary>
-        /// Gets the name of the file system.
-        /// </summary>
-        public abstract string Name { get; }
-
-        /// <summary>
-        /// Gets a one-line description of the file system.
-        /// </summary>
-        public abstract string Description { get; }
-
-        /// <summary>
-        /// Opens a volume using the file system.
-        /// </summary>
-        /// <param name="volume">The volume to access.</param>
-        /// <returns>A file system instance.</returns>
-        public DiscFileSystem Open(VolumeInfo volume)
-        {
-            return Open(volume, null);
-        }
-
-        /// <summary>
-        /// Opens a stream using the file system.
-        /// </summary>
-        /// <param name="stream">The stream to access.</param>
-        /// <returns>A file system instance.</returns>
-        public DiscFileSystem Open(Stream stream)
-        {
-            return Open(stream, null);
-        }
-
-        /// <summary>
-        /// Opens a volume using the file system.
-        /// </summary>
-        /// <param name="volume">The volume to access.</param>
-        /// <param name="parameters">Parameters for the file system.</param>
-        /// <returns>A file system instance.</returns>
-        public abstract DiscFileSystem Open(VolumeInfo volume, FileSystemParameters parameters);
-
-        /// <summary>
-        /// Opens a stream using the file system.
-        /// </summary>
-        /// <param name="stream">The stream to access.</param>
-        /// <param name="parameters">Parameters for the file system.</param>
-        /// <returns>A file system instance.</returns>
-        public abstract DiscFileSystem Open(Stream stream, FileSystemParameters parameters);
-
-        /// <summary>
-        /// Gets the name of the file system.
-        /// </summary>
-        /// <returns>The file system name.</returns>
-        public override string ToString()
-        {
-            return Name;
-        }
-    }
-}
diff --git a/DiscUtils/FileSystemParameters.cs b/DiscUtils/FileSystemParameters.cs
deleted file mode 100644
index be1d00a..0000000
--- a/DiscUtils/FileSystemParameters.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.Text;
-
-    /// <summary>
-    /// Converts a time to/from UTC.
-    /// </summary>
-    /// <param name="time">The time to convert.</param>
-    /// <param name="toUtc"><c>true</c> to convert FAT time to UTC, <c>false</c> to convert UTC to FAT time.</param>
-    /// <returns>The converted time.</returns>
-    public delegate DateTime TimeConverter(DateTime time, bool toUtc);
-
-    /// <summary>
-    /// Class with generic file system parameters.
-    /// </summary>
-    /// <remarks>Note - not all parameters apply to all types of file system.</remarks>
-    public sealed class FileSystemParameters
-    {
-        /// <summary>
-        /// Gets or sets the character encoding for file names, or <c>null</c> for default.
-        /// </summary>
-        /// <remarks>Some file systems, such as FAT, don't specify a particular character set for
-        /// file names.  This parameter determines the character set that will be used for such
-        /// file systems.</remarks>
-        public Encoding FileNameEncoding { get; set; }
-
-        /// <summary>
-        /// Gets or sets the algorithm to convert file system time to UTC.
-        /// </summary>
-        /// <remarks>Some file system, such as FAT, don't have a defined way to convert from file system
-        /// time (local time where the file system is authored) to UTC time.  This parameter determines
-        /// the algorithm to use.</remarks>
-        public TimeConverter TimeConverter { get; set; }
-    }
-}
diff --git a/DiscUtils/FloppyDiskType.cs b/DiscUtils/FloppyDiskType.cs
deleted file mode 100644
index 1830c7b..0000000
--- a/DiscUtils/FloppyDiskType.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    /// <summary>
-    /// The supported Floppy Disk logical formats.
-    /// </summary>
-    public enum FloppyDiskType
-    {
-        /// <summary>
-        /// 720KiB capacity disk.
-        /// </summary>
-        DoubleDensity = 0,
-
-        /// <summary>
-        /// 1440KiB capacity disk.
-        /// </summary>
-        HighDensity = 1,
-
-        /// <summary>
-        /// 2880KiB capacity disk.
-        /// </summary>
-        Extended = 2
-    }
-}
diff --git a/DiscUtils/GenericDiskAdapterType.cs b/DiscUtils/GenericDiskAdapterType.cs
deleted file mode 100644
index 550885b..0000000
--- a/DiscUtils/GenericDiskAdapterType.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    /// <summary>
-    /// Well known hard disk adaptor types.
-    /// </summary>
-    public enum GenericDiskAdapterType
-    {
-        /// <summary>
-        /// IDE adaptor.
-        /// </summary>
-        Ide = 0,
-
-        /// <summary>
-        /// SCSI adaptor.
-        /// </summary>
-        Scsi = 1
-    }
-}
diff --git a/DiscUtils/Geometry.cs b/DiscUtils/Geometry.cs
deleted file mode 100644
index 1d7555a..0000000
--- a/DiscUtils/Geometry.cs
+++ /dev/null
@@ -1,497 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.Globalization;
-
-    /// <summary>
-    /// Class whose instances represent disk geometries.
-    /// </summary>
-    /// <remarks>Instances of this class are immutable.</remarks>
-    public sealed class Geometry
-    {
-        private int _cylinders;
-        private int _headsPerCylinder;
-        private int _sectorsPerTrack;
-        private int _bytesPerSector;
-
-        /// <summary>
-        /// Initializes a new instance of the Geometry class.  The default 512 bytes per sector is assumed.
-        /// </summary>
-        /// <param name="cylinders">The number of cylinders of the disk.</param>
-        /// <param name="headsPerCylinder">The number of heads (aka platters) of the disk.</param>
-        /// <param name="sectorsPerTrack">The number of sectors per track/cylinder of the disk.</param>
-        public Geometry(int cylinders, int headsPerCylinder, int sectorsPerTrack)
-        {
-            _cylinders = cylinders;
-            _headsPerCylinder = headsPerCylinder;
-            _sectorsPerTrack = sectorsPerTrack;
-            _bytesPerSector = 512;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the Geometry class.
-        /// </summary>
-        /// <param name="cylinders">The number of cylinders of the disk.</param>
-        /// <param name="headsPerCylinder">The number of heads (aka platters) of the disk.</param>
-        /// <param name="sectorsPerTrack">The number of sectors per track/cylinder of the disk.</param>
-        /// <param name="bytesPerSector">The number of bytes per sector of the disk.</param>
-        public Geometry(int cylinders, int headsPerCylinder, int sectorsPerTrack, int bytesPerSector)
-        {
-            _cylinders = cylinders;
-            _headsPerCylinder = headsPerCylinder;
-            _sectorsPerTrack = sectorsPerTrack;
-            _bytesPerSector = bytesPerSector;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the Geometry class.
-        /// </summary>
-        /// <param name="capacity">The total capacity of the disk.</param>
-        /// <param name="headsPerCylinder">The number of heads (aka platters) of the disk.</param>
-        /// <param name="sectorsPerTrack">The number of sectors per track/cylinder of the disk.</param>
-        /// <param name="bytesPerSector">The number of bytes per sector of the disk.</param>
-        public Geometry(long capacity, int headsPerCylinder, int sectorsPerTrack, int bytesPerSector)
-        {
-            _cylinders = (int)(capacity / (headsPerCylinder * (long)sectorsPerTrack * bytesPerSector));
-            _headsPerCylinder = headsPerCylinder;
-            _sectorsPerTrack = sectorsPerTrack;
-            _bytesPerSector = bytesPerSector;
-        }
-
-        /// <summary>
-        /// Gets a null geometry, which has 512-byte sectors but zero sectors, tracks or cylinders.
-        /// </summary>
-        public static Geometry Null
-        {
-            get { return new Geometry(0, 0, 0, 512); }
-        }
-
-        /// <summary>
-        /// Gets the number of cylinders.
-        /// </summary>
-        public int Cylinders
-        {
-            get { return _cylinders; }
-        }
-
-        /// <summary>
-        /// Gets the number of heads (aka platters).
-        /// </summary>
-        public int HeadsPerCylinder
-        {
-            get { return _headsPerCylinder; }
-        }
-
-        /// <summary>
-        /// Gets the number of sectors per track.
-        /// </summary>
-        public int SectorsPerTrack
-        {
-            get { return _sectorsPerTrack; }
-        }
-
-        /// <summary>
-        /// Gets the number of bytes in each sector.
-        /// </summary>
-        public int BytesPerSector
-        {
-            get { return _bytesPerSector; }
-        }
-
-        /// <summary>
-        /// Gets the total size of the disk (in sectors).
-        /// </summary>
-        [Obsolete("Use TotalSectorsLong instead, to support very large disks.")]
-        public int TotalSectors
-        {
-            get { return Cylinders * HeadsPerCylinder * SectorsPerTrack; }
-        }
-
-        /// <summary>
-        /// Gets the total size of the disk (in sectors).
-        /// </summary>
-        public long TotalSectorsLong
-        {
-            get { return (long)Cylinders * (long)HeadsPerCylinder * (long)SectorsPerTrack; }
-        }
-
-        /// <summary>
-        /// Gets the total capacity of the disk (in bytes).
-        /// </summary>
-        public long Capacity
-        {
-            get { return TotalSectorsLong * (long)BytesPerSector; }
-        }
-
-        /// <summary>
-        /// Gets the address of the last sector on the disk.
-        /// </summary>
-        public ChsAddress LastSector
-        {
-            get { return new ChsAddress(_cylinders - 1, _headsPerCylinder - 1, _sectorsPerTrack); }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the Geometry is consistent with the values a BIOS can support.
-        /// </summary>
-        public bool IsBiosSafe
-        {
-            get { return _cylinders <= 1024 && _headsPerCylinder <= 255 && _sectorsPerTrack <= 63; }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the Geometry is consistent with the values IDE can represent.
-        /// </summary>
-        public bool IsIdeSafe
-        {
-            get { return _cylinders <= 65536 && _headsPerCylinder <= 16 && _sectorsPerTrack <= 255; }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the Geometry is representable both by the BIOS and by IDE.
-        /// </summary>
-        public bool IsBiosAndIdeSafe
-        {
-            get { return _cylinders <= 1024 && _headsPerCylinder <= 16 && _sectorsPerTrack <= 63; }
-        }
-
-        /// <summary>
-        /// Gets the 'Large' BIOS geometry for a disk, given it's physical geometry.
-        /// </summary>
-        /// <param name="ideGeometry">The physical (aka IDE) geometry of the disk.</param>
-        /// <returns>The geometry a BIOS using the 'Large' method for calculating disk geometry will indicate for the disk.</returns>
-        public static Geometry LargeBiosGeometry(Geometry ideGeometry)
-        {
-            int cylinders = ideGeometry.Cylinders;
-            int heads = ideGeometry.HeadsPerCylinder;
-            int sectors = ideGeometry.SectorsPerTrack;
-
-            while (cylinders > 1024 && heads <= 127)
-            {
-                cylinders >>= 1;
-                heads <<= 1;
-            }
-
-            return new Geometry(cylinders, heads, sectors);
-        }
-
-        /// <summary>
-        /// Gets the 'LBA Assisted' BIOS geometry for a disk, given it's capacity.
-        /// </summary>
-        /// <param name="capacity">The capacity of the disk.</param>
-        /// <returns>The geometry a BIOS using the 'LBA Assisted' method for calculating disk geometry will indicate for the disk.</returns>
-        public static Geometry LbaAssistedBiosGeometry(long capacity)
-        {
-            int heads;
-            if (capacity <= 504 * Sizes.OneMiB)
-            {
-                heads = 16;
-            }
-            else if (capacity <= 1008 * Sizes.OneMiB)
-            {
-                heads = 32;
-            }
-            else if (capacity <= 2016 * Sizes.OneMiB)
-            {
-                heads = 64;
-            }
-            else if (capacity <= 4032 * Sizes.OneMiB)
-            {
-                heads = 128;
-            }
-            else
-            {
-                heads = 255;
-            }
-
-            int sectors = 63;
-            int cylinders = (int)Math.Min(1024, capacity / (sectors * (long)heads * Sizes.Sector));
-            return new Geometry(cylinders, heads, sectors, Sizes.Sector);
-        }
-
-        /// <summary>
-        /// Converts a geometry into one that is BIOS-safe, if not already.
-        /// </summary>
-        /// <param name="geometry">The geometry to make BIOS-safe.</param>
-        /// <param name="capacity">The capacity of the disk.</param>
-        /// <returns>The new geometry.</returns>
-        /// <remarks>This method returns the LBA-Assisted geometry if the given geometry isn't BIOS-safe.</remarks>
-        public static Geometry MakeBiosSafe(Geometry geometry, long capacity)
-        {
-            if (geometry == null)
-            {
-                return LbaAssistedBiosGeometry(capacity);
-            }
-            else if (geometry.IsBiosSafe)
-            {
-                return geometry;
-            }
-            else
-            {
-                return LbaAssistedBiosGeometry(capacity);
-            }
-        }
-
-        /// <summary>
-        /// Calculates a sensible disk geometry for a disk capacity using the VHD algorithm (errs under).
-        /// </summary>
-        /// <param name="capacity">The desired capacity of the disk.</param>
-        /// <returns>The appropriate disk geometry.</returns>
-        /// <remarks>The geometry returned tends to produce a disk with less capacity
-        /// than requested (an exact capacity is not always possible).  The geometry returned is the IDE
-        /// (aka Physical) geometry of the disk, not necessarily the geometry used by the BIOS.</remarks>
-        public static Geometry FromCapacity(long capacity)
-        {
-            return FromCapacity(capacity, Utilities.SectorSize);
-        }
-
-        /// <summary>
-        /// Calculates a sensible disk geometry for a disk capacity using the VHD algorithm (errs under).
-        /// </summary>
-        /// <param name="capacity">The desired capacity of the disk.</param>
-        /// <param name="sectorSize">The logical sector size of the disk.</param>
-        /// <returns>The appropriate disk geometry.</returns>
-        /// <remarks>The geometry returned tends to produce a disk with less capacity
-        /// than requested (an exact capacity is not always possible).  The geometry returned is the IDE
-        /// (aka Physical) geometry of the disk, not necessarily the geometry used by the BIOS.</remarks>
-        public static Geometry FromCapacity(long capacity, int sectorSize)
-        {
-            int totalSectors;
-            int cylinders;
-            int headsPerCylinder;
-            int sectorsPerTrack;
-
-            // If more than ~128GB truncate at ~128GB
-            if (capacity > 65535 * (long)16 * 255 * sectorSize)
-            {
-                totalSectors = 65535 * 16 * 255;
-            }
-            else
-            {
-                totalSectors = (int)(capacity / sectorSize);
-            }
-
-            // If more than ~32GB, break partition table compatibility.
-            // Partition table has max 63 sectors per track.  Otherwise
-            // we're looking for a geometry that's valid for both BIOS
-            // and ATA.
-            if (totalSectors > 65535 * 16 * 63)
-            {
-                sectorsPerTrack = 255;
-                headsPerCylinder = 16;
-            }
-            else
-            {
-                sectorsPerTrack = 17;
-                int cylindersTimesHeads = totalSectors / sectorsPerTrack;
-                headsPerCylinder = (cylindersTimesHeads + 1023) / 1024;
-
-                if (headsPerCylinder < 4)
-                {
-                    headsPerCylinder = 4;
-                }
-
-                // If we need more than 1023 cylinders, or 16 heads, try more sectors per track
-                if (cylindersTimesHeads >= (headsPerCylinder * 1024U) || headsPerCylinder > 16)
-                {
-                    sectorsPerTrack = 31;
-                    headsPerCylinder = 16;
-                    cylindersTimesHeads = totalSectors / sectorsPerTrack;
-                }
-
-                // We need 63 sectors per track to keep the cylinder count down
-                if (cylindersTimesHeads >= (headsPerCylinder * 1024U))
-                {
-                    sectorsPerTrack = 63;
-                    headsPerCylinder = 16;
-                }
-            }
-
-            cylinders = (totalSectors / sectorsPerTrack) / headsPerCylinder;
-
-            return new Geometry(cylinders, headsPerCylinder, sectorsPerTrack, sectorSize);
-        }
-
-        /// <summary>
-        /// Converts a CHS (Cylinder,Head,Sector) address to a LBA (Logical Block Address).
-        /// </summary>
-        /// <param name="chsAddress">The CHS address to convert.</param>
-        /// <returns>The Logical Block Address (in sectors).</returns>
-        public long ToLogicalBlockAddress(ChsAddress chsAddress)
-        {
-            return ToLogicalBlockAddress(chsAddress.Cylinder, chsAddress.Head, chsAddress.Sector);
-        }
-
-        /// <summary>
-        /// Converts a CHS (Cylinder,Head,Sector) address to a LBA (Logical Block Address).
-        /// </summary>
-        /// <param name="cylinder">The cylinder of the address.</param>
-        /// <param name="head">The head of the address.</param>
-        /// <param name="sector">The sector of the address.</param>
-        /// <returns>The Logical Block Address (in sectors).</returns>
-        public long ToLogicalBlockAddress(int cylinder, int head, int sector)
-        {
-            if (cylinder < 0)
-            {
-                throw new ArgumentOutOfRangeException("cylinder", cylinder, "cylinder number is negative");
-            }
-
-            if (head >= _headsPerCylinder)
-            {
-                throw new ArgumentOutOfRangeException("head", head, "head number is larger than disk geometry");
-            }
-
-            if (head < 0)
-            {
-                throw new ArgumentOutOfRangeException("head", head, "head number is negative");
-            }
-
-            if (sector > _sectorsPerTrack)
-            {
-                throw new ArgumentOutOfRangeException("sector", sector, "sector number is larger than disk geometry");
-            }
-
-            if (sector < 1)
-            {
-                throw new ArgumentOutOfRangeException("sector", sector, "sector number is less than one (sectors are 1-based)");
-            }
-
-            return (((cylinder * (long)_headsPerCylinder) + head) * _sectorsPerTrack) + sector - 1;
-        }
-
-        /// <summary>
-        /// Converts a LBA (Logical Block Address) to a CHS (Cylinder, Head, Sector) address.
-        /// </summary>
-        /// <param name="logicalBlockAddress">The logical block address (in sectors).</param>
-        /// <returns>The address in CHS form.</returns>
-        public ChsAddress ToChsAddress(long logicalBlockAddress)
-        {
-            if (logicalBlockAddress < 0)
-            {
-                throw new ArgumentOutOfRangeException("logicalBlockAddress", logicalBlockAddress, "Logical Block Address is negative");
-            }
-
-            int cylinder = (int)(logicalBlockAddress / (_headsPerCylinder * _sectorsPerTrack));
-            int temp = (int)(logicalBlockAddress % (_headsPerCylinder * _sectorsPerTrack));
-            int head = temp / _sectorsPerTrack;
-            int sector = (temp % _sectorsPerTrack) + 1;
-
-            return new ChsAddress(cylinder, head, sector);
-        }
-
-        /// <summary>
-        /// Translates an IDE (aka Physical) geometry to a BIOS (aka Logical) geometry.
-        /// </summary>
-        /// <param name="translation">The translation to perform.</param>
-        /// <returns>The translated disk geometry.</returns>
-        public Geometry TranslateToBios(GeometryTranslation translation)
-        {
-            return TranslateToBios(0, translation);
-        }
-
-        /// <summary>
-        /// Translates an IDE (aka Physical) geometry to a BIOS (aka Logical) geometry.
-        /// </summary>
-        /// <param name="capacity">The capacity of the disk, required if the geometry is an approximation on the actual disk size.</param>
-        /// <param name="translation">The translation to perform.</param>
-        /// <returns>The translated disk geometry.</returns>
-        public Geometry TranslateToBios(long capacity, GeometryTranslation translation)
-        {
-            if (capacity <= 0)
-            {
-                capacity = TotalSectorsLong * 512L;
-            }
-
-            switch (translation)
-            {
-                case GeometryTranslation.None:
-                    return this;
-
-                case GeometryTranslation.Auto:
-                    if (IsBiosSafe)
-                    {
-                        return this;
-                    }
-                    else
-                    {
-                        return Geometry.LbaAssistedBiosGeometry(capacity);
-                    }
-
-                case GeometryTranslation.Lba:
-                    return Geometry.LbaAssistedBiosGeometry(capacity);
-
-                case GeometryTranslation.Large:
-                    return Geometry.LargeBiosGeometry(this);
-
-                default:
-                    throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, "Translation mode '{0}' not yet implemented", translation), "translation");
-            }
-        }
-
-        /// <summary>
-        /// Determines if this object is equivalent to another.
-        /// </summary>
-        /// <param name="obj">The object to test against.</param>
-        /// <returns><c>true</c> if the <paramref name="obj"/> is equivalent, else <c>false</c>.</returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null || obj.GetType() != GetType())
-            {
-                return false;
-            }
-
-            Geometry other = (Geometry)obj;
-
-            return _cylinders == other._cylinders && _headsPerCylinder == other._headsPerCylinder
-                && _sectorsPerTrack == other._sectorsPerTrack && _bytesPerSector == other._bytesPerSector;
-        }
-
-        /// <summary>
-        /// Calculates the hash code for this object.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            return _cylinders.GetHashCode() ^ _headsPerCylinder.GetHashCode()
-                ^ _sectorsPerTrack.GetHashCode() ^ _bytesPerSector.GetHashCode();
-        }
-
-        /// <summary>
-        /// Gets a string representation of this object, in the form (C/H/S).
-        /// </summary>
-        /// <returns>The string representation.</returns>
-        public override string ToString()
-        {
-            if (_bytesPerSector == 512)
-            {
-                return "(" + _cylinders + "/" + _headsPerCylinder + "/" + _sectorsPerTrack + ")";
-            }
-            else
-            {
-                return "(" + _cylinders + "/" + _headsPerCylinder + "/" + _sectorsPerTrack + ":" + _bytesPerSector + ")";
-            }
-        }
-    }
-}
diff --git a/DiscUtils/GeometryTranslation.cs b/DiscUtils/GeometryTranslation.cs
deleted file mode 100644
index 26476a8..0000000
--- a/DiscUtils/GeometryTranslation.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    /// <summary>
-    /// Enumeration of standard BIOS disk geometry translation methods.
-    /// </summary>
-    public enum GeometryTranslation
-    {
-        /// <summary>
-        /// Apply no translation.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// Automatic, based on the physical geometry select the most appropriate translation.
-        /// </summary>
-        Auto = 1,
-
-        /// <summary>
-        /// LBA assisted translation, based on just the disk capacity.
-        /// </summary>
-        Lba = 2,
-
-        /// <summary>
-        /// Bit-shifting translation, based on the physical geometry of the disk.
-        /// </summary>
-        Large = 3,
-    }
-}
diff --git a/DiscUtils/IBuffer.cs b/DiscUtils/IBuffer.cs
deleted file mode 100644
index 8922e0a..0000000
--- a/DiscUtils/IBuffer.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// Interface shared by all buffers.
-    /// </summary>
-    /// <remarks>
-    /// Buffers are very similar to streams, except the buffer has no notion of
-    /// 'current position'.  All I/O operations instead specify the position, as
-    /// needed.  Buffers also support sparse behaviour.
-    /// </remarks>
-    public interface IBuffer
-    {
-        /// <summary>
-        /// Gets a value indicating whether this buffer can be read.
-        /// </summary>
-        bool CanRead { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether this buffer can be modified.
-        /// </summary>
-        bool CanWrite { get; }
-
-        /// <summary>
-        /// Gets the current capacity of the buffer, in bytes.
-        /// </summary>
-        long Capacity
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets the parts of the buffer that are stored.
-        /// </summary>
-        /// <remarks>This may be an empty enumeration if all bytes are zero.</remarks>
-        IEnumerable<StreamExtent> Extents
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Reads from the buffer into a byte array.
-        /// </summary>
-        /// <param name="pos">The offset within the buffer to start reading.</param>
-        /// <param name="buffer">The destination byte array.</param>
-        /// <param name="offset">The start offset within the destination buffer.</param>
-        /// <param name="count">The number of bytes to read.</param>
-        /// <returns>The actual number of bytes read.</returns>
-        int Read(long pos, byte[] buffer, int offset, int count);
-
-        /// <summary>
-        /// Writes a byte array into the buffer.
-        /// </summary>
-        /// <param name="pos">The start offset within the buffer.</param>
-        /// <param name="buffer">The source byte array.</param>
-        /// <param name="offset">The start offset within the source byte array.</param>
-        /// <param name="count">The number of bytes to write.</param>
-        void Write(long pos, byte[] buffer, int offset, int count);
-
-        /// <summary>
-        /// Clears bytes from the buffer.
-        /// </summary>
-        /// <param name="pos">The start offset within the buffer.</param>
-        /// <param name="count">The number of bytes to clear.</param>
-        /// <remarks>
-        /// <para>Logically equivalent to writing <c>count</c> null/zero bytes to the buffer, some
-        /// implementations determine that some (or all) of the range indicated is not actually
-        /// stored.  There is no direct, automatic, correspondence to clearing bytes and them
-        /// not being represented as an 'extent' - for example, the implementation of the underlying
-        /// stream may not permit fine-grained extent storage.</para>
-        /// <para>It is always safe to call this method to 'zero-out' a section of a buffer, regardless of
-        /// the underlying buffer implementation.</para>
-        /// </remarks>
-        void Clear(long pos, int count);
-
-        /// <summary>
-        /// Flushes all data to the underlying storage.
-        /// </summary>
-        void Flush();
-
-        /// <summary>
-        /// Sets the capacity of the buffer, truncating if appropriate.
-        /// </summary>
-        /// <param name="value">The desired capacity of the buffer.</param>
-        void SetCapacity(long value);
-
-        /// <summary>
-        /// Gets the parts of a buffer that are stored, within a specified range.
-        /// </summary>
-        /// <param name="start">The offset of the first byte of interest.</param>
-        /// <param name="count">The number of bytes of interest.</param>
-        /// <returns>An enumeration of stream extents, indicating stored bytes.</returns>
-        IEnumerable<StreamExtent> GetExtentsInRange(long start, long count);
-    }
-}
diff --git a/DiscUtils/IByteArraySerializable.cs b/DiscUtils/IByteArraySerializable.cs
deleted file mode 100644
index 73904ad..0000000
--- a/DiscUtils/IByteArraySerializable.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    /// <summary>
-    /// Common interface for reading structures to/from byte arrays.
-    /// </summary>
-    internal interface IByteArraySerializable
-    {
-        /// <summary>
-        /// Gets the total number of bytes the structure occupies.
-        /// </summary>
-        int Size { get; }
-
-        /// <summary>
-        /// Reads the structure from a byte array.
-        /// </summary>
-        /// <param name="buffer">The buffer to read from.</param>
-        /// <param name="offset">The buffer offset to start reading from.</param>
-        /// <returns>The number of bytes read.</returns>
-        int ReadFrom(byte[] buffer, int offset);
-
-        /// <summary>
-        /// Writes a structure to a byte array.
-        /// </summary>
-        /// <param name="buffer">The buffer to write to.</param>
-        /// <param name="offset">The buffer offset to start writing at.</param>
-        void WriteTo(byte[] buffer, int offset);
-    }
-}
diff --git a/DiscUtils/IClusterBasedFileSystem.cs b/DiscUtils/IClusterBasedFileSystem.cs
deleted file mode 100644
index 0aff2c1..0000000
--- a/DiscUtils/IClusterBasedFileSystem.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    /// <summary>
-    /// Base class for all file systems based on a cluster model.
-    /// </summary>
-    public interface IClusterBasedFileSystem : IFileSystem
-    {
-        /// <summary>
-        /// Gets the size (in bytes) of each cluster.
-        /// </summary>
-        long ClusterSize
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets the total number of clusters managed by the file system.
-        /// </summary>
-        long TotalClusters
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Converts a cluster (index) into an absolute byte position in the underlying stream.
-        /// </summary>
-        /// <param name="cluster">The cluster to convert.</param>
-        /// <returns>The corresponding absolute byte position.</returns>
-        long ClusterToOffset(long cluster);
-
-        /// <summary>
-        /// Converts an absolute byte position in the underlying stream to a cluster (index).
-        /// </summary>
-        /// <param name="offset">The byte position to convert.</param>
-        /// <returns>The cluster containing the specified byte.</returns>
-        long OffsetToCluster(long offset);
-
-        /// <summary>
-        /// Converts a file name to the list of clusters occupied by the file's data.
-        /// </summary>
-        /// <param name="path">The path to inspect.</param>
-        /// <returns>The clusters.</returns>
-        /// <remarks>Note that in some file systems, small files may not have dedicated
-        /// clusters.  Only dedicated clusters will be returned.</remarks>
-        Range<long, long>[] PathToClusters(string path);
-
-        /// <summary>
-        /// Converts a file name to the extents containing its data.
-        /// </summary>
-        /// <param name="path">The path to inspect.</param>
-        /// <returns>The file extents, as absolute byte positions in the underlying stream.</returns>
-        /// <remarks>Use this method with caution - not all file systems will store all bytes
-        /// directly in extents.  Files may be compressed, sparse or encrypted.  This method
-        /// merely indicates where file data is stored, not what's stored.</remarks>
-        StreamExtent[] PathToExtents(string path);
-
-        /// <summary>
-        /// Gets an object that can convert between clusters and files.
-        /// </summary>
-        /// <returns>The cluster map.</returns>
-        ClusterMap BuildClusterMap();
-    }
-}
diff --git a/DiscUtils/IDiagnosticTraceable.cs b/DiscUtils/IDiagnosticTraceable.cs
deleted file mode 100644
index 44a103b..0000000
--- a/DiscUtils/IDiagnosticTraceable.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System.IO;
-
-    /// <summary>
-    /// Interface exposed by objects that can provide a structured trace of their content.
-    /// </summary>
-    public interface IDiagnosticTraceable
-    {
-        /// <summary>
-        /// Writes a diagnostic report about the state of the object to a writer.
-        /// </summary>
-        /// <param name="writer">The writer to send the report to.</param>
-        /// <param name="linePrefix">The prefix to place at the start of each line.</param>
-        void Dump(TextWriter writer, string linePrefix);
-    }
-}
diff --git a/DiscUtils/IFileSystem.cs b/DiscUtils/IFileSystem.cs
deleted file mode 100644
index d69ecd3..0000000
--- a/DiscUtils/IFileSystem.cs
+++ /dev/null
@@ -1,354 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Common interface for all file systems.
-    /// </summary>
-    public interface IFileSystem
-    {
-        /// <summary>
-        /// Gets a value indicating whether the file system is read-only or read-write.
-        /// </summary>
-        /// <returns>true if the file system is read-write.</returns>
-        bool CanWrite { get; }
-
-        /// <summary>
-        /// Gets the root directory of the file system.
-        /// </summary>
-        DiscDirectoryInfo Root
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the file system is thread-safe.
-        /// </summary>
-        bool IsThreadSafe { get; }
-
-        /// <summary>
-        /// Copies an existing file to a new file.
-        /// </summary>
-        /// <param name="sourceFile">The source file.</param>
-        /// <param name="destinationFile">The destination file.</param>
-        void CopyFile(string sourceFile, string destinationFile);
-
-        /// <summary>
-        /// Copies an existing file to a new file, allowing overwriting of an existing file.
-        /// </summary>
-        /// <param name="sourceFile">The source file.</param>
-        /// <param name="destinationFile">The destination file.</param>
-        /// <param name="overwrite">Whether to permit over-writing of an existing file.</param>
-        void CopyFile(string sourceFile, string destinationFile, bool overwrite);
-
-        /// <summary>
-        /// Creates a directory.
-        /// </summary>
-        /// <param name="path">The path of the new directory.</param>
-        void CreateDirectory(string path);
-
-        /// <summary>
-        /// Deletes a directory.
-        /// </summary>
-        /// <param name="path">The path of the directory to delete.</param>
-        void DeleteDirectory(string path);
-
-        /// <summary>
-        /// Deletes a directory, optionally with all descendants.
-        /// </summary>
-        /// <param name="path">The path of the directory to delete.</param>
-        /// <param name="recursive">Determines if the all descendants should be deleted.</param>
-        void DeleteDirectory(string path, bool recursive);
-
-        /// <summary>
-        /// Deletes a file.
-        /// </summary>
-        /// <param name="path">The path of the file to delete.</param>
-        void DeleteFile(string path);
-
-        /// <summary>
-        /// Indicates if a directory exists.
-        /// </summary>
-        /// <param name="path">The path to test.</param>
-        /// <returns>true if the directory exists.</returns>
-        bool DirectoryExists(string path);
-
-        /// <summary>
-        /// Indicates if a file exists.
-        /// </summary>
-        /// <param name="path">The path to test.</param>
-        /// <returns>true if the file exists.</returns>
-        bool FileExists(string path);
-
-        /// <summary>
-        /// Indicates if a file or directory exists.
-        /// </summary>
-        /// <param name="path">The path to test.</param>
-        /// <returns>true if the file or directory exists.</returns>
-        bool Exists(string path);
-
-        /// <summary>
-        /// Gets the names of subdirectories in a specified directory.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <returns>Array of directories.</returns>
-        string[] GetDirectories(string path);
-
-        /// <summary>
-        /// Gets the names of subdirectories in a specified directory matching a specified
-        /// search pattern.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <returns>Array of directories matching the search pattern.</returns>
-        string[] GetDirectories(string path, string searchPattern);
-
-        /// <summary>
-        /// Gets the names of subdirectories in a specified directory matching a specified
-        /// search pattern, using a value to determine whether to search subdirectories.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <param name="searchOption">Indicates whether to search subdirectories.</param>
-        /// <returns>Array of directories matching the search pattern.</returns>
-        string[] GetDirectories(string path, string searchPattern, SearchOption searchOption);
-
-        /// <summary>
-        /// Gets the names of files in a specified directory.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <returns>Array of files.</returns>
-        string[] GetFiles(string path);
-
-        /// <summary>
-        /// Gets the names of files in a specified directory.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <returns>Array of files matching the search pattern.</returns>
-        string[] GetFiles(string path, string searchPattern);
-
-        /// <summary>
-        /// Gets the names of files in a specified directory matching a specified
-        /// search pattern, using a value to determine whether to search subdirectories.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <param name="searchOption">Indicates whether to search subdirectories.</param>
-        /// <returns>Array of files matching the search pattern.</returns>
-        string[] GetFiles(string path, string searchPattern, SearchOption searchOption);
-
-        /// <summary>
-        /// Gets the names of all files and subdirectories in a specified directory.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <returns>Array of files and subdirectories matching the search pattern.</returns>
-        string[] GetFileSystemEntries(string path);
-
-        /// <summary>
-        /// Gets the names of files and subdirectories in a specified directory matching a specified
-        /// search pattern.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <returns>Array of files and subdirectories matching the search pattern.</returns>
-        string[] GetFileSystemEntries(string path, string searchPattern);
-
-        /// <summary>
-        /// Moves a directory.
-        /// </summary>
-        /// <param name="sourceDirectoryName">The directory to move.</param>
-        /// <param name="destinationDirectoryName">The target directory name.</param>
-        void MoveDirectory(string sourceDirectoryName, string destinationDirectoryName);
-
-        /// <summary>
-        /// Moves a file.
-        /// </summary>
-        /// <param name="sourceName">The file to move.</param>
-        /// <param name="destinationName">The target file name.</param>
-        void MoveFile(string sourceName, string destinationName);
-
-        /// <summary>
-        /// Moves a file, allowing an existing file to be overwritten.
-        /// </summary>
-        /// <param name="sourceName">The file to move.</param>
-        /// <param name="destinationName">The target file name.</param>
-        /// <param name="overwrite">Whether to permit a destination file to be overwritten.</param>
-        void MoveFile(string sourceName, string destinationName, bool overwrite);
-
-        /// <summary>
-        /// Opens the specified file.
-        /// </summary>
-        /// <param name="path">The full path of the file to open.</param>
-        /// <param name="mode">The file mode for the created stream.</param>
-        /// <returns>The new stream.</returns>
-        SparseStream OpenFile(string path, FileMode mode);
-
-        /// <summary>
-        /// Opens the specified file.
-        /// </summary>
-        /// <param name="path">The full path of the file to open.</param>
-        /// <param name="mode">The file mode for the created stream.</param>
-        /// <param name="access">The access permissions for the created stream.</param>
-        /// <returns>The new stream.</returns>
-        SparseStream OpenFile(string path, FileMode mode, FileAccess access);
-
-        /// <summary>
-        /// Gets the attributes of a file or directory.
-        /// </summary>
-        /// <param name="path">The file or directory to inspect.</param>
-        /// <returns>The attributes of the file or directory.</returns>
-        FileAttributes GetAttributes(string path);
-
-        /// <summary>
-        /// Sets the attributes of a file or directory.
-        /// </summary>
-        /// <param name="path">The file or directory to change.</param>
-        /// <param name="newValue">The new attributes of the file or directory.</param>
-        void SetAttributes(string path, FileAttributes newValue);
-
-        /// <summary>
-        /// Gets the creation time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The creation time.</returns>
-        DateTime GetCreationTime(string path);
-
-        /// <summary>
-        /// Sets the creation time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        void SetCreationTime(string path, DateTime newTime);
-
-        /// <summary>
-        /// Gets the creation time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The creation time.</returns>
-        DateTime GetCreationTimeUtc(string path);
-
-        /// <summary>
-        /// Sets the creation time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        void SetCreationTimeUtc(string path, DateTime newTime);
-
-        /// <summary>
-        /// Gets the last access time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The last access time.</returns>
-        DateTime GetLastAccessTime(string path);
-
-        /// <summary>
-        /// Sets the last access time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        void SetLastAccessTime(string path, DateTime newTime);
-
-        /// <summary>
-        /// Gets the last access time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The last access time.</returns>
-        DateTime GetLastAccessTimeUtc(string path);
-
-        /// <summary>
-        /// Sets the last access time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        void SetLastAccessTimeUtc(string path, DateTime newTime);
-
-        /// <summary>
-        /// Gets the last modification time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The last write time.</returns>
-        DateTime GetLastWriteTime(string path);
-
-        /// <summary>
-        /// Sets the last modification time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        void SetLastWriteTime(string path, DateTime newTime);
-
-        /// <summary>
-        /// Gets the last modification time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The last write time.</returns>
-        DateTime GetLastWriteTimeUtc(string path);
-
-        /// <summary>
-        /// Sets the last modification time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        void SetLastWriteTimeUtc(string path, DateTime newTime);
-
-        /// <summary>
-        /// Gets the length of a file.
-        /// </summary>
-        /// <param name="path">The path to the file.</param>
-        /// <returns>The length in bytes.</returns>
-        long GetFileLength(string path);
-
-        /// <summary>
-        /// Gets an object representing a possible file.
-        /// </summary>
-        /// <param name="path">The file path.</param>
-        /// <returns>The representing object.</returns>
-        /// <remarks>The file does not need to exist.</remarks>
-        DiscFileInfo GetFileInfo(string path);
-
-        /// <summary>
-        /// Gets an object representing a possible directory.
-        /// </summary>
-        /// <param name="path">The directory path.</param>
-        /// <returns>The representing object.</returns>
-        /// <remarks>The directory does not need to exist.</remarks>
-        DiscDirectoryInfo GetDirectoryInfo(string path);
-
-        /// <summary>
-        /// Gets an object representing a possible file system object (file or directory).
-        /// </summary>
-        /// <param name="path">The file system path.</param>
-        /// <returns>The representing object.</returns>
-        /// <remarks>The file system object does not need to exist.</remarks>
-        DiscFileSystemInfo GetFileSystemInfo(string path);
-
-        /// <summary>
-        /// Reads the boot code of the file system into a byte array.
-        /// </summary>
-        /// <returns>The boot code, or <c>null</c> if not available.</returns>
-        byte[] ReadBootCode();
-    }
-}
diff --git a/DiscUtils/IMappedBuffer.cs b/DiscUtils/IMappedBuffer.cs
deleted file mode 100644
index 410a098..0000000
--- a/DiscUtils/IMappedBuffer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    internal interface IMappedBuffer : IBuffer
-    {
-        long MapPosition(long position);
-    }
-}
diff --git a/DiscUtils/IWindowsFileSystem.cs b/DiscUtils/IWindowsFileSystem.cs
deleted file mode 100644
index 01b8ac0..0000000
--- a/DiscUtils/IWindowsFileSystem.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System.Security.AccessControl;
-
-    /// <summary>
-    /// Provides the base class for all file systems that support Windows semantics.
-    /// </summary>
-    public interface IWindowsFileSystem : IFileSystem
-    {
-        /// <summary>
-        /// Gets the security descriptor associated with the file or directory.
-        /// </summary>
-        /// <param name="path">The file or directory to inspect.</param>
-        /// <returns>The security descriptor.</returns>
-        RawSecurityDescriptor GetSecurity(string path);
-
-        /// <summary>
-        /// Sets the security descriptor associated with the file or directory.
-        /// </summary>
-        /// <param name="path">The file or directory to change.</param>
-        /// <param name="securityDescriptor">The new security descriptor.</param>
-        void SetSecurity(string path, RawSecurityDescriptor securityDescriptor);
-
-        /// <summary>
-        /// Gets the reparse point data associated with a file or directory.
-        /// </summary>
-        /// <param name="path">The file to query.</param>
-        /// <returns>The reparse point information.</returns>
-        ReparsePoint GetReparsePoint(string path);
-
-        /// <summary>
-        /// Sets the reparse point data on a file or directory.
-        /// </summary>
-        /// <param name="path">The file to set the reparse point on.</param>
-        /// <param name="reparsePoint">The new reparse point.</param>
-        void SetReparsePoint(string path, ReparsePoint reparsePoint);
-
-        /// <summary>
-        /// Removes a reparse point from a file or directory, without deleting the file or directory.
-        /// </summary>
-        /// <param name="path">The path to the file or directory to remove the reparse point from.</param>
-        void RemoveReparsePoint(string path);
-
-        /// <summary>
-        /// Gets the short name for a given path.
-        /// </summary>
-        /// <param name="path">The path to convert.</param>
-        /// <returns>The short name.</returns>
-        /// <remarks>
-        /// This method only gets the short name for the final part of the path, to
-        /// convert a complete path, call this method repeatedly, once for each path
-        /// segment.  If there is no short name for the given path,<c>null</c> is
-        /// returned.
-        /// </remarks>
-        string GetShortName(string path);
-
-        /// <summary>
-        /// Sets the short name for a given file or directory.
-        /// </summary>
-        /// <param name="path">The full path to the file or directory to change.</param>
-        /// <param name="shortName">The shortName, which should not include a path.</param>
-        void SetShortName(string path, string shortName);
-
-        /// <summary>
-        /// Gets the standard file information for a file.
-        /// </summary>
-        /// <param name="path">The full path to the file or directory to query.</param>
-        /// <returns>The standard file information.</returns>
-        WindowsFileInformation GetFileStandardInformation(string path);
-
-        /// <summary>
-        /// Sets the standard file information for a file.
-        /// </summary>
-        /// <param name="path">The full path to the file or directory to query.</param>
-        /// <param name="info">The standard file information.</param>
-        void SetFileStandardInformation(string path, WindowsFileInformation info);
-
-        /// <summary>
-        /// Gets the names of the alternate data streams for a file.
-        /// </summary>
-        /// <param name="path">The path to the file.</param>
-        /// <returns>
-        /// The list of alternate data streams (or empty, if none).  To access the contents
-        /// of the alternate streams, use OpenFile(path + ":" + name, ...).
-        /// </returns>
-        string[] GetAlternateDataStreams(string path);
-
-        /// <summary>
-        /// Gets the file id for a given path.
-        /// </summary>
-        /// <param name="path">The path to get the id of.</param>
-        /// <returns>The file id, or -1.</returns>
-        /// <remarks>
-        /// The returned file id uniquely identifies the file, and is shared by all hard
-        /// links to the same file.  The value -1 indicates no unique identifier is
-        /// available, and so it can be assumed the file has no hard links.
-        /// </remarks>
-        long GetFileId(string path);
-
-        /// <summary>
-        /// Indicates whether the file is known by other names.
-        /// </summary>
-        /// <param name="path">The file to inspect.</param>
-        /// <returns><c>true</c> if the file has other names, else <c>false</c>.</returns>
-        bool HasHardLinks(string path);
-    }
-}
diff --git a/DiscUtils/InvalidFileSystemException.cs b/DiscUtils/InvalidFileSystemException.cs
deleted file mode 100644
index 59b66b1..0000000
--- a/DiscUtils/InvalidFileSystemException.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.IO;
-    using System.Runtime.Serialization;
-
-    /// <summary>
-    /// Exception thrown when some invalid file system data is found, indicating probably corruption.
-    /// </summary>
-    [Serializable]
-    public class InvalidFileSystemException : IOException
-    {
-        /// <summary>
-        /// Initializes a new instance of the InvalidFileSystemException class.
-        /// </summary>
-        public InvalidFileSystemException()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the InvalidFileSystemException class.
-        /// </summary>
-        /// <param name="message">The exception message.</param>
-        public InvalidFileSystemException(string message)
-            : base(message)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the InvalidFileSystemException class.
-        /// </summary>
-        /// <param name="message">The exception message.</param>
-        /// <param name="innerException">The inner exception.</param>
-        public InvalidFileSystemException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the InvalidFileSystemException class.
-        /// </summary>
-        /// <param name="info">The serialization info.</param>
-        /// <param name="context">The streaming context.</param>
-        protected InvalidFileSystemException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-    }
-}
diff --git a/DiscUtils/LogicalDiskManager/ComponentRecord.cs b/DiscUtils/LogicalDiskManager/ComponentRecord.cs
deleted file mode 100644
index 102bc9f..0000000
--- a/DiscUtils/LogicalDiskManager/ComponentRecord.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.LogicalDiskManager
-{
-    internal sealed class ComponentRecord : DatabaseRecord
-    {
-        public string StatusString;
-        public ExtentMergeType MergeType; // (02 Spanned, Simple, Mirrored)  (01 on striped)
-        public uint Unknown1; // Zero
-        public ulong NumExtents; // Could be num disks
-        public uint Unknown2; // Zero
-        public uint LinkId; // Identical on mirrors
-        public ulong Unknown3; // 00 .. 00
-        public ulong VolumeId;
-        public ulong Unknown4; // ??
-        public long StripeSizeSectors;
-        public long StripeStride; // aka num partitions
-
-        protected override void DoReadFrom(byte[] buffer, int offset)
-        {
-            base.DoReadFrom(buffer, offset);
-
-            int pos = offset + 0x18;
-
-            Id = ReadVarULong(buffer, ref pos);
-            Name = ReadVarString(buffer, ref pos);
-            StatusString = ReadVarString(buffer, ref pos);
-            MergeType = (ExtentMergeType)ReadByte(buffer, ref pos);
-            Unknown1 = ReadUInt(buffer, ref pos); // Zero
-            NumExtents = ReadVarULong(buffer, ref pos);
-            Unknown2 = ReadUInt(buffer, ref pos);
-            LinkId = ReadUInt(buffer, ref pos);
-            Unknown3 = ReadULong(buffer, ref pos); // Zero
-            VolumeId = ReadVarULong(buffer, ref pos);
-            Unknown4 = ReadVarULong(buffer, ref pos); // Zero
-
-            if ((Flags & 0x1000) != 0)
-            {
-                StripeSizeSectors = ReadVarLong(buffer, ref pos);
-                StripeStride = ReadVarLong(buffer, ref pos);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/LogicalDiskManager/Database.cs b/DiscUtils/LogicalDiskManager/Database.cs
deleted file mode 100644
index b33be0f..0000000
--- a/DiscUtils/LogicalDiskManager/Database.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.LogicalDiskManager
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal class Database
-    {
-        private DatabaseHeader _vmdb;
-        private Dictionary<ulong, DatabaseRecord> _records;
-
-        public Database(Stream stream)
-        {
-            long dbStart = stream.Position;
-
-            byte[] buffer = new byte[Sizes.Sector];
-            stream.Read(buffer, 0, buffer.Length);
-            _vmdb = new DatabaseHeader();
-            _vmdb.ReadFrom(buffer, 0);
-
-            stream.Position = dbStart + _vmdb.HeaderSize;
-
-            buffer = Utilities.ReadFully(stream, (int)(_vmdb.BlockSize * _vmdb.NumVBlks));
-
-            _records = new Dictionary<ulong, DatabaseRecord>();
-            for (int i = 0; i < _vmdb.NumVBlks; ++i)
-            {
-                DatabaseRecord rec = DatabaseRecord.ReadFrom(buffer, (int)(i * _vmdb.BlockSize));
-                if (rec != null)
-                {
-                    _records.Add(rec.Id, rec);
-                }
-            }
-        }
-
-        internal IEnumerable<DiskRecord> Disks
-        {
-            get
-            {
-                foreach (var record in _records.Values)
-                {
-                    if (record.RecordType == RecordType.Disk)
-                    {
-                        yield return (DiskRecord)record;
-                    }
-                }
-            }
-        }
-
-        internal IEnumerable<VolumeRecord> Volumes
-        {
-            get
-            {
-                foreach (var record in _records.Values)
-                {
-                    if (record.RecordType == RecordType.Volume)
-                    {
-                        yield return (VolumeRecord)record;
-                    }
-                }
-            }
-        }
-
-        internal DiskGroupRecord GetDiskGroup(Guid guid)
-        {
-            foreach (var record in _records.Values)
-            {
-                if (record.RecordType == RecordType.DiskGroup)
-                {
-                    DiskGroupRecord dgRecord = (DiskGroupRecord)record;
-                    if (new Guid(dgRecord.GroupGuidString) == guid || guid == Guid.Empty)
-                    {
-                        return dgRecord;
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        internal IEnumerable<ComponentRecord> GetVolumeComponents(ulong volumeId)
-        {
-            foreach (var record in _records.Values)
-            {
-                if (record.RecordType == RecordType.Component)
-                {
-                    ComponentRecord cmpntRecord = (ComponentRecord)record;
-                    if (cmpntRecord.VolumeId == volumeId)
-                    {
-                        yield return cmpntRecord;
-                    }
-                }
-            }
-        }
-
-        internal IEnumerable<ExtentRecord> GetComponentExtents(ulong componentId)
-        {
-            foreach (var record in _records.Values)
-            {
-                if (record.RecordType == RecordType.Extent)
-                {
-                    ExtentRecord extentRecord = (ExtentRecord)record;
-                    if (extentRecord.ComponentId == componentId)
-                    {
-                        yield return extentRecord;
-                    }
-                }
-            }
-        }
-
-        internal DiskRecord GetDisk(ulong diskId)
-        {
-            return (DiskRecord)_records[diskId];
-        }
-
-        internal VolumeRecord GetVolume(ulong volumeId)
-        {
-            return (VolumeRecord)_records[volumeId];
-        }
-
-        internal VolumeRecord GetVolume(Guid id)
-        {
-            return FindRecord<VolumeRecord>(r => (r.VolumeGuid == id), RecordType.Volume);
-        }
-
-        internal IEnumerable<VolumeRecord> GetVolumes()
-        {
-            foreach (var record in _records.Values)
-            {
-                if (record.RecordType == RecordType.Volume)
-                {
-                    yield return (VolumeRecord)record;
-                }
-            }
-        }
-
-        internal T FindRecord<T>(Predicate<T> pred, RecordType typeId)
-            where T : DatabaseRecord
-        {
-            foreach (var record in _records.Values)
-            {
-                if (record.RecordType == typeId)
-                {
-                    T t = (T)record;
-                    if (pred(t))
-                    {
-                        return t;
-                    }
-                }
-            }
-
-            return null;
-        }
-    }
-}
diff --git a/DiscUtils/LogicalDiskManager/DatabaseHeader.cs b/DiscUtils/LogicalDiskManager/DatabaseHeader.cs
deleted file mode 100644
index 83728c5..0000000
--- a/DiscUtils/LogicalDiskManager/DatabaseHeader.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.LogicalDiskManager
-{
-    using System;
-
-    internal class DatabaseHeader
-    {
-        public string Signature; // VMDB
-        public uint NumVBlks; // 00 00 17 24
-        public uint BlockSize; // 00 00 00 80
-        public uint HeaderSize; // 00 00 02 00
-        public ushort Unknown1; // 00 01
-        public ushort VersionNum; // 00 04
-        public ushort VersionDenom; // 00 0a
-        public string GroupName;
-        public string DiskGroupId;
-        public long CommittedSequence; // 0xA
-        public long PendingSequence; // 0xA
-        public uint Unknown2; // 1
-        public uint Unknown3; // 1
-        public uint Unknown4; // 3
-        public uint Unknown5; // 3
-        public long Unknown6; // 0
-        public long Unknown7; // 1
-        public uint Unknown8; // 1
-        public uint Unknown9; // 3
-        public uint UnknownA; // 3
-        public long UnknownB; // 0
-        public uint UnknownC; // 0
-        public DateTime Timestamp;
-
-        public void ReadFrom(byte[] buffer, int offset)
-        {
-            Signature = Utilities.BytesToString(buffer, offset + 0x00, 4);
-            NumVBlks = Utilities.ToUInt32BigEndian(buffer, offset + 0x04);
-            BlockSize = Utilities.ToUInt32BigEndian(buffer, offset + 0x08);
-            HeaderSize = Utilities.ToUInt32BigEndian(buffer, offset + 0x0C);
-            Unknown1 = Utilities.ToUInt16BigEndian(buffer, offset + 0x10);
-            VersionNum = Utilities.ToUInt16BigEndian(buffer, offset + 0x12);
-            VersionDenom = Utilities.ToUInt16BigEndian(buffer, offset + 0x14);
-            GroupName = Utilities.BytesToString(buffer, offset + 0x16, 31).Trim('\0');
-            DiskGroupId = Utilities.BytesToString(buffer, offset + 0x35, 0x40).Trim('\0');
-
-            // May be wrong way round...
-            CommittedSequence = Utilities.ToInt64BigEndian(buffer, offset + 0x75);
-            PendingSequence = Utilities.ToInt64BigEndian(buffer, offset + 0x7D);
-
-            Unknown2 = Utilities.ToUInt32BigEndian(buffer, offset + 0x85);
-            Unknown3 = Utilities.ToUInt32BigEndian(buffer, offset + 0x89);
-            Unknown4 = Utilities.ToUInt32BigEndian(buffer, offset + 0x8D);
-            Unknown5 = Utilities.ToUInt32BigEndian(buffer, offset + 0x91);
-            Unknown6 = Utilities.ToInt64BigEndian(buffer, offset + 0x95);
-            Unknown7 = Utilities.ToInt64BigEndian(buffer, offset + 0x9D);
-            Unknown8 = Utilities.ToUInt32BigEndian(buffer, offset + 0xA5);
-            Unknown9 = Utilities.ToUInt32BigEndian(buffer, offset + 0xA9);
-            UnknownA = Utilities.ToUInt32BigEndian(buffer, offset + 0xAD);
-
-            UnknownB = Utilities.ToInt64BigEndian(buffer, offset + 0xB1);
-            UnknownC = Utilities.ToUInt32BigEndian(buffer, offset + 0xB9);
-
-            Timestamp = DateTime.FromFileTimeUtc(Utilities.ToInt64BigEndian(buffer, offset + 0xBD));
-        }
-
-        ////private static int CalcChecksum()
-        ////{
-        ////    // Zero checksum bytes (0x08, 4)
-        ////    // Add all byte values for ?? bytes
-        ////    throw new NotImplementedException();
-        ////}
-    }
-}
diff --git a/DiscUtils/LogicalDiskManager/DatabaseRecord.cs b/DiscUtils/LogicalDiskManager/DatabaseRecord.cs
deleted file mode 100644
index 406d5f0..0000000
--- a/DiscUtils/LogicalDiskManager/DatabaseRecord.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.LogicalDiskManager
-{
-    using System;
-
-    internal abstract class DatabaseRecord
-    {
-        public string Signature; // VBLK
-        public uint Label;
-        public uint Counter;
-        public uint Valid;
-        public uint Flags;
-        public RecordType RecordType;
-        public uint DataLength;
-
-        public ulong Id;
-        public string Name;
-
-        protected DatabaseRecord()
-        {
-        }
-
-        public static DatabaseRecord ReadFrom(byte[] buffer, int offset)
-        {
-            DatabaseRecord result = null;
-
-            if (Utilities.ToInt32BigEndian(buffer, offset + 0xC) != 0)
-            {
-                switch ((RecordType)(buffer[offset + 0x13] & 0xF))
-                {
-                    case RecordType.Volume:
-                        result = new VolumeRecord();
-                        break;
-
-                    case RecordType.Component:
-                        result = new ComponentRecord();
-                        break;
-
-                    case RecordType.Extent:
-                        result = new ExtentRecord();
-                        break;
-
-                    case RecordType.Disk:
-                        result = new DiskRecord();
-                        break;
-
-                    case RecordType.DiskGroup:
-                        result = new DiskGroupRecord();
-                        break;
-
-                    default:
-                        throw new NotImplementedException("Unrecognized record type: " + buffer[offset + 0x13]);
-                }
-
-                result.DoReadFrom(buffer, offset);
-            }
-
-            return result;
-        }
-
-        protected static ulong ReadVarULong(byte[] buffer, ref int offset)
-        {
-            int length = buffer[offset];
-
-            ulong result = 0;
-            for (int i = 0; i < length; ++i)
-            {
-                result = (result << 8) | buffer[offset + i + 1];
-            }
-
-            offset += length + 1;
-
-            return result;
-        }
-
-        protected static long ReadVarLong(byte[] buffer, ref int offset)
-        {
-            return (long)ReadVarULong(buffer, ref offset);
-        }
-
-        protected static string ReadVarString(byte[] buffer, ref int offset)
-        {
-            int length = buffer[offset];
-
-            string result = Utilities.BytesToString(buffer, offset + 1, length);
-            offset += length + 1;
-            return result;
-        }
-
-        protected static byte ReadByte(byte[] buffer, ref int offset)
-        {
-            return buffer[offset++];
-        }
-
-        protected static uint ReadUInt(byte[] buffer, ref int offset)
-        {
-            offset += 4;
-            return Utilities.ToUInt32BigEndian(buffer, offset - 4);
-        }
-
-        protected static long ReadLong(byte[] buffer, ref int offset)
-        {
-            offset += 8;
-            return Utilities.ToInt64BigEndian(buffer, offset - 8);
-        }
-
-        protected static ulong ReadULong(byte[] buffer, ref int offset)
-        {
-            offset += 8;
-            return Utilities.ToUInt64BigEndian(buffer, offset - 8);
-        }
-
-        protected static string ReadString(byte[] buffer, int len, ref int offset)
-        {
-            offset += len;
-            return Utilities.BytesToString(buffer, offset - len, len);
-        }
-
-        protected static Guid ReadBinaryGuid(byte[] buffer, ref int offset)
-        {
-            offset += 16;
-            return Utilities.ToGuidBigEndian(buffer, offset - 16);
-        }
-
-        protected virtual void DoReadFrom(byte[] buffer, int offset)
-        {
-            Signature = Utilities.BytesToString(buffer, offset + 0x00, 4);
-            Label = Utilities.ToUInt32BigEndian(buffer, offset + 0x04);
-            Counter = Utilities.ToUInt32BigEndian(buffer, offset + 0x08);
-            Valid = Utilities.ToUInt32BigEndian(buffer, offset + 0x0C);
-            Flags = Utilities.ToUInt32BigEndian(buffer, offset + 0x10);
-            RecordType = (RecordType)(Flags & 0xF);
-            DataLength = Utilities.ToUInt32BigEndian(buffer, 0x14);
-        }
-    }
-}
diff --git a/DiscUtils/LogicalDiskManager/DiskGroupRecord.cs b/DiscUtils/LogicalDiskManager/DiskGroupRecord.cs
deleted file mode 100644
index 0051bcc..0000000
--- a/DiscUtils/LogicalDiskManager/DiskGroupRecord.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.LogicalDiskManager
-{
-    internal sealed class DiskGroupRecord : DatabaseRecord
-    {
-        public string GroupGuidString;
-        public uint Unknown1;
-
-        protected override void DoReadFrom(byte[] buffer, int offset)
-        {
-            base.DoReadFrom(buffer, offset);
-
-            int pos = offset + 0x18;
-
-            Id = ReadVarULong(buffer, ref pos);
-            Name = ReadVarString(buffer, ref pos);
-            if ((Flags & 0xF0) == 0x40)
-            {
-                GroupGuidString = ReadBinaryGuid(buffer, ref pos).ToString();
-            }
-            else
-            {
-                GroupGuidString = ReadVarString(buffer, ref pos);
-            }
-            Unknown1 = ReadUInt(buffer, ref pos);
-        }
-    }
-}
diff --git a/DiscUtils/LogicalDiskManager/DiskRecord.cs b/DiscUtils/LogicalDiskManager/DiskRecord.cs
deleted file mode 100644
index 5972935..0000000
--- a/DiscUtils/LogicalDiskManager/DiskRecord.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.LogicalDiskManager
-{
-    internal sealed class DiskRecord : DatabaseRecord
-    {
-        public string DiskGuidString;
-
-        protected override void DoReadFrom(byte[] buffer, int offset)
-        {
-            base.DoReadFrom(buffer, offset);
-
-            int pos = offset + 0x18;
-
-            Id = ReadVarULong(buffer, ref pos);
-            Name = ReadVarString(buffer, ref pos);
-            if ((Flags & 0xF0) == 0x40)
-            {
-                DiskGuidString = ReadBinaryGuid(buffer, ref pos).ToString();
-            }
-            else
-            {
-                DiskGuidString = ReadVarString(buffer, ref pos);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/LogicalDiskManager/DynamicDisk.cs b/DiscUtils/LogicalDiskManager/DynamicDisk.cs
deleted file mode 100644
index 8dec605..0000000
--- a/DiscUtils/LogicalDiskManager/DynamicDisk.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.LogicalDiskManager
-{
-    using DiscUtils.Partitions;
-    using System;
-    using System.IO;
-
-    internal class DynamicDisk : IDiagnosticTraceable
-    {
-        private VirtualDisk _disk;
-        private PrivateHeader _header;
-        private Database _database;
-
-        internal DynamicDisk(VirtualDisk disk)
-        {
-            _disk = disk;
-            _header = GetPrivateHeader(_disk);
-
-            TocBlock toc = GetTableOfContents();
-
-            long dbStart = (_header.ConfigurationStartLba * 512) + (toc.Item1Start * 512);
-            _disk.Content.Position = dbStart;
-            _database = new Database(_disk.Content);
-        }
-
-        public SparseStream Content
-        {
-            get { return _disk.Content; }
-        }
-
-        public long DataOffset
-        {
-            get { return _header.DataStartLba; }
-        }
-
-        public Guid Id
-        {
-            get { return new Guid(_header.DiskId); }
-        }
-
-        public Guid GroupId
-        {
-            get { return string.IsNullOrEmpty(_header.DiskGroupId) ? Guid.Empty : new Guid(_header.DiskGroupId); }
-        }
-
-        public Database Database
-        {
-            get { return _database; }
-        }
-
-        public void Dump(TextWriter writer, string linePrefix)
-        {
-            writer.WriteLine(linePrefix + "DISK (" + _header.DiskId + ")");
-            writer.WriteLine(linePrefix + "      Metadata Version: " + ((_header.Version >> 16) & 0xFFFF) + "." + (_header.Version & 0xFFFF));
-            writer.WriteLine(linePrefix + "             Timestamp: " + _header.Timestamp);
-            writer.WriteLine(linePrefix + "               Disk Id: " + _header.DiskId);
-            writer.WriteLine(linePrefix + "               Host Id: " + _header.HostId);
-            writer.WriteLine(linePrefix + "         Disk Group Id: " + _header.DiskGroupId);
-            writer.WriteLine(linePrefix + "       Disk Group Name: " + _header.DiskGroupName);
-            writer.WriteLine(linePrefix + "            Data Start: " + _header.DataStartLba + " (Sectors)");
-            writer.WriteLine(linePrefix + "             Data Size: " + _header.DataSizeLba + " (Sectors)");
-            writer.WriteLine(linePrefix + "   Configuration Start: " + _header.ConfigurationStartLba + " (Sectors)");
-            writer.WriteLine(linePrefix + "    Configuration Size: " + _header.ConfigurationSizeLba + " (Sectors)");
-            writer.WriteLine(linePrefix + "              TOC Size: " + _header.TocSizeLba + " (Sectors)");
-            writer.WriteLine(linePrefix + "              Next TOC: " + _header.NextTocLba + " (Sectors)");
-            writer.WriteLine(linePrefix + "     Number of Configs: " + _header.NumberOfConfigs);
-            writer.WriteLine(linePrefix + "           Config Size: " + _header.ConfigurationSizeLba + " (Sectors)");
-            writer.WriteLine(linePrefix + "        Number of Logs: " + _header.NumberOfLogs);
-            writer.WriteLine(linePrefix + "              Log Size: " + _header.LogSizeLba + " (Sectors)");
-        }
-
-        internal static PrivateHeader GetPrivateHeader(VirtualDisk disk)
-        {
-            if (disk.IsPartitioned)
-            {
-                long headerPos = 0;
-                PartitionTable pt = disk.Partitions;
-                if (pt is BiosPartitionTable)
-                {
-                    headerPos = 0xc00;
-                }
-                else
-                {
-                    foreach (var part in pt.Partitions)
-                    {
-                        if (part.GuidType == GuidPartitionTypes.WindowsLdmMetadata)
-                        {
-                            headerPos = part.LastSector * Sizes.Sector;
-                        }
-                    }
-                }
-
-                if (headerPos != 0)
-                {
-                    disk.Content.Position = headerPos;
-                    byte[] buffer = new byte[Sizes.Sector];
-                    disk.Content.Read(buffer, 0, buffer.Length);
-
-                    PrivateHeader hdr = new PrivateHeader();
-                    hdr.ReadFrom(buffer, 0);
-                    return hdr;
-                }
-            }
-
-            return null;
-        }
-
-        private TocBlock GetTableOfContents()
-        {
-            byte[] buffer = new byte[_header.TocSizeLba * 512];
-            _disk.Content.Position = (_header.ConfigurationStartLba * 512) + (1 * _header.TocSizeLba * 512);
-
-            _disk.Content.Read(buffer, 0, buffer.Length);
-            TocBlock tocBlock = new TocBlock();
-            tocBlock.ReadFrom(buffer, 0);
-
-            if (tocBlock.Signature == "TOCBLOCK")
-            {
-                return tocBlock;
-            }
-
-            return null;
-        }
-    }
-}
diff --git a/DiscUtils/LogicalDiskManager/DynamicDiskGroup.cs b/DiscUtils/LogicalDiskManager/DynamicDiskGroup.cs
deleted file mode 100644
index 0e29e99..0000000
--- a/DiscUtils/LogicalDiskManager/DynamicDiskGroup.cs
+++ /dev/null
@@ -1,319 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.LogicalDiskManager
-{
-    using DiscUtils.Partitions;
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-
-    internal class DynamicDiskGroup : IDiagnosticTraceable
-    {
-        private DiskGroupRecord _record;
-        private Dictionary<Guid, DynamicDisk> _disks;
-        private Database _database;
-
-        internal DynamicDiskGroup(VirtualDisk disk)
-        {
-            _disks = new Dictionary<Guid, DynamicDisk>();
-
-            DynamicDisk dynDisk = new DynamicDisk(disk);
-            _database = dynDisk.Database;
-            _disks.Add(dynDisk.Id, dynDisk);
-            _record = dynDisk.Database.GetDiskGroup(dynDisk.GroupId);
-        }
-
-        public void Add(VirtualDisk disk)
-        {
-            DynamicDisk dynDisk = new DynamicDisk(disk);
-            _disks.Add(dynDisk.Id, dynDisk);
-        }
-
-        #region IDiagnosticTraceable Members
-
-        public void Dump(TextWriter writer, string linePrefix)
-        {
-            writer.WriteLine(linePrefix + "DISK GROUP (" + _record.Name + ")");
-            writer.WriteLine(linePrefix + "  Name: " + _record.Name);
-            writer.WriteLine(linePrefix + "  Flags: 0x" + (_record.Flags & 0xFFF0).ToString("X4", CultureInfo.InvariantCulture));
-            writer.WriteLine(linePrefix + "  Database Id: " + _record.Id);
-            writer.WriteLine(linePrefix + "  Guid: " + _record.GroupGuidString);
-            writer.WriteLine();
-
-            writer.WriteLine(linePrefix + "  DISKS");
-            foreach (var disk in _database.Disks)
-            {
-                writer.WriteLine(linePrefix + "    DISK (" + disk.Name + ")");
-                writer.WriteLine(linePrefix + "      Name: " + disk.Name);
-                writer.WriteLine(linePrefix + "      Flags: 0x" + (disk.Flags & 0xFFF0).ToString("X4", CultureInfo.InvariantCulture));
-                writer.WriteLine(linePrefix + "      Database Id: " + disk.Id);
-                writer.WriteLine(linePrefix + "      Guid: " + disk.DiskGuidString);
-
-                DynamicDisk dynDisk;
-                if (_disks.TryGetValue(new Guid(disk.DiskGuidString), out dynDisk))
-                {
-                    writer.WriteLine(linePrefix + "      PRIVATE HEADER");
-                    dynDisk.Dump(writer, linePrefix + "        ");
-                }
-            }
-
-            writer.WriteLine(linePrefix + "  VOLUMES");
-            foreach (var vol in _database.Volumes)
-            {
-                writer.WriteLine(linePrefix + "    VOLUME (" + vol.Name + ")");
-                writer.WriteLine(linePrefix + "      Name: " + vol.Name);
-                writer.WriteLine(linePrefix + "      BIOS Type: " + vol.BiosType.ToString("X2", CultureInfo.InvariantCulture) + " [" + BiosPartitionTypes.ToString(vol.BiosType) + "]");
-                writer.WriteLine(linePrefix + "      Flags: 0x" + (vol.Flags & 0xFFF0).ToString("X4", CultureInfo.InvariantCulture));
-                writer.WriteLine(linePrefix + "      Database Id: " + vol.Id);
-                writer.WriteLine(linePrefix + "      Guid: " + vol.VolumeGuid);
-                writer.WriteLine(linePrefix + "      State: " + vol.ActiveString);
-                writer.WriteLine(linePrefix + "      Drive Hint: " + vol.MountHint);
-                writer.WriteLine(linePrefix + "      Num Components: " + vol.ComponentCount);
-                writer.WriteLine(linePrefix + "      Link Id: " + vol.PartitionComponentLink);
-
-                writer.WriteLine(linePrefix + "      COMPONENTS");
-                foreach (var cmpnt in _database.GetVolumeComponents(vol.Id))
-                {
-                    writer.WriteLine(linePrefix + "        COMPONENT (" + cmpnt.Name + ")");
-                    writer.WriteLine(linePrefix + "          Name: " + cmpnt.Name);
-                    writer.WriteLine(linePrefix + "          Flags: 0x" + (cmpnt.Flags & 0xFFF0).ToString("X4", CultureInfo.InvariantCulture));
-                    writer.WriteLine(linePrefix + "          Database Id: " + cmpnt.Id);
-                    writer.WriteLine(linePrefix + "          State: " + cmpnt.StatusString);
-                    writer.WriteLine(linePrefix + "          Mode: " + cmpnt.MergeType);
-                    writer.WriteLine(linePrefix + "          Num Extents: " + cmpnt.NumExtents);
-                    writer.WriteLine(linePrefix + "          Link Id: " + cmpnt.LinkId);
-                    writer.WriteLine(linePrefix + "          Stripe Size: " + cmpnt.StripeSizeSectors + " (Sectors)");
-                    writer.WriteLine(linePrefix + "          Stripe Stride: " + cmpnt.StripeStride);
-
-                    writer.WriteLine(linePrefix + "          EXTENTS");
-                    foreach (var extent in _database.GetComponentExtents(cmpnt.Id))
-                    {
-                        writer.WriteLine(linePrefix + "            EXTENT (" + extent.Name + ")");
-                        writer.WriteLine(linePrefix + "              Name: " + extent.Name);
-                        writer.WriteLine(linePrefix + "              Flags: 0x" + (extent.Flags & 0xFFF0).ToString("X4", CultureInfo.InvariantCulture));
-                        writer.WriteLine(linePrefix + "              Database Id: " + extent.Id);
-                        writer.WriteLine(linePrefix + "              Disk Offset: " + extent.DiskOffsetLba + " (Sectors)");
-                        writer.WriteLine(linePrefix + "              Volume Offset: " + extent.OffsetInVolumeLba + " (Sectors)");
-                        writer.WriteLine(linePrefix + "              Size: " + extent.SizeLba + " (Sectors)");
-                        writer.WriteLine(linePrefix + "              Component Id: " + extent.ComponentId);
-                        writer.WriteLine(linePrefix + "              Disk Id: " + extent.DiskId);
-                        writer.WriteLine(linePrefix + "              Link Id: " + extent.PartitionComponentLink);
-                        writer.WriteLine(linePrefix + "              Interleave Order: " + extent.InterleaveOrder);
-                    }
-                }
-            }
-        }
-        #endregion
-
-        internal DynamicVolume[] GetVolumes()
-        {
-            List<DynamicVolume> vols = new List<DynamicVolume>();
-            foreach (var record in _database.GetVolumes())
-            {
-                vols.Add(new DynamicVolume(this, record.VolumeGuid));
-            }
-
-            return vols.ToArray();
-        }
-
-        internal VolumeRecord GetVolume(Guid volume)
-        {
-            return _database.GetVolume(volume);
-        }
-
-        internal LogicalVolumeStatus GetVolumeStatus(ulong volumeId)
-        {
-            return GetVolumeStatus(_database.GetVolume(volumeId));
-        }
-
-        internal SparseStream OpenVolume(ulong volumeId)
-        {
-            return OpenVolume(_database.GetVolume(volumeId));
-        }
-
-        private static int CompareExtentOffsets(ExtentRecord x, ExtentRecord y)
-        {
-            if (x.OffsetInVolumeLba > y.OffsetInVolumeLba)
-            {
-                return 1;
-            }
-            else if (x.OffsetInVolumeLba < y.OffsetInVolumeLba)
-            {
-                return -1;
-            }
-
-            return 0;
-        }
-
-        private static int CompareExtentInterleaveOrder(ExtentRecord x, ExtentRecord y)
-        {
-            if (x.InterleaveOrder > y.InterleaveOrder)
-            {
-                return 1;
-            }
-            else if (x.InterleaveOrder < y.InterleaveOrder)
-            {
-                return -1;
-            }
-
-            return 0;
-        }
-
-        private static LogicalVolumeStatus WorstOf(LogicalVolumeStatus x, LogicalVolumeStatus y)
-        {
-            return (LogicalVolumeStatus)Math.Max((int)x, (int)y);
-        }
-
-        private LogicalVolumeStatus GetVolumeStatus(VolumeRecord volume)
-        {
-            int numFailed = 0;
-            ulong numOK = 0;
-            LogicalVolumeStatus worst = LogicalVolumeStatus.Healthy;
-            foreach (var cmpnt in _database.GetVolumeComponents(volume.Id))
-            {
-                LogicalVolumeStatus cmpntStatus = GetComponentStatus(cmpnt);
-                worst = WorstOf(worst, cmpntStatus);
-                if (cmpntStatus == LogicalVolumeStatus.Failed)
-                {
-                    numFailed++;
-                }
-                else
-                {
-                    numOK++;
-                }
-            }
-
-            if (numOK < 1)
-            {
-                return LogicalVolumeStatus.Failed;
-            }
-            else if (numOK == volume.ComponentCount)
-            {
-                return worst;
-            }
-            else
-            {
-                return LogicalVolumeStatus.FailedRedundancy;
-            }
-        }
-
-        private LogicalVolumeStatus GetComponentStatus(ComponentRecord cmpnt)
-        {
-            // NOTE: no support for RAID, so either valid or failed...
-            LogicalVolumeStatus status = LogicalVolumeStatus.Healthy;
-
-            foreach (var extent in _database.GetComponentExtents(cmpnt.Id))
-            {
-                DiskRecord disk = _database.GetDisk(extent.DiskId);
-                if (!_disks.ContainsKey(new Guid(disk.DiskGuidString)))
-                {
-                    status = LogicalVolumeStatus.Failed;
-                    break;
-                }
-            }
-
-            return status;
-        }
-
-        private SparseStream OpenExtent(ExtentRecord extent)
-        {
-            DiskRecord disk = _database.GetDisk(extent.DiskId);
-
-            DynamicDisk diskObj = _disks[new Guid(disk.DiskGuidString)];
-
-            return new SubStream(diskObj.Content, Ownership.None, (diskObj.DataOffset + extent.DiskOffsetLba) * Sizes.Sector, extent.SizeLba * Sizes.Sector);
-        }
-
-        private SparseStream OpenComponent(ComponentRecord component)
-        {
-            if (component.MergeType == ExtentMergeType.Concatenated)
-            {
-                List<ExtentRecord> extents = new List<ExtentRecord>(_database.GetComponentExtents(component.Id));
-                extents.Sort(CompareExtentOffsets);
-
-                // Sanity Check...
-                long pos = 0;
-                foreach (var extent in extents)
-                {
-                    if (extent.OffsetInVolumeLba != pos)
-                    {
-                        throw new IOException("Volume extents are non-contiguous");
-                    }
-
-                    pos += extent.SizeLba;
-                }
-
-                List<SparseStream> streams = new List<SparseStream>();
-                foreach (var extent in extents)
-                {
-                    streams.Add(OpenExtent(extent));
-                }
-
-                return new ConcatStream(Ownership.Dispose, streams.ToArray());
-            }
-            else if (component.MergeType == ExtentMergeType.Interleaved)
-            {
-                List<ExtentRecord> extents = new List<ExtentRecord>(_database.GetComponentExtents(component.Id));
-                extents.Sort(CompareExtentInterleaveOrder);
-
-                List<SparseStream> streams = new List<SparseStream>();
-                foreach (var extent in extents)
-                {
-                    streams.Add(OpenExtent(extent));
-                }
-
-                return new StripedStream(component.StripeSizeSectors * Sizes.Sector, Ownership.Dispose, streams.ToArray());
-            }
-            else
-            {
-                throw new NotImplementedException("Unknown component mode: " + component.MergeType);
-            }
-        }
-
-        private SparseStream OpenVolume(VolumeRecord volume)
-        {
-            List<SparseStream> cmpntStreams = new List<SparseStream>();
-            foreach (var component in _database.GetVolumeComponents(volume.Id))
-            {
-                if (GetComponentStatus(component) == LogicalVolumeStatus.Healthy)
-                {
-                    cmpntStreams.Add(OpenComponent(component));
-                }
-            }
-
-            if (cmpntStreams.Count < 1)
-            {
-                throw new IOException("Volume with no associated or healthy components");
-            }
-            else if (cmpntStreams.Count == 1)
-            {
-                return cmpntStreams[0];
-            }
-            else
-            {
-                return new MirrorStream(Ownership.Dispose, cmpntStreams.ToArray());
-            }
-        }
-    }
-}
diff --git a/DiscUtils/LogicalDiskManager/DynamicDiskManager.cs b/DiscUtils/LogicalDiskManager/DynamicDiskManager.cs
deleted file mode 100644
index be69aff..0000000
--- a/DiscUtils/LogicalDiskManager/DynamicDiskManager.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.LogicalDiskManager
-{
-    using DiscUtils.Partitions;
-    using System.Collections.Generic;
-    using System.IO;
-
-    /// <summary>
-    /// A class that understands Windows LDM structures, mapping physical volumes to logical volumes.
-    /// </summary>
-    public class DynamicDiskManager : IDiagnosticTraceable
-    {
-        private Dictionary<string, DynamicDiskGroup> _groups;
-
-        /// <summary>
-        /// Initializes a new instance of the DynamicDiskManager class.
-        /// </summary>
-        /// <param name="disks">The initial set of disks to manage.</param>
-        public DynamicDiskManager(params VirtualDisk[] disks)
-        {
-            _groups = new Dictionary<string, DynamicDiskGroup>();
-
-            foreach (var disk in disks)
-            {
-                Add(disk);
-            }
-        }
-
-        /// <summary>
-        /// Determines if a physical volume contains LDM data.
-        /// </summary>
-        /// <param name="volumeInfo">The volume to inspect.</param>
-        /// <returns><c>true</c> if the physical volume contains LDM data, else <c>false</c>.</returns>
-        public static bool HandlesPhysicalVolume(PhysicalVolumeInfo volumeInfo)
-        {
-            PartitionInfo pi = volumeInfo.Partition;
-            if (pi != null)
-            {
-                return IsLdmPartition(pi);
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Determines if a disk is 'dynamic' (i.e. contains LDM volumes).
-        /// </summary>
-        /// <param name="disk">The disk to inspect.</param>
-        /// <returns><c>true</c> if the disk contains LDM volumes, else <c>false</c>.</returns>
-        public static bool IsDynamicDisk(VirtualDisk disk)
-        {
-            if (disk.IsPartitioned)
-            {
-                foreach (var partition in disk.Partitions.Partitions)
-                {
-                    if (IsLdmPartition(partition))
-                    {
-                        return true;
-                    }
-                }
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Adds a new disk to be managed.
-        /// </summary>
-        /// <param name="disk">The disk to manage.</param>
-        public void Add(VirtualDisk disk)
-        {
-            PrivateHeader header = DynamicDisk.GetPrivateHeader(disk);
-
-            DynamicDiskGroup group;
-            if (_groups.TryGetValue(header.DiskGroupId, out group))
-            {
-                group.Add(disk);
-            }
-            else
-            {
-                group = new DynamicDiskGroup(disk);
-                _groups.Add(header.DiskGroupId, group);
-            }
-        }
-
-        /// <summary>
-        /// Gets the logical volumes held across the set of managed disks.
-        /// </summary>
-        /// <returns>An array of logical volumes.</returns>
-        public LogicalVolumeInfo[] GetLogicalVolumes()
-        {
-            List<LogicalVolumeInfo> result = new List<LogicalVolumeInfo>();
-            foreach (var group in _groups.Values)
-            {
-                foreach (var volume in group.GetVolumes())
-                {
-                    LogicalVolumeInfo lvi = new LogicalVolumeInfo(
-                        volume.Identity,
-                        null,
-                        volume.Open,
-                        volume.Length,
-                        volume.BiosType,
-                        volume.Status);
-                    result.Add(lvi);
-                }
-            }
-
-            return result.ToArray();
-        }
-
-        /// <summary>
-        /// Writes a diagnostic report about the state of the disk manager.
-        /// </summary>
-        /// <param name="writer">The writer to send the report to.</param>
-        /// <param name="linePrefix">The prefix to place at the start of each line.</param>
-        public void Dump(TextWriter writer, string linePrefix)
-        {
-            writer.WriteLine(linePrefix + "DISK GROUPS");
-            foreach (var group in _groups.Values)
-            {
-                group.Dump(writer, linePrefix + "  ");
-            }
-        }
-
-        private static bool IsLdmPartition(PartitionInfo partition)
-        {
-            return partition.BiosType == BiosPartitionTypes.WindowsDynamicVolume
-                   || partition.GuidType == GuidPartitionTypes.WindowsLdmMetadata
-                   || partition.GuidType == GuidPartitionTypes.WindowsLdmData;
-        }
-    }
-}
diff --git a/DiscUtils/LogicalDiskManager/DynamicDiskManagerFactory.cs b/DiscUtils/LogicalDiskManager/DynamicDiskManagerFactory.cs
deleted file mode 100644
index eafc1d9..0000000
--- a/DiscUtils/LogicalDiskManager/DynamicDiskManagerFactory.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.LogicalDiskManager
-{
-    using System.Collections.Generic;
-
-    [LogicalVolumeFactory]
-    internal class DynamicDiskManagerFactory : LogicalVolumeFactory
-    {
-        public override bool HandlesPhysicalVolume(PhysicalVolumeInfo volume)
-        {
-            return DynamicDiskManager.HandlesPhysicalVolume(volume);
-        }
-
-        public override void MapDisks(IEnumerable<VirtualDisk> disks, Dictionary<string, LogicalVolumeInfo> result)
-        {
-            DynamicDiskManager mgr = new DynamicDiskManager();
-
-            foreach (var disk in disks)
-            {
-                if (DynamicDiskManager.IsDynamicDisk(disk))
-                {
-                    mgr.Add(disk);
-                }
-            }
-
-            foreach (var vol in mgr.GetLogicalVolumes())
-            {
-                result.Add(vol.Identity, vol);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/LogicalDiskManager/DynamicVolume.cs b/DiscUtils/LogicalDiskManager/DynamicVolume.cs
deleted file mode 100644
index 12462e3..0000000
--- a/DiscUtils/LogicalDiskManager/DynamicVolume.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.LogicalDiskManager
-{
-    using System;
-    using System.IO;
-
-    internal class DynamicVolume
-    {
-        private DynamicDiskGroup _group;
-        private Guid _volumeId;
-
-        internal DynamicVolume(DynamicDiskGroup group, Guid volumeId)
-        {
-            _group = group;
-            _volumeId = volumeId;
-        }
-
-        public byte BiosType
-        {
-            get { return Record.BiosType; }
-        }
-
-        public Guid Identity
-        {
-            get { return _volumeId; }
-        }
-
-        public long Length
-        {
-            get { return Record.Size * Sizes.Sector; }
-        }
-
-        public LogicalVolumeStatus Status
-        {
-            get { return _group.GetVolumeStatus(Record.Id); }
-        }
-
-        private VolumeRecord Record
-        {
-            get { return _group.GetVolume(_volumeId); }
-        }
-
-        public SparseStream Open()
-        {
-            if (Status == LogicalVolumeStatus.Failed)
-            {
-                throw new IOException("Attempt to open 'failed' volume");
-            }
-            else
-            {
-                return _group.OpenVolume(Record.Id);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/LogicalDiskManager/ExtentMergeType.cs b/DiscUtils/LogicalDiskManager/ExtentMergeType.cs
deleted file mode 100644
index e4fe308..0000000
--- a/DiscUtils/LogicalDiskManager/ExtentMergeType.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.LogicalDiskManager
-{
-    internal enum ExtentMergeType : byte
-    {
-        None = 0,
-        Interleaved = 1,
-        Concatenated = 2
-    }
-}
diff --git a/DiscUtils/LogicalDiskManager/ExtentRecord.cs b/DiscUtils/LogicalDiskManager/ExtentRecord.cs
deleted file mode 100644
index ed53760..0000000
--- a/DiscUtils/LogicalDiskManager/ExtentRecord.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.LogicalDiskManager
-{
-    internal sealed class ExtentRecord : DatabaseRecord
-    {
-        public uint Unknown1;
-        public uint Unknown2;
-        public uint PartitionComponentLink;
-        public long DiskOffsetLba;
-        public long OffsetInVolumeLba;
-        public long SizeLba;
-        public ulong ComponentId;
-        public ulong DiskId;
-        public ulong InterleaveOrder;
-
-        protected override void DoReadFrom(byte[] buffer, int offset)
-        {
-            base.DoReadFrom(buffer, offset);
-
-            int pos = offset + 0x18;
-
-            Id = ReadVarULong(buffer, ref pos);
-            Name = ReadVarString(buffer, ref pos);
-            Unknown1 = ReadUInt(buffer, ref pos);
-            Unknown2 = ReadUInt(buffer, ref pos);
-            PartitionComponentLink = ReadUInt(buffer, ref pos);
-            DiskOffsetLba = ReadLong(buffer, ref pos);
-            OffsetInVolumeLba = ReadLong(buffer, ref pos);
-            SizeLba = ReadVarLong(buffer, ref pos);
-            ComponentId = ReadVarULong(buffer, ref pos);
-            DiskId = ReadVarULong(buffer, ref pos);
-
-            if ((Flags & 0x0800) != 0)
-            {
-                InterleaveOrder = ReadVarULong(buffer, ref pos);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/LogicalDiskManager/PrivateHeader.cs b/DiscUtils/LogicalDiskManager/PrivateHeader.cs
deleted file mode 100644
index bc4bcb8..0000000
--- a/DiscUtils/LogicalDiskManager/PrivateHeader.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.LogicalDiskManager
-{
-    using System;
-
-    internal class PrivateHeader
-    {
-        public string Signature; // PRIVHEAD
-        public uint Checksum; // 00 00 2f 96
-        public uint Version; // 2.12
-        public DateTime Timestamp;
-        public long Unknown2; // Active TOC? 00 .. 00 01
-        public long Unknown3; // 00 .. 07 ff  // 1 sector less than 2MB
-        public long Unknown4; // 00 .. 07 40
-        public string DiskId; // GUID string
-        public string HostId; // GUID string
-        public string DiskGroupId; // GUID string
-        public string DiskGroupName; // MAX_COMPUTER_NAME_LENGTH?
-        public uint Unknown5; // Sector Size?
-        public long DataStartLba; // 3F
-        public long DataSizeLba; // 03 FF F7 C1
-        public long ConfigurationStartLba; // 03 FF F8 00
-        public long ConfigurationSizeLba; // 08 00
-        public long TocSizeLba;
-        public long NextTocLba;
-        public long NumberOfConfigs;
-        public long ConfigSizeLba;
-        public long NumberOfLogs;
-        public long LogSizeLba;
-
-        public void ReadFrom(byte[] buffer, int offset)
-        {
-            Signature = Utilities.BytesToString(buffer, offset + 0x00, 8);
-            Checksum = Utilities.ToUInt32BigEndian(buffer, offset + 0x08);
-            Version = Utilities.ToUInt32BigEndian(buffer, offset + 0x0C);
-            Timestamp = DateTime.FromFileTimeUtc(Utilities.ToInt64BigEndian(buffer, offset + 0x10));
-            Unknown2 = Utilities.ToInt64BigEndian(buffer, offset + 0x18);
-            Unknown3 = Utilities.ToInt64BigEndian(buffer, offset + 0x20);
-            Unknown4 = Utilities.ToInt64BigEndian(buffer, offset + 0x28);
-            DiskId = Utilities.BytesToString(buffer, offset + 0x30, 0x40).Trim('\0');
-            HostId = Utilities.BytesToString(buffer, offset + 0x70, 0x40).Trim('\0');
-            DiskGroupId = Utilities.BytesToString(buffer, offset + 0xB0, 0x40).Trim('\0');
-            DiskGroupName = Utilities.BytesToString(buffer, offset + 0xF0, 31).Trim('\0');
-            Unknown5 = Utilities.ToUInt32BigEndian(buffer, offset + 0x10F);
-            DataStartLba = Utilities.ToInt64BigEndian(buffer, offset + 0x11B);
-            DataSizeLba = Utilities.ToInt64BigEndian(buffer, offset + 0x123);
-            ConfigurationStartLba = Utilities.ToInt64BigEndian(buffer, offset + 0x12B);
-            ConfigurationSizeLba = Utilities.ToInt64BigEndian(buffer, offset + 0x133);
-            TocSizeLba = Utilities.ToInt64BigEndian(buffer, offset + 0x13B);
-            NextTocLba = Utilities.ToInt64BigEndian(buffer, offset + 0x143);
-
-            // These two may be reversed
-            NumberOfConfigs = Utilities.ToInt32BigEndian(buffer, offset + 0x14B);
-            NumberOfLogs = Utilities.ToInt32BigEndian(buffer, offset + 0x14F);
-
-            ConfigSizeLba = Utilities.ToInt64BigEndian(buffer, offset + 0x153);
-            LogSizeLba = Utilities.ToInt64BigEndian(buffer, offset + 0x15B);
-        }
-
-        ////private static int CalcChecksum()
-        ////{
-        ////    // Zero checksum bytes (0x08, 4)
-        ////    // Add all byte values for 512 bytes
-        ////    throw new NotImplementedException();
-        ////}
-    }
-}
diff --git a/DiscUtils/LogicalDiskManager/RecordType.cs b/DiscUtils/LogicalDiskManager/RecordType.cs
deleted file mode 100644
index af10ad5..0000000
--- a/DiscUtils/LogicalDiskManager/RecordType.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.LogicalDiskManager
-{
-    internal enum RecordType : byte
-    {
-        None = 0,
-        Volume = 1,
-        Component = 2,
-        Extent = 3,
-        Disk = 4,
-        DiskGroup = 5
-    }
-}
diff --git a/DiscUtils/LogicalDiskManager/TocBlock.cs b/DiscUtils/LogicalDiskManager/TocBlock.cs
deleted file mode 100644
index 158c4f0..0000000
--- a/DiscUtils/LogicalDiskManager/TocBlock.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.LogicalDiskManager
-{
-    internal class TocBlock
-    {
-        public string Signature; // TOCBLOCK
-        public uint Checksum; // 00 00 08 B6
-        public long SequenceNumber; // 00 .. 01
-        public long Unknown1; // 0
-        public long Unknown2; // 00
-        public string Item1Str; // 'config', length 10
-        public long Item1Start; // Sector Offset from ConfigurationStart
-        public long Item1Size; // Unit?
-        public uint Unknown3; // 00 06 00 01  (may be two values?)
-        public uint Unknown4; // 00 00 00 00
-        public string Item2Str; // 'log', length 10
-        public long Item2Start; // Sector Offset from ConfigurationStart
-        public long Item2Size; // Unit?
-        public uint Unknown5; // 00 06 00 01  (may be two values?)
-        public uint Unknown6; // 00 00 00 00
-
-        public void ReadFrom(byte[] buffer, int offset)
-        {
-            Signature = Utilities.BytesToString(buffer, offset + 0x00, 8);
-            Checksum = Utilities.ToUInt32BigEndian(buffer, offset + 0x08);
-            SequenceNumber = Utilities.ToInt64BigEndian(buffer, offset + 0x0C);
-            Unknown1 = Utilities.ToInt64BigEndian(buffer, offset + 0x14);
-            Unknown2 = Utilities.ToInt64BigEndian(buffer, offset + 0x1C);
-            Item1Str = Utilities.BytesToString(buffer, offset + 0x24, 10).Trim('\0');
-            Item1Start = Utilities.ToInt64BigEndian(buffer, offset + 0x2E);
-            Item1Size = Utilities.ToInt64BigEndian(buffer, offset + 0x36);
-            Unknown3 = Utilities.ToUInt32BigEndian(buffer, offset + 0x3E);
-            Unknown4 = Utilities.ToUInt32BigEndian(buffer, offset + 0x42);
-            Item2Str = Utilities.BytesToString(buffer, offset + 0x46, 10).Trim('\0');
-            Item2Start = Utilities.ToInt64BigEndian(buffer, offset + 0x50);
-            Item2Size = Utilities.ToInt64BigEndian(buffer, offset + 0x58);
-            Unknown5 = Utilities.ToUInt32BigEndian(buffer, offset + 0x60);
-            Unknown6 = Utilities.ToUInt32BigEndian(buffer, offset + 0x64);
-        }
-
-        ////private static int CalcChecksum()
-        ////{
-        ////    // Zero checksum bytes (0x08, 4)
-        ////    // Add all byte values for ?? bytes
-        ////    throw new NotImplementedException();
-        ////}
-    }
-}
diff --git a/DiscUtils/LogicalDiskManager/VolumeRecord.cs b/DiscUtils/LogicalDiskManager/VolumeRecord.cs
deleted file mode 100644
index c035024..0000000
--- a/DiscUtils/LogicalDiskManager/VolumeRecord.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.LogicalDiskManager
-{
-    using System;
-
-    internal sealed class VolumeRecord : DatabaseRecord
-    {
-        public string GenString;
-        public string NumberString; // 8000000000000000 sometimes...
-        public string ActiveString;
-        public ulong UnknownA; // Zero
-        public ulong UnknownB; // 00 .. 03
-        public ulong DupCount; // ??Seen once after adding 'foreign disk', from broken mirror (identical links(P/V/C))
-        public uint UnknownC; // 00 00 00 11
-        public ulong ComponentCount;
-        public uint UnknownD; // Zero
-        public uint PartitionComponentLink;
-        public ulong Unknown1; // Zero
-        public long Size;
-        public uint Unknown2; // Zero
-        public byte BiosType;
-        public Guid VolumeGuid;
-        public string MountHint;
-
-        protected override void DoReadFrom(byte[] buffer, int offset)
-        {
-            base.DoReadFrom(buffer, offset);
-
-            int pos = offset + 0x18;
-
-            Id = ReadVarULong(buffer, ref pos);
-            Name = ReadVarString(buffer, ref pos);
-            GenString = ReadVarString(buffer, ref pos);
-            NumberString = ReadVarString(buffer, ref pos);
-            ActiveString = ReadString(buffer, 6, ref pos);
-            UnknownA = ReadVarULong(buffer, ref pos);
-            UnknownB = ReadULong(buffer, ref pos);
-            DupCount = ReadVarULong(buffer, ref pos);
-            UnknownC = ReadUInt(buffer, ref pos);
-            ComponentCount = ReadVarULong(buffer, ref pos);
-            UnknownD = ReadUInt(buffer, ref pos);
-            PartitionComponentLink = ReadUInt(buffer, ref pos);
-            Unknown1 = ReadULong(buffer, ref pos);
-            Size = ReadVarLong(buffer, ref pos);
-            Unknown2 = ReadUInt(buffer, ref pos);
-            BiosType = ReadByte(buffer, ref pos);
-            VolumeGuid = Utilities.ToGuidBigEndian(buffer, pos);
-            pos += 16;
-
-            if ((Flags & 0x0200) != 0)
-            {
-                MountHint = ReadVarString(buffer, ref pos);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/LogicalVolumeFactory.cs b/DiscUtils/LogicalVolumeFactory.cs
deleted file mode 100644
index b426678..0000000
--- a/DiscUtils/LogicalVolumeFactory.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System.Collections.Generic;
-
-    internal abstract class LogicalVolumeFactory
-    {
-        public abstract bool HandlesPhysicalVolume(PhysicalVolumeInfo volume);
-
-        public abstract void MapDisks(IEnumerable<VirtualDisk> disks, Dictionary<string, LogicalVolumeInfo> result);
-    }
-}
diff --git a/DiscUtils/LogicalVolumeFactoryAttribute.cs b/DiscUtils/LogicalVolumeFactoryAttribute.cs
deleted file mode 100644
index 71b4870..0000000
--- a/DiscUtils/LogicalVolumeFactoryAttribute.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
-    internal sealed class LogicalVolumeFactoryAttribute : Attribute
-    {
-    }
-}
diff --git a/DiscUtils/LogicalVolumeInfo.cs b/DiscUtils/LogicalVolumeInfo.cs
deleted file mode 100644
index 726e343..0000000
--- a/DiscUtils/LogicalVolumeInfo.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-
-    /// <summary>
-    /// Enumeration of the health status of a logical volume.
-    /// </summary>
-    public enum LogicalVolumeStatus
-    {
-        /// <summary>
-        /// The volume is healthy and fully functional.
-        /// </summary>
-        Healthy = 0,
-
-        /// <summary>
-        /// The volume is completely accessible, but at degraded redundancy.
-        /// </summary>
-        FailedRedundancy = 1,
-
-        /// <summary>
-        /// The volume is wholey, or partly, inaccessible.
-        /// </summary>
-        Failed = 2
-    }
-
-    /// <summary>
-    /// Information about a logical disk volume, which may be backed by one or more physical volumes.
-    /// </summary>
-    public sealed class LogicalVolumeInfo : VolumeInfo
-    {
-        private Guid _guid;
-        private PhysicalVolumeInfo _physicalVol;
-        private SparseStreamOpenDelegate _opener;
-        private long _length;
-        private LogicalVolumeStatus _status;
-        private byte _biosType;
-
-        internal LogicalVolumeInfo(Guid guid, PhysicalVolumeInfo physicalVolume, SparseStreamOpenDelegate opener, long length, byte biosType, LogicalVolumeStatus status)
-        {
-            _guid = guid;
-            _physicalVol = physicalVolume;
-            _opener = opener;
-            _length = length;
-            _biosType = biosType;
-            _status = status;
-        }
-
-        /// <summary>
-        /// Gets the one-byte BIOS type for this volume, which indicates the content.
-        /// </summary>
-        public override byte BiosType
-        {
-            get { return _biosType; }
-        }
-
-        /// <summary>
-        /// Gets the status of the logical volume, indicating volume health.
-        /// </summary>
-        public LogicalVolumeStatus Status
-        {
-            get { return _status; }
-        }
-
-        /// <summary>
-        /// Gets the length of the volume (in bytes).
-        /// </summary>
-        public override long Length
-        {
-            get { return _length; }
-        }
-
-        /// <summary>
-        /// The stable identity for this logical volume.
-        /// </summary>
-        /// <remarks>The stability of the identity depends the disk structure.
-        /// In some cases the identity may include a simple index, when no other information
-        /// is available.  Best practice is to add disks to the Volume Manager in a stable 
-        /// order, if the stability of this identity is paramount.</remarks>
-        public override string Identity
-        {
-            get
-            {
-                if (_guid != Guid.Empty)
-                {
-                    return "VLG" + _guid.ToString("B");
-                }
-                else
-                {
-                    return "VLP:" + _physicalVol.Identity;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the disk geometry of the underlying storage medium, if any (may be Geometry.Null).
-        /// </summary>
-        public override Geometry PhysicalGeometry
-        {
-            get { return (_physicalVol == null) ? Geometry.Null : _physicalVol.PhysicalGeometry; }
-        }
-
-        /// <summary>
-        /// Gets the disk geometry of the underlying storage medium (as used in BIOS calls), may be null.
-        /// </summary>
-        public override Geometry BiosGeometry
-        {
-            get { return (_physicalVol == null) ? Geometry.Null : _physicalVol.BiosGeometry; }
-        }
-
-        /// <summary>
-        /// Gets the offset of this volume in the underlying storage medium, if any (may be Zero).
-        /// </summary>
-        public override long PhysicalStartSector
-        {
-            get { return (_physicalVol == null) ? 0 : _physicalVol.PhysicalStartSector; }
-        }
-
-        /// <summary>
-        /// Opens a stream with access to the content of the logical volume.
-        /// </summary>
-        /// <returns>The volume's content as a stream.</returns>
-        public override SparseStream Open()
-        {
-            return _opener();
-        }
-    }
-}
diff --git a/DiscUtils/MappedStream.cs b/DiscUtils/MappedStream.cs
deleted file mode 100644
index 0995f8b..0000000
--- a/DiscUtils/MappedStream.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System.Collections.Generic;
-    using System.IO;
-
-    /// <summary>
-    /// Base class for streams that are essentially a mapping onto a parent stream.
-    /// </summary>
-    /// <remarks>
-    /// This class provides access to the mapping underlying the stream, enabling
-    /// callers to convert a byte range in this stream into one or more ranges in
-    /// the parent stream.
-    /// </remarks>
-    public abstract class MappedStream : SparseStream
-    {
-        /// <summary>
-        /// Converts any stream into a non-linear stream.
-        /// </summary>
-        /// <param name="stream">The stream to convert.</param>
-        /// <param name="takeOwnership"><c>true</c> to have the new stream dispose the wrapped
-        /// stream when it is disposed.</param>
-        /// <returns>A sparse stream.</returns>
-        /// <remarks>The wrapped stream is assumed to be a linear stream (such that any byte range
-        /// maps directly onto the parent stream).</remarks>
-        public static new MappedStream FromStream(Stream stream, Ownership takeOwnership)
-        {
-            return new WrappingMappedStream<Stream>(stream, takeOwnership, null);
-        }
-
-        /// <summary>
-        /// Converts any stream into a non-linear stream.
-        /// </summary>
-        /// <param name="stream">The stream to convert.</param>
-        /// <param name="takeOwnership"><c>true</c> to have the new stream dispose the wrapped
-        /// stream when it is disposed.</param>
-        /// <param name="extents">The set of extents actually stored in <c>stream</c>.</param>
-        /// <returns>A sparse stream.</returns>
-        /// <remarks>The wrapped stream is assumed to be a linear stream (such that any byte range
-        /// maps directly onto the parent stream).</remarks>
-        public static new MappedStream FromStream(Stream stream, Ownership takeOwnership, IEnumerable<StreamExtent> extents)
-        {
-            return new WrappingMappedStream<Stream>(stream, takeOwnership, extents);
-        }
-
-        /// <summary>
-        /// Maps a logical range down to storage locations.
-        /// </summary>
-        /// <param name="start">The first logical range to map.</param>
-        /// <param name="length">The length of the range to map.</param>
-        /// <returns>One or more stream extents specifying the storage locations that correspond
-        /// to the identified logical extent range.</returns>
-        /// <remarks>
-        /// <para>As far as possible, the stream extents are returned in logical disk order -
-        /// however, due to the nature of non-linear streams, not all of the range may actually
-        /// be stored, or some or all of the range may be compressed - thus reading the
-        /// returned stream extents is not equivalent to reading the logical disk range.</para>
-        /// </remarks>
-        public abstract IEnumerable<StreamExtent> MapContent(long start, long length);
-    }
-}
diff --git a/DiscUtils/MirrorStream.cs b/DiscUtils/MirrorStream.cs
deleted file mode 100644
index a845e28..0000000
--- a/DiscUtils/MirrorStream.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal class MirrorStream : SparseStream
-    {
-        private List<SparseStream> _wrapped;
-        private Ownership _ownsWrapped;
-        private bool _canRead;
-        private bool _canWrite;
-        private bool _canSeek;
-        private long _length;
-
-        public MirrorStream(Ownership ownsWrapped, params SparseStream[] wrapped)
-        {
-            _wrapped = new List<SparseStream>(wrapped);
-            _ownsWrapped = ownsWrapped;
-
-            _canRead = _wrapped[0].CanRead;
-            _canWrite = _wrapped[0].CanWrite;
-            _canSeek = _wrapped[0].CanSeek;
-            _length = _wrapped[0].Length;
-
-            foreach (var stream in _wrapped)
-            {
-                if (stream.CanRead != _canRead || stream.CanWrite != _canWrite || stream.CanSeek != _canSeek)
-                {
-                    throw new ArgumentException("All mirrored streams must have the same read/write/seek permissions", "wrapped");
-                }
-
-                if (stream.Length != _length)
-                {
-                    throw new ArgumentException("All mirrored streams must have the same length", "wrapped");
-                }
-            }
-        }
-
-        public override bool CanRead
-        {
-            get { return _canRead; }
-        }
-
-        public override bool CanSeek
-        {
-            get { return _canSeek; }
-        }
-
-        public override bool CanWrite
-        {
-            get { return _canWrite; }
-        }
-
-        public override long Length
-        {
-            get { return _length; }
-        }
-
-        public override long Position
-        {
-            get
-            {
-                return _wrapped[0].Position;
-            }
-
-            set
-            {
-                _wrapped[0].Position = value;
-            }
-        }
-
-        public override IEnumerable<StreamExtent> Extents
-        {
-            get { return _wrapped[0].Extents; }
-        }
-
-        public override void Flush()
-        {
-            _wrapped[0].Flush();
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            return _wrapped[0].Read(buffer, offset, count);
-        }
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            return _wrapped[0].Seek(offset, origin);
-        }
-
-        public override void SetLength(long value)
-        {
-            if (value != _length)
-            {
-                throw new InvalidOperationException("Changing the stream length is not permitted for mirrored streams");
-            }
-        }
-
-        public override void Clear(int count)
-        {
-            long pos = _wrapped[0].Position;
-
-            if (pos + count > _length)
-            {
-                throw new IOException("Attempt to clear beyond end of mirrored stream");
-            }
-
-            foreach (var stream in _wrapped)
-            {
-                stream.Position = pos;
-                stream.Clear(count);
-            }
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            long pos = _wrapped[0].Position;
-
-            if (pos + count > _length)
-            {
-                throw new IOException("Attempt to write beyond end of mirrored stream");
-            }
-
-            foreach (var stream in _wrapped)
-            {
-                stream.Position = pos;
-                stream.Write(buffer, offset, count);
-            }
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            try
-            {
-                if (disposing && _ownsWrapped == Ownership.Dispose && _wrapped != null)
-                {
-                    foreach (var stream in _wrapped)
-                    {
-                        stream.Dispose();
-                    }
-
-                    _wrapped = null;
-                }
-            }
-            finally
-            {
-                base.Dispose(disposing);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/AttributeDefinitionRecord.cs b/DiscUtils/Ntfs/AttributeDefinitionRecord.cs
deleted file mode 100644
index 062bec9..0000000
--- a/DiscUtils/Ntfs/AttributeDefinitionRecord.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Text;
-
-    internal enum AttributeCollationRule : int
-    {
-        Binary = 0x00000000,
-        Filename = 0x00000001,
-        UnicodeString = 0x00000002,
-        UnsignedLong = 0x00000010,
-        Sid = 0x00000011,
-        SecurityHash = 0x00000012,
-        MultipleUnsignedLongs = 0x00000013
-    }
-
-    [Flags]
-    internal enum AttributeTypeFlags : int
-    {
-        None = 0x00,
-        Indexed = 0x02,
-        Multiple = 0x04,
-        NotZero = 0x08,
-        IndexedUnique = 0x10,
-        NamedUnique = 0x20,
-        MustBeResident = 0x40,
-        CanBeNonResident = 0x80
-    }
-
-    internal sealed class AttributeDefinitionRecord
-    {
-        public const int Size = 0xA0;
-
-        public string Name;
-        public AttributeType Type;
-        public uint DisplayRule;
-        public AttributeCollationRule CollationRule;
-        public AttributeTypeFlags Flags;
-        public long MinSize;
-        public long MaxSize;
-
-        internal void Read(byte[] buffer, int offset)
-        {
-            Name = Encoding.Unicode.GetString(buffer, offset + 0, 128).Trim('\0');
-            Type = (AttributeType)Utilities.ToUInt32LittleEndian(buffer, offset + 0x80);
-            DisplayRule = Utilities.ToUInt32LittleEndian(buffer, offset + 0x84);
-            CollationRule = (AttributeCollationRule)Utilities.ToUInt32LittleEndian(buffer, offset + 0x88);
-            Flags = (AttributeTypeFlags)Utilities.ToUInt32LittleEndian(buffer, offset + 0x8C);
-            MinSize = Utilities.ToInt64LittleEndian(buffer, offset + 0x90);
-            MaxSize = Utilities.ToInt64LittleEndian(buffer, offset + 0x98);
-        }
-
-        internal void Write(byte[] buffer, int offset)
-        {
-            Encoding.Unicode.GetBytes(Name, 0, Name.Length, buffer, offset + 0);
-            Utilities.WriteBytesLittleEndian((uint)Type, buffer, offset + 0x80);
-            Utilities.WriteBytesLittleEndian(DisplayRule, buffer, offset + 0x84);
-            Utilities.WriteBytesLittleEndian((uint)CollationRule, buffer, offset + 0x88);
-            Utilities.WriteBytesLittleEndian((uint)Flags, buffer, offset + 0x8C);
-            Utilities.WriteBytesLittleEndian(MinSize, buffer, offset + 0x90);
-            Utilities.WriteBytesLittleEndian(MaxSize, buffer, offset + 0x98);
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/AttributeDefinitions.cs b/DiscUtils/Ntfs/AttributeDefinitions.cs
deleted file mode 100644
index 0682956..0000000
--- a/DiscUtils/Ntfs/AttributeDefinitions.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal sealed class AttributeDefinitions
-    {
-        private Dictionary<AttributeType, AttributeDefinitionRecord> _attrDefs;
-
-        public AttributeDefinitions()
-        {
-            _attrDefs = new Dictionary<AttributeType, AttributeDefinitionRecord>();
-
-            Add(AttributeType.StandardInformation, "$STANDARD_INFORMATION", AttributeTypeFlags.MustBeResident, 0x30, 0x48);
-            Add(AttributeType.AttributeList, "$ATTRIBUTE_LIST", AttributeTypeFlags.CanBeNonResident, 0, -1);
-            Add(AttributeType.FileName, "$FILE_NAME", AttributeTypeFlags.Indexed | AttributeTypeFlags.MustBeResident, 0x44, 0x242);
-            Add(AttributeType.ObjectId, "$OBJECT_ID", AttributeTypeFlags.MustBeResident, 0, 0x100);
-            Add(AttributeType.SecurityDescriptor, "$SECURITY_DESCRIPTOR", AttributeTypeFlags.CanBeNonResident, 0x0, -1);
-            Add(AttributeType.VolumeName, "$VOLUME_NAME", AttributeTypeFlags.MustBeResident, 0x2, 0x100);
-            Add(AttributeType.VolumeInformation, "$VOLUME_INFORMATION", AttributeTypeFlags.MustBeResident, 0xC, 0xC);
-            Add(AttributeType.Data, "$DATA", AttributeTypeFlags.None, 0, -1);
-            Add(AttributeType.IndexRoot, "$INDEX_ROOT", AttributeTypeFlags.MustBeResident, 0, -1);
-            Add(AttributeType.IndexAllocation, "$INDEX_ALLOCATION", AttributeTypeFlags.CanBeNonResident, 0, -1);
-            Add(AttributeType.Bitmap, "$BITMAP", AttributeTypeFlags.CanBeNonResident, 0, -1);
-            Add(AttributeType.ReparsePoint, "$REPARSE_POINT", AttributeTypeFlags.CanBeNonResident, 0, 0x4000);
-            Add(AttributeType.ExtendedAttributesInformation, "$EA_INFORMATION", AttributeTypeFlags.MustBeResident, 0x8, 0x8);
-            Add(AttributeType.ExtendedAttributes, "$EA", AttributeTypeFlags.None, 0, 0x10000);
-            Add(AttributeType.LoggedUtilityStream, "$LOGGED_UTILITY_STREAM", AttributeTypeFlags.CanBeNonResident, 0, 0x10000);
-        }
-
-        public AttributeDefinitions(File file)
-        {
-            _attrDefs = new Dictionary<AttributeType, AttributeDefinitionRecord>();
-
-            byte[] buffer = new byte[AttributeDefinitionRecord.Size];
-            using (Stream s = file.OpenStream(AttributeType.Data, null, FileAccess.Read))
-            {
-                while (Utilities.ReadFully(s, buffer, 0, buffer.Length) == buffer.Length)
-                {
-                    AttributeDefinitionRecord record = new AttributeDefinitionRecord();
-                    record.Read(buffer, 0);
-
-                    // NULL terminator record
-                    if (record.Type != AttributeType.None)
-                    {
-                        _attrDefs.Add(record.Type, record);
-                    }
-                }
-            }
-        }
-
-        public void WriteTo(File file)
-        {
-            List<AttributeType> attribs = new List<AttributeType>(_attrDefs.Keys);
-            attribs.Sort();
-
-            using (Stream s = file.OpenStream(AttributeType.Data, null, FileAccess.ReadWrite))
-            {
-                byte[] buffer;
-                for (int i = 0; i < attribs.Count; ++i)
-                {
-                    buffer = new byte[AttributeDefinitionRecord.Size];
-                    AttributeDefinitionRecord attrDef = _attrDefs[attribs[i]];
-                    attrDef.Write(buffer, 0);
-
-                    s.Write(buffer, 0, buffer.Length);
-                }
-
-                buffer = new byte[AttributeDefinitionRecord.Size];
-                s.Write(buffer, 0, buffer.Length);
-            }
-        }
-
-        internal AttributeDefinitionRecord Lookup(string name)
-        {
-            foreach (var record in _attrDefs.Values)
-            {
-                if (string.Compare(name, record.Name, StringComparison.OrdinalIgnoreCase) == 0)
-                {
-                    return record;
-                }
-            }
-
-            return null;
-        }
-
-        internal bool MustBeResident(AttributeType attributeType)
-        {
-            AttributeDefinitionRecord record;
-            if (_attrDefs.TryGetValue(attributeType, out record))
-            {
-                return (record.Flags & AttributeTypeFlags.MustBeResident) != 0;
-            }
-
-            return false;
-        }
-
-        internal bool IsIndexed(AttributeType attributeType)
-        {
-            AttributeDefinitionRecord record;
-            if (_attrDefs.TryGetValue(attributeType, out record))
-            {
-                return (record.Flags & AttributeTypeFlags.Indexed) != 0;
-            }
-
-            return false;
-        }
-
-        private void Add(AttributeType attributeType, string name, AttributeTypeFlags attributeTypeFlags, int minSize, int maxSize)
-        {
-            AttributeDefinitionRecord adr = new AttributeDefinitionRecord();
-            adr.Type = attributeType;
-            adr.Name = name;
-            adr.Flags = attributeTypeFlags;
-            adr.MinSize = minSize;
-            adr.MaxSize = maxSize;
-            _attrDefs.Add(attributeType, adr);
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/AttributeList.cs b/DiscUtils/Ntfs/AttributeList.cs
deleted file mode 100644
index 9c862fe..0000000
--- a/DiscUtils/Ntfs/AttributeList.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal class AttributeList : IByteArraySerializable, IDiagnosticTraceable, ICollection<AttributeListRecord>
-    {
-        private List<AttributeListRecord> _records;
-
-        public AttributeList()
-        {
-            _records = new List<AttributeListRecord>();
-        }
-
-        public int Size
-        {
-            get
-            {
-                int total = 0;
-                foreach (var record in _records)
-                {
-                    total += record.Size;
-                }
-
-                return total;
-            }
-        }
-
-        public int Count
-        {
-            get { return _records.Count; }
-        }
-
-        public bool IsReadOnly
-        {
-            get { return false; }
-        }
-
-        public int ReadFrom(byte[] buffer, int offset)
-        {
-            _records.Clear();
-
-            int pos = 0;
-            while (pos < buffer.Length)
-            {
-                AttributeListRecord r = new AttributeListRecord();
-                pos += r.ReadFrom(buffer, offset + pos);
-                _records.Add(r);
-            }
-
-            return pos;
-        }
-
-        public void WriteTo(byte[] buffer, int offset)
-        {
-            int pos = offset;
-            foreach (var record in _records)
-            {
-                record.WriteTo(buffer, offset + pos);
-                pos += record.Size;
-            }
-        }
-
-        public void Dump(TextWriter writer, string indent)
-        {
-            writer.WriteLine(indent + "ATTRIBUTE LIST RECORDS");
-            foreach (AttributeListRecord r in _records)
-            {
-                r.Dump(writer, indent + "  ");
-            }
-        }
-
-        public void Add(AttributeListRecord item)
-        {
-            _records.Add(item);
-            _records.Sort();
-        }
-
-        public void Clear()
-        {
-            _records.Clear();
-        }
-
-        public bool Contains(AttributeListRecord item)
-        {
-            return _records.Contains(item);
-        }
-
-        public void CopyTo(AttributeListRecord[] array, int arrayIndex)
-        {
-            _records.CopyTo(array, arrayIndex);
-        }
-
-        public bool Remove(AttributeListRecord item)
-        {
-            return _records.Remove(item);
-        }
-
-        #region IEnumerable<AttributeListRecord> Members
-
-        public IEnumerator<AttributeListRecord> GetEnumerator()
-        {
-            return _records.GetEnumerator();
-        }
-
-        #endregion
-
-        #region IEnumerable Members
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return _records.GetEnumerator();
-        }
-
-        #endregion
-    }
-}
diff --git a/DiscUtils/Ntfs/AttributeListRecord.cs b/DiscUtils/Ntfs/AttributeListRecord.cs
deleted file mode 100644
index df4ae1f..0000000
--- a/DiscUtils/Ntfs/AttributeListRecord.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.IO;
-    using System.Text;
-
-    internal class AttributeListRecord : IDiagnosticTraceable, IByteArraySerializable, IComparable<AttributeListRecord>
-    {
-        public AttributeType Type;
-        public ushort RecordLength;
-        public byte NameLength;
-        public byte NameOffset;
-        public string Name;
-        public ulong StartVcn;
-        public FileRecordReference BaseFileReference;
-        public ushort AttributeId;
-
-        public int Size
-        {
-            get
-            {
-                return Utilities.RoundUp(0x20 + (string.IsNullOrEmpty(Name) ? 0 : Encoding.Unicode.GetByteCount(Name)), 8);
-            }
-        }
-
-        public static AttributeListRecord FromAttribute(AttributeRecord attr, FileRecordReference mftRecord)
-        {
-            AttributeListRecord newRecord = new AttributeListRecord()
-            {
-                Type = attr.AttributeType,
-                Name = attr.Name,
-                StartVcn = 0,
-                BaseFileReference = mftRecord,
-                AttributeId = attr.AttributeId
-            };
-
-            if (attr.IsNonResident)
-            {
-                newRecord.StartVcn = (ulong)((NonResidentAttributeRecord)attr).StartVcn;
-            }
-
-            return newRecord;
-        }
-
-        public int ReadFrom(byte[] data, int offset)
-        {
-            Type = (AttributeType)Utilities.ToUInt32LittleEndian(data, offset + 0x00);
-            RecordLength = Utilities.ToUInt16LittleEndian(data, offset + 0x04);
-            NameLength = data[offset + 0x06];
-            NameOffset = data[offset + 0x07];
-            StartVcn = Utilities.ToUInt64LittleEndian(data, offset + 0x08);
-            BaseFileReference = new FileRecordReference(Utilities.ToUInt64LittleEndian(data, offset + 0x10));
-            AttributeId = Utilities.ToUInt16LittleEndian(data, offset + 0x18);
-
-            if (NameLength > 0)
-            {
-                Name = Encoding.Unicode.GetString(data, offset + NameOffset, NameLength * 2);
-            }
-            else
-            {
-                Name = null;
-            }
-
-            if (RecordLength < 0x18)
-            {
-                throw new InvalidDataException("Malformed AttributeList record");
-            }
-
-            return RecordLength;
-        }
-
-        public void WriteTo(byte[] buffer, int offset)
-        {
-            NameOffset = 0x20;
-            if (string.IsNullOrEmpty(Name))
-            {
-                NameLength = 0;
-            }
-            else
-            {
-                NameLength = (byte)(Encoding.Unicode.GetBytes(Name, 0, Name.Length, buffer, offset + NameOffset) / 2);
-            }
-
-            RecordLength = (ushort)Utilities.RoundUp(NameOffset + (NameLength * 2), 8);
-
-            Utilities.WriteBytesLittleEndian((uint)Type, buffer, offset);
-            Utilities.WriteBytesLittleEndian(RecordLength, buffer, offset + 0x04);
-            buffer[offset + 0x06] = NameLength;
-            buffer[offset + 0x07] = NameOffset;
-            Utilities.WriteBytesLittleEndian(StartVcn, buffer, offset + 0x08);
-            Utilities.WriteBytesLittleEndian(BaseFileReference.Value, buffer, offset + 0x10);
-            Utilities.WriteBytesLittleEndian(AttributeId, buffer, offset + 0x18);
-        }
-
-        public int CompareTo(AttributeListRecord other)
-        {
-            int val = ((int)Type) - (int)other.Type;
-            if (val != 0)
-            {
-                return val;
-            }
-
-            val = string.Compare(Name, other.Name, StringComparison.OrdinalIgnoreCase);
-            if (val != 0)
-            {
-                return val;
-            }
-
-            return ((int)StartVcn) - (int)other.StartVcn;
-        }
-
-        public void Dump(TextWriter writer, string indent)
-        {
-            writer.WriteLine(indent + "ATTRIBUTE LIST RECORD");
-            writer.WriteLine(indent + "                 Type: " + Type);
-            writer.WriteLine(indent + "        Record Length: " + RecordLength);
-            writer.WriteLine(indent + "                 Name: " + Name);
-            writer.WriteLine(indent + "            Start VCN: " + StartVcn);
-            writer.WriteLine(indent + "  Base File Reference: " + BaseFileReference);
-            writer.WriteLine(indent + "         Attribute ID: " + AttributeId);
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/AttributeRecord.cs b/DiscUtils/Ntfs/AttributeRecord.cs
deleted file mode 100644
index d7e7dce..0000000
--- a/DiscUtils/Ntfs/AttributeRecord.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.IO;
-    using System.Text;
-
-    [Flags]
-    internal enum AttributeFlags : ushort
-    {
-        None = 0x0000,
-        Compressed = 0x0001,
-        Encrypted = 0x4000,
-        Sparse = 0x8000
-    }
-
-    internal abstract class AttributeRecord : IComparable<AttributeRecord>
-    {
-        protected AttributeType _type;
-        protected byte _nonResidentFlag;
-        protected AttributeFlags _flags;
-        protected ushort _attributeId;
-
-        protected string _name;
-
-        public AttributeRecord()
-        {
-        }
-
-        public AttributeRecord(AttributeType type, string name, ushort id, AttributeFlags flags)
-        {
-            _type = type;
-            _name = name;
-            _attributeId = id;
-            _flags = flags;
-        }
-
-        public AttributeType AttributeType
-        {
-            get { return _type; }
-        }
-
-        public ushort AttributeId
-        {
-            get { return _attributeId; }
-            set { _attributeId = value; }
-        }
-
-        public abstract long AllocatedLength
-        {
-            get;
-            set;
-        }
-
-        public abstract long StartVcn
-        {
-            get;
-        }
-
-        public abstract long DataLength
-        {
-            get;
-            set;
-        }
-
-        public abstract long InitializedDataLength
-        {
-            get;
-            set;
-        }
-
-        public bool IsNonResident
-        {
-            get { return _nonResidentFlag != 0; }
-        }
-
-        public string Name
-        {
-            get { return _name; }
-        }
-
-        public AttributeFlags Flags
-        {
-            get { return _flags; }
-            set { _flags = value; }
-        }
-
-        public abstract int Size { get; }
-
-        public static AttributeRecord FromBytes(byte[] buffer, int offset, out int length)
-        {
-            if (Utilities.ToUInt32LittleEndian(buffer, offset) == 0xFFFFFFFF)
-            {
-                length = 0;
-                return null;
-            }
-            else if (buffer[offset + 0x08] != 0x00)
-            {
-                return new NonResidentAttributeRecord(buffer, offset, out length);
-            }
-            else
-            {
-                return new ResidentAttributeRecord(buffer, offset, out length);
-            }
-        }
-
-        public static int CompareStartVcns(AttributeRecord x, AttributeRecord y)
-        {
-            if (x.StartVcn < y.StartVcn)
-            {
-                return -1;
-            }
-            else if (x.StartVcn == y.StartVcn)
-            {
-                return 0;
-            }
-            else
-            {
-                return 1;
-            }
-        }
-
-        public abstract Range<long, long>[] GetClusters();
-
-        public abstract IBuffer GetReadOnlyDataBuffer(INtfsContext context);
-
-        public int CompareTo(AttributeRecord other)
-        {
-            int val = ((int)_type) - (int)other._type;
-            if (val != 0)
-            {
-                return val;
-            }
-
-            val = string.Compare(_name, other._name, StringComparison.OrdinalIgnoreCase);
-            if (val != 0)
-            {
-                return val;
-            }
-
-            return ((int)_attributeId) - (int)other._attributeId;
-        }
-
-        public abstract int Write(byte[] buffer, int offset);
-
-        public virtual void Dump(TextWriter writer, string indent)
-        {
-            writer.WriteLine(indent + "ATTRIBUTE RECORD");
-            writer.WriteLine(indent + "            Type: " + _type);
-            writer.WriteLine(indent + "    Non-Resident: " + _nonResidentFlag);
-            writer.WriteLine(indent + "            Name: " + _name);
-            writer.WriteLine(indent + "           Flags: " + _flags);
-            writer.WriteLine(indent + "     AttributeId: " + _attributeId);
-        }
-
-        protected virtual void Read(byte[] buffer, int offset, out int length)
-        {
-            _type = (AttributeType)Utilities.ToUInt32LittleEndian(buffer, offset + 0x00);
-            length = Utilities.ToInt32LittleEndian(buffer, offset + 0x04);
-
-            _nonResidentFlag = buffer[offset + 0x08];
-            byte nameLength = buffer[offset + 0x09];
-            ushort nameOffset = Utilities.ToUInt16LittleEndian(buffer, offset + 0x0A);
-            _flags = (AttributeFlags)Utilities.ToUInt16LittleEndian(buffer, offset + 0x0C);
-            _attributeId = Utilities.ToUInt16LittleEndian(buffer, offset + 0x0E);
-
-            if (nameLength != 0x00)
-            {
-                if (nameLength + nameOffset > length)
-                {
-                    throw new IOException("Corrupt attribute, name outside of attribute");
-                }
-
-                _name = Encoding.Unicode.GetString(buffer, offset + nameOffset, nameLength * 2);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/AttributeReference.cs b/DiscUtils/Ntfs/AttributeReference.cs
deleted file mode 100644
index 6608675..0000000
--- a/DiscUtils/Ntfs/AttributeReference.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-
-    /// <summary>
-    /// Fully-qualified reference to an attribute.
-    /// </summary>
-    internal class AttributeReference : IComparable<AttributeReference>, IEquatable<AttributeReference>
-    {
-        private FileRecordReference _fileReference;
-        private ushort _attributeId;
-
-        /// <summary>
-        /// Initializes a new instance of the AttributeReference class.
-        /// </summary>
-        /// <param name="fileReference">The file containing the attribute.</param>
-        /// <param name="attributeId">The identity of the attribute within the file record.</param>
-        public AttributeReference(FileRecordReference fileReference, ushort attributeId)
-        {
-            _fileReference = fileReference;
-            _attributeId = attributeId;
-        }
-
-        /// <summary>
-        /// Gets the file containing the attribute.
-        /// </summary>
-        public FileRecordReference File
-        {
-            get { return _fileReference; }
-        }
-
-        /// <summary>
-        /// Gets the identity of the attribute within the file record.
-        /// </summary>
-        public ushort AttributeId
-        {
-            get { return _attributeId; }
-        }
-
-        /// <summary>
-        /// The reference as a string.
-        /// </summary>
-        /// <returns>String representing the attribute.</returns>
-        public override string ToString()
-        {
-            return _fileReference.ToString() + ".attr[" + _attributeId + "]";
-        }
-
-        #region IComparable<AttributeReference> Members
-
-        /// <summary>
-        /// Compares this attribute reference to another.
-        /// </summary>
-        /// <param name="other">The attribute reference to compare against.</param>
-        /// <returns>Zero if references are identical.</returns>
-        public int CompareTo(AttributeReference other)
-        {
-            int refDiff = _fileReference.CompareTo(other._fileReference);
-            if (refDiff != 0)
-            {
-                return refDiff;
-            }
-
-            return _attributeId.CompareTo(other._attributeId);
-        }
-
-        #endregion
-
-        #region IEquatable<AttributeReference> Members
-
-        /// <summary>
-        /// Indicates if two references are equivalent.
-        /// </summary>
-        /// <param name="other">The attribute reference to compare.</param>
-        /// <returns><c>true</c> if the references are equivalent.</returns>
-        public bool Equals(AttributeReference other)
-        {
-            return CompareTo(other) == 0;
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Indicates if this reference is equivalent to another object.
-        /// </summary>
-        /// <param name="obj">The object to compare.</param>
-        /// <returns><c>true</c> if obj is an equivalent attribute reference.</returns>
-        public override bool Equals(object obj)
-        {
-            AttributeReference objAsAttrRef = obj as AttributeReference;
-            if (objAsAttrRef == null)
-            {
-                return false;
-            }
-
-            return Equals(objAsAttrRef);
-        }
-
-        /// <summary>
-        /// Gets the hash code for this reference.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            return _fileReference.GetHashCode() ^ _attributeId.GetHashCode();
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/AttributeType.cs b/DiscUtils/Ntfs/AttributeType.cs
deleted file mode 100644
index e343b43..0000000
--- a/DiscUtils/Ntfs/AttributeType.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    /// <summary>
-    /// Enumeration of NTFS file attribute types.
-    /// </summary>
-    /// <remarks>Normally applications only create Data attributes.</remarks>
-    public enum AttributeType : int
-    {
-        /// <summary>
-        /// No type specified.
-        /// </summary>
-        None = 0x00,
-
-        /// <summary>
-        /// NTFS Standard Information.
-        /// </summary>
-        StandardInformation = 0x10,
-
-        /// <summary>
-        /// Attribute list, that holds a list of attribute locations for files with a large attribute set.
-        /// </summary>
-        AttributeList = 0x20,
-
-        /// <summary>
-        /// FileName information, one per hard link.
-        /// </summary>
-        FileName = 0x30,
-
-        /// <summary>
-        /// Distributed Link Tracking object identity.
-        /// </summary>
-        ObjectId = 0x40,
-
-        /// <summary>
-        /// Legacy Security Descriptor attribute.
-        /// </summary>
-        SecurityDescriptor = 0x50,
-
-        /// <summary>
-        /// The name of the NTFS volume.
-        /// </summary>
-        VolumeName = 0x60,
-
-        /// <summary>
-        /// Information about the NTFS volume.
-        /// </summary>
-        VolumeInformation = 0x70,
-
-        /// <summary>
-        /// File contents, a file may have multiple data attributes (default is unnamed).
-        /// </summary>
-        Data = 0x80,
-
-        /// <summary>
-        /// Root information for directories and other NTFS index's.
-        /// </summary>
-        IndexRoot = 0x90,
-
-        /// <summary>
-        /// For 'large' directories and other NTFS index's, the index contents.
-        /// </summary>
-        IndexAllocation = 0xA0,
-
-        /// <summary>
-        /// Bitmask of allocated clusters, records, etc - typically used in indexes.
-        /// </summary>
-        Bitmap = 0xB0,
-
-        /// <summary>
-        /// ReparsePoint information.
-        /// </summary>
-        ReparsePoint = 0xC0,
-
-        /// <summary>
-        /// Extended Attributes meta-information.
-        /// </summary>
-        ExtendedAttributesInformation = 0xD0,
-
-        /// <summary>
-        /// Extended Attributes data.
-        /// </summary>
-        ExtendedAttributes = 0xE0,
-
-        /// <summary>
-        /// Legacy attribute type from NT (not used).
-        /// </summary>
-        PropertySet = 0xF0,
-
-        /// <summary>
-        /// Encrypted File System (EFS) data.
-        /// </summary>
-        LoggedUtilityStream = 0x100
-    }
-}
diff --git a/DiscUtils/Ntfs/BiosParameterBlock.cs b/DiscUtils/Ntfs/BiosParameterBlock.cs
deleted file mode 100644
index 6ec2035..0000000
--- a/DiscUtils/Ntfs/BiosParameterBlock.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Globalization;
-    using System.IO;
-
-    internal class BiosParameterBlock
-    {
-        public string OemId;
-        public ushort BytesPerSector;
-        public byte SectorsPerCluster;
-        public ushort ReservedSectors; // Must be 0
-        public byte NumFats; // Must be 0
-        public ushort FatRootEntriesCount; // Must be 0
-        public ushort TotalSectors16; // Must be 0
-        public byte Media; // Must be 0xF8
-        public ushort FatSize16; // Must be 0
-        public ushort SectorsPerTrack; // Value: 0x3F 0x00
-        public ushort NumHeads; // Value: 0xFF 0x00
-        public uint HiddenSectors; // Value: 0x3F 0x00 0x00 0x00
-        public uint TotalSectors32; // Must be 0
-        public byte BiosDriveNumber; // Value: 0x80 (first hard disk)
-        public byte ChkDskFlags; // Value: 0x00
-        public byte SignatureByte; // Value: 0x80
-        public byte PaddingByte; // Value: 0x00
-        public long TotalSectors64;
-        public long MftCluster;
-        public long MftMirrorCluster;
-        public byte RawMftRecordSize;
-        public byte RawIndexBufferSize;
-        public ulong VolumeSerialNumber;
-
-        public int MftRecordSize
-        {
-            get { return CalcRecordSize(RawMftRecordSize); }
-        }
-
-        public int IndexBufferSize
-        {
-            get { return CalcRecordSize(RawIndexBufferSize); }
-        }
-
-        public int BytesPerCluster
-        {
-            get { return ((int)BytesPerSector) * ((int)SectorsPerCluster); }
-        }
-
-        public void Dump(TextWriter writer, string linePrefix)
-        {
-            writer.WriteLine(linePrefix + "BIOS PARAMETER BLOCK (BPB)");
-            writer.WriteLine(linePrefix + "                OEM ID: " + OemId);
-            writer.WriteLine(linePrefix + "      Bytes per Sector: " + BytesPerSector);
-            writer.WriteLine(linePrefix + "   Sectors per Cluster: " + SectorsPerCluster);
-            writer.WriteLine(linePrefix + "      Reserved Sectors: " + ReservedSectors);
-            writer.WriteLine(linePrefix + "                # FATs: " + NumFats);
-            writer.WriteLine(linePrefix + "    # FAT Root Entries: " + FatRootEntriesCount);
-            writer.WriteLine(linePrefix + "   Total Sectors (16b): " + TotalSectors16);
-            writer.WriteLine(linePrefix + "                 Media: " + Media.ToString("X", CultureInfo.InvariantCulture) + "h");
-            writer.WriteLine(linePrefix + "        FAT size (16b): " + FatSize16);
-            writer.WriteLine(linePrefix + "     Sectors per Track: " + SectorsPerTrack);
-            writer.WriteLine(linePrefix + "               # Heads: " + NumHeads);
-            writer.WriteLine(linePrefix + "        Hidden Sectors: " + HiddenSectors);
-            writer.WriteLine(linePrefix + "   Total Sectors (32b): " + TotalSectors32);
-            writer.WriteLine(linePrefix + "     BIOS Drive Number: " + BiosDriveNumber);
-            writer.WriteLine(linePrefix + "          Chkdsk Flags: " + ChkDskFlags);
-            writer.WriteLine(linePrefix + "        Signature Byte: " + SignatureByte);
-            writer.WriteLine(linePrefix + "   Total Sectors (64b): " + TotalSectors64);
-            writer.WriteLine(linePrefix + "       MFT Record Size: " + RawMftRecordSize);
-            writer.WriteLine(linePrefix + "     Index Buffer Size: " + RawIndexBufferSize);
-            writer.WriteLine(linePrefix + "  Volume Serial Number: " + VolumeSerialNumber);
-        }
-
-        internal static BiosParameterBlock Initialized(Geometry diskGeometry, int clusterSize, uint partitionStartLba, long partitionSizeLba, int mftRecordSize, int indexBufferSize)
-        {
-            BiosParameterBlock bpb = new BiosParameterBlock();
-            bpb.OemId = "NTFS    ";
-            bpb.BytesPerSector = Sizes.Sector;
-            bpb.SectorsPerCluster = (byte)(clusterSize / bpb.BytesPerSector);
-            bpb.ReservedSectors = 0;
-            bpb.NumFats = 0;
-            bpb.FatRootEntriesCount = 0;
-            bpb.TotalSectors16 = 0;
-            bpb.Media = 0xF8;
-            bpb.FatSize16 = 0;
-            bpb.SectorsPerTrack = (ushort)diskGeometry.SectorsPerTrack;
-            bpb.NumHeads = (ushort)diskGeometry.HeadsPerCylinder;
-            bpb.HiddenSectors = partitionStartLba;
-            bpb.TotalSectors32 = 0;
-            bpb.BiosDriveNumber = 0x80;
-            bpb.ChkDskFlags = 0;
-            bpb.SignatureByte = 0x80;
-            bpb.PaddingByte = 0;
-            bpb.TotalSectors64 = partitionSizeLba - 1;
-            bpb.RawMftRecordSize = bpb.CodeRecordSize(mftRecordSize);
-            bpb.RawIndexBufferSize = bpb.CodeRecordSize(indexBufferSize);
-            bpb.VolumeSerialNumber = GenSerialNumber();
-
-            return bpb;
-        }
-
-        internal static BiosParameterBlock FromBytes(byte[] bytes, int offset)
-        {
-            BiosParameterBlock bpb = new BiosParameterBlock();
-            bpb.OemId = Utilities.BytesToString(bytes, offset + 0x03, 8);
-            bpb.BytesPerSector = Utilities.ToUInt16LittleEndian(bytes, offset + 0x0B);
-            bpb.SectorsPerCluster = bytes[offset + 0x0D];
-            bpb.ReservedSectors = Utilities.ToUInt16LittleEndian(bytes, offset + 0x0E);
-            bpb.NumFats = bytes[offset + 0x10];
-            bpb.FatRootEntriesCount = Utilities.ToUInt16LittleEndian(bytes, offset + 0x11);
-            bpb.TotalSectors16 = Utilities.ToUInt16LittleEndian(bytes, offset + 0x13);
-            bpb.Media = bytes[offset + 0x15];
-            bpb.FatSize16 = Utilities.ToUInt16LittleEndian(bytes, offset + 0x16);
-            bpb.SectorsPerTrack = Utilities.ToUInt16LittleEndian(bytes, offset + 0x18);
-            bpb.NumHeads = Utilities.ToUInt16LittleEndian(bytes, offset + 0x1A);
-            bpb.HiddenSectors = Utilities.ToUInt32LittleEndian(bytes, offset + 0x1C);
-            bpb.TotalSectors32 = Utilities.ToUInt32LittleEndian(bytes, offset + 0x20);
-            bpb.BiosDriveNumber = bytes[offset + 0x24];
-            bpb.ChkDskFlags = bytes[offset + 0x25];
-            bpb.SignatureByte = bytes[offset + 0x26];
-            bpb.PaddingByte = bytes[offset + 0x27];
-            bpb.TotalSectors64 = Utilities.ToInt64LittleEndian(bytes, offset + 0x28);
-            bpb.MftCluster = Utilities.ToInt64LittleEndian(bytes, offset + 0x30);
-            bpb.MftMirrorCluster = Utilities.ToInt64LittleEndian(bytes, offset + 0x38);
-            bpb.RawMftRecordSize = bytes[offset + 0x40];
-            bpb.RawIndexBufferSize = bytes[offset + 0x44];
-            bpb.VolumeSerialNumber = Utilities.ToUInt64LittleEndian(bytes, offset + 0x48);
-
-            return bpb;
-        }
-
-        internal void ToBytes(byte[] buffer, int offset)
-        {
-            Utilities.StringToBytes(OemId, buffer, offset + 0x03, 8);
-            Utilities.WriteBytesLittleEndian(BytesPerSector, buffer, offset + 0x0B);
-            buffer[offset + 0x0D] = SectorsPerCluster;
-            Utilities.WriteBytesLittleEndian(ReservedSectors, buffer, offset + 0x0E);
-            buffer[offset + 0x10] = NumFats;
-            Utilities.WriteBytesLittleEndian(FatRootEntriesCount, buffer, offset + 0x11);
-            Utilities.WriteBytesLittleEndian(TotalSectors16, buffer, offset + 0x13);
-            buffer[offset + 0x15] = Media;
-            Utilities.WriteBytesLittleEndian(FatSize16, buffer, offset + 0x16);
-            Utilities.WriteBytesLittleEndian(SectorsPerTrack, buffer, offset + 0x18);
-            Utilities.WriteBytesLittleEndian(NumHeads, buffer, offset + 0x1A);
-            Utilities.WriteBytesLittleEndian(HiddenSectors, buffer, offset + 0x1C);
-            Utilities.WriteBytesLittleEndian(TotalSectors32, buffer, offset + 0x20);
-            buffer[offset + 0x24] = BiosDriveNumber;
-            buffer[offset + 0x25] = ChkDskFlags;
-            buffer[offset + 0x26] = SignatureByte;
-            buffer[offset + 0x27] = PaddingByte;
-            Utilities.WriteBytesLittleEndian(TotalSectors64, buffer, offset + 0x28);
-            Utilities.WriteBytesLittleEndian(MftCluster, buffer, offset + 0x30);
-            Utilities.WriteBytesLittleEndian(MftMirrorCluster, buffer, offset + 0x38);
-            buffer[offset + 0x40] = RawMftRecordSize;
-            buffer[offset + 0x44] = RawIndexBufferSize;
-            Utilities.WriteBytesLittleEndian(VolumeSerialNumber, buffer, offset + 0x48);
-        }
-
-        internal int CalcRecordSize(byte rawSize)
-        {
-            if ((rawSize & 0x80) != 0)
-            {
-                return 1 << (-(sbyte)rawSize);
-            }
-            else
-            {
-                return rawSize * SectorsPerCluster * BytesPerSector;
-            }
-        }
-
-        private static ulong GenSerialNumber()
-        {
-            byte[] buffer = new byte[8];
-            Random rng = new Random();
-            rng.NextBytes(buffer);
-            return Utilities.ToUInt64LittleEndian(buffer, 0);
-        }
-
-        private byte CodeRecordSize(int size)
-        {
-            if (size >= BytesPerCluster)
-            {
-                return (byte)(size / BytesPerCluster);
-            }
-            else
-            {
-                sbyte val = 0;
-                while (size != 1)
-                {
-                    size = (size >> 1) & 0x7FFFFFFF;
-                    val++;
-                }
-
-                return (byte)-val;
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/Bitmap.cs b/DiscUtils/Ntfs/Bitmap.cs
deleted file mode 100644
index 8c4a7e4..0000000
--- a/DiscUtils/Ntfs/Bitmap.cs
+++ /dev/null
@@ -1,223 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.IO;
-
-    internal sealed class Bitmap : IDisposable
-    {
-        private Stream _stream;
-        private long _maxIndex;
-
-        private BlockCacheStream _bitmap;
-
-        private long _nextAvailable;
-
-        public Bitmap(Stream stream, long maxIndex)
-        {
-            _stream = stream;
-            _maxIndex = maxIndex;
-            _bitmap = new BlockCacheStream(SparseStream.FromStream(stream, Ownership.None), Ownership.None);
-        }
-
-        public void Dispose()
-        {
-            if (_bitmap != null)
-            {
-                _bitmap.Dispose();
-                _bitmap = null;
-            }
-        }
-
-        public bool IsPresent(long index)
-        {
-            long byteIdx = index / 8;
-            int mask = 1 << (int)(index % 8);
-            return (GetByte(byteIdx) & mask) != 0;
-        }
-
-        public void MarkPresent(long index)
-        {
-            long byteIdx = index / 8;
-            byte mask = (byte)(1 << (byte)(index % 8));
-
-            if (byteIdx >= _bitmap.Length)
-            {
-                _bitmap.Position = Utilities.RoundUp(byteIdx + 1, 8) - 1;
-                _bitmap.WriteByte(0);
-            }
-
-            SetByte(byteIdx, (byte)(GetByte(byteIdx) | mask));
-        }
-
-        public void MarkPresentRange(long index, long count)
-        {
-            if (count <= 0)
-            {
-                return;
-            }
-
-            long firstByte = index / 8;
-            long lastByte = (index + count - 1) / 8;
-
-            if (lastByte >= _bitmap.Length)
-            {
-                _bitmap.Position = Utilities.RoundUp(lastByte + 1, 8) - 1;
-                _bitmap.WriteByte(0);
-            }
-
-            byte[] buffer = new byte[lastByte - firstByte + 1];
-            buffer[0] = GetByte(firstByte);
-            if (buffer.Length != 1)
-            {
-                buffer[buffer.Length - 1] = GetByte(lastByte);
-            }
-
-            for (long i = index; i < index + count; ++i)
-            {
-                long byteIdx = (i / 8) - firstByte;
-                byte mask = (byte)(1 << (byte)(i % 8));
-
-                buffer[byteIdx] |= mask;
-            }
-
-            SetBytes(firstByte, buffer);
-        }
-
-        public void MarkAbsent(long index)
-        {
-            long byteIdx = index / 8;
-            byte mask = (byte)(1 << (byte)(index % 8));
-
-            if (byteIdx < _stream.Length)
-            {
-                SetByte(byteIdx, (byte)(GetByte(byteIdx) & ~mask));
-            }
-
-            if (index < _nextAvailable)
-            {
-                _nextAvailable = index;
-            }
-        }
-
-        internal void MarkAbsentRange(long index, long count)
-        {
-            if (count <= 0)
-            {
-                return;
-            }
-
-            long firstByte = index / 8;
-            long lastByte = (index + count - 1) / 8;
-            if (lastByte >= _bitmap.Length)
-            {
-                _bitmap.Position = Utilities.RoundUp(lastByte + 1, 8) - 1;
-                _bitmap.WriteByte(0);
-            }
-
-            byte[] buffer = new byte[lastByte - firstByte + 1];
-            buffer[0] = GetByte(firstByte);
-            if (buffer.Length != 1)
-            {
-                buffer[buffer.Length - 1] = GetByte(lastByte);
-            }
-
-            for (long i = index; i < index + count; ++i)
-            {
-                long byteIdx = (i / 8) - firstByte;
-                byte mask = (byte)(1 << (byte)(i % 8));
-
-                buffer[byteIdx] &= (byte)(~mask);
-            }
-
-            SetBytes(firstByte, buffer);
-
-            if (index < _nextAvailable)
-            {
-                _nextAvailable = index;
-            }
-        }
-
-        internal long AllocateFirstAvailable(long minValue)
-        {
-            long i = Math.Max(minValue, _nextAvailable);
-            while (IsPresent(i) && i < _maxIndex)
-            {
-                ++i;
-            }
-
-            if (i < _maxIndex)
-            {
-                MarkPresent(i);
-                _nextAvailable = i + 1;
-                return i;
-            }
-            else
-            {
-                return -1;
-            }
-        }
-
-        internal long SetTotalEntries(long numEntries)
-        {
-            long length = Utilities.RoundUp(Utilities.Ceil(numEntries, 8), 8);
-            _stream.SetLength(length);
-            return length * 8;
-        }
-
-        private byte GetByte(long index)
-        {
-            if (index >= _bitmap.Length)
-            {
-                return 0;
-            }
-
-            byte[] buffer = new byte[1];
-            _bitmap.Position = index;
-            if (_bitmap.Read(buffer, 0, 1) != 0)
-            {
-                return buffer[0];
-            }
-            else
-            {
-                return 0;
-            }
-        }
-
-        private void SetByte(long index, byte value)
-        {
-            byte[] buffer = new byte[] { value };
-            _bitmap.Position = index;
-            _bitmap.Write(buffer, 0, 1);
-            _bitmap.Flush();
-        }
-
-        private void SetBytes(long index, byte[] buffer)
-        {
-            _bitmap.Position = index;
-            _bitmap.Write(buffer, 0, buffer.Length);
-            _bitmap.Flush();
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/ClusterBitmap.cs b/DiscUtils/Ntfs/ClusterBitmap.cs
deleted file mode 100644
index 3214cc5..0000000
--- a/DiscUtils/Ntfs/ClusterBitmap.cs
+++ /dev/null
@@ -1,270 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal class ClusterBitmap : System.IDisposable
-    {
-        private File _file;
-        private Bitmap _bitmap;
-
-        private long _nextDataCluster;
-        private bool _fragmentedDiskMode;
-
-        public ClusterBitmap(File file)
-        {
-            _file = file;
-            _bitmap = new Bitmap(
-                _file.OpenStream(AttributeType.Data, null, FileAccess.ReadWrite),
-                Utilities.Ceil(file.Context.BiosParameterBlock.TotalSectors64, file.Context.BiosParameterBlock.SectorsPerCluster));
-        }
-
-        public void Dispose()
-        {
-            if (_bitmap != null)
-            {
-                _bitmap.Dispose();
-                _bitmap = null;
-            }
-        }
-
-        /// <summary>
-        /// Allocates clusters from the disk.
-        /// </summary>
-        /// <param name="count">The number of clusters to allocate.</param>
-        /// <param name="proposedStart">The proposed start cluster (or -1).</param>
-        /// <param name="isMft"><c>true</c> if this attribute is the $MFT\$DATA attribute.</param>
-        /// <param name="total">The total number of clusters in the file, including this allocation.</param>
-        /// <returns>The list of cluster allocations.</returns>
-        public Tuple<long, long>[] AllocateClusters(long count, long proposedStart, bool isMft, long total)
-        {
-            List<Tuple<long, long>> result = new List<Tuple<long, long>>();
-
-            long numFound = 0;
-
-            long totalClusters = _file.Context.RawStream.Length / _file.Context.BiosParameterBlock.BytesPerCluster;
-
-            if (isMft)
-            {
-                // First, try to extend the existing cluster run (if available)
-                if (proposedStart >= 0)
-                {
-                    numFound += ExtendRun(count - numFound, result, proposedStart, totalClusters);
-                }
-
-                // The MFT grows sequentially across the disk
-                if (numFound < count && !_fragmentedDiskMode)
-                {
-                    numFound += FindClusters(count - numFound, result, 0, totalClusters, isMft, true, 0);
-                }
-
-                if (numFound < count)
-                {
-                    numFound += FindClusters(count - numFound, result, 0, totalClusters, isMft, false, 0);
-                }
-            }
-            else
-            {
-                // First, try to extend the existing cluster run (if available)
-                if (proposedStart >= 0)
-                {
-                    numFound += ExtendRun(count - numFound, result, proposedStart, totalClusters);
-                }
-
-                // Try to find a contiguous range
-                if (numFound < count && !_fragmentedDiskMode)
-                {
-                    numFound += FindClusters(count - numFound, result, totalClusters / 8, totalClusters, isMft, true, total / 4);
-                }
-
-                if (numFound < count)
-                {
-                    numFound += FindClusters(count - numFound, result, totalClusters / 8, totalClusters, isMft, false, 0);
-                }
-
-                if (numFound < count)
-                {
-                    numFound = FindClusters(count - numFound, result, totalClusters / 16, totalClusters / 8, isMft, false, 0);
-                }
-
-                if (numFound < count)
-                {
-                    numFound = FindClusters(count - numFound, result, totalClusters / 32, totalClusters / 16, isMft, false, 0);
-                }
-
-                if (numFound < count)
-                {
-                    numFound = FindClusters(count - numFound, result, 0, totalClusters / 32, isMft, false, 0);
-                }
-            }
-
-            if (numFound < count)
-            {
-                FreeClusters(result.ToArray());
-                throw new IOException("Out of disk space");
-            }
-
-            // If we found more than two clusters, or we have a fragmented result,
-            // then switch out of trying to allocate contiguous ranges.  Similarly,
-            // switch back if we found a resonable quantity in a single span.
-            if ((numFound > 4 && result.Count == 1) || result.Count > 1)
-            {
-                _fragmentedDiskMode = (numFound / result.Count) < 4;
-            }
-
-            return result.ToArray();
-        }
-
-        internal void MarkAllocated(long first, long count)
-        {
-            _bitmap.MarkPresentRange(first, count);
-        }
-
-        internal void FreeClusters(params Tuple<long, long>[] runs)
-        {
-            foreach (var run in runs)
-            {
-                _bitmap.MarkAbsentRange(run.First, run.Second);
-            }
-        }
-
-        internal void FreeClusters(params Range<long, long>[] runs)
-        {
-            foreach (var run in runs)
-            {
-                _bitmap.MarkAbsentRange(run.Offset, run.Count);
-            }
-        }
-
-        /// <summary>
-        /// Sets the total number of clusters managed in the volume.
-        /// </summary>
-        /// <param name="numClusters">Total number of clusters in the volume.</param>
-        /// <remarks>
-        /// Any clusters represented in the bitmap beyond the total number in the volume are marked as in-use.
-        /// </remarks>
-        internal void SetTotalClusters(long numClusters)
-        {
-            long actualClusters = _bitmap.SetTotalEntries(numClusters);
-            if (actualClusters != numClusters)
-            {
-                MarkAllocated(numClusters, actualClusters - numClusters);
-            }
-        }
-
-        private long ExtendRun(long count, List<Tuple<long, long>> result, long start, long end)
-        {
-            long focusCluster = start;
-            while (!_bitmap.IsPresent(focusCluster) && focusCluster < end && focusCluster - start < count)
-            {
-                ++focusCluster;
-            }
-
-            long numFound = focusCluster - start;
-
-            if (numFound > 0)
-            {
-                _bitmap.MarkPresentRange(start, numFound);
-                result.Add(new Tuple<long, long>(start, numFound));
-            }
-
-            return numFound;
-        }
-
-        /// <summary>
-        /// Finds one or more free clusters in a range.
-        /// </summary>
-        /// <param name="count">The number of clusters required.</param>
-        /// <param name="result">The list of clusters found (i.e. out param).</param>
-        /// <param name="start">The first cluster in the range to look at.</param>
-        /// <param name="end">The last cluster in the range to look at (exclusive).</param>
-        /// <param name="isMft">Indicates if the clusters are for the MFT.</param>
-        /// <param name="contiguous">Indicates if contiguous clusters are required.</param>
-        /// <param name="headroom">Indicates how many clusters to skip before next allocation, to prevent fragmentation.</param>
-        /// <returns>The number of clusters found in the range.</returns>
-        private long FindClusters(long count, List<Tuple<long, long>> result, long start, long end, bool isMft, bool contiguous, long headroom)
-        {
-            long numFound = 0;
-
-            long focusCluster;
-            if (isMft)
-            {
-                focusCluster = start;
-            }
-            else
-            {
-                if (_nextDataCluster < start || _nextDataCluster >= end)
-                {
-                    _nextDataCluster = start;
-                }
-
-                focusCluster = _nextDataCluster;
-            }
-
-            long numInspected = 0;
-            while (numFound < count && focusCluster >= start && numInspected < end - start)
-            {
-                if (!_bitmap.IsPresent(focusCluster))
-                {
-                    // Start of a run...
-                    long runStart = focusCluster;
-                    ++focusCluster;
-
-                    while (!_bitmap.IsPresent(focusCluster) && focusCluster - runStart < (count - numFound))
-                    {
-                        ++focusCluster;
-                        ++numInspected;
-                    }
-
-                    if (!contiguous || (focusCluster - runStart) == (count - numFound))
-                    {
-                        _bitmap.MarkPresentRange(runStart, focusCluster - runStart);
-
-                        result.Add(new Tuple<long, long>(runStart, focusCluster - runStart));
-                        numFound += focusCluster - runStart;
-                    }
-                }
-                else
-                {
-                    ++focusCluster;
-                }
-
-                ++numInspected;
-
-                if (focusCluster >= end)
-                {
-                    focusCluster = start;
-                }
-            }
-
-            if (!isMft)
-            {
-                _nextDataCluster = focusCluster + headroom;
-            }
-
-            return numFound;
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/ClusterStream.cs b/DiscUtils/Ntfs/ClusterStream.cs
deleted file mode 100644
index 2e178ff..0000000
--- a/DiscUtils/Ntfs/ClusterStream.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System.Collections.Generic;
-
-    internal abstract class ClusterStream
-    {
-        public abstract long AllocatedClusterCount
-        {
-            get;
-        }
-
-        public abstract IEnumerable<Range<long, long>> StoredClusters
-        {
-            get;
-        }
-
-        public abstract bool IsClusterStored(long vcn);
-
-        public abstract void ExpandToClusters(long numVirtualClusters, NonResidentAttributeRecord extent, bool allocate);
-
-        public abstract void TruncateToClusters(long numVirtualClusters);
-
-        public abstract void ReadClusters(long startVcn, int count, byte[] buffer, int offset);
-
-        public abstract int WriteClusters(long startVcn, int count, byte[] buffer, int offset);
-
-        public abstract int ClearClusters(long startVcn, int count);
-    }
-}
diff --git a/DiscUtils/Ntfs/CompressedClusterStream.cs b/DiscUtils/Ntfs/CompressedClusterStream.cs
deleted file mode 100644
index dc05382..0000000
--- a/DiscUtils/Ntfs/CompressedClusterStream.cs
+++ /dev/null
@@ -1,257 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using DiscUtils.Compression;
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal sealed class CompressedClusterStream : ClusterStream
-    {
-        private INtfsContext _context;
-        private NtfsAttribute _attr;
-        private RawClusterStream _rawStream;
-        private int _bytesPerCluster;
-
-        private byte[] _cacheBuffer;
-        private long _cacheBufferVcn = -1;
-        private byte[] _ioBuffer;
-
-        public CompressedClusterStream(INtfsContext context, NtfsAttribute attr, RawClusterStream rawStream)
-        {
-            _context = context;
-            _attr = attr;
-            _rawStream = rawStream;
-            _bytesPerCluster = _context.BiosParameterBlock.BytesPerCluster;
-
-            _cacheBuffer = new byte[_attr.CompressionUnitSize * context.BiosParameterBlock.BytesPerCluster];
-            _ioBuffer = new byte[_attr.CompressionUnitSize * context.BiosParameterBlock.BytesPerCluster];
-        }
-
-        public override long AllocatedClusterCount
-        {
-            get { return _rawStream.AllocatedClusterCount; }
-        }
-
-        public override IEnumerable<Range<long, long>> StoredClusters
-        {
-            get
-            {
-                return Range<long, long>.Chunked(_rawStream.StoredClusters, _attr.CompressionUnitSize);
-            }
-        }
-
-        public override bool IsClusterStored(long vcn)
-        {
-            return _rawStream.IsClusterStored(CompressionStart(vcn));
-        }
-
-        public override void ExpandToClusters(long numVirtualClusters, NonResidentAttributeRecord extent, bool allocate)
-        {
-            _rawStream.ExpandToClusters(Utilities.RoundUp(numVirtualClusters, _attr.CompressionUnitSize), extent, false);
-        }
-
-        public override void TruncateToClusters(long numVirtualClusters)
-        {
-            long alignedNum = Utilities.RoundUp(numVirtualClusters, _attr.CompressionUnitSize);
-            _rawStream.TruncateToClusters(alignedNum);
-            if (alignedNum != numVirtualClusters)
-            {
-                _rawStream.ReleaseClusters(numVirtualClusters, (int)(alignedNum - numVirtualClusters));
-            }
-        }
-
-        public override void ReadClusters(long startVcn, int count, byte[] buffer, int offset)
-        {
-            if (buffer.Length < (count * _bytesPerCluster) + offset)
-            {
-                throw new ArgumentException("Cluster buffer too small", "buffer");
-            }
-
-            int totalRead = 0;
-            while (totalRead < count)
-            {
-                long focusVcn = startVcn + totalRead;
-                LoadCache(focusVcn);
-
-                int cacheOffset = (int)(focusVcn - _cacheBufferVcn);
-                int toCopy = Math.Min(_attr.CompressionUnitSize - cacheOffset, count - totalRead);
-
-                Array.Copy(_cacheBuffer, cacheOffset * _bytesPerCluster, buffer, offset + (totalRead * _bytesPerCluster), toCopy * _bytesPerCluster);
-
-                totalRead += toCopy;
-            }
-        }
-
-        public override int WriteClusters(long startVcn, int count, byte[] buffer, int offset)
-        {
-            if (buffer.Length < (count * _bytesPerCluster) + offset)
-            {
-                throw new ArgumentException("Cluster buffer too small", "buffer");
-            }
-
-            int totalAllocated = 0;
-
-            int totalWritten = 0;
-            while (totalWritten < count)
-            {
-                long focusVcn = startVcn + totalWritten;
-                long cuStart = CompressionStart(focusVcn);
-
-                if (cuStart == focusVcn && count - totalWritten >= _attr.CompressionUnitSize)
-                {
-                    // Aligned write...
-                    totalAllocated += CompressAndWriteClusters(focusVcn, _attr.CompressionUnitSize, buffer, offset + (totalWritten * _bytesPerCluster));
-
-                    totalWritten += _attr.CompressionUnitSize;
-                }
-                else
-                {
-                    // Unaligned, so go through cache
-                    LoadCache(focusVcn);
-
-                    int cacheOffset = (int)(focusVcn - _cacheBufferVcn);
-                    int toCopy = Math.Min(count - totalWritten, _attr.CompressionUnitSize - cacheOffset);
-
-                    Array.Copy(buffer, offset + (totalWritten * _bytesPerCluster), _cacheBuffer, cacheOffset * _bytesPerCluster, toCopy * _bytesPerCluster);
-
-                    totalAllocated += CompressAndWriteClusters(_cacheBufferVcn, _attr.CompressionUnitSize, _cacheBuffer, 0);
-
-                    totalWritten += toCopy;
-                }
-            }
-
-            return totalAllocated;
-        }
-
-        public override int ClearClusters(long startVcn, int count)
-        {
-            int totalReleased = 0;
-            int totalCleared = 0;
-            while (totalCleared < count)
-            {
-                long focusVcn = startVcn + totalCleared;
-                if (CompressionStart(focusVcn) == focusVcn && count - totalCleared >= _attr.CompressionUnitSize)
-                {
-                    // Aligned - so it's a sparse compression unit...
-                    totalReleased += _rawStream.ReleaseClusters(startVcn, _attr.CompressionUnitSize);
-                    totalCleared += _attr.CompressionUnitSize;
-                }
-                else
-                {
-                    int toZero = (int)Math.Min(count - totalCleared, _attr.CompressionUnitSize - (focusVcn - CompressionStart(focusVcn)));
-                    totalReleased -= WriteZeroClusters(focusVcn, toZero);
-                    totalCleared += toZero;
-                }
-            }
-
-            return totalReleased;
-        }
-
-        private int WriteZeroClusters(long focusVcn, int count)
-        {
-            int allocatedClusters = 0;
-
-            byte[] zeroBuffer = new byte[16 * _bytesPerCluster];
-            int numWritten = 0;
-            while (numWritten < count)
-            {
-                int toWrite = Math.Min(count - numWritten, 16);
-
-                allocatedClusters += WriteClusters(focusVcn + numWritten, toWrite, zeroBuffer, 0);
-
-                numWritten += toWrite;
-            }
-
-            return allocatedClusters;
-        }
-
-        private int CompressAndWriteClusters(long focusVcn, int count, byte[] buffer, int offset)
-        {
-            BlockCompressor compressor = _context.Options.Compressor;
-            compressor.BlockSize = _bytesPerCluster;
-
-            int totalAllocated = 0;
-
-            int compressedLength = _ioBuffer.Length;
-            var result = compressor.Compress(buffer, offset, _attr.CompressionUnitSize * _bytesPerCluster, _ioBuffer, 0, ref compressedLength);
-            if (result == CompressionResult.AllZeros)
-            {
-                totalAllocated -= _rawStream.ReleaseClusters(focusVcn, count);
-            }
-            else if (result == CompressionResult.Compressed && (_attr.CompressionUnitSize * _bytesPerCluster) - compressedLength > _bytesPerCluster)
-            {
-                int compClusters = Utilities.Ceil(compressedLength, _bytesPerCluster);
-                totalAllocated += _rawStream.AllocateClusters(focusVcn, compClusters);
-                totalAllocated += _rawStream.WriteClusters(focusVcn, compClusters, _ioBuffer, 0);
-                totalAllocated -= _rawStream.ReleaseClusters(focusVcn + compClusters, _attr.CompressionUnitSize - compClusters);
-            }
-            else
-            {
-                totalAllocated += _rawStream.AllocateClusters(focusVcn, _attr.CompressionUnitSize);
-                totalAllocated += _rawStream.WriteClusters(focusVcn, _attr.CompressionUnitSize, buffer, offset);
-            }
-
-            return totalAllocated;
-        }
-
-        private long CompressionStart(long vcn)
-        {
-            return Utilities.RoundDown(vcn, _attr.CompressionUnitSize);
-        }
-
-        private void LoadCache(long vcn)
-        {
-            long cuStart = CompressionStart(vcn);
-            if (_cacheBufferVcn != cuStart)
-            {
-                if (_rawStream.AreAllClustersStored(cuStart, _attr.CompressionUnitSize))
-                {
-                    // Uncompressed data - read straight into cache buffer
-                    _rawStream.ReadClusters(cuStart, _attr.CompressionUnitSize, _cacheBuffer, 0);
-                }
-                else if (_rawStream.IsClusterStored(cuStart))
-                {
-                    // Compressed data - read via IO buffer
-                    _rawStream.ReadClusters(cuStart, _attr.CompressionUnitSize, _ioBuffer, 0);
-
-                    int expected = (int)Math.Min(_attr.Length - (vcn * _bytesPerCluster), _attr.CompressionUnitSize * _bytesPerCluster);
-
-                    int decomp = _context.Options.Compressor.Decompress(_ioBuffer, 0, _ioBuffer.Length, _cacheBuffer, 0);
-                    if (decomp < expected)
-                    {
-                        throw new IOException("Decompression returned too little data");
-                    }
-                }
-                else
-                {
-                    // Sparse, wipe cache buffer directly
-                    Array.Clear(_cacheBuffer, 0, _cacheBuffer.Length);
-                }
-
-                _cacheBufferVcn = cuStart;
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/CookedDataRun.cs b/DiscUtils/Ntfs/CookedDataRun.cs
deleted file mode 100644
index 241020a..0000000
--- a/DiscUtils/Ntfs/CookedDataRun.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-
-    internal class CookedDataRun
-    {
-        private long _startVcn;
-        private long _startLcn;
-        private DataRun _raw;
-        private NonResidentAttributeRecord _attributeExtent;
-
-        public CookedDataRun(DataRun raw, long startVcn, long prevLcn, NonResidentAttributeRecord attributeExtent)
-        {
-            _raw = raw;
-            _startVcn = startVcn;
-            _startLcn = prevLcn + raw.RunOffset;
-            _attributeExtent = attributeExtent;
-
-            if (startVcn < 0)
-            {
-                throw new ArgumentOutOfRangeException("startVcn", startVcn, "VCN must be >= 0");
-            }
-
-            if (_startLcn < 0)
-            {
-                throw new ArgumentOutOfRangeException("prevLcn", prevLcn, "LCN must be >= 0");
-            }
-        }
-
-        public long StartVcn
-        {
-            get { return _startVcn; }
-        }
-
-        public long StartLcn
-        {
-            get { return _startLcn; }
-            set { _startLcn = value; }
-        }
-
-        public long Length
-        {
-            get { return _raw.RunLength; }
-            set { _raw.RunLength = value; }
-        }
-
-        public bool IsSparse
-        {
-            get { return _raw.IsSparse; }
-        }
-
-        public DataRun DataRun
-        {
-            get { return _raw; }
-        }
-
-        public NonResidentAttributeRecord AttributeExtent
-        {
-            get { return _attributeExtent; }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/CookedDataRuns.cs b/DiscUtils/Ntfs/CookedDataRuns.cs
deleted file mode 100644
index 971c88b..0000000
--- a/DiscUtils/Ntfs/CookedDataRuns.cs
+++ /dev/null
@@ -1,321 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal class CookedDataRuns
-    {
-        private List<CookedDataRun> _runs;
-
-        private int _firstDirty = int.MaxValue;
-        private int _lastDirty = 0;
-
-        public CookedDataRuns()
-        {
-            _runs = new List<CookedDataRun>();
-        }
-
-        public CookedDataRuns(IEnumerable<DataRun> rawRuns, NonResidentAttributeRecord attributeExtent)
-        {
-            _runs = new List<CookedDataRun>();
-            Append(rawRuns, attributeExtent);
-        }
-
-        public long NextVirtualCluster
-        {
-            get
-            {
-                if (_runs.Count == 0)
-                {
-                    return 0;
-                }
-                else
-                {
-                    int lastRun = _runs.Count - 1;
-                    return _runs[lastRun].StartVcn + _runs[lastRun].Length;
-                }
-            }
-        }
-
-        public CookedDataRun Last
-        {
-            get
-            {
-                if (_runs.Count == 0)
-                {
-                    return null;
-                }
-                else
-                {
-                    return _runs[_runs.Count - 1];
-                }
-            }
-        }
-
-        public int Count
-        {
-            get { return _runs.Count; }
-        }
-
-        public CookedDataRun this[int index]
-        {
-            get { return _runs[index]; }
-        }
-
-        public int FindDataRun(long vcn, int startIdx)
-        {
-            int numRuns = _runs.Count;
-            if (numRuns > 0)
-            {
-                CookedDataRun run = _runs[numRuns - 1];
-                if (vcn >= run.StartVcn)
-                {
-                    if (run.StartVcn + run.Length > vcn)
-                    {
-                        return numRuns - 1;
-                    }
-                    else
-                    {
-                        throw new IOException("Looking for VCN outside of data runs");
-                    }
-                }
-
-                for (int i = startIdx; i < numRuns; ++i)
-                {
-                    run = _runs[i];
-                    if (run.StartVcn + run.Length > vcn)
-                    {
-                        return i;
-                    }
-                }
-            }
-
-            throw new IOException("Looking for VCN outside of data runs");
-        }
-
-        public void Append(DataRun rawRun, NonResidentAttributeRecord attributeExtent)
-        {
-            CookedDataRun last = Last;
-            _runs.Add(new CookedDataRun(rawRun, NextVirtualCluster, last == null ? 0 : last.StartLcn, attributeExtent));
-        }
-
-        public void Append(IEnumerable<DataRun> rawRuns, NonResidentAttributeRecord attributeExtent)
-        {
-            long vcn = NextVirtualCluster;
-            long lcn = 0;
-            foreach (var run in rawRuns)
-            {
-                _runs.Add(new CookedDataRun(run, vcn, lcn, attributeExtent));
-                vcn += run.RunLength;
-                lcn += run.RunOffset;
-            }
-        }
-
-        public void MakeSparse(int index)
-        {
-            if (index < _firstDirty)
-            {
-                _firstDirty = index;
-            }
-
-            if (index > _lastDirty)
-            {
-                _lastDirty = index;
-            }
-
-            long prevLcn = index == 0 ? 0 : _runs[index - 1].StartLcn;
-            CookedDataRun run = _runs[index];
-
-            if (run.IsSparse)
-            {
-                throw new ArgumentException("Run is already sparse", "index");
-            }
-
-            _runs[index] = new CookedDataRun(new DataRun(0, run.Length, true), run.StartVcn, prevLcn, run.AttributeExtent);
-            run.AttributeExtent.ReplaceRun(run.DataRun, _runs[index].DataRun);
-
-            for (int i = index + 1; i < _runs.Count; ++i)
-            {
-                if (!_runs[i].IsSparse)
-                {
-                    _runs[i].DataRun.RunOffset += run.StartLcn - prevLcn;
-                    break;
-                }
-            }
-        }
-
-        public void MakeNonSparse(int index, IEnumerable<DataRun> rawRuns)
-        {
-            if (index < _firstDirty)
-            {
-                _firstDirty = index;
-            }
-
-            if (index > _lastDirty)
-            {
-                _lastDirty = index;
-            }
-
-            long prevLcn = index == 0 ? 0 : _runs[index - 1].StartLcn;
-            CookedDataRun run = _runs[index];
-
-            if (!run.IsSparse)
-            {
-                throw new ArgumentException("Run is already non-sparse", "index");
-            }
-
-            _runs.RemoveAt(index);
-            int insertIdx = run.AttributeExtent.RemoveRun(run.DataRun);
-
-            CookedDataRun lastNewRun = null;
-            long lcn = prevLcn;
-            long vcn = run.StartVcn;
-            foreach (var rawRun in rawRuns)
-            {
-                CookedDataRun newRun = new CookedDataRun(rawRun, vcn, lcn, run.AttributeExtent);
-
-                _runs.Insert(index, newRun);
-                run.AttributeExtent.InsertRun(insertIdx, rawRun);
-
-                vcn += rawRun.RunLength;
-                lcn += rawRun.RunOffset;
-
-                lastNewRun = newRun;
-                insertIdx++;
-
-                index++;
-            }
-
-            for (int i = index; i < _runs.Count; ++i)
-            {
-                if (_runs[i].IsSparse)
-                {
-                    _runs[i].StartLcn = lastNewRun.StartLcn;
-                }
-                else
-                {
-                    _runs[i].DataRun.RunOffset = _runs[i].StartLcn - lastNewRun.StartLcn;
-                    break;
-                }
-            }
-        }
-
-        public void SplitRun(int runIdx, long vcn)
-        {
-            if (runIdx < _firstDirty)
-            {
-                _firstDirty = runIdx;
-            }
-
-            if (runIdx > _lastDirty)
-            {
-                _lastDirty = runIdx;
-            }
-
-            CookedDataRun run = _runs[runIdx];
-
-            if (run.StartVcn >= vcn || run.StartVcn + run.Length <= vcn)
-            {
-                throw new ArgumentException("Attempt to split run outside of it's range", "vcn");
-            }
-
-            long distance = vcn - run.StartVcn;
-            long offset = run.IsSparse ? 0 : distance;
-            CookedDataRun newRun = new CookedDataRun(new DataRun(offset, run.Length - distance, run.IsSparse), vcn, run.StartLcn, run.AttributeExtent);
-
-            run.Length = distance;
-
-            _runs.Insert(runIdx + 1, newRun);
-            run.AttributeExtent.InsertRun(run.DataRun, newRun.DataRun);
-
-            for (int i = runIdx + 2; i < _runs.Count; ++i)
-            {
-                if (_runs[i].IsSparse)
-                {
-                    _runs[i].StartLcn += offset;
-                }
-                else
-                {
-                    _runs[i].DataRun.RunOffset -= offset;
-                    break;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Truncates the set of data runs.
-        /// </summary>
-        /// <param name="index">The first run to be truncated.</param>
-        public void TruncateAt(int index)
-        {
-            while (index < _runs.Count)
-            {
-                _runs[index].AttributeExtent.RemoveRun(_runs[index].DataRun);
-                _runs.RemoveAt(index);
-            }
-        }
-
-        internal void CollapseRuns()
-        {
-            int i = _firstDirty > 1 ? _firstDirty - 1 : 0;
-            while (i < _runs.Count - 1 && i <= _lastDirty + 1)
-            {
-                if (_runs[i].IsSparse && _runs[i + 1].IsSparse)
-                {
-                    _runs[i].Length += _runs[i + 1].Length;
-                    _runs[i + 1].AttributeExtent.RemoveRun(_runs[i + 1].DataRun);
-                    _runs.RemoveAt(i + 1);
-                }
-                else if (!_runs[i].IsSparse && !_runs[i].IsSparse && _runs[i].StartLcn + _runs[i].Length == _runs[i + 1].StartLcn)
-                {
-                    _runs[i].Length += _runs[i + 1].Length;
-                    _runs[i + 1].AttributeExtent.RemoveRun(_runs[i + 1].DataRun);
-                    _runs.RemoveAt(i + 1);
-
-                    for (int j = i + 1; j < _runs.Count; ++j)
-                    {
-                        if (_runs[j].IsSparse)
-                        {
-                            _runs[j].StartLcn = _runs[i].StartLcn;
-                        }
-                        else
-                        {
-                            _runs[j].DataRun.RunOffset = _runs[j].StartLcn - _runs[i].StartLcn;
-                            break;
-                        }
-                    }
-                }
-                else
-                {
-                    ++i;
-                }
-            }
-
-            _firstDirty = int.MaxValue;
-            _lastDirty = 0;
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/DataRun.cs b/DiscUtils/Ntfs/DataRun.cs
deleted file mode 100644
index b1abf0c..0000000
--- a/DiscUtils/Ntfs/DataRun.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System.Globalization;
-
-    internal class DataRun
-    {
-        private long _runLength;
-        private long _runOffset;
-        private bool _isSparse;
-
-        public DataRun()
-        {
-        }
-
-        public DataRun(long offset, long length, bool isSparse)
-        {
-            _runOffset = offset;
-            _runLength = length;
-            _isSparse = isSparse;
-        }
-
-        public long RunLength
-        {
-            get { return _runLength; }
-            set { _runLength = value; }
-        }
-
-        public long RunOffset
-        {
-            get { return _runOffset; }
-            set { _runOffset = value; }
-        }
-
-        public bool IsSparse
-        {
-            get { return _isSparse; }
-        }
-
-        internal int Size
-        {
-            get
-            {
-                int runLengthSize = VarLongSize(_runLength);
-                int runOffsetSize = VarLongSize(_runOffset);
-                return 1 + runLengthSize + runOffsetSize;
-            }
-        }
-
-        public int Read(byte[] buffer, int offset)
-        {
-            int runOffsetSize = (buffer[offset] >> 4) & 0x0F;
-            int runLengthSize = buffer[offset] & 0x0F;
-
-            _runLength = ReadVarLong(buffer, offset + 1, runLengthSize);
-            _runOffset = ReadVarLong(buffer, offset + 1 + runLengthSize, runOffsetSize);
-            _isSparse = runOffsetSize == 0;
-
-            return 1 + runLengthSize + runOffsetSize;
-        }
-
-        public override string ToString()
-        {
-            return string.Format(CultureInfo.InvariantCulture, "{0:+##;-##;0}[+{1}]", _runOffset, _runLength);
-        }
-
-        internal int Write(byte[] buffer, int offset)
-        {
-            int runLengthSize = WriteVarLong(buffer, offset + 1, _runLength);
-            int runOffsetSize = _isSparse ? 0 : WriteVarLong(buffer, offset + 1 + runLengthSize, _runOffset);
-
-            buffer[offset] = (byte)((runLengthSize & 0x0F) | ((runOffsetSize << 4) & 0xF0));
-
-            return 1 + runLengthSize + runOffsetSize;
-        }
-
-        private static long ReadVarLong(byte[] buffer, int offset, int size)
-        {
-            ulong val = 0;
-            bool signExtend = false;
-
-            for (int i = 0; i < size; ++i)
-            {
-                byte b = buffer[offset + i];
-                val = val | (((ulong)b) << (i * 8));
-                signExtend = (b & 0x80) != 0;
-            }
-
-            if (signExtend)
-            {
-                for (int i = size; i < 8; ++i)
-                {
-                    val = val | (((ulong)0xFF) << (i * 8));
-                }
-            }
-
-            return (long)val;
-        }
-
-        private static int WriteVarLong(byte[] buffer, int offset, long val)
-        {
-            bool isPositive = val >= 0;
-
-            int pos = 0;
-            do
-            {
-                buffer[offset + pos] = (byte)(val & 0xFF);
-                val >>= 8;
-                pos++;
-            }
-            while (val != 0 && val != -1);
-
-            // Avoid appearing to have a negative number that is actually positive,
-            // record an extra empty byte if needed.
-            if (isPositive && (buffer[offset + pos - 1] & 0x80) != 0)
-            {
-                buffer[offset + pos] = 0;
-                pos++;
-            }
-            else if (!isPositive && (buffer[offset + pos - 1] & 0x80) != 0x80)
-            {
-                buffer[offset + pos] = 0xFF;
-                pos++;
-            }
-
-            return pos;
-        }
-
-        private static int VarLongSize(long val)
-        {
-            bool isPositive = val >= 0;
-            bool lastByteHighBitSet = false;
-
-            int len = 0;
-            do
-            {
-                lastByteHighBitSet = (val & 0x80) != 0;
-                val >>= 8;
-                len++;
-            }
-            while (val != 0 && val != -1);
-
-            if ((isPositive && lastByteHighBitSet) || (!isPositive && !lastByteHighBitSet))
-            {
-                len++;
-            }
-
-            return len;
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/Directory.cs b/DiscUtils/Ntfs/Directory.cs
deleted file mode 100644
index 5e4d0c8..0000000
--- a/DiscUtils/Ntfs/Directory.cs
+++ /dev/null
@@ -1,291 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using System.Text;
-    using DirectoryIndexEntry = System.Collections.Generic.KeyValuePair<DiscUtils.Ntfs.FileNameRecord, DiscUtils.Ntfs.FileRecordReference>;
-
-    internal class Directory : File
-    {
-        private IndexView<FileNameRecord, FileRecordReference> _index;
-
-        public Directory(INtfsContext context, FileRecord baseRecord)
-            : base(context, baseRecord)
-        {
-        }
-
-        public bool IsEmpty
-        {
-            get { return Index.Count == 0; }
-        }
-
-        private IndexView<FileNameRecord, FileRecordReference> Index
-        {
-            get
-            {
-                if (_index == null && StreamExists(AttributeType.IndexRoot, "$I30"))
-                {
-                    _index = new IndexView<FileNameRecord, FileRecordReference>(GetIndex("$I30"));
-                }
-
-                return _index;
-            }
-        }
-
-        public IEnumerable<DirectoryEntry> GetAllEntries(bool filter)
-        {
-            IEnumerable<DirectoryIndexEntry> entries = filter ? FilterEntries(Index.Entries) : Index.Entries;
-
-            foreach (var entry in entries)
-            {
-                yield return new DirectoryEntry(this, entry.Value, entry.Key);
-            }
-        }
-
-        public void UpdateEntry(DirectoryEntry entry)
-        {
-            Index[entry.Details] = entry.Reference;
-            UpdateRecordInMft();
-        }
-
-        public override void Dump(TextWriter writer, string indent)
-        {
-            writer.WriteLine(indent + "DIRECTORY (" + base.ToString() + ")");
-            writer.WriteLine(indent + "  File Number: " + IndexInMft);
-
-            if (Index != null)
-            {
-                foreach (var entry in Index.Entries)
-                {
-                    writer.WriteLine(indent + "  DIRECTORY ENTRY (" + entry.Key.FileName + ")");
-                    writer.WriteLine(indent + "    MFT Ref: " + entry.Value);
-                    entry.Key.Dump(writer, indent + "    ");
-                }
-            }
-        }
-
-        public override string ToString()
-        {
-            return base.ToString() + @"\";
-        }
-
-        internal static new Directory CreateNew(INtfsContext context, FileAttributeFlags parentDirFlags)
-        {
-            Directory dir = (Directory)context.AllocateFile(FileRecordFlags.IsDirectory);
-
-            StandardInformation.InitializeNewFile(
-                dir,
-                FileAttributeFlags.Archive | (parentDirFlags & FileAttributeFlags.Compressed));
-
-            // Create the index root attribute by instantiating a new index
-            dir.CreateIndex("$I30", AttributeType.FileName, AttributeCollationRule.Filename);
-
-            dir.UpdateRecordInMft();
-
-            return dir;
-        }
-
-        internal DirectoryEntry GetEntryByName(string name)
-        {
-            string searchName = name;
-
-            int streamSepPos = name.IndexOf(':');
-            if (streamSepPos >= 0)
-            {
-                searchName = name.Substring(0, streamSepPos);
-            }
-
-            DirectoryIndexEntry entry = Index.FindFirst(new FileNameQuery(searchName, _context.UpperCase));
-            if (entry.Key != null)
-            {
-                return new DirectoryEntry(this, entry.Value, entry.Key);
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        internal DirectoryEntry AddEntry(File file, string name, FileNameNamespace nameNamespace)
-        {
-            if (name.Length > 255)
-            {
-                throw new IOException("Invalid file name, more than 255 characters: " + name);
-            }
-            else if (name.IndexOfAny(new char[] { '\0', '/' }) != -1)
-            {
-                throw new IOException(@"Invalid file name, contains '\0' or '/': " + name);
-            }
-
-            FileNameRecord newNameRecord = file.GetFileNameRecord(null, true);
-            newNameRecord.FileNameNamespace = nameNamespace;
-            newNameRecord.FileName = name;
-            newNameRecord.ParentDirectory = MftReference;
-
-            NtfsStream nameStream = file.CreateStream(AttributeType.FileName, null);
-            nameStream.SetContent(newNameRecord);
-
-            file.HardLinkCount++;
-            file.UpdateRecordInMft();
-
-            Index[newNameRecord] = file.MftReference;
-
-            Modified();
-            UpdateRecordInMft();
-
-            return new DirectoryEntry(this, file.MftReference, newNameRecord);
-        }
-
-        internal void RemoveEntry(DirectoryEntry dirEntry)
-        {
-            File file = _context.GetFileByRef(dirEntry.Reference);
-
-            FileNameRecord nameRecord = dirEntry.Details;
-
-            Index.Remove(dirEntry.Details);
-
-            foreach (NtfsStream stream in file.GetStreams(AttributeType.FileName, null))
-            {
-                FileNameRecord streamName = stream.GetContent<FileNameRecord>();
-                if (nameRecord.Equals(streamName))
-                {
-                    file.RemoveStream(stream);
-                    break;
-                }
-            }
-
-            file.HardLinkCount--;
-            file.UpdateRecordInMft();
-
-            Modified();
-            UpdateRecordInMft();
-        }
-
-        internal string CreateShortName(string name)
-        {
-            string baseName = string.Empty;
-            string ext = string.Empty;
-
-            int lastPeriod = name.LastIndexOf('.');
-
-            int i = 0;
-            while (baseName.Length < 6 && i < name.Length && i != lastPeriod)
-            {
-                char upperChar = Char.ToUpperInvariant(name[i]);
-                if (Utilities.Is8Dot3Char(upperChar))
-                {
-                    baseName += upperChar;
-                }
-
-                ++i;
-            }
-
-            if (lastPeriod >= 0)
-            {
-                i = lastPeriod + 1;
-                while (ext.Length < 3 && i < name.Length)
-                {
-                    char upperChar = Char.ToUpperInvariant(name[i]);
-                    if (Utilities.Is8Dot3Char(upperChar))
-                    {
-                        ext += upperChar;
-                    }
-
-                    ++i;
-                }
-            }
-
-            i = 1;
-            string candidate;
-            do
-            {
-                string suffix = string.Format(CultureInfo.InvariantCulture, "~{0}", i);
-                candidate = baseName.Substring(0, Math.Min(8 - suffix.Length, baseName.Length)) + suffix + (ext.Length > 0 ? "." + ext : string.Empty);
-                i++;
-            }
-            while (GetEntryByName(candidate) != null);
-
-            return candidate;
-        }
-
-        private List<DirectoryIndexEntry> FilterEntries(IEnumerable<DirectoryIndexEntry> entriesIter)
-        {
-            List<DirectoryIndexEntry> entries = new List<DirectoryIndexEntry>(entriesIter);
-
-            // Weed out short-name entries for files and any hidden / system / metadata files.
-            int i = 0;
-            while (i < entries.Count)
-            {
-                DirectoryIndexEntry entry = entries[i];
-
-                if (((entry.Key.Flags & FileAttributeFlags.Hidden) != 0) && _context.Options.HideHiddenFiles)
-                {
-                    entries.RemoveAt(i);
-                }
-                else if (((entry.Key.Flags & FileAttributeFlags.System) != 0) && _context.Options.HideSystemFiles)
-                {
-                    entries.RemoveAt(i);
-                }
-                else if (entry.Value.MftIndex < 24 && _context.Options.HideMetafiles)
-                {
-                    entries.RemoveAt(i);
-                }
-                else if (entry.Key.FileNameNamespace == FileNameNamespace.Dos && _context.Options.HideDosFileNames)
-                {
-                    entries.RemoveAt(i);
-                }
-                else
-                {
-                    ++i;
-                }
-            }
-
-            return entries;
-        }
-
-        private sealed class FileNameQuery : IComparable<byte[]>
-        {
-            private byte[] _query;
-            private UpperCase _upperCase;
-
-            public FileNameQuery(string query, UpperCase upperCase)
-            {
-                _query = Encoding.Unicode.GetBytes(query);
-                _upperCase = upperCase;
-            }
-
-            public int CompareTo(byte[] buffer)
-            {
-                // Note: this is internal knowledge of FileNameRecord structure - but for performance
-                // reasons, we don't want to decode the entire structure.  In fact can avoid the string
-                // conversion as well.
-                byte fnLen = buffer[0x40];
-                return _upperCase.Compare(_query, 0, _query.Length, buffer, 0x42, fnLen * 2);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/DirectoryEntry.cs b/DiscUtils/Ntfs/DirectoryEntry.cs
deleted file mode 100644
index 49a8a8f..0000000
--- a/DiscUtils/Ntfs/DirectoryEntry.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    internal class DirectoryEntry
-    {
-        private Directory _directory;
-        private FileRecordReference _fileReference;
-        private FileNameRecord _fileDetails;
-
-        public DirectoryEntry(Directory directory, FileRecordReference fileReference, FileNameRecord fileDetails)
-        {
-            _directory = directory;
-            _fileReference = fileReference;
-            _fileDetails = fileDetails;
-        }
-
-        public FileRecordReference Reference
-        {
-            get { return _fileReference; }
-        }
-
-        public FileNameRecord Details
-        {
-            get { return _fileDetails; }
-        }
-
-        public bool IsDirectory
-        {
-            get { return (_fileDetails.Flags & FileAttributeFlags.Directory) != 0; }
-        }
-
-        public string SearchName
-        {
-            get
-            {
-                string fileName = _fileDetails.FileName;
-                if (fileName.IndexOf('.') == -1)
-                {
-                    return fileName + ".";
-                }
-                else
-                {
-                    return fileName;
-                }
-            }
-        }
-
-        internal void UpdateFrom(File file)
-        {
-            file.FreshenFileName(_fileDetails, true);
-            _directory.UpdateEntry(this);
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/File.cs b/DiscUtils/Ntfs/File.cs
deleted file mode 100644
index 71127ae..0000000
--- a/DiscUtils/Ntfs/File.cs
+++ /dev/null
@@ -1,1279 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal class File
-    {
-        protected INtfsContext _context;
-
-        private MasterFileTable _mft;
-        private List<FileRecord> _records;
-        private ObjectCache<string, Index> _indexCache;
-        private List<NtfsAttribute> _attributes;
-
-        private bool _dirty;
-
-        public File(INtfsContext context, FileRecord baseRecord)
-        {
-            _context = context;
-            _mft = _context.Mft;
-            _records = new List<FileRecord>();
-            _records.Add(baseRecord);
-            _indexCache = new ObjectCache<string, Index>();
-            _attributes = new List<NtfsAttribute>();
-
-            LoadAttributes();
-        }
-
-        public uint IndexInMft
-        {
-            get { return _records[0].MasterFileTableIndex; }
-        }
-
-        public uint MaxMftRecordSize
-        {
-            get { return _records[0].AllocatedSize; }
-        }
-
-        public FileRecordReference MftReference
-        {
-            get { return _records[0].Reference; }
-        }
-
-        public List<string> Names
-        {
-            get
-            {
-                List<string> result = new List<string>();
-
-                if (IndexInMft == MasterFileTable.RootDirIndex)
-                {
-                    result.Add(string.Empty);
-                }
-                else
-                {
-                    foreach (StructuredNtfsAttribute<FileNameRecord> attr in GetAttributes(AttributeType.FileName))
-                    {
-                        string name = attr.Content.FileName;
-
-                        Directory parentDir = _context.GetDirectoryByRef(attr.Content.ParentDirectory);
-                        if (parentDir != null)
-                        {
-                            foreach (string dirName in parentDir.Names)
-                            {
-                                result.Add(Utilities.CombinePaths(dirName, name));
-                            }
-                        }
-                    }
-                }
-
-                return result;
-            }
-        }
-
-        public bool HasWin32OrDosName
-        {
-            get
-            {
-                foreach (StructuredNtfsAttribute<FileNameRecord> attr in GetAttributes(AttributeType.FileName))
-                {
-                    FileNameRecord fnr = attr.Content;
-                    if (fnr.FileNameNamespace != FileNameNamespace.Posix)
-                    {
-                        return true;
-                    }
-                }
-
-                return false;
-            }
-        }
-
-        public bool MftRecordIsDirty
-        {
-            get
-            {
-                return _dirty;
-            }
-        }
-
-        public ushort HardLinkCount
-        {
-            get { return _records[0].HardLinkCount; }
-            set { _records[0].HardLinkCount = value; }
-        }
-
-        public IEnumerable<NtfsStream> AllStreams
-        {
-            get
-            {
-                foreach (var attr in _attributes)
-                {
-                    yield return new NtfsStream(this, attr);
-                }
-            }
-        }
-
-        public DirectoryEntry DirectoryEntry
-        {
-            get
-            {
-                if (_context.GetDirectoryByRef == null)
-                {
-                    return null;
-                }
-
-                NtfsStream stream = GetStream(AttributeType.FileName, null);
-                if (stream == null)
-                {
-                    return null;
-                }
-
-                FileNameRecord record = stream.GetContent<FileNameRecord>();
-
-                // Root dir is stored without root directory flag set in FileNameRecord, simulate it.
-                if (_records[0].MasterFileTableIndex == MasterFileTable.RootDirIndex)
-                {
-                    record.Flags |= FileAttributeFlags.Directory;
-                }
-
-                return new DirectoryEntry(_context.GetDirectoryByRef(record.ParentDirectory), MftReference, record);
-            }
-        }
-
-        public string BestName
-        {
-            get
-            {
-                NtfsAttribute[] attrs = GetAttributes(AttributeType.FileName);
-
-                string bestName = null;
-
-                if (attrs != null && attrs.Length != 0)
-                {
-                    bestName = attrs[0].ToString();
-
-                    for (int i = 1; i < attrs.Length; ++i)
-                    {
-                        string name = attrs[i].ToString();
-
-                        if (Utilities.Is8Dot3(bestName))
-                        {
-                            bestName = name;
-                        }
-                    }
-                }
-
-                return bestName;
-            }
-        }
-
-        public bool IsDirectory
-        {
-            get { return (_records[0].Flags & FileRecordFlags.IsDirectory) != 0; }
-        }
-
-        public StandardInformation StandardInformation
-        {
-            get { return GetStream(AttributeType.StandardInformation, null).GetContent<StandardInformation>(); }
-        }
-
-        internal INtfsContext Context
-        {
-            get
-            {
-                return _context;
-            }
-        }
-
-        /// <summary>
-        /// Gets an enumeration of all the attributes.
-        /// </summary>
-        internal IEnumerable<NtfsAttribute> AllAttributes
-        {
-            get { return _attributes; }
-        }
-
-        public static File CreateNew(INtfsContext context, FileAttributeFlags dirFlags)
-        {
-            return CreateNew(context, FileRecordFlags.None, dirFlags);
-        }
-
-        public static File CreateNew(INtfsContext context, FileRecordFlags flags, FileAttributeFlags dirFlags)
-        {
-            File newFile = context.AllocateFile(flags);
-
-            FileAttributeFlags fileFlags =
-                FileAttributeFlags.Archive
-                | FileRecord.ConvertFlags(flags)
-                | (dirFlags & FileAttributeFlags.Compressed);
-
-            AttributeFlags dataAttrFlags = AttributeFlags.None;
-            if ((dirFlags & FileAttributeFlags.Compressed) != 0)
-            {
-                dataAttrFlags |= AttributeFlags.Compressed;
-            }
-
-            StandardInformation.InitializeNewFile(newFile, fileFlags);
-
-            if (context.ObjectIds != null)
-            {
-                Guid newId = CreateNewGuid(context);
-                NtfsStream stream = newFile.CreateStream(AttributeType.ObjectId, null);
-                ObjectId objId = new ObjectId();
-                objId.Id = newId;
-                stream.SetContent(objId);
-                context.ObjectIds.Add(newId, newFile.MftReference, newId, Guid.Empty, Guid.Empty);
-            }
-
-            newFile.CreateAttribute(AttributeType.Data, dataAttrFlags);
-
-            newFile.UpdateRecordInMft();
-
-            return newFile;
-        }
-
-        public int MftRecordFreeSpace(AttributeType attrType, string attrName)
-        {
-            foreach (var record in _records)
-            {
-                if (record.GetAttribute(attrType, attrName) != null)
-                {
-                    return _mft.RecordSize - record.Size;
-                }
-            }
-
-            throw new IOException("Attempt to determine free space for non-existent attribute");
-        }
-
-        public void Modified()
-        {
-            DateTime now = DateTime.UtcNow;
-
-            NtfsStream siStream = GetStream(AttributeType.StandardInformation, null);
-            StandardInformation si = siStream.GetContent<StandardInformation>();
-            si.LastAccessTime = now;
-            si.ModificationTime = now;
-            siStream.SetContent(si);
-
-            MarkMftRecordDirty();
-        }
-
-        public void Accessed()
-        {
-            DateTime now = DateTime.UtcNow;
-
-            NtfsStream siStream = GetStream(AttributeType.StandardInformation, null);
-            StandardInformation si = siStream.GetContent<StandardInformation>();
-            si.LastAccessTime = now;
-            siStream.SetContent(si);
-
-            MarkMftRecordDirty();
-        }
-
-        public void MarkMftRecordDirty()
-        {
-            _dirty = true;
-        }
-
-        public void UpdateRecordInMft()
-        {
-            if (_dirty)
-            {
-                if (NtfsTransaction.Current != null)
-                {
-                    NtfsStream stream = GetStream(AttributeType.StandardInformation, null);
-                    StandardInformation si = stream.GetContent<StandardInformation>();
-                    si.MftChangedTime = NtfsTransaction.Current.Timestamp;
-                    stream.SetContent(si);
-                }
-
-                bool fixesApplied = true;
-                while (fixesApplied)
-                {
-                    fixesApplied = false;
-
-                    for (int i = 0; i < _records.Count; ++i)
-                    {
-                        var record = _records[i];
-
-                        bool fixedAttribute = true;
-                        while (record.Size > _mft.RecordSize && fixedAttribute)
-                        {
-                            fixedAttribute = false;
-
-                            if (!fixedAttribute && !record.IsMftRecord)
-                            {
-                                foreach (var attr in record.Attributes)
-                                {
-                                    if (!attr.IsNonResident && !_context.AttributeDefinitions.MustBeResident(attr.AttributeType))
-                                    {
-                                        MakeAttributeNonResident(new AttributeReference(record.Reference, attr.AttributeId), (int)attr.DataLength);
-                                        fixedAttribute = true;
-                                        break;
-                                    }
-                                }
-                            }
-
-                            if (!fixedAttribute)
-                            {
-                                foreach (var attr in record.Attributes)
-                                {
-                                    if (attr.AttributeType == AttributeType.IndexRoot
-                                        && ShrinkIndexRoot(attr.Name))
-                                    {
-                                        fixedAttribute = true;
-                                        break;
-                                    }
-                                }
-                            }
-
-                            if (!fixedAttribute)
-                            {
-                                if (record.Attributes.Count == 1)
-                                {
-                                    fixedAttribute = SplitAttribute(record);
-                                }
-                                else
-                                {
-                                    if (_records.Count == 1)
-                                    {
-                                        CreateAttributeList();
-                                    }
-
-                                    fixedAttribute = ExpelAttribute(record);
-                                }
-                            }
-
-                            fixesApplied |= fixedAttribute;
-                        }
-                    }
-                }
-
-                _dirty = false;
-                foreach (var record in _records)
-                {
-                    _mft.WriteRecord(record);
-                }
-            }
-        }
-
-        public Index CreateIndex(string name, AttributeType attrType, AttributeCollationRule collRule)
-        {
-            Index.Create(attrType, collRule, this, name);
-            return GetIndex(name);
-        }
-
-        public Index GetIndex(string name)
-        {
-            Index idx = _indexCache[name];
-
-            if (idx == null)
-            {
-                idx = new Index(this, name, _context.BiosParameterBlock, _context.UpperCase);
-                _indexCache[name] = idx;
-            }
-
-            return idx;
-        }
-
-        public void Delete()
-        {
-            if (_records[0].HardLinkCount != 0)
-            {
-                throw new InvalidOperationException("Attempt to delete in-use file: " + ToString());
-            }
-
-            _context.ForgetFile(this);
-
-            NtfsStream objIdStream = GetStream(AttributeType.ObjectId, null);
-            if (objIdStream != null)
-            {
-                ObjectId objId = objIdStream.GetContent<ObjectId>();
-                Context.ObjectIds.Remove(objId.Id);
-            }
-
-            // Truncate attributes, allowing for truncation silently removing the AttributeList attribute
-            // in some cases (large file with all attributes first extent in the first MFT record).  This
-            // releases all allocated clusters in most cases.
-            List<NtfsAttribute> truncateAttrs = new List<NtfsAttribute>(_attributes.Count);
-            foreach (var attr in _attributes)
-            {
-                if (attr.Type != AttributeType.AttributeList)
-                {
-                    truncateAttrs.Add(attr);
-                }
-            }
-
-            foreach (NtfsAttribute attr in truncateAttrs)
-            {
-                attr.GetDataBuffer().SetCapacity(0);
-            }
-
-            // If the attribute list record remains, free any possible clusters it owns.  We've now freed
-            // all clusters.
-            NtfsAttribute attrList = GetAttribute(AttributeType.AttributeList, null);
-            if (attrList != null)
-            {
-                attrList.GetDataBuffer().SetCapacity(0);
-            }
-
-            // Now go through the MFT records, freeing them up
-            foreach (var mftRecord in _records)
-            {
-                _context.Mft.RemoveRecord(mftRecord.Reference);
-            }
-
-            _attributes.Clear();
-            _records.Clear();
-        }
-
-        public bool StreamExists(AttributeType attrType, string name)
-        {
-            return GetStream(attrType, name) != null;
-        }
-
-        public NtfsStream GetStream(AttributeType attrType, string name)
-        {
-            foreach (NtfsStream stream in GetStreams(attrType, name))
-            {
-                return stream;
-            }
-
-            return null;
-        }
-
-        public IEnumerable<NtfsStream> GetStreams(AttributeType attrType, string name)
-        {
-            foreach (var attr in _attributes)
-            {
-                if (attr.Type == attrType && attr.Name == name)
-                {
-                    yield return new NtfsStream(this, attr);
-                }
-            }
-        }
-
-        public NtfsStream CreateStream(AttributeType attrType, string name)
-        {
-            return new NtfsStream(this, CreateAttribute(attrType, name, AttributeFlags.None));
-        }
-
-        public NtfsStream CreateStream(AttributeType attrType, string name, long firstCluster, ulong numClusters, uint bytesPerCluster)
-        {
-            return new NtfsStream(this, CreateAttribute(attrType, name, AttributeFlags.None, firstCluster, numClusters, bytesPerCluster));
-        }
-
-        public SparseStream OpenStream(AttributeType attrType, string name, FileAccess access)
-        {
-            NtfsAttribute attr = GetAttribute(attrType, name);
-            if (attr != null)
-            {
-                return new FileStream(this, attr, access);
-            }
-
-            return null;
-        }
-
-        public void RemoveStream(NtfsStream stream)
-        {
-            RemoveAttribute(stream.Attribute);
-        }
-
-        public FileNameRecord GetFileNameRecord(string name, bool freshened)
-        {
-            NtfsAttribute[] attrs = GetAttributes(AttributeType.FileName);
-            StructuredNtfsAttribute<FileNameRecord> attr = null;
-            if (String.IsNullOrEmpty(name))
-            {
-                if (attrs.Length != 0)
-                {
-                    attr = (StructuredNtfsAttribute<FileNameRecord>)attrs[0];
-                }
-            }
-            else
-            {
-                foreach (StructuredNtfsAttribute<FileNameRecord> a in attrs)
-                {
-                    if (_context.UpperCase.Compare(a.Content.FileName, name) == 0)
-                    {
-                        attr = a;
-                    }
-                }
-
-                if (attr == null)
-                {
-                    throw new FileNotFoundException("File name not found on file", name);
-                }
-            }
-
-            FileNameRecord fnr = attr == null ? new FileNameRecord() : new FileNameRecord(attr.Content);
-
-            if (freshened)
-            {
-                FreshenFileName(fnr, false);
-            }
-
-            return fnr;
-        }
-
-        public virtual void Dump(TextWriter writer, string indent)
-        {
-            writer.WriteLine(indent + "FILE (" + ToString() + ")");
-            writer.WriteLine(indent + "  File Number: " + _records[0].MasterFileTableIndex);
-
-            _records[0].Dump(writer, indent + "  ");
-
-            foreach (AttributeRecord attrRec in _records[0].Attributes)
-            {
-                NtfsAttribute.FromRecord(this, MftReference, attrRec).Dump(writer, indent + "  ");
-            }
-        }
-
-        public override string ToString()
-        {
-            string bestName = BestName;
-            if (bestName == null)
-            {
-                return "?????";
-            }
-            else
-            {
-                return bestName;
-            }
-        }
-
-        internal void RemoveAttributeExtents(NtfsAttribute attr)
-        {
-            attr.GetDataBuffer().SetCapacity(0);
-
-            foreach (var extentRef in attr.Extents.Keys)
-            {
-                RemoveAttributeExtent(extentRef);
-            }
-        }
-
-        internal void RemoveAttributeExtent(AttributeReference extentRef)
-        {
-            FileRecord fileRec = GetFileRecord(extentRef.File);
-            if (fileRec != null)
-            {
-                fileRec.RemoveAttribute(extentRef.AttributeId);
-
-                // Remove empty non-primary MFT records
-                if (fileRec.Attributes.Count == 0 && fileRec.BaseFile.Value != 0)
-                {
-                    RemoveFileRecord(extentRef.File);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets an attribute by reference.
-        /// </summary>
-        /// <param name="attrRef">Reference to the attribute.</param>
-        /// <returns>The attribute.</returns>
-        internal NtfsAttribute GetAttribute(AttributeReference attrRef)
-        {
-            foreach (var attr in _attributes)
-            {
-                if (attr.Reference.Equals(attrRef))
-                {
-                    return attr;
-                }
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        ///  Gets the first (if more than one) instance of a named attribute.
-        /// </summary>
-        /// <param name="type">The attribute type.</param>
-        /// <param name="name">The attribute's name.</param>
-        /// <returns>The attribute of <c>null</c>.</returns>
-        internal NtfsAttribute GetAttribute(AttributeType type, string name)
-        {
-            foreach (var attr in _attributes)
-            {
-                if (attr.PrimaryRecord.AttributeType == type && attr.Name == name)
-                {
-                    return attr;
-                }
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        ///  Gets all instances of an unnamed attribute.
-        /// </summary>
-        /// <param name="type">The attribute type.</param>
-        /// <returns>The attributes.</returns>
-        internal NtfsAttribute[] GetAttributes(AttributeType type)
-        {
-            List<NtfsAttribute> matches = new List<NtfsAttribute>();
-
-            foreach (var attr in _attributes)
-            {
-                if (attr.PrimaryRecord.AttributeType == type && string.IsNullOrEmpty(attr.Name))
-                {
-                    matches.Add(attr);
-                }
-            }
-
-            return matches.ToArray();
-        }
-
-        internal void MakeAttributeNonResident(AttributeReference attrRef, int maxData)
-        {
-            NtfsAttribute attr = GetAttribute(attrRef);
-            if (attr.IsNonResident)
-            {
-                throw new InvalidOperationException("Attribute is already non-resident");
-            }
-
-            ushort id = _records[0].CreateNonResidentAttribute(attr.Type, attr.Name, attr.Flags);
-            AttributeRecord newAttrRecord = _records[0].GetAttribute(id);
-
-            IBuffer attrBuffer = attr.GetDataBuffer();
-            byte[] tempData = Utilities.ReadFully(attrBuffer, 0, (int)Math.Min(maxData, attrBuffer.Capacity));
-
-            RemoveAttributeExtents(attr);
-            attr.SetExtent(_records[0].Reference, newAttrRecord);
-
-            attr.GetDataBuffer().Write(0, tempData, 0, tempData.Length);
-
-            UpdateAttributeList();
-        }
-
-        internal void FreshenFileName(FileNameRecord fileName, bool updateMftRecord)
-        {
-            //
-            // Freshen the record from the definitive info in the other attributes
-            //
-            StandardInformation si = StandardInformation;
-            NtfsAttribute anonDataAttr = GetAttribute(AttributeType.Data, null);
-
-            fileName.CreationTime = si.CreationTime;
-            fileName.ModificationTime = si.ModificationTime;
-            fileName.MftChangedTime = si.MftChangedTime;
-            fileName.LastAccessTime = si.LastAccessTime;
-            fileName.Flags = si.FileAttributes;
-
-            if (_dirty && NtfsTransaction.Current != null)
-            {
-                fileName.MftChangedTime = NtfsTransaction.Current.Timestamp;
-            }
-
-            // Directories don't have directory flag set in StandardInformation, so set from MFT record
-            if ((_records[0].Flags & FileRecordFlags.IsDirectory) != 0)
-            {
-                fileName.Flags |= FileAttributeFlags.Directory;
-            }
-
-            if (anonDataAttr != null)
-            {
-                fileName.RealSize = (ulong)anonDataAttr.PrimaryRecord.DataLength;
-                fileName.AllocatedSize = (ulong)anonDataAttr.PrimaryRecord.AllocatedLength;
-            }
-
-            if (updateMftRecord)
-            {
-                foreach (NtfsStream stream in GetStreams(AttributeType.FileName, null))
-                {
-                    FileNameRecord fnr = stream.GetContent<FileNameRecord>();
-                    if (fnr.Equals(fileName))
-                    {
-                        fnr = new FileNameRecord(fileName);
-                        fnr.Flags &= ~FileAttributeFlags.ReparsePoint;
-                        stream.SetContent(fnr);
-                    }
-                }
-            }
-        }
-
-        internal long GetAttributeOffset(AttributeReference attrRef)
-        {
-            long recordOffset = _mft.GetRecordOffset(attrRef.File);
-
-            FileRecord frs = GetFileRecord(attrRef.File);
-            return recordOffset + frs.GetAttributeOffset(attrRef.AttributeId);
-        }
-
-        private static Guid CreateNewGuid(INtfsContext context)
-        {
-            Random rng = context.Options.RandomNumberGenerator;
-            if (rng != null)
-            {
-                byte[] buffer = new byte[16];
-                rng.NextBytes(buffer);
-                return new Guid(buffer);
-            }
-            else
-            {
-                return Guid.NewGuid();
-            }
-        }
-
-        private void LoadAttributes()
-        {
-            Dictionary<long, FileRecord> extraFileRecords = new Dictionary<long, FileRecord>();
-
-            AttributeRecord attrListRec = _records[0].GetAttribute(AttributeType.AttributeList);
-            if (attrListRec != null)
-            {
-                NtfsAttribute lastAttr = null;
-
-                StructuredNtfsAttribute<AttributeList> attrListAttr = (StructuredNtfsAttribute<AttributeList>)NtfsAttribute.FromRecord(this, MftReference, attrListRec);
-                var attrList = attrListAttr.Content;
-                _attributes.Add(attrListAttr);
-
-                foreach (var record in attrList)
-                {
-                    FileRecord attrFileRecord = _records[0];
-                    if (record.BaseFileReference.MftIndex != _records[0].MasterFileTableIndex)
-                    {
-                        if (!extraFileRecords.TryGetValue(record.BaseFileReference.MftIndex, out attrFileRecord))
-                        {
-                            attrFileRecord = _context.Mft.GetRecord(record.BaseFileReference);
-                            if (attrFileRecord != null)
-                            {
-                                extraFileRecords[attrFileRecord.MasterFileTableIndex] = attrFileRecord;
-                            }
-                        }
-                    }
-
-                    if (attrFileRecord != null)
-                    {
-                        AttributeRecord attrRec = attrFileRecord.GetAttribute(record.AttributeId);
-
-                        if (attrRec != null)
-                        {
-                            if (record.StartVcn == 0)
-                            {
-                                lastAttr = NtfsAttribute.FromRecord(this, record.BaseFileReference, attrRec);
-                                _attributes.Add(lastAttr);
-                            }
-                            else
-                            {
-                                lastAttr.AddExtent(record.BaseFileReference, attrRec);
-                            }
-                        }
-                    }
-                }
-
-                foreach (var extraFileRecord in extraFileRecords)
-                {
-                    _records.Add(extraFileRecord.Value);
-                }
-            }
-            else
-            {
-                foreach (var record in _records[0].Attributes)
-                {
-                    _attributes.Add(NtfsAttribute.FromRecord(this, MftReference, record));
-                }
-            }
-        }
-
-        private bool SplitAttribute(FileRecord record)
-        {
-            if (record.Attributes.Count != 1)
-            {
-                throw new InvalidOperationException("Attempting to split attribute in MFT record containing multiple attributes");
-            }
-
-            return SplitAttribute(record, (NonResidentAttributeRecord)record.FirstAttribute, false);
-        }
-
-        private bool SplitAttribute(FileRecord record, NonResidentAttributeRecord targetAttr, bool atStart)
-        {
-            if (targetAttr.DataRuns.Count <= 1)
-            {
-                return false;
-            }
-
-            int splitIndex = 1;
-            if (!atStart)
-            {
-                List<DataRun> runs = targetAttr.DataRuns;
-
-                splitIndex = runs.Count - 1;
-                int saved = runs[splitIndex].Size;
-                while (splitIndex > 1 && record.Size - saved > record.AllocatedSize)
-                {
-                    --splitIndex;
-                    saved += runs[splitIndex].Size;
-                }
-            }
-
-            AttributeRecord newAttr = targetAttr.Split(splitIndex);
-
-            // Find a home for the new attribute record
-            FileRecord newAttrHome = null;
-            foreach (var targetRecord in _records)
-            {
-                if (!targetRecord.IsMftRecord && _mft.RecordSize - targetRecord.Size >= newAttr.Size)
-                {
-                    targetRecord.AddAttribute(newAttr);
-                    newAttrHome = targetRecord;
-                }
-            }
-
-            if (newAttrHome == null)
-            {
-                newAttrHome = _mft.AllocateRecord(_records[0].Flags & (~FileRecordFlags.InUse), record.IsMftRecord);
-                newAttrHome.BaseFile = record.BaseFile.IsNull ? record.Reference : record.BaseFile;
-                _records.Add(newAttrHome);
-                newAttrHome.AddAttribute(newAttr);
-            }
-
-            // Add the new attribute record as an extent on the attribute it split from
-            bool added = false;
-            foreach (var attr in _attributes)
-            {
-                foreach (var existingRecord in attr.Extents)
-                {
-                    if (existingRecord.Key.File == record.Reference && existingRecord.Key.AttributeId == targetAttr.AttributeId)
-                    {
-                        attr.AddExtent(newAttrHome.Reference, newAttr);
-                        added = true;
-                        break;
-                    }
-                }
-
-                if (added)
-                {
-                    break;
-                }
-            }
-
-            UpdateAttributeList();
-
-            return true;
-        }
-
-        private bool ExpelAttribute(FileRecord record)
-        {
-            if (record.MasterFileTableIndex == MasterFileTable.MftIndex)
-            {
-                // Special case for MFT - can't fully expel attributes, instead split most of the data runs off.
-                List<AttributeRecord> attrs = record.Attributes;
-                for (int i = attrs.Count - 1; i >= 0; --i)
-                {
-                    AttributeRecord attr = attrs[i];
-                    if (attr.AttributeType == AttributeType.Data)
-                    {
-                        if (SplitAttribute(record, (NonResidentAttributeRecord)attr, true))
-                        {
-                            return true;
-                        }
-                    }
-                }
-            }
-            else
-            {
-                List<AttributeRecord> attrs = record.Attributes;
-                for (int i = attrs.Count - 1; i >= 0; --i)
-                {
-                    AttributeRecord attr = attrs[i];
-                    if (attr.AttributeType > AttributeType.AttributeList)
-                    {
-                        foreach (var targetRecord in _records)
-                        {
-                            if (_mft.RecordSize - targetRecord.Size >= attr.Size)
-                            {
-                                MoveAttribute(record, attr, targetRecord);
-                                return true;
-                            }
-                        }
-
-                        FileRecord newFileRecord = _mft.AllocateRecord(FileRecordFlags.None, record.IsMftRecord);
-                        newFileRecord.BaseFile = record.Reference;
-                        _records.Add(newFileRecord);
-                        MoveAttribute(record, attr, newFileRecord);
-                        return true;
-                    }
-                }
-            }
-
-            return false;
-        }
-
-        private void MoveAttribute(FileRecord record, AttributeRecord attrRec, FileRecord targetRecord)
-        {
-            AttributeReference oldRef = new AttributeReference(record.Reference, attrRec.AttributeId);
-
-            record.RemoveAttribute(attrRec.AttributeId);
-            targetRecord.AddAttribute(attrRec);
-
-            AttributeReference newRef = new AttributeReference(targetRecord.Reference, attrRec.AttributeId);
-
-            foreach (var attr in _attributes)
-            {
-                attr.ReplaceExtent(oldRef, newRef, attrRec);
-            }
-
-            UpdateAttributeList();
-        }
-
-        private void CreateAttributeList()
-        {
-            ushort id = _records[0].CreateAttribute(AttributeType.AttributeList, null, false, AttributeFlags.None);
-
-            StructuredNtfsAttribute<AttributeList> newAttr = (StructuredNtfsAttribute<AttributeList>)NtfsAttribute.FromRecord(this, MftReference, _records[0].GetAttribute(id));
-            _attributes.Add(newAttr);
-            UpdateAttributeList();
-        }
-
-        private void UpdateAttributeList()
-        {
-            if (_records.Count > 1)
-            {
-                AttributeList attrList = new AttributeList();
-
-                foreach (var attr in _attributes)
-                {
-                    if (attr.Type != AttributeType.AttributeList)
-                    {
-                        foreach (var extent in attr.Extents)
-                        {
-                            attrList.Add(AttributeListRecord.FromAttribute(extent.Value, extent.Key.File));
-                        }
-                    }
-                }
-
-                StructuredNtfsAttribute<AttributeList> alAttr;
-                alAttr = (StructuredNtfsAttribute<AttributeList>)GetAttribute(AttributeType.AttributeList, null);
-                alAttr.Content = attrList;
-                alAttr.Save();
-            }
-        }
-
-        /// <summary>
-        /// Creates a new unnamed attribute.
-        /// </summary>
-        /// <param name="type">The type of the new attribute.</param>
-        /// <param name="flags">The flags of the new attribute.</param>
-        /// <returns>The new attribute.</returns>
-        private NtfsAttribute CreateAttribute(AttributeType type, AttributeFlags flags)
-        {
-            return CreateAttribute(type, null, flags);
-        }
-
-        /// <summary>
-        /// Creates a new attribute.
-        /// </summary>
-        /// <param name="type">The type of the new attribute.</param>
-        /// <param name="name">The name of the new attribute.</param>
-        /// <param name="flags">The flags of the new attribute.</param>
-        /// <returns>The new attribute.</returns>
-        private NtfsAttribute CreateAttribute(AttributeType type, string name, AttributeFlags flags)
-        {
-            bool indexed = _context.AttributeDefinitions.IsIndexed(type);
-            ushort id = _records[0].CreateAttribute(type, name, indexed, flags);
-
-            AttributeRecord newAttrRecord = _records[0].GetAttribute(id);
-            NtfsAttribute newAttr = NtfsAttribute.FromRecord(this, MftReference, newAttrRecord);
-
-            _attributes.Add(newAttr);
-            UpdateAttributeList();
-
-            MarkMftRecordDirty();
-
-            return newAttr;
-        }
-
-        /// <summary>
-        /// Creates a new attribute at a fixed cluster.
-        /// </summary>
-        /// <param name="type">The type of the new attribute.</param>
-        /// <param name="name">The name of the new attribute.</param>
-        /// <param name="flags">The flags of the new attribute.</param>
-        /// <param name="firstCluster">The first cluster to assign to the attribute.</param>
-        /// <param name="numClusters">The number of sequential clusters to assign to the attribute.</param>
-        /// <param name="bytesPerCluster">The number of bytes in each cluster.</param>
-        /// <returns>The new attribute.</returns>
-        private NtfsAttribute CreateAttribute(AttributeType type, string name, AttributeFlags flags, long firstCluster, ulong numClusters, uint bytesPerCluster)
-        {
-            bool indexed = _context.AttributeDefinitions.IsIndexed(type);
-            ushort id = _records[0].CreateNonResidentAttribute(type, name, flags, firstCluster, numClusters, bytesPerCluster);
-
-            AttributeRecord newAttrRecord = _records[0].GetAttribute(id);
-            NtfsAttribute newAttr = NtfsAttribute.FromRecord(this, MftReference, newAttrRecord);
-
-            _attributes.Add(newAttr);
-            UpdateAttributeList();
-            MarkMftRecordDirty();
-            return newAttr;
-        }
-
-        private void RemoveAttribute(NtfsAttribute attr)
-        {
-            if (attr != null)
-            {
-                if (attr.PrimaryRecord.AttributeType == AttributeType.IndexRoot)
-                {
-                    _indexCache.Remove(attr.PrimaryRecord.Name);
-                }
-
-                RemoveAttributeExtents(attr);
-
-                _attributes.Remove(attr);
-
-                UpdateAttributeList();
-            }
-        }
-
-        private bool ShrinkIndexRoot(string indexName)
-        {
-            NtfsAttribute attr = GetAttribute(AttributeType.IndexRoot, indexName);
-
-            // Nothing to win, can't make IndexRoot smaller than this
-            // 8 = min size of entry that points to IndexAllocation...
-            if (attr.Length <= IndexRoot.HeaderOffset + IndexHeader.Size + 8)
-            {
-                return false;
-            }
-
-            Index idx = GetIndex(indexName);
-            return idx.ShrinkRoot();
-        }
-
-        private void MakeAttributeResident(AttributeReference attrRef, int maxData)
-        {
-            NtfsAttribute attr = GetAttribute(attrRef);
-            if (!attr.IsNonResident)
-            {
-                throw new InvalidOperationException("Attribute is already resident");
-            }
-
-            ushort id = _records[0].CreateAttribute(attr.Type, attr.Name, _context.AttributeDefinitions.IsIndexed(attr.Type), attr.Flags);
-            AttributeRecord newAttrRecord = _records[0].GetAttribute(id);
-
-            IBuffer attrBuffer = attr.GetDataBuffer();
-            byte[] tempData = Utilities.ReadFully(attrBuffer, 0, (int)Math.Min(maxData, attrBuffer.Capacity));
-
-            RemoveAttributeExtents(attr);
-            attr.SetExtent(_records[0].Reference, newAttrRecord);
-
-            attr.GetDataBuffer().Write(0, tempData, 0, tempData.Length);
-
-            UpdateAttributeList();
-        }
-
-        private FileRecord GetFileRecord(FileRecordReference fileReference)
-        {
-            foreach (var record in _records)
-            {
-                if (record.MasterFileTableIndex == fileReference.MftIndex)
-                {
-                    return record;
-                }
-            }
-
-            return null;
-        }
-
-        private void RemoveFileRecord(FileRecordReference fileReference)
-        {
-            for (int i = 0; i < _records.Count; ++i)
-            {
-                if (_records[i].MasterFileTableIndex == fileReference.MftIndex)
-                {
-                    FileRecord record = _records[i];
-
-                    if (record.Attributes.Count > 0)
-                    {
-                        throw new IOException("Attempting to remove non-empty MFT record");
-                    }
-
-                    _context.Mft.RemoveRecord(fileReference);
-                    _records.Remove(record);
-
-                    if (_records.Count == 1)
-                    {
-                        NtfsAttribute attrListAttr = GetAttribute(AttributeType.AttributeList, null);
-                        if (attrListAttr != null)
-                        {
-                            RemoveAttribute(attrListAttr);
-                        }
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Wrapper for Resident/Non-Resident attribute streams, that remains valid
-        /// despite the attribute oscillating between resident and not.
-        /// </summary>
-        private class FileStream : SparseStream
-        {
-            private File _file;
-            private NtfsAttribute _attr;
-            private SparseStream _wrapped;
-
-            public FileStream(File file, NtfsAttribute attr, FileAccess access)
-            {
-                _file = file;
-                _attr = attr;
-                _wrapped = attr.Open(access);
-            }
-
-            public override IEnumerable<StreamExtent> Extents
-            {
-                get
-                {
-                    return _wrapped.Extents;
-                }
-            }
-
-            public override bool CanRead
-            {
-                get
-                {
-                    return _wrapped.CanRead;
-                }
-            }
-
-            public override bool CanSeek
-            {
-                get
-                {
-                    return _wrapped.CanSeek;
-                }
-            }
-
-            public override bool CanWrite
-            {
-                get
-                {
-                    return _wrapped.CanWrite;
-                }
-            }
-
-            public override long Length
-            {
-                get
-                {
-                    return _wrapped.Length;
-                }
-            }
-
-            public override long Position
-            {
-                get
-                {
-                    return _wrapped.Position;
-                }
-
-                set
-                {
-                    _wrapped.Position = value;
-                }
-            }
-
-            public override void Close()
-            {
-                base.Close();
-                _wrapped.Close();
-            }
-
-            public override void Flush()
-            {
-                _wrapped.Flush();
-            }
-
-            public override int Read(byte[] buffer, int offset, int count)
-            {
-                return _wrapped.Read(buffer, offset, count);
-            }
-
-            public override long Seek(long offset, SeekOrigin origin)
-            {
-                return _wrapped.Seek(offset, origin);
-            }
-
-            public override void SetLength(long value)
-            {
-                ChangeAttributeResidencyByLength(value);
-                _wrapped.SetLength(value);
-            }
-
-            public override void Write(byte[] buffer, int offset, int count)
-            {
-                if (_wrapped.Position + count > Length)
-                {
-                    ChangeAttributeResidencyByLength(_wrapped.Position + count);
-                }
-
-                _wrapped.Write(buffer, offset, count);
-            }
-
-            public override void Clear(int count)
-            {
-                if (_wrapped.Position + count > Length)
-                {
-                    ChangeAttributeResidencyByLength(_wrapped.Position + count);
-                }
-
-                _wrapped.Clear(count);
-            }
-
-            public override string ToString()
-            {
-                return _file.ToString() + ".attr[" + _attr.Id + "]";
-            }
-
-            /// <summary>
-            /// Change attribute residency if it gets too big (or small).
-            /// </summary>
-            /// <param name="value">The new (anticipated) length of the stream.</param>
-            /// <remarks>Has hysteresis - the decision is based on the input and the current
-            /// state, not the current state alone.</remarks>
-            private void ChangeAttributeResidencyByLength(long value)
-            {
-                // This is a bit of a hack - but it's really important the bitmap file remains non-resident
-                if (_file._records[0].MasterFileTableIndex == MasterFileTable.BitmapIndex)
-                {
-                    return;
-                }
-
-                if (!_attr.IsNonResident && value >= _file.MaxMftRecordSize)
-                {
-                    _file.MakeAttributeNonResident(_attr.Reference, (int)Math.Min(value, _wrapped.Length));
-                }
-                else if (_attr.IsNonResident && value <= _file.MaxMftRecordSize / 4)
-                {
-                    // Use of 1/4 of record size here is just a heuristic - the important thing is not to end up with
-                    // zero-length non-resident attributes
-                    _file.MakeAttributeResident(_attr.Reference, (int)value);
-                }
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/FileNameRecord.cs b/DiscUtils/Ntfs/FileNameRecord.cs
deleted file mode 100644
index cc32f3f..0000000
--- a/DiscUtils/Ntfs/FileNameRecord.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.IO;
-    using System.Text;
-
-    [Flags]
-    internal enum FileAttributeFlags : uint
-    {
-        None = 0x00000000,
-        ReadOnly = 0x00000001,
-        Hidden = 0x00000002,
-        System = 0x00000004,
-        Archive = 0x00000020,
-        Device = 0x00000040,
-        Normal = 0x00000080,
-        Temporary = 0x00000100,
-        Sparse = 0x00000200,
-        ReparsePoint = 0x00000400,
-        Compressed = 0x00000800,
-        Offline = 0x00001000,
-        NotIndexed = 0x00002000,
-        Encrypted = 0x00004000,
-        Directory = 0x10000000,
-        IndexView = 0x20000000
-    }
-
-    internal enum FileNameNamespace : byte
-    {
-        Posix = 0,
-        Win32 = 1,
-        Dos = 2,
-        Win32AndDos = 3
-    }
-
-    internal class FileNameRecord : IByteArraySerializable, IDiagnosticTraceable, IEquatable<FileNameRecord>
-    {
-        public FileRecordReference ParentDirectory;
-        public DateTime CreationTime;
-        public DateTime ModificationTime;
-        public DateTime MftChangedTime;
-        public DateTime LastAccessTime;
-        public ulong AllocatedSize;
-        public ulong RealSize;
-        public FileAttributeFlags Flags;
-        public uint EASizeOrReparsePointTag;
-        public FileNameNamespace FileNameNamespace;
-        public string FileName;
-
-        public FileNameRecord()
-        {
-        }
-
-        public FileNameRecord(FileNameRecord toCopy)
-        {
-            ParentDirectory = toCopy.ParentDirectory;
-            CreationTime = toCopy.CreationTime;
-            ModificationTime = toCopy.ModificationTime;
-            MftChangedTime = toCopy.MftChangedTime;
-            LastAccessTime = toCopy.LastAccessTime;
-            AllocatedSize = toCopy.AllocatedSize;
-            RealSize = toCopy.RealSize;
-            Flags = toCopy.Flags;
-            EASizeOrReparsePointTag = toCopy.EASizeOrReparsePointTag;
-            FileNameNamespace = toCopy.FileNameNamespace;
-            FileName = toCopy.FileName;
-        }
-
-        public FileAttributes FileAttributes
-        {
-            get { return ConvertFlags(Flags); }
-        }
-
-        public int Size
-        {
-            get
-            {
-                return 0x42 + (FileName.Length * 2);
-            }
-        }
-
-        public override string ToString()
-        {
-            return FileName;
-        }
-
-        public void Dump(TextWriter writer, string indent)
-        {
-            writer.WriteLine(indent + "FILE NAME RECORD");
-            writer.WriteLine(indent + "   Parent Directory: " + ParentDirectory);
-            writer.WriteLine(indent + "      Creation Time: " + CreationTime);
-            writer.WriteLine(indent + "  Modification Time: " + ModificationTime);
-            writer.WriteLine(indent + "   MFT Changed Time: " + MftChangedTime);
-            writer.WriteLine(indent + "   Last Access Time: " + LastAccessTime);
-            writer.WriteLine(indent + "     Allocated Size: " + AllocatedSize);
-            writer.WriteLine(indent + "          Real Size: " + RealSize);
-            writer.WriteLine(indent + "              Flags: " + Flags);
-
-            if ((Flags & FileAttributeFlags.ReparsePoint) != 0)
-            {
-                writer.WriteLine(indent + "  Reparse Point Tag: " + EASizeOrReparsePointTag);
-            }
-            else
-            {
-                writer.WriteLine(indent + "      Ext Attr Size: " + (EASizeOrReparsePointTag & 0xFFFF));
-            }
-
-            writer.WriteLine(indent + "          Namespace: " + FileNameNamespace);
-            writer.WriteLine(indent + "          File Name: " + FileName);
-        }
-
-        public int ReadFrom(byte[] buffer, int offset)
-        {
-            ParentDirectory = new FileRecordReference(Utilities.ToUInt64LittleEndian(buffer, offset + 0x00));
-            CreationTime = ReadDateTime(buffer, offset + 0x08);
-            ModificationTime = ReadDateTime(buffer, offset + 0x10);
-            MftChangedTime = ReadDateTime(buffer, offset + 0x18);
-            LastAccessTime = ReadDateTime(buffer, offset + 0x20);
-            AllocatedSize = Utilities.ToUInt64LittleEndian(buffer, offset + 0x28);
-            RealSize = Utilities.ToUInt64LittleEndian(buffer, offset + 0x30);
-            Flags = (FileAttributeFlags)Utilities.ToUInt32LittleEndian(buffer, offset + 0x38);
-            EASizeOrReparsePointTag = Utilities.ToUInt32LittleEndian(buffer, offset + 0x3C);
-            byte fnLen = buffer[offset + 0x40];
-            FileNameNamespace = (FileNameNamespace)buffer[offset + 0x41];
-            FileName = Encoding.Unicode.GetString(buffer, offset + 0x42, fnLen * 2);
-
-            return 0x42 + (fnLen * 2);
-        }
-
-        public void WriteTo(byte[] buffer, int offset)
-        {
-            Utilities.WriteBytesLittleEndian((ulong)ParentDirectory.Value, buffer, offset + 0x00);
-            Utilities.WriteBytesLittleEndian((ulong)CreationTime.ToFileTimeUtc(), buffer, offset + 0x08);
-            Utilities.WriteBytesLittleEndian((ulong)ModificationTime.ToFileTimeUtc(), buffer, offset + 0x10);
-            Utilities.WriteBytesLittleEndian((ulong)MftChangedTime.ToFileTimeUtc(), buffer, offset + 0x18);
-            Utilities.WriteBytesLittleEndian((ulong)LastAccessTime.ToFileTimeUtc(), buffer, offset + 0x20);
-            Utilities.WriteBytesLittleEndian(AllocatedSize, buffer, offset + 0x28);
-            Utilities.WriteBytesLittleEndian(RealSize, buffer, offset + 0x30);
-            Utilities.WriteBytesLittleEndian((uint)Flags, buffer, offset + 0x38);
-            Utilities.WriteBytesLittleEndian(EASizeOrReparsePointTag, buffer, offset + 0x3C);
-            buffer[offset + 0x40] = (byte)FileName.Length;
-            buffer[offset + 0x41] = (byte)FileNameNamespace;
-            Encoding.Unicode.GetBytes(FileName, 0, FileName.Length, buffer, offset + 0x42);
-        }
-
-        public bool Equals(FileNameRecord other)
-        {
-            if (other == null)
-            {
-                return false;
-            }
-
-            return ParentDirectory == other.ParentDirectory
-                && FileNameNamespace == other.FileNameNamespace
-                && FileName == other.FileName;
-        }
-
-        internal static FileAttributeFlags SetAttributes(FileAttributes attrs, FileAttributeFlags flags)
-        {
-            FileAttributes attrMask = ((FileAttributes)0xFFFF) & ~FileAttributes.Directory;
-            return (FileAttributeFlags)(((uint)flags & 0xFFFF0000) | (uint)(attrs & attrMask));
-        }
-
-        internal static FileAttributes ConvertFlags(FileAttributeFlags flags)
-        {
-            FileAttributes result = (FileAttributes)(((uint)flags) & 0xFFFF);
-
-            if ((flags & FileAttributeFlags.Directory) != 0)
-            {
-                result |= FileAttributes.Directory;
-            }
-
-            return result;
-        }
-
-        private static DateTime ReadDateTime(byte[] buffer, int offset)
-        {
-            try
-            {
-                return DateTime.FromFileTimeUtc(Utilities.ToInt64LittleEndian(buffer, offset));
-            }
-            catch (ArgumentException)
-            {
-                return DateTime.MinValue;
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/FileRecord.cs b/DiscUtils/Ntfs/FileRecord.cs
deleted file mode 100644
index 7dc7976..0000000
--- a/DiscUtils/Ntfs/FileRecord.cs
+++ /dev/null
@@ -1,467 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    [Flags]
-    internal enum FileRecordFlags : ushort
-    {
-        None = 0x0000,
-        InUse = 0x0001,
-        IsDirectory = 0x0002,
-        IsMetaFile = 0x0004,
-        HasViewIndex = 0x0008
-    }
-
-    internal class FileRecord : FixupRecordBase
-    {
-        private ulong _logFileSequenceNumber;
-        private ushort _sequenceNumber;
-        private ushort _hardLinkCount;
-        private ushort _firstAttributeOffset;
-        private FileRecordFlags _flags;
-        private uint _recordRealSize;
-        private uint _recordAllocatedSize;
-        private FileRecordReference _baseFile;
-        private ushort _nextAttributeId;
-        private uint _index; // Self-reference (on XP+)
-        private List<AttributeRecord> _attributes;
-
-        private bool _haveIndex;
-        private uint _loadedIndex;
-
-        public FileRecord(int sectorSize)
-            : base("FILE", sectorSize)
-        {
-        }
-
-        public FileRecord(int sectorSize, int recordLength, uint index)
-            : base("FILE", sectorSize, recordLength)
-        {
-            ReInitialize(sectorSize, recordLength, index);
-        }
-
-        public uint MasterFileTableIndex
-        {
-            get { return _haveIndex ? _index : _loadedIndex; }
-        }
-
-        public uint LoadedIndex
-        {
-            get { return _loadedIndex; }
-            set { _loadedIndex = value; }
-        }
-
-        public ulong LogFileSequenceNumber
-        {
-            get { return _logFileSequenceNumber; }
-        }
-
-        public ushort SequenceNumber
-        {
-            get { return _sequenceNumber; }
-            set { _sequenceNumber = value; }
-        }
-
-        public ushort HardLinkCount
-        {
-            get { return _hardLinkCount; }
-            set { _hardLinkCount = value; }
-        }
-
-        public uint AllocatedSize
-        {
-            get { return _recordAllocatedSize; }
-        }
-
-        public uint RealSize
-        {
-            get { return _recordRealSize; }
-        }
-
-        public FileRecordReference BaseFile
-        {
-            get { return _baseFile; }
-            set { _baseFile = value; }
-        }
-
-        public FileRecordFlags Flags
-        {
-            get { return _flags; }
-            set { _flags = value; }
-        }
-
-        public List<AttributeRecord> Attributes
-        {
-            get { return _attributes; }
-        }
-
-        public AttributeRecord FirstAttribute
-        {
-            get { return _attributes.Count > 0 ? _attributes[0] : null; }
-        }
-
-        public FileRecordReference Reference
-        {
-            get { return new FileRecordReference(MasterFileTableIndex, SequenceNumber); }
-        }
-
-        public ushort NextAttributeId
-        {
-            get { return _nextAttributeId; }
-        }
-
-        public bool IsMftRecord
-        {
-            get { return MasterFileTableIndex == MasterFileTable.MftIndex || (_baseFile.MftIndex == MasterFileTable.MftIndex && _baseFile.SequenceNumber != 0); }
-        }
-
-        public static FileAttributeFlags ConvertFlags(FileRecordFlags source)
-        {
-            FileAttributeFlags result = FileAttributeFlags.None;
-
-            if ((source & FileRecordFlags.IsDirectory) != 0)
-            {
-                result |= FileAttributeFlags.Directory;
-            }
-
-            if ((source & FileRecordFlags.HasViewIndex) != 0)
-            {
-                result |= FileAttributeFlags.IndexView;
-            }
-
-            if ((source & FileRecordFlags.IsMetaFile) != 0)
-            {
-                result |= FileAttributeFlags.Hidden | FileAttributeFlags.System;
-            }
-
-            return result;
-        }
-
-        public void ReInitialize(int sectorSize, int recordLength, uint index)
-        {
-            Initialize("FILE", sectorSize, recordLength);
-            _sequenceNumber++;
-            _flags = FileRecordFlags.None;
-            _recordAllocatedSize = (uint)recordLength;
-            _nextAttributeId = 0;
-            _index = index;
-            _hardLinkCount = 0;
-            _baseFile = new FileRecordReference(0);
-
-            _attributes = new List<AttributeRecord>();
-            _haveIndex = true;
-        }
-
-        /// <summary>
-        /// Gets an attribute by it's id.
-        /// </summary>
-        /// <param name="id">The attribute's id.</param>
-        /// <returns>The attribute, or <c>null</c>.</returns>
-        public AttributeRecord GetAttribute(ushort id)
-        {
-            foreach (AttributeRecord attrRec in _attributes)
-            {
-                if (attrRec.AttributeId == id)
-                {
-                    return attrRec;
-                }
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Gets an unnamed attribute.
-        /// </summary>
-        /// <param name="type">The attribute type.</param>
-        /// <returns>The attribute, or <c>null</c>.</returns>
-        public AttributeRecord GetAttribute(AttributeType type)
-        {
-            return GetAttribute(type, null);
-        }
-
-        /// <summary>
-        /// Gets an named attribute.
-        /// </summary>
-        /// <param name="type">The attribute type.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <returns>The attribute, or <c>null</c>.</returns>
-        public AttributeRecord GetAttribute(AttributeType type, string name)
-        {
-            foreach (AttributeRecord attrRec in _attributes)
-            {
-                if (attrRec.AttributeType == type && attrRec.Name == name)
-                {
-                    return attrRec;
-                }
-            }
-
-            return null;
-        }
-
-        public override string ToString()
-        {
-            foreach (AttributeRecord attr in _attributes)
-            {
-                if (attr.AttributeType == AttributeType.FileName)
-                {
-                    StructuredNtfsAttribute<FileNameRecord> fnAttr = (StructuredNtfsAttribute<FileNameRecord>)NtfsAttribute.FromRecord(null, new FileRecordReference(0), attr);
-                    return fnAttr.Content.FileName;
-                }
-            }
-
-            return "No Name";
-        }
-
-        /// <summary>
-        /// Creates a new attribute.
-        /// </summary>
-        /// <param name="type">The type of the new attribute.</param>
-        /// <param name="name">The name of the new attribute.</param>
-        /// <param name="indexed">Whether the attribute is marked as indexed.</param>
-        /// <param name="flags">Flags for the new attribute.</param>
-        /// <returns>The id of the new attribute.</returns>
-        public ushort CreateAttribute(AttributeType type, string name, bool indexed, AttributeFlags flags)
-        {
-            ushort id = _nextAttributeId++;
-            _attributes.Add(
-                new ResidentAttributeRecord(
-                    type,
-                    name,
-                    id,
-                    indexed,
-                    flags));
-            _attributes.Sort();
-            return id;
-        }
-
-        /// <summary>
-        /// Creates a new non-resident attribute.
-        /// </summary>
-        /// <param name="type">The type of the new attribute.</param>
-        /// <param name="name">The name of the new attribute.</param>
-        /// <param name="flags">Flags for the new attribute.</param>
-        /// <returns>The id of the new attribute.</returns>
-        public ushort CreateNonResidentAttribute(AttributeType type, string name, AttributeFlags flags)
-        {
-            ushort id = _nextAttributeId++;
-            _attributes.Add(
-                new NonResidentAttributeRecord(
-                    type,
-                    name,
-                    id,
-                    flags,
-                    0,
-                    new List<DataRun>()));
-            _attributes.Sort();
-            return id;
-        }
-
-        /// <summary>
-        /// Creates a new attribute.
-        /// </summary>
-        /// <param name="type">The type of the new attribute.</param>
-        /// <param name="name">The name of the new attribute.</param>
-        /// <param name="flags">Flags for the new attribute.</param>
-        /// <param name="firstCluster">The first cluster to assign to the attribute.</param>
-        /// <param name="numClusters">The number of sequential clusters to assign to the attribute.</param>
-        /// <param name="bytesPerCluster">The number of bytes in each cluster.</param>
-        /// <returns>The id of the new attribute.</returns>
-        public ushort CreateNonResidentAttribute(AttributeType type, string name, AttributeFlags flags, long firstCluster, ulong numClusters, uint bytesPerCluster)
-        {
-            ushort id = _nextAttributeId++;
-            _attributes.Add(
-                new NonResidentAttributeRecord(
-                    type,
-                    name,
-                    id,
-                    flags,
-                    firstCluster,
-                    numClusters,
-                    bytesPerCluster));
-            _attributes.Sort();
-            return id;
-        }
-
-        /// <summary>
-        /// Adds an existing attribute.
-        /// </summary>
-        /// <param name="attrRec">The attribute to add.</param>
-        /// <returns>The new Id of the attribute.</returns>
-        /// <remarks>This method is used to move an attribute between different MFT records.</remarks>
-        public ushort AddAttribute(AttributeRecord attrRec)
-        {
-            attrRec.AttributeId = _nextAttributeId++;
-            _attributes.Add(attrRec);
-            _attributes.Sort();
-            return attrRec.AttributeId;
-        }
-
-        /// <summary>
-        /// Removes an attribute by it's id.
-        /// </summary>
-        /// <param name="id">The attribute's id.</param>
-        public void RemoveAttribute(ushort id)
-        {
-            for (int i = 0; i < _attributes.Count; ++i)
-            {
-                if (_attributes[i].AttributeId == id)
-                {
-                    _attributes.RemoveAt(i);
-                    break;
-                }
-            }
-        }
-
-        public void Reset()
-        {
-            _attributes.Clear();
-            _flags = FileRecordFlags.None;
-            _hardLinkCount = 0;
-            _nextAttributeId = 0;
-            _recordRealSize = 0;
-        }
-
-        internal long GetAttributeOffset(ushort id)
-        {
-            int firstAttrPos = (ushort)Utilities.RoundUp((_haveIndex ? 0x30 : 0x2A) + UpdateSequenceSize, 8);
-
-            int offset = firstAttrPos;
-            foreach (var attr in _attributes)
-            {
-                if (attr.AttributeId == id)
-                {
-                    return offset;
-                }
-
-                offset += attr.Size;
-            }
-
-            return -1;
-        }
-
-        internal void Dump(TextWriter writer, string indent)
-        {
-            writer.WriteLine(indent + "FILE RECORD (" + ToString() + ")");
-            writer.WriteLine(indent + "              Magic: " + Magic);
-            writer.WriteLine(indent + "  Update Seq Offset: " + UpdateSequenceOffset);
-            writer.WriteLine(indent + "   Update Seq Count: " + UpdateSequenceCount);
-            writer.WriteLine(indent + "  Update Seq Number: " + UpdateSequenceNumber);
-            writer.WriteLine(indent + "   Log File Seq Num: " + _logFileSequenceNumber);
-            writer.WriteLine(indent + "    Sequence Number: " + _sequenceNumber);
-            writer.WriteLine(indent + "    Hard Link Count: " + _hardLinkCount);
-            writer.WriteLine(indent + "              Flags: " + _flags);
-            writer.WriteLine(indent + "   Record Real Size: " + _recordRealSize);
-            writer.WriteLine(indent + "  Record Alloc Size: " + _recordAllocatedSize);
-            writer.WriteLine(indent + "          Base File: " + _baseFile);
-            writer.WriteLine(indent + "  Next Attribute Id: " + _nextAttributeId);
-            writer.WriteLine(indent + "    Attribute Count: " + _attributes.Count);
-            writer.WriteLine(indent + "   Index (Self Ref): " + _index);
-        }
-
-        protected override void Read(byte[] buffer, int offset)
-        {
-            _logFileSequenceNumber = Utilities.ToUInt64LittleEndian(buffer, offset + 0x08);
-            _sequenceNumber = Utilities.ToUInt16LittleEndian(buffer, offset + 0x10);
-            _hardLinkCount = Utilities.ToUInt16LittleEndian(buffer, offset + 0x12);
-            _firstAttributeOffset = Utilities.ToUInt16LittleEndian(buffer, offset + 0x14);
-            _flags = (FileRecordFlags)Utilities.ToUInt16LittleEndian(buffer, offset + 0x16);
-            _recordRealSize = Utilities.ToUInt32LittleEndian(buffer, offset + 0x18);
-            _recordAllocatedSize = Utilities.ToUInt32LittleEndian(buffer, offset + 0x1C);
-            _baseFile = new FileRecordReference(Utilities.ToUInt64LittleEndian(buffer, offset + 0x20));
-            _nextAttributeId = Utilities.ToUInt16LittleEndian(buffer, offset + 0x28);
-
-            if (UpdateSequenceOffset >= 0x30)
-            {
-                _index = Utilities.ToUInt32LittleEndian(buffer, offset + 0x2C);
-                _haveIndex = true;
-            }
-
-            _attributes = new List<AttributeRecord>();
-            int focus = _firstAttributeOffset;
-            while (true)
-            {
-                int length;
-                AttributeRecord attr = AttributeRecord.FromBytes(buffer, focus, out length);
-                if (attr == null)
-                {
-                    break;
-                }
-
-                _attributes.Add(attr);
-                focus += (int)length;
-            }
-        }
-
-        protected override ushort Write(byte[] buffer, int offset)
-        {
-            ushort headerEnd = (ushort)(_haveIndex ? 0x30 : 0x2A);
-
-            _firstAttributeOffset = (ushort)Utilities.RoundUp(headerEnd + UpdateSequenceSize, 0x08);
-            _recordRealSize = (uint)CalcSize();
-
-            Utilities.WriteBytesLittleEndian(_logFileSequenceNumber, buffer, offset + 0x08);
-            Utilities.WriteBytesLittleEndian(_sequenceNumber, buffer, offset + 0x10);
-            Utilities.WriteBytesLittleEndian(_hardLinkCount, buffer, offset + 0x12);
-            Utilities.WriteBytesLittleEndian(_firstAttributeOffset, buffer, offset + 0x14);
-            Utilities.WriteBytesLittleEndian((ushort)_flags, buffer, offset + 0x16);
-            Utilities.WriteBytesLittleEndian(_recordRealSize, buffer, offset + 0x18);
-            Utilities.WriteBytesLittleEndian(_recordAllocatedSize, buffer, offset + 0x1C);
-            Utilities.WriteBytesLittleEndian(_baseFile.Value, buffer, offset + 0x20);
-            Utilities.WriteBytesLittleEndian(_nextAttributeId, buffer, offset + 0x28);
-
-            if (_haveIndex)
-            {
-                Utilities.WriteBytesLittleEndian((ushort)0, buffer, offset + 0x2A); // Alignment field
-                Utilities.WriteBytesLittleEndian(_index, buffer, offset + 0x2C);
-            }
-
-            int pos = _firstAttributeOffset;
-            foreach (var attr in _attributes)
-            {
-                pos += attr.Write(buffer, offset + pos);
-            }
-
-            Utilities.WriteBytesLittleEndian(uint.MaxValue, buffer, offset + pos);
-
-            return headerEnd;
-        }
-
-        protected override int CalcSize()
-        {
-            int firstAttrPos = (ushort)Utilities.RoundUp((_haveIndex ? 0x30 : 0x2A) + UpdateSequenceSize, 8);
-
-            int size = firstAttrPos;
-            foreach (var attr in _attributes)
-            {
-                size += attr.Size;
-            }
-
-            return Utilities.RoundUp(size + 4, 8); // 0xFFFFFFFF terminator on attributes
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/FileRecordReference.cs b/DiscUtils/Ntfs/FileRecordReference.cs
deleted file mode 100644
index 595f234..0000000
--- a/DiscUtils/Ntfs/FileRecordReference.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-
-    internal struct FileRecordReference : IByteArraySerializable, IComparable<FileRecordReference>
-    {
-        private ulong _val;
-
-        public FileRecordReference(ulong val)
-        {
-            _val = val;
-        }
-
-        public FileRecordReference(long mftIndex, ushort sequenceNumber)
-        {
-            _val = (ulong)(mftIndex & 0x0000FFFFFFFFFFFFL) | ((ulong)((ulong)sequenceNumber << 48) & 0xFFFF000000000000L);
-        }
-
-        public ulong Value
-        {
-            get { return _val; }
-        }
-
-        public long MftIndex
-        {
-            get { return (long)(_val & 0x0000FFFFFFFFFFFFL); }
-        }
-
-        public ushort SequenceNumber
-        {
-            get { return (ushort)((_val >> 48) & 0xFFFF); }
-        }
-
-        public int Size
-        {
-            get { return 8; }
-        }
-
-        public bool IsNull
-        {
-            get { return SequenceNumber == 0; }
-        }
-
-        public static bool operator ==(FileRecordReference a, FileRecordReference b)
-        {
-            return a._val == b._val;
-        }
-
-        public static bool operator !=(FileRecordReference a, FileRecordReference b)
-        {
-            return a._val != b._val;
-        }
-
-        public int ReadFrom(byte[] buffer, int offset)
-        {
-            _val = Utilities.ToUInt64LittleEndian(buffer, offset);
-            return 8;
-        }
-
-        public void WriteTo(byte[] buffer, int offset)
-        {
-            Utilities.WriteBytesLittleEndian(_val, buffer, offset);
-        }
-
-        public override bool Equals(object obj)
-        {
-            if (obj == null || !(obj is FileRecordReference))
-            {
-                return false;
-            }
-
-            return _val == ((FileRecordReference)obj)._val;
-        }
-
-        public override int GetHashCode()
-        {
-            return _val.GetHashCode();
-        }
-
-        public int CompareTo(FileRecordReference other)
-        {
-            if (_val < other._val)
-            {
-                return -1;
-            }
-            else if (_val > other._val)
-            {
-                return 1;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-
-        public override string ToString()
-        {
-            return "MFT:" + MftIndex + " (ver: " + SequenceNumber + ")";
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/FileSystemFactory.cs b/DiscUtils/Ntfs/FileSystemFactory.cs
deleted file mode 100644
index 72d9b37..0000000
--- a/DiscUtils/Ntfs/FileSystemFactory.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using DiscUtils.Vfs;
-    using System.IO;
-
-    [VfsFileSystemFactory]
-    internal class FileSystemFactory : VfsFileSystemFactory
-    {
-        public override DiscUtils.FileSystemInfo[] Detect(Stream stream, VolumeInfo volume)
-        {
-            if (NtfsFileSystem.Detect(stream))
-            {
-                return new DiscUtils.FileSystemInfo[] { new VfsFileSystemInfo("NTFS", "Microsoft NTFS", Open) };
-            }
-
-            return new DiscUtils.FileSystemInfo[0];
-        }
-
-        private DiscFileSystem Open(Stream stream, VolumeInfo volumeInfo, FileSystemParameters parameters)
-        {
-            return new NtfsFileSystem(stream);
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/FixupRecordBase.cs b/DiscUtils/Ntfs/FixupRecordBase.cs
deleted file mode 100644
index bba1972..0000000
--- a/DiscUtils/Ntfs/FixupRecordBase.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System.IO;
-
-    internal abstract class FixupRecordBase
-    {
-        private int _sectorSize;
-
-        private string _magic;
-        private ushort _updateSequenceOffset;
-        private ushort _updateSequenceCount;
-
-        private ushort _updateSequenceNumber;
-        private ushort[] _updateSequenceArray;
-
-        public FixupRecordBase(string magic, int sectorSize)
-        {
-            _magic = magic;
-            _sectorSize = sectorSize;
-        }
-
-        public FixupRecordBase(string magic, int sectorSize, int recordLength)
-        {
-            Initialize(magic, sectorSize, recordLength);
-        }
-
-        public string Magic
-        {
-            get { return _magic; }
-        }
-
-        public ushort UpdateSequenceOffset
-        {
-            get { return _updateSequenceOffset; }
-        }
-
-        public ushort UpdateSequenceCount
-        {
-            get { return _updateSequenceCount; }
-        }
-
-        public ushort UpdateSequenceNumber
-        {
-            get { return _updateSequenceNumber; }
-        }
-
-        public int UpdateSequenceSize
-        {
-            get { return _updateSequenceCount * 2; }
-        }
-
-        public int Size
-        {
-            get
-            {
-                return CalcSize();
-            }
-        }
-
-        public void FromBytes(byte[] buffer, int offset)
-        {
-            FromBytes(buffer, offset, false);
-        }
-
-        public void FromBytes(byte[] buffer, int offset, bool ignoreMagic)
-        {
-            string diskMagic = Utilities.BytesToString(buffer, offset + 0x00, 4);
-            if (_magic == null)
-            {
-                _magic = diskMagic;
-            }
-            else
-            {
-                if (diskMagic != _magic && ignoreMagic)
-                {
-                    return;
-                }
-
-                if (diskMagic != _magic)
-                {
-                    throw new IOException("Corrupt record");
-                }
-            }
-
-            _updateSequenceOffset = Utilities.ToUInt16LittleEndian(buffer, offset + 0x04);
-            _updateSequenceCount = Utilities.ToUInt16LittleEndian(buffer, offset + 0x06);
-
-            _updateSequenceNumber = Utilities.ToUInt16LittleEndian(buffer, offset + _updateSequenceOffset);
-            _updateSequenceArray = new ushort[_updateSequenceCount - 1];
-            for (int i = 0; i < _updateSequenceArray.Length; ++i)
-            {
-                _updateSequenceArray[i] = Utilities.ToUInt16LittleEndian(buffer, offset + _updateSequenceOffset + (2 * (i + 1)));
-            }
-
-            UnprotectBuffer(buffer, offset);
-
-            Read(buffer, offset);
-        }
-
-        public void ToBytes(byte[] buffer, int offset)
-        {
-            _updateSequenceOffset = Write(buffer, offset);
-
-            ProtectBuffer(buffer, offset);
-
-            Utilities.StringToBytes(_magic, buffer, offset + 0x00, 4);
-            Utilities.WriteBytesLittleEndian(_updateSequenceOffset, buffer, offset + 0x04);
-            Utilities.WriteBytesLittleEndian(_updateSequenceCount, buffer, offset + 0x06);
-
-            Utilities.WriteBytesLittleEndian(_updateSequenceNumber, buffer, offset + _updateSequenceOffset);
-            for (int i = 0; i < _updateSequenceArray.Length; ++i)
-            {
-                Utilities.WriteBytesLittleEndian(_updateSequenceArray[i], buffer, offset + _updateSequenceOffset + (2 * (i + 1)));
-            }
-        }
-
-        protected void Initialize(string magic, int sectorSize, int recordLength)
-        {
-            _magic = magic;
-            _sectorSize = sectorSize;
-            _updateSequenceCount = (ushort)(1 + Utilities.Ceil(recordLength, Sizes.Sector));
-            _updateSequenceNumber = 1;
-            _updateSequenceArray = new ushort[_updateSequenceCount - 1];
-        }
-
-        protected abstract void Read(byte[] buffer, int offset);
-
-        protected abstract ushort Write(byte[] buffer, int offset);
-
-        protected abstract int CalcSize();
-
-        private void UnprotectBuffer(byte[] buffer, int offset)
-        {
-            // First do validation check - make sure the USN matches on all sectors)
-            for (int i = 0; i < _updateSequenceArray.Length; ++i)
-            {
-                if (_updateSequenceNumber != Utilities.ToUInt16LittleEndian(buffer, offset + (Sizes.Sector * (i + 1)) - 2))
-                {
-                    throw new IOException("Corrupt file system record found");
-                }
-            }
-
-            // Now replace the USNs with the actual data from the sequence array
-            for (int i = 0; i < _updateSequenceArray.Length; ++i)
-            {
-                Utilities.WriteBytesLittleEndian(_updateSequenceArray[i], buffer, offset + (Sizes.Sector * (i + 1)) - 2);
-            }
-        }
-
-        private void ProtectBuffer(byte[] buffer, int offset)
-        {
-            _updateSequenceNumber++;
-
-            // Read in the bytes that are replaced by the USN
-            for (int i = 0; i < _updateSequenceArray.Length; ++i)
-            {
-                _updateSequenceArray[i] = Utilities.ToUInt16LittleEndian(buffer, offset + (Sizes.Sector * (i + 1)) - 2);
-            }
-
-            // Overwrite the bytes that are replaced with the USN
-            for (int i = 0; i < _updateSequenceArray.Length; ++i)
-            {
-                Utilities.WriteBytesLittleEndian(_updateSequenceNumber, buffer, offset + (Sizes.Sector * (i + 1)) - 2);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/GenericFixupRecord.cs b/DiscUtils/Ntfs/GenericFixupRecord.cs
deleted file mode 100644
index 427823c..0000000
--- a/DiscUtils/Ntfs/GenericFixupRecord.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-
-    internal sealed class GenericFixupRecord : FixupRecordBase
-    {
-        private int _bytesPerSector;
-        private byte[] _content;
-
-        public GenericFixupRecord(int bytesPerSector)
-            : base(null, bytesPerSector)
-        {
-            _bytesPerSector = bytesPerSector;
-        }
-
-        public byte[] Content
-        {
-            get { return _content; }
-        }
-
-        protected override void Read(byte[] buffer, int offset)
-        {
-            _content = new byte[(UpdateSequenceCount - 1) * _bytesPerSector];
-            Array.Copy(buffer, offset, _content, 0, _content.Length);
-        }
-
-        protected override ushort Write(byte[] buffer, int offset)
-        {
-            throw new NotImplementedException();
-        }
-
-        protected override int CalcSize()
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/Index.cs b/DiscUtils/Ntfs/Index.cs
deleted file mode 100644
index 7683bbf..0000000
--- a/DiscUtils/Ntfs/Index.cs
+++ /dev/null
@@ -1,485 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal class Index : IDisposable
-    {
-        protected File _file;
-        protected string _name;
-        protected BiosParameterBlock _bpb;
-        private bool _isFileIndex;
-
-        private IComparer<byte[]> _comparer;
-
-        private IndexRoot _root;
-        private IndexNode _rootNode;
-        private Stream _indexStream;
-        private Bitmap _indexBitmap;
-
-        private ObjectCache<long, IndexBlock> _blockCache;
-
-        public Index(File file, string name, BiosParameterBlock bpb, UpperCase upCase)
-        {
-            _file = file;
-            _name = name;
-            _bpb = bpb;
-            _isFileIndex = name == "$I30";
-
-            _blockCache = new ObjectCache<long, IndexBlock>();
-
-            _root = _file.GetStream(AttributeType.IndexRoot, _name).GetContent<IndexRoot>();
-            _comparer = _root.GetCollator(upCase);
-
-            using (Stream s = _file.OpenStream(AttributeType.IndexRoot, _name, FileAccess.Read))
-            {
-                byte[] buffer = Utilities.ReadFully(s, (int)s.Length);
-                _rootNode = new IndexNode(WriteRootNodeToDisk, 0, this, true, buffer, IndexRoot.HeaderOffset);
-
-                // Give the attribute some room to breathe, so long as it doesn't squeeze others out
-                // BROKEN, BROKEN, BROKEN - how to figure this out?  Query at the point of adding entries to the root node?
-                _rootNode.TotalSpaceAvailable += _file.MftRecordFreeSpace(AttributeType.IndexRoot, _name) - 100;
-            }
-
-            if (_file.StreamExists(AttributeType.IndexAllocation, _name))
-            {
-                _indexStream = _file.OpenStream(AttributeType.IndexAllocation, _name, FileAccess.ReadWrite);
-            }
-
-            if (_file.StreamExists(AttributeType.Bitmap, _name))
-            {
-                _indexBitmap = new Bitmap(_file.OpenStream(AttributeType.Bitmap, _name, FileAccess.ReadWrite), long.MaxValue);
-            }
-        }
-
-        private Index(AttributeType attrType, AttributeCollationRule collationRule, File file, string name, BiosParameterBlock bpb, UpperCase upCase)
-        {
-            _file = file;
-            _name = name;
-            _bpb = bpb;
-            _isFileIndex = name == "$I30";
-
-            _blockCache = new ObjectCache<long, IndexBlock>();
-
-            _file.CreateStream(AttributeType.IndexRoot, _name);
-
-            _root = new IndexRoot()
-            {
-                AttributeType = (uint)attrType,
-                CollationRule = collationRule,
-                IndexAllocationSize = (uint)bpb.IndexBufferSize,
-                RawClustersPerIndexRecord = bpb.RawIndexBufferSize
-            };
-
-            _comparer = _root.GetCollator(upCase);
-
-            _rootNode = new IndexNode(WriteRootNodeToDisk, 0, this, true, 32);
-        }
-
-        public IEnumerable<KeyValuePair<byte[], byte[]>> Entries
-        {
-            get
-            {
-                foreach (var entry in Enumerate(_rootNode))
-                {
-                    yield return new KeyValuePair<byte[], byte[]>(entry.KeyBuffer, entry.DataBuffer);
-                }
-            }
-        }
-
-        public int Count
-        {
-            get
-            {
-                int i = 0;
-                foreach (var entry in Entries)
-                {
-                    ++i;
-                }
-
-                return i;
-            }
-        }
-
-        internal Stream AllocationStream
-        {
-            get { return _indexStream; }
-        }
-
-        internal uint IndexBufferSize
-        {
-            get { return _root.IndexAllocationSize; }
-        }
-
-        internal bool IsFileIndex
-        {
-            get { return _isFileIndex; }
-        }
-
-        public byte[] this[byte[] key]
-        {
-            get
-            {
-                byte[] value;
-                if (TryGetValue(key, out value))
-                {
-                    return value;
-                }
-                else
-                {
-                    throw new KeyNotFoundException();
-                }
-            }
-
-            set
-            {
-                IndexEntry oldEntry;
-                IndexNode node;
-                _rootNode.TotalSpaceAvailable = _rootNode.CalcSize() + _file.MftRecordFreeSpace(AttributeType.IndexRoot, _name);
-                if (_rootNode.TryFindEntry(key, out oldEntry, out node))
-                {
-                    node.UpdateEntry(key, value);
-                }
-                else
-                {
-                    _rootNode.AddEntry(key, value);
-                }
-            }
-        }
-
-        public static void Create(AttributeType attrType, AttributeCollationRule collationRule, File file, string name)
-        {
-            Index idx = new Index(attrType, collationRule, file, name, file.Context.BiosParameterBlock, file.Context.UpperCase);
-
-            idx.WriteRootNodeToDisk();
-        }
-
-        public void Dispose()
-        {
-            if (_indexBitmap != null)
-            {
-                _indexBitmap.Dispose();
-                _indexBitmap = null;
-            }
-        }
-
-        public IEnumerable<KeyValuePair<byte[], byte[]>> FindAll(IComparable<byte[]> query)
-        {
-            foreach (var entry in FindAllIn(query, _rootNode))
-            {
-                yield return new KeyValuePair<byte[], byte[]>(entry.KeyBuffer, entry.DataBuffer);
-            }
-        }
-
-        public bool ContainsKey(byte[] key)
-        {
-            byte[] value;
-            return TryGetValue(key, out value);
-        }
-
-        public bool Remove(byte[] key)
-        {
-            _rootNode.TotalSpaceAvailable = _rootNode.CalcSize() + _file.MftRecordFreeSpace(AttributeType.IndexRoot, _name);
-
-            IndexEntry overflowEntry;
-            bool found = _rootNode.RemoveEntry(key, out overflowEntry);
-            if (overflowEntry != null)
-            {
-                throw new IOException("Error removing entry, root overflowed");
-            }
-
-            return found;
-        }
-
-        public bool TryGetValue(byte[] key, out byte[] value)
-        {
-            IndexEntry entry;
-            IndexNode node;
-
-            if (_rootNode.TryFindEntry(key, out entry, out node))
-            {
-                value = entry.DataBuffer;
-                return true;
-            }
-
-            value = default(byte[]);
-            return false;
-        }
-
-        internal static string EntryAsString(IndexEntry entry, string fileName, string indexName)
-        {
-            IByteArraySerializable keyValue = null;
-            IByteArraySerializable dataValue = null;
-
-            // Try to guess the type of data in the key and data fields from the filename and index name
-            if (indexName == "$I30")
-            {
-                keyValue = new FileNameRecord();
-                dataValue = new FileRecordReference();
-            }
-            else if (fileName == "$ObjId" && indexName == "$O")
-            {
-                keyValue = new ObjectIds.IndexKey();
-                dataValue = new ObjectIdRecord();
-            }
-            else if (fileName == "$Reparse" && indexName == "$R")
-            {
-                keyValue = new ReparsePoints.Key();
-                dataValue = new ReparsePoints.Data();
-            }
-            else if (fileName == "$Quota")
-            {
-                if (indexName == "$O")
-                {
-                    keyValue = new Quotas.OwnerKey();
-                    dataValue = new Quotas.OwnerRecord();
-                }
-                else if (indexName == "$Q")
-                {
-                    keyValue = new Quotas.OwnerRecord();
-                    dataValue = new Quotas.QuotaRecord();
-                }
-            }
-            else if (fileName == "$Secure")
-            {
-                if (indexName == "$SII")
-                {
-                    keyValue = new SecurityDescriptors.IdIndexKey();
-                    dataValue = new SecurityDescriptors.IdIndexData();
-                }
-                else if (indexName == "$SDH")
-                {
-                    keyValue = new SecurityDescriptors.HashIndexKey();
-                    dataValue = new SecurityDescriptors.IdIndexData();
-                }
-            }
-
-            try
-            {
-                if (keyValue != null && dataValue != null)
-                {
-                    keyValue.ReadFrom(entry.KeyBuffer, 0);
-                    dataValue.ReadFrom(entry.DataBuffer, 0);
-                    return "{" + keyValue + "-->" + dataValue + "}";
-                }
-            }
-            catch
-            {
-                return "{Parsing-Error}";
-            }
-
-            return "{Unknown-Index-Type}";
-        }
-
-        internal long IndexBlockVcnToPosition(long vcn)
-        {
-            if (vcn % _root.RawClustersPerIndexRecord != 0)
-            {
-                throw new NotSupportedException("Unexpected vcn (not a multiple of clusters-per-index-record): vcn=" + vcn + " rcpir=" + _root.RawClustersPerIndexRecord);
-            }
-
-            if (_bpb.BytesPerCluster <= _root.IndexAllocationSize)
-            {
-                return vcn * (long)_bpb.BytesPerCluster;
-            }
-            else
-            {
-                if (_root.RawClustersPerIndexRecord != 8)
-                {
-                    throw new NotSupportedException("Unexpected RawClustersPerIndexRecord (multiple index blocks per cluster): " + _root.RawClustersPerIndexRecord);
-                }
-
-                return (vcn / _root.RawClustersPerIndexRecord) * _root.IndexAllocationSize;
-            }
-        }
-
-        internal bool ShrinkRoot()
-        {
-            if (_rootNode.Depose())
-            {
-                WriteRootNodeToDisk();
-                _rootNode.TotalSpaceAvailable = _rootNode.CalcSize() + _file.MftRecordFreeSpace(AttributeType.IndexRoot, _name);
-                return true;
-            }
-
-            return false;
-        }
-
-        internal IndexBlock GetSubBlock(IndexEntry parentEntry)
-        {
-            IndexBlock block = _blockCache[parentEntry.ChildrenVirtualCluster];
-            if (block == null)
-            {
-                block = new IndexBlock(this, false, parentEntry, _bpb);
-                _blockCache[parentEntry.ChildrenVirtualCluster] = block;
-            }
-
-            return block;
-        }
-
-        internal IndexBlock AllocateBlock(IndexEntry parentEntry)
-        {
-            if (_indexStream == null)
-            {
-                _file.CreateStream(AttributeType.IndexAllocation, _name);
-                _indexStream = _file.OpenStream(AttributeType.IndexAllocation, _name, FileAccess.ReadWrite);
-            }
-
-            if (_indexBitmap == null)
-            {
-                _file.CreateStream(AttributeType.Bitmap, _name);
-                _indexBitmap = new Bitmap(_file.OpenStream(AttributeType.Bitmap, _name, FileAccess.ReadWrite), long.MaxValue);
-            }
-
-            long idx = _indexBitmap.AllocateFirstAvailable(0);
-
-            parentEntry.ChildrenVirtualCluster = idx * Utilities.Ceil(_bpb.IndexBufferSize, _bpb.SectorsPerCluster * _bpb.BytesPerSector);
-            parentEntry.Flags |= IndexEntryFlags.Node;
-
-            IndexBlock block = IndexBlock.Initialize(this, false, parentEntry, _bpb);
-            _blockCache[parentEntry.ChildrenVirtualCluster] = block;
-            return block;
-        }
-
-        internal void FreeBlock(long vcn)
-        {
-            long idx = vcn / Utilities.Ceil(_bpb.IndexBufferSize, _bpb.SectorsPerCluster * _bpb.BytesPerSector);
-            _indexBitmap.MarkAbsent(idx);
-            _blockCache.Remove(vcn);
-        }
-
-        internal int Compare(byte[] x, byte[] y)
-        {
-            return _comparer.Compare(x, y);
-        }
-
-        internal void Dump(TextWriter writer, string prefix)
-        {
-            NodeAsString(writer, prefix, _rootNode, "R");
-        }
-
-        protected IEnumerable<IndexEntry> Enumerate(IndexNode node)
-        {
-            foreach (var focus in node.Entries)
-            {
-                if ((focus.Flags & IndexEntryFlags.Node) != 0)
-                {
-                    IndexBlock block = GetSubBlock(focus);
-                    foreach (var subEntry in Enumerate(block.Node))
-                    {
-                        yield return subEntry;
-                    }
-                }
-
-                if ((focus.Flags & IndexEntryFlags.End) == 0)
-                {
-                    yield return focus;
-                }
-            }
-        }
-
-        private IEnumerable<IndexEntry> FindAllIn(IComparable<byte[]> query, IndexNode node)
-        {
-            foreach (var focus in node.Entries)
-            {
-                bool searchChildren = true;
-                bool matches = false;
-                bool keepIterating = true;
-
-                if ((focus.Flags & IndexEntryFlags.End) == 0)
-                {
-                    int compVal = query.CompareTo(focus.KeyBuffer);
-                    if (compVal == 0)
-                    {
-                        matches = true;
-                    }
-                    else if (compVal > 0)
-                    {
-                        searchChildren = false;
-                    }
-                    else if (compVal < 0)
-                    {
-                        keepIterating = false;
-                    }
-                }
-
-                if (searchChildren && (focus.Flags & IndexEntryFlags.Node) != 0)
-                {
-                    IndexBlock block = GetSubBlock(focus);
-                    foreach (var entry in FindAllIn(query, block.Node))
-                    {
-                        yield return entry;
-                    }
-                }
-
-                if (matches)
-                {
-                    yield return focus;
-                }
-
-                if (!keepIterating)
-                {
-                    yield break;
-                }
-            }
-        }
-
-        private void WriteRootNodeToDisk()
-        {
-            _rootNode.Header.AllocatedSizeOfEntries = (uint)_rootNode.CalcSize();
-            byte[] buffer = new byte[_rootNode.Header.AllocatedSizeOfEntries + _root.Size];
-            _root.WriteTo(buffer, 0);
-            _rootNode.WriteTo(buffer, _root.Size);
-            using (Stream s = _file.OpenStream(AttributeType.IndexRoot, _name, FileAccess.Write))
-            {
-                s.Position = 0;
-                s.Write(buffer, 0, buffer.Length);
-                s.SetLength(s.Position);
-            }
-        }
-
-        private void NodeAsString(TextWriter writer, string prefix, IndexNode node, string id)
-        {
-            writer.WriteLine(prefix + id + ":");
-            foreach (var entry in node.Entries)
-            {
-                if ((entry.Flags & IndexEntryFlags.End) != 0)
-                {
-                    writer.WriteLine(prefix + "      E");
-                }
-                else
-                {
-                    writer.WriteLine(prefix + "      " + EntryAsString(entry, _file.BestName, _name));
-                }
-
-                if ((entry.Flags & IndexEntryFlags.Node) != 0)
-                {
-                    NodeAsString(writer, prefix + "        ", GetSubBlock(entry).Node, ":i" + entry.ChildrenVirtualCluster);
-                }
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/IndexBlock.cs b/DiscUtils/Ntfs/IndexBlock.cs
deleted file mode 100644
index b38b750..0000000
--- a/DiscUtils/Ntfs/IndexBlock.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.IO;
-
-    internal class IndexBlock : FixupRecordBase
-    {
-        /// <summary>
-        /// Size of meta-data placed at start of a block.
-        /// </summary>
-        private const int FieldSize = 0x18;
-
-        private ulong _logSequenceNumber;
-        private ulong _indexBlockVcn; // Virtual Cluster Number (maybe in sectors sometimes...?)
-
-        private IndexNode _node;
-
-        private Index _index;
-        private bool _isRoot;
-        private long _streamPosition;
-
-        public IndexBlock(Index index, bool isRoot, IndexEntry parentEntry, BiosParameterBlock bpb)
-            : base("INDX", bpb.BytesPerSector)
-        {
-            _index = index;
-            _isRoot = isRoot;
-
-            Stream stream = index.AllocationStream;
-            _streamPosition = index.IndexBlockVcnToPosition(parentEntry.ChildrenVirtualCluster);
-            stream.Position = _streamPosition;
-            byte[] buffer = Utilities.ReadFully(stream, (int)index.IndexBufferSize);
-            FromBytes(buffer, 0);
-        }
-
-        private IndexBlock(Index index, bool isRoot, long vcn, BiosParameterBlock bpb)
-            : base("INDX", bpb.BytesPerSector, bpb.IndexBufferSize)
-        {
-            _index = index;
-            _isRoot = isRoot;
-
-            _indexBlockVcn = (ulong)vcn;
-
-            _streamPosition = vcn * bpb.BytesPerSector * bpb.SectorsPerCluster;
-
-            _node = new IndexNode(WriteToDisk, UpdateSequenceSize, _index, isRoot, (uint)bpb.IndexBufferSize - FieldSize);
-
-            WriteToDisk();
-        }
-
-        public IndexNode Node
-        {
-            get { return _node; }
-        }
-
-        internal static IndexBlock Initialize(Index index, bool isRoot, IndexEntry parentEntry, BiosParameterBlock bpb)
-        {
-            return new IndexBlock(index, isRoot, parentEntry.ChildrenVirtualCluster, bpb);
-        }
-
-        internal void WriteToDisk()
-        {
-            byte[] buffer = new byte[_index.IndexBufferSize];
-            ToBytes(buffer, 0);
-
-            Stream stream = _index.AllocationStream;
-            stream.Position = _streamPosition;
-            stream.Write(buffer, 0, buffer.Length);
-            stream.Flush();
-        }
-
-        protected override void Read(byte[] buffer, int offset)
-        {
-            // Skip FixupRecord fields...
-            _logSequenceNumber = Utilities.ToUInt64LittleEndian(buffer, offset + 0x08);
-            _indexBlockVcn = Utilities.ToUInt64LittleEndian(buffer, offset + 0x10);
-            _node = new IndexNode(WriteToDisk, UpdateSequenceSize, _index, _isRoot, buffer, offset + FieldSize);
-        }
-
-        protected override ushort Write(byte[] buffer, int offset)
-        {
-            Utilities.WriteBytesLittleEndian(_logSequenceNumber, buffer, offset + 0x08);
-            Utilities.WriteBytesLittleEndian(_indexBlockVcn, buffer, offset + 0x10);
-            return (ushort)(FieldSize + Node.WriteTo(buffer, offset + FieldSize));
-        }
-
-        protected override int CalcSize()
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/IndexEntry.cs b/DiscUtils/Ntfs/IndexEntry.cs
deleted file mode 100644
index cddac84..0000000
--- a/DiscUtils/Ntfs/IndexEntry.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-
-    [Flags]
-    internal enum IndexEntryFlags : ushort
-    {
-        None = 0x00,
-        Node = 0x01,
-        End = 0x02
-    }
-
-    internal class IndexEntry
-    {
-        public const int EndNodeSize = 0x18;
-
-        protected IndexEntryFlags _flags;
-        protected long _vcn; // Only valid if Node flag set
-
-        protected byte[] _keyBuffer;
-        protected byte[] _dataBuffer;
-
-        private bool _isFileIndexEntry;
-
-        public IndexEntry(bool isFileIndexEntry)
-        {
-            _isFileIndexEntry = isFileIndexEntry;
-        }
-
-        public IndexEntry(IndexEntry toCopy, byte[] newKey, byte[] newData)
-        {
-            _isFileIndexEntry = toCopy._isFileIndexEntry;
-            _flags = toCopy._flags;
-            _vcn = toCopy._vcn;
-            _keyBuffer = newKey;
-            _dataBuffer = newData;
-        }
-
-        public IndexEntry(byte[] key, byte[] data, bool isFileIndexEntry)
-        {
-            _isFileIndexEntry = isFileIndexEntry;
-            _flags = IndexEntryFlags.None;
-            _keyBuffer = key;
-            _dataBuffer = data;
-        }
-
-        public byte[] KeyBuffer
-        {
-            get { return _keyBuffer; }
-            set { _keyBuffer = value; }
-        }
-
-        public byte[] DataBuffer
-        {
-            get { return _dataBuffer; }
-            set { _dataBuffer = value; }
-        }
-
-        public IndexEntryFlags Flags
-        {
-            get { return _flags; }
-            set { _flags = value; }
-        }
-
-        public long ChildrenVirtualCluster
-        {
-            get { return _vcn; }
-            set { _vcn = value; }
-        }
-
-        public virtual int Size
-        {
-            get
-            {
-                int size = 0x10; // start of variable data
-
-                if ((_flags & IndexEntryFlags.End) == 0)
-                {
-                    size += _keyBuffer.Length;
-                    size += IsFileIndexEntry ? 0 : _dataBuffer.Length;
-                }
-
-                size = Utilities.RoundUp(size, 8);
-
-                if ((_flags & IndexEntryFlags.Node) != 0)
-                {
-                    size += 8;
-                }
-
-                return size;
-            }
-        }
-
-        protected bool IsFileIndexEntry
-        {
-            get { return _isFileIndexEntry; }
-        }
-
-        public virtual void Read(byte[] buffer, int offset)
-        {
-            ushort dataOffset = Utilities.ToUInt16LittleEndian(buffer, offset + 0x00);
-            ushort dataLength = Utilities.ToUInt16LittleEndian(buffer, offset + 0x02);
-            ushort length = Utilities.ToUInt16LittleEndian(buffer, offset + 0x08);
-            ushort keyLength = Utilities.ToUInt16LittleEndian(buffer, offset + 0x0A);
-            _flags = (IndexEntryFlags)Utilities.ToUInt16LittleEndian(buffer, offset + 0x0C);
-
-            if ((_flags & IndexEntryFlags.End) == 0)
-            {
-                _keyBuffer = new byte[keyLength];
-                Array.Copy(buffer, offset + 0x10, _keyBuffer, 0, keyLength);
-
-                if (IsFileIndexEntry)
-                {
-                    // Special case, for file indexes, the MFT ref is held where the data offset & length go
-                    _dataBuffer = new byte[8];
-                    Array.Copy(buffer, offset + 0x00, _dataBuffer, 0, 8);
-                }
-                else
-                {
-                    _dataBuffer = new byte[dataLength];
-                    Array.Copy(buffer, offset + 0x10 + keyLength, _dataBuffer, 0, dataLength);
-                }
-            }
-
-            if ((_flags & IndexEntryFlags.Node) != 0)
-            {
-                _vcn = Utilities.ToInt64LittleEndian(buffer, offset + length - 8);
-            }
-        }
-
-        public virtual void WriteTo(byte[] buffer, int offset)
-        {
-            ushort length = (ushort)Size;
-
-            if ((_flags & IndexEntryFlags.End) == 0)
-            {
-                ushort keyLength = (ushort)_keyBuffer.Length;
-
-                if (IsFileIndexEntry)
-                {
-                    Array.Copy(_dataBuffer, 0, buffer, offset + 0x00, 8);
-                }
-                else
-                {
-                    ushort dataOffset = (ushort)(IsFileIndexEntry ? 0 : (0x10 + keyLength));
-                    ushort dataLength = (ushort)_dataBuffer.Length;
-
-                    Utilities.WriteBytesLittleEndian(dataOffset, buffer, offset + 0x00);
-                    Utilities.WriteBytesLittleEndian(dataLength, buffer, offset + 0x02);
-                    Array.Copy(_dataBuffer, 0, buffer, offset + dataOffset, _dataBuffer.Length);
-                }
-
-                Utilities.WriteBytesLittleEndian(keyLength, buffer, offset + 0x0A);
-                Array.Copy(_keyBuffer, 0, buffer, offset + 0x10, _keyBuffer.Length);
-            }
-            else
-            {
-                Utilities.WriteBytesLittleEndian((ushort)0, buffer, offset + 0x00); // dataOffset
-                Utilities.WriteBytesLittleEndian((ushort)0, buffer, offset + 0x02); // dataLength
-                Utilities.WriteBytesLittleEndian((ushort)0, buffer, offset + 0x0A); // keyLength
-            }
-
-            Utilities.WriteBytesLittleEndian(length, buffer, offset + 0x08);
-            Utilities.WriteBytesLittleEndian((ushort)_flags, buffer, offset + 0x0C);
-            if ((_flags & IndexEntryFlags.Node) != 0)
-            {
-                Utilities.WriteBytesLittleEndian(_vcn, buffer, offset + length - 8);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/IndexHeader.cs b/DiscUtils/Ntfs/IndexHeader.cs
deleted file mode 100644
index 1798846..0000000
--- a/DiscUtils/Ntfs/IndexHeader.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    internal class IndexHeader
-    {
-        public const int Size = 0x10;
-
-        public uint OffsetToFirstEntry;
-        public uint TotalSizeOfEntries;
-        public uint AllocatedSizeOfEntries;
-        public byte HasChildNodes;
-
-        public IndexHeader(uint allocatedSize)
-        {
-            AllocatedSizeOfEntries = allocatedSize;
-        }
-
-        public IndexHeader(byte[] data, int offset)
-        {
-            OffsetToFirstEntry = Utilities.ToUInt32LittleEndian(data, offset + 0x00);
-            TotalSizeOfEntries = Utilities.ToUInt32LittleEndian(data, offset + 0x04);
-            AllocatedSizeOfEntries = Utilities.ToUInt32LittleEndian(data, offset + 0x08);
-            HasChildNodes = data[offset + 0x0C];
-        }
-
-        internal void WriteTo(byte[] buffer, int offset)
-        {
-            Utilities.WriteBytesLittleEndian(OffsetToFirstEntry, buffer, offset + 0x00);
-            Utilities.WriteBytesLittleEndian(TotalSizeOfEntries, buffer, offset + 0x04);
-            Utilities.WriteBytesLittleEndian(AllocatedSizeOfEntries, buffer, offset + 0x08);
-            buffer[offset + 0x0C] = HasChildNodes;
-            buffer[offset + 0x0D] = 0;
-            buffer[offset + 0x0E] = 0;
-            buffer[offset + 0x0F] = 0;
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/IndexNode.cs b/DiscUtils/Ntfs/IndexNode.cs
deleted file mode 100644
index 51bd993..0000000
--- a/DiscUtils/Ntfs/IndexNode.cs
+++ /dev/null
@@ -1,588 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal delegate void IndexNodeSaveFn();
-
-    internal class IndexNode
-    {
-        private IndexNodeSaveFn _store;
-        private int _storageOverhead;
-        private long _totalSpaceAvailable;
-
-        private IndexHeader _header;
-
-        private Index _index;
-        private bool _isRoot;
-
-        private List<IndexEntry> _entries;
-
-        public IndexNode(IndexNodeSaveFn store, int storeOverhead, Index index, bool isRoot, uint allocatedSize)
-        {
-            _store = store;
-            _storageOverhead = storeOverhead;
-            _index = index;
-            _isRoot = isRoot;
-            _header = new IndexHeader(allocatedSize);
-            _totalSpaceAvailable = allocatedSize;
-
-            IndexEntry endEntry = new IndexEntry(_index.IsFileIndex);
-            endEntry.Flags |= IndexEntryFlags.End;
-
-            _entries = new List<IndexEntry>();
-            _entries.Add(endEntry);
-
-            _header.OffsetToFirstEntry = (uint)(IndexHeader.Size + storeOverhead);
-            _header.TotalSizeOfEntries = (uint)(_header.OffsetToFirstEntry + endEntry.Size);
-        }
-
-        public IndexNode(IndexNodeSaveFn store, int storeOverhead, Index index, bool isRoot, byte[] buffer, int offset)
-        {
-            _store = store;
-            _storageOverhead = storeOverhead;
-            _index = index;
-            _isRoot = isRoot;
-            _header = new IndexHeader(buffer, offset + 0);
-            _totalSpaceAvailable = _header.AllocatedSizeOfEntries;
-
-            _entries = new List<IndexEntry>();
-            int pos = (int)_header.OffsetToFirstEntry;
-            while (pos < _header.TotalSizeOfEntries)
-            {
-                IndexEntry entry = new IndexEntry(index.IsFileIndex);
-                entry.Read(buffer, offset + pos);
-                _entries.Add(entry);
-
-                if ((entry.Flags & IndexEntryFlags.End) != 0)
-                {
-                    break;
-                }
-
-                pos += entry.Size;
-            }
-        }
-
-        public IndexHeader Header
-        {
-            get { return _header; }
-        }
-
-        public IEnumerable<IndexEntry> Entries
-        {
-            get { return _entries; }
-        }
-
-        internal long TotalSpaceAvailable
-        {
-            get { return _totalSpaceAvailable; }
-            set { _totalSpaceAvailable = value; }
-        }
-
-        private long SpaceFree
-        {
-            get
-            {
-                long entriesTotal = 0;
-                for (int i = 0; i < _entries.Count; ++i)
-                {
-                    entriesTotal += _entries[i].Size;
-                }
-
-                int firstEntryOffset = Utilities.RoundUp(IndexHeader.Size + _storageOverhead, 8);
-
-                return _totalSpaceAvailable - (entriesTotal + firstEntryOffset);
-            }
-        }
-
-        public void AddEntry(byte[] key, byte[] data)
-        {
-            IndexEntry overflowEntry = AddEntry(new IndexEntry(key, data, _index.IsFileIndex));
-            if (overflowEntry != null)
-            {
-                throw new IOException("Error adding entry - root overflowed");
-            }
-        }
-
-        public void UpdateEntry(byte[] key, byte[] data)
-        {
-            for (int i = 0; i < _entries.Count; ++i)
-            {
-                var focus = _entries[i];
-                int compVal = _index.Compare(key, focus.KeyBuffer);
-                if (compVal == 0)
-                {
-                    IndexEntry newEntry = new IndexEntry(focus, key, data);
-                    if (_entries[i].Size != newEntry.Size)
-                    {
-                        throw new NotImplementedException("Changing index entry sizes");
-                    }
-
-                    _entries[i] = newEntry;
-                    _store();
-                    return;
-                }
-            }
-
-            throw new IOException("No such index entry");
-        }
-
-        public bool TryFindEntry(byte[] key, out IndexEntry entry, out IndexNode node)
-        {
-            foreach (var focus in _entries)
-            {
-                if ((focus.Flags & IndexEntryFlags.End) != 0)
-                {
-                    if ((focus.Flags & IndexEntryFlags.Node) != 0)
-                    {
-                        IndexBlock subNode = _index.GetSubBlock(focus);
-                        return subNode.Node.TryFindEntry(key, out entry, out node);
-                    }
-
-                    break;
-                }
-                else
-                {
-                    int compVal = _index.Compare(key, focus.KeyBuffer);
-                    if (compVal == 0)
-                    {
-                        entry = focus;
-                        node = this;
-                        return true;
-                    }
-                    else if (compVal < 0 && (focus.Flags & (IndexEntryFlags.End | IndexEntryFlags.Node)) != 0)
-                    {
-                        IndexBlock subNode = _index.GetSubBlock(focus);
-                        return subNode.Node.TryFindEntry(key, out entry, out node);
-                    }
-                }
-            }
-
-            entry = null;
-            node = null;
-            return false;
-        }
-
-        public virtual ushort WriteTo(byte[] buffer, int offset)
-        {
-            bool haveSubNodes = false;
-            uint totalEntriesSize = 0;
-            foreach (var entry in _entries)
-            {
-                totalEntriesSize += (uint)entry.Size;
-                haveSubNodes |= (entry.Flags & IndexEntryFlags.Node) != 0;
-            }
-
-            _header.OffsetToFirstEntry = (uint)Utilities.RoundUp(IndexHeader.Size + _storageOverhead, 8);
-            _header.TotalSizeOfEntries = totalEntriesSize + _header.OffsetToFirstEntry;
-            _header.HasChildNodes = (byte)(haveSubNodes ? 1 : 0);
-            _header.WriteTo(buffer, offset + 0);
-
-            int pos = (int)_header.OffsetToFirstEntry;
-            foreach (var entry in _entries)
-            {
-                entry.WriteTo(buffer, offset + pos);
-                pos += entry.Size;
-            }
-
-            return IndexHeader.Size;
-        }
-
-        public int CalcEntriesSize()
-        {
-            int totalEntriesSize = 0;
-            foreach (var entry in _entries)
-            {
-                totalEntriesSize += entry.Size;
-            }
-
-            return totalEntriesSize;
-        }
-
-        public virtual int CalcSize()
-        {
-            int firstEntryOffset = Utilities.RoundUp(IndexHeader.Size + _storageOverhead, 8);
-            return firstEntryOffset + CalcEntriesSize();
-        }
-
-        public int GetEntry(byte[] key, out bool exactMatch)
-        {
-            for (int i = 0; i < _entries.Count; ++i)
-            {
-                var focus = _entries[i];
-                int compVal;
-
-                if ((focus.Flags & IndexEntryFlags.End) != 0)
-                {
-                    exactMatch = false;
-                    return i;
-                }
-                else
-                {
-                    compVal = _index.Compare(key, focus.KeyBuffer);
-                    if (compVal <= 0)
-                    {
-                        exactMatch = compVal == 0;
-                        return i;
-                    }
-                }
-            }
-
-            throw new IOException("Corrupt index node - no End entry");
-        }
-
-        public bool RemoveEntry(byte[] key, out IndexEntry newParentEntry)
-        {
-            bool exactMatch;
-            int entryIndex = GetEntry(key, out exactMatch);
-            IndexEntry entry = _entries[entryIndex];
-
-            if (exactMatch)
-            {
-                if ((entry.Flags & IndexEntryFlags.Node) != 0)
-                {
-                    IndexNode childNode = _index.GetSubBlock(entry).Node;
-                    IndexEntry rLeaf = childNode.FindLargestLeaf();
-
-                    byte[] newKey = rLeaf.KeyBuffer;
-                    byte[] newData = rLeaf.DataBuffer;
-
-                    IndexEntry newEntry;
-                    childNode.RemoveEntry(newKey, out newEntry);
-                    entry.KeyBuffer = newKey;
-                    entry.DataBuffer = newData;
-
-                    if (newEntry != null)
-                    {
-                        InsertEntryThisNode(newEntry);
-                    }
-
-                    newEntry = LiftNode(entryIndex);
-                    if (newEntry != null)
-                    {
-                        InsertEntryThisNode(newEntry);
-                    }
-
-                    newEntry = PopulateEnd();
-                    if (newEntry != null)
-                    {
-                        InsertEntryThisNode(newEntry);
-                    }
-
-                    // New entry could be larger than old, so may need
-                    // to divide this node...
-                    newParentEntry = EnsureNodeSize();
-                }
-                else
-                {
-                    _entries.RemoveAt(entryIndex);
-                    newParentEntry = null;
-                }
-
-                _store();
-                return true;
-            }
-            else if ((entry.Flags & IndexEntryFlags.Node) != 0)
-            {
-                IndexNode childNode = _index.GetSubBlock(entry).Node;
-                IndexEntry newEntry;
-                if (childNode.RemoveEntry(key, out newEntry))
-                {
-                    if (newEntry != null)
-                    {
-                        InsertEntryThisNode(newEntry);
-                    }
-
-                    newEntry = LiftNode(entryIndex);
-                    if (newEntry != null)
-                    {
-                        InsertEntryThisNode(newEntry);
-                    }
-
-                    newEntry = PopulateEnd();
-                    if (newEntry != null)
-                    {
-                        InsertEntryThisNode(newEntry);
-                    }
-
-                    // New entry could be larger than old, so may need
-                    // to divide this node...
-                    newParentEntry = EnsureNodeSize();
-
-                    _store();
-                    return true;
-                }
-            }
-
-            newParentEntry = null;
-            return false;
-        }
-
-        /// <summary>
-        /// Only valid on the root node, this method moves all entries into a
-        /// single child node.
-        /// </summary>
-        /// <returns>Whether any changes were made.</returns>
-        internal bool Depose()
-        {
-            if (!_isRoot)
-            {
-                throw new InvalidOperationException("Only valid on root node");
-            }
-
-            if (_entries.Count == 1)
-            {
-                return false;
-            }
-
-            IndexEntry newRootEntry = new IndexEntry(_index.IsFileIndex);
-            newRootEntry.Flags = IndexEntryFlags.End;
-
-            IndexBlock newBlock = _index.AllocateBlock(newRootEntry);
-
-            // Set the deposed entries into the new node.  Note we updated the parent
-            // pointers first, because it's possible SetEntries may need to further
-            // divide the entries to fit into nodes.  We mustn't overwrite any changes.
-            newBlock.Node.SetEntries(_entries, 0, _entries.Count);
-
-            _entries.Clear();
-            _entries.Add(newRootEntry);
-
-            return true;
-        }
-
-        /// <summary>
-        /// Removes redundant nodes (that contain only an 'End' entry).
-        /// </summary>
-        /// <param name="entryIndex">The index of the entry that may have a redundant child.</param>
-        /// <returns>An entry that needs to be promoted to the parent node (if any).</returns>
-        private IndexEntry LiftNode(int entryIndex)
-        {
-            if ((_entries[entryIndex].Flags & IndexEntryFlags.Node) != 0)
-            {
-                IndexNode childNode = _index.GetSubBlock(_entries[entryIndex]).Node;
-                if (childNode._entries.Count == 1)
-                {
-                    long freeBlock = _entries[entryIndex].ChildrenVirtualCluster;
-                    _entries[entryIndex].Flags = (_entries[entryIndex].Flags & ~IndexEntryFlags.Node) | (childNode._entries[0].Flags & IndexEntryFlags.Node);
-                    _entries[entryIndex].ChildrenVirtualCluster = childNode._entries[0].ChildrenVirtualCluster;
-
-                    _index.FreeBlock(freeBlock);
-                }
-
-                if ((_entries[entryIndex].Flags & (IndexEntryFlags.Node | IndexEntryFlags.End)) == 0)
-                {
-                    IndexEntry entry = _entries[entryIndex];
-                    _entries.RemoveAt(entryIndex);
-
-                    IndexNode nextNode = _index.GetSubBlock(_entries[entryIndex]).Node;
-                    return nextNode.AddEntry(entry);
-                }
-            }
-
-            return null;
-        }
-
-        private IndexEntry PopulateEnd()
-        {
-            if (_entries.Count > 1
-                && _entries[_entries.Count - 1].Flags == IndexEntryFlags.End
-                && (_entries[_entries.Count - 2].Flags & IndexEntryFlags.Node) != 0)
-            {
-                IndexEntry old = _entries[_entries.Count - 2];
-                _entries.RemoveAt(_entries.Count - 2);
-                _entries[_entries.Count - 1].ChildrenVirtualCluster = old.ChildrenVirtualCluster;
-                _entries[_entries.Count - 1].Flags |= IndexEntryFlags.Node;
-                old.ChildrenVirtualCluster = 0;
-                old.Flags = IndexEntryFlags.None;
-                return _index.GetSubBlock(_entries[_entries.Count - 1]).Node.AddEntry(old);
-            }
-
-            return null;
-        }
-
-        private void InsertEntryThisNode(IndexEntry newEntry)
-        {
-            bool exactMatch;
-            int index = GetEntry(newEntry.KeyBuffer, out exactMatch);
-
-            if (exactMatch)
-            {
-                throw new InvalidOperationException("Entry already exists");
-            }
-            else
-            {
-                _entries.Insert(index, newEntry);
-            }
-        }
-
-        private IndexEntry AddEntry(IndexEntry newEntry)
-        {
-            bool exactMatch;
-            int index = GetEntry(newEntry.KeyBuffer, out exactMatch);
-
-            if (exactMatch)
-            {
-                throw new InvalidOperationException("Entry already exists");
-            }
-
-            if ((_entries[index].Flags & IndexEntryFlags.Node) != 0)
-            {
-                IndexEntry ourNewEntry = _index.GetSubBlock(_entries[index]).Node.AddEntry(newEntry);
-                if (ourNewEntry == null)
-                {
-                    // No change to this node
-                    return null;
-                }
-
-                InsertEntryThisNode(ourNewEntry);
-            }
-            else
-            {
-                _entries.Insert(index, newEntry);
-            }
-
-            // If there wasn't enough space, we may need to
-            // divide this node
-            IndexEntry newParentEntry = EnsureNodeSize();
-
-            _store();
-
-            return newParentEntry;
-        }
-
-        private IndexEntry EnsureNodeSize()
-        {
-            // While the node is too small to hold the entries, we need to reduce
-            // the number of entries.
-            if (SpaceFree < 0)
-            {
-                if (_isRoot)
-                {
-                    Depose();
-                }
-                else
-                {
-                    return Divide();
-                }
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Finds the largest leaf entry in this tree.
-        /// </summary>
-        /// <returns>The index entry of the largest leaf.</returns>
-        private IndexEntry FindLargestLeaf()
-        {
-            if ((_entries[_entries.Count - 1].Flags & IndexEntryFlags.Node) != 0)
-            {
-                return _index.GetSubBlock(_entries[_entries.Count - 1]).Node.FindLargestLeaf();
-            }
-            else if (_entries.Count > 1 && (_entries[_entries.Count - 2].Flags & IndexEntryFlags.Node) == 0)
-            {
-                return _entries[_entries.Count - 2];
-            }
-            else
-            {
-                throw new IOException("Invalid index node found");
-            }
-        }
-
-        /// <summary>
-        /// Only valid on non-root nodes, this method divides the node in two,
-        /// adding the new node to the current parent.
-        /// </summary>
-        /// <returns>An entry that needs to be promoted to the parent node (if any).</returns>
-        private IndexEntry Divide()
-        {
-            int midEntryIdx = _entries.Count / 2;
-            IndexEntry midEntry = _entries[midEntryIdx];
-
-            // The terminating entry (aka end) for the new node
-            IndexEntry newTerm = new IndexEntry(_index.IsFileIndex);
-            newTerm.Flags |= IndexEntryFlags.End;
-
-            // The set of entries in the new node
-            List<IndexEntry> newEntries = new List<IndexEntry>(midEntryIdx + 1);
-            for (int i = 0; i < midEntryIdx; ++i)
-            {
-                newEntries.Add(_entries[i]);
-            }
-
-            newEntries.Add(newTerm);
-
-            // Copy the node pointer from the elected 'mid' entry to the new node
-            if ((midEntry.Flags & IndexEntryFlags.Node) != 0)
-            {
-                newTerm.ChildrenVirtualCluster = midEntry.ChildrenVirtualCluster;
-                newTerm.Flags |= IndexEntryFlags.Node;
-            }
-
-            // Set the new entries into the new node
-            IndexBlock newBlock = _index.AllocateBlock(midEntry);
-
-            // Set the entries into the new node.  Note we updated the parent
-            // pointers first, because it's possible SetEntries may need to further
-            // divide the entries to fit into nodes.  We mustn't overwrite any changes.
-            newBlock.Node.SetEntries(newEntries, 0, newEntries.Count);
-
-            // Forget about the entries moved into the new node, and the entry about
-            // to be promoted as the new node's pointer
-            _entries.RemoveRange(0, midEntryIdx + 1);
-
-            // Promote the old mid entry
-            return midEntry;
-        }
-
-        private void SetEntries(IList<IndexEntry> newEntries, int offset, int count)
-        {
-            _entries.Clear();
-            for (int i = 0; i < count; ++i)
-            {
-                _entries.Add(newEntries[i + offset]);
-            }
-
-            // Add an end entry, if not present
-            if (count == 0 || (_entries[_entries.Count - 1].Flags & IndexEntryFlags.End) == 0)
-            {
-                IndexEntry end = new IndexEntry(_index.IsFileIndex);
-                end.Flags = IndexEntryFlags.End;
-                _entries.Add(end);
-            }
-
-            // Ensure the node isn't over-filled
-            if (SpaceFree < 0)
-            {
-                throw new IOException("Error setting node entries - oversized for node");
-            }
-
-            // Persist the new entries to disk
-            _store();
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/IndexRoot.cs b/DiscUtils/Ntfs/IndexRoot.cs
deleted file mode 100644
index f308689..0000000
--- a/DiscUtils/Ntfs/IndexRoot.cs
+++ /dev/null
@@ -1,297 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal sealed class IndexRoot : IByteArraySerializable, IDiagnosticTraceable
-    {
-        public const int HeaderOffset = 0x10;
-
-        private uint _attrType;
-        private AttributeCollationRule _collationRule;
-        private uint _indexAllocationEntrySize;
-        private byte _rawClustersPerIndexRecord;
-
-        public uint AttributeType
-        {
-            get { return _attrType; }
-            set { _attrType = value; }
-        }
-
-        public AttributeCollationRule CollationRule
-        {
-            get { return _collationRule; }
-            set { _collationRule = value; }
-        }
-
-        public uint IndexAllocationSize
-        {
-            get { return _indexAllocationEntrySize; }
-            set { _indexAllocationEntrySize = value; }
-        }
-
-        public byte RawClustersPerIndexRecord
-        {
-            get { return _rawClustersPerIndexRecord; }
-            set { _rawClustersPerIndexRecord = value; }
-        }
-
-        public int Size
-        {
-            get { return 16; }
-        }
-
-        public IComparer<byte[]> GetCollator(UpperCase upCase)
-        {
-            switch (_collationRule)
-            {
-                case AttributeCollationRule.Filename:
-                    return new FileNameComparer(upCase);
-                case AttributeCollationRule.SecurityHash:
-                    return new SecurityHashComparer();
-                case AttributeCollationRule.UnsignedLong:
-                    return new UnsignedLongComparer();
-                case AttributeCollationRule.MultipleUnsignedLongs:
-                    return new MultipleUnsignedLongComparer();
-                case AttributeCollationRule.Sid:
-                    return new SidComparer();
-                default:
-                    throw new NotImplementedException();
-            }
-        }
-
-        public int ReadFrom(byte[] buffer, int offset)
-        {
-            _attrType = Utilities.ToUInt32LittleEndian(buffer, 0x00);
-            _collationRule = (AttributeCollationRule)Utilities.ToUInt32LittleEndian(buffer, 0x04);
-            _indexAllocationEntrySize = Utilities.ToUInt32LittleEndian(buffer, 0x08);
-            _rawClustersPerIndexRecord = buffer[0x0C];
-            return 16;
-        }
-
-        public void WriteTo(byte[] buffer, int offset)
-        {
-            Utilities.WriteBytesLittleEndian(_attrType, buffer, 0);
-            Utilities.WriteBytesLittleEndian((uint)_collationRule, buffer, 0x04);
-            Utilities.WriteBytesLittleEndian(_indexAllocationEntrySize, buffer, 0x08);
-            Utilities.WriteBytesLittleEndian(_rawClustersPerIndexRecord, buffer, 0x0C);
-        }
-
-        public void Dump(TextWriter writer, string indent)
-        {
-            writer.WriteLine(indent + "                Attr Type: " + _attrType);
-            writer.WriteLine(indent + "           Collation Rule: " + _collationRule);
-            writer.WriteLine(indent + "         Index Alloc Size: " + _indexAllocationEntrySize);
-            writer.WriteLine(indent + "  Raw Clusters Per Record: " + _rawClustersPerIndexRecord);
-        }
-
-        private sealed class SecurityHashComparer : IComparer<byte[]>
-        {
-            public int Compare(byte[] x, byte[] y)
-            {
-                if (x == null && y == null)
-                {
-                    return 0;
-                }
-                else if (y == null)
-                {
-                    return -1;
-                }
-                else if (x == null)
-                {
-                    return 1;
-                }
-
-                uint xHash = Utilities.ToUInt32LittleEndian(x, 0);
-                uint yHash = Utilities.ToUInt32LittleEndian(y, 0);
-
-                if (xHash < yHash)
-                {
-                    return -1;
-                }
-                else if (xHash > yHash)
-                {
-                    return 1;
-                }
-
-                uint xId = Utilities.ToUInt32LittleEndian(x, 4);
-                uint yId = Utilities.ToUInt32LittleEndian(y, 4);
-                if (xId < yId)
-                {
-                    return -1;
-                }
-                else if (xId > yId)
-                {
-                    return 1;
-                }
-                else
-                {
-                    return 0;
-                }
-            }
-        }
-
-        private sealed class UnsignedLongComparer : IComparer<byte[]>
-        {
-            public int Compare(byte[] x, byte[] y)
-            {
-                if (x == null && y == null)
-                {
-                    return 0;
-                }
-                else if (y == null)
-                {
-                    return -1;
-                }
-                else if (x == null)
-                {
-                    return 1;
-                }
-
-                uint xVal = Utilities.ToUInt32LittleEndian(x, 0);
-                uint yVal = Utilities.ToUInt32LittleEndian(y, 0);
-
-                if (xVal < yVal)
-                {
-                    return -1;
-                }
-                else if (xVal > yVal)
-                {
-                    return 1;
-                }
-
-                return 0;
-            }
-        }
-
-        private sealed class MultipleUnsignedLongComparer : IComparer<byte[]>
-        {
-            public int Compare(byte[] x, byte[] y)
-            {
-                for (int i = 0; i < x.Length / 4; ++i)
-                {
-                    if (x == null && y == null)
-                    {
-                        return 0;
-                    }
-                    else if (y == null)
-                    {
-                        return -1;
-                    }
-                    else if (x == null)
-                    {
-                        return 1;
-                    }
-
-                    uint xVal = Utilities.ToUInt32LittleEndian(x, i * 4);
-                    uint yVal = Utilities.ToUInt32LittleEndian(y, i * 4);
-
-                    if (xVal < yVal)
-                    {
-                        return -1;
-                    }
-                    else if (xVal > yVal)
-                    {
-                        return 1;
-                    }
-                }
-
-                return 0;
-            }
-        }
-
-        private sealed class FileNameComparer : IComparer<byte[]>
-        {
-            private UpperCase _stringComparer;
-
-            public FileNameComparer(UpperCase upCase)
-            {
-                _stringComparer = upCase;
-            }
-
-            public int Compare(byte[] x, byte[] y)
-            {
-                if (x == null && y == null)
-                {
-                    return 0;
-                }
-                else if (y == null)
-                {
-                    return -1;
-                }
-                else if (x == null)
-                {
-                    return 1;
-                }
-
-                byte xFnLen = x[0x40];
-                byte yFnLen = y[0x40];
-
-                return _stringComparer.Compare(x, 0x42, xFnLen * 2, y, 0x42, yFnLen * 2);
-            }
-        }
-
-        private sealed class SidComparer : IComparer<byte[]>
-        {
-            public int Compare(byte[] x, byte[] y)
-            {
-                if (x == null && y == null)
-                {
-                    return 0;
-                }
-                else if (y == null)
-                {
-                    return -1;
-                }
-                else if (x == null)
-                {
-                    return 1;
-                }
-
-                int toComp = Math.Min(x.Length, y.Length);
-                for (int i = 0; i < toComp; ++i)
-                {
-                    int val = ((int)x[i]) - ((int)y[i]);
-                    if (val != 0)
-                    {
-                        return val;
-                    }
-                }
-
-                if (x.Length < y.Length)
-                {
-                    return -1;
-                }
-                else if (x.Length > y.Length)
-                {
-                    return 1;
-                }
-
-                return 0;
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/IndexView.cs b/DiscUtils/Ntfs/IndexView.cs
deleted file mode 100644
index 7222a95..0000000
--- a/DiscUtils/Ntfs/IndexView.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Collections.Generic;
-
-    internal class IndexView<K, D>
-        where K : IByteArraySerializable, new()
-        where D : IByteArraySerializable, new()
-    {
-        private Index _index;
-
-        public IndexView(Index index)
-        {
-            _index = index;
-        }
-
-        public int Count
-        {
-            get { return _index.Count; }
-        }
-
-        public IEnumerable<KeyValuePair<K, D>> Entries
-        {
-            get
-            {
-                foreach (var entry in _index.Entries)
-                {
-                    yield return new KeyValuePair<K, D>(Convert<K>(entry.Key), Convert<D>(entry.Value));
-                }
-            }
-        }
-
-        public D this[K key]
-        {
-            get
-            {
-                return Convert<D>(_index[Unconvert(key)]);
-            }
-
-            set
-            {
-                _index[Unconvert(key)] = Unconvert<D>(value);
-            }
-        }
-
-        public IEnumerable<KeyValuePair<K, D>> FindAll(IComparable<byte[]> query)
-        {
-            foreach (var entry in _index.FindAll(query))
-            {
-                yield return new KeyValuePair<K, D>(Convert<K>(entry.Key), Convert<D>(entry.Value));
-            }
-        }
-
-        public KeyValuePair<K, D> FindFirst(IComparable<byte[]> query)
-        {
-            foreach (var entry in FindAll(query))
-            {
-                return entry;
-            }
-
-            return default(KeyValuePair<K, D>);
-        }
-
-        public IEnumerable<KeyValuePair<K, D>> FindAll(IComparable<K> query)
-        {
-            foreach (var entry in _index.FindAll(new ComparableConverter(query)))
-            {
-                yield return new KeyValuePair<K, D>(Convert<K>(entry.Key), Convert<D>(entry.Value));
-            }
-        }
-
-        public KeyValuePair<K, D> FindFirst(IComparable<K> query)
-        {
-            foreach (var entry in FindAll(query))
-            {
-                return entry;
-            }
-
-            return default(KeyValuePair<K, D>);
-        }
-
-        public bool TryGetValue(K key, out D data)
-        {
-            byte[] value;
-            if (_index.TryGetValue(Unconvert(key), out value))
-            {
-                data = Convert<D>(value);
-                return true;
-            }
-            else
-            {
-                data = default(D);
-                return false;
-            }
-        }
-
-        public bool ContainsKey(K key)
-        {
-            return _index.ContainsKey(Unconvert(key));
-        }
-
-        public void Remove(K key)
-        {
-            _index.Remove(Unconvert(key));
-        }
-
-        private static T Convert<T>(byte[] data)
-            where T : IByteArraySerializable, new()
-        {
-            T result = new T();
-            result.ReadFrom(data, 0);
-            return result;
-        }
-
-        private static byte[] Unconvert<T>(T value)
-            where T : IByteArraySerializable, new()
-        {
-            byte[] buffer = new byte[value.Size];
-            value.WriteTo(buffer, 0);
-            return buffer;
-        }
-
-        private class ComparableConverter : IComparable<byte[]>
-        {
-            private IComparable<K> _wrapped;
-
-            public ComparableConverter(IComparable<K> toWrap)
-            {
-                _wrapped = toWrap;
-            }
-
-            public int CompareTo(byte[] other)
-            {
-                return _wrapped.CompareTo(Convert<K>(other));
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/Internals/AttributeFlags.cs b/DiscUtils/Ntfs/Internals/AttributeFlags.cs
deleted file mode 100644
index 1ceca8a..0000000
--- a/DiscUtils/Ntfs/Internals/AttributeFlags.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs.Internals
-{
-    using System;
-
-    /// <summary>
-    /// Flags indicating how an attribute's content is stored on disk.
-    /// </summary>
-    [Flags]
-    public enum AttributeFlags
-    {
-        /// <summary>
-        /// The data is stored in linear form.
-        /// </summary>
-        None = 0x0000,
-
-        /// <summary>
-        /// The data is compressed.
-        /// </summary>
-        Compressed = 0x0001,
-
-        /// <summary>
-        /// The data is encrypted.
-        /// </summary>
-        Encrypted = 0x4000,
-
-        /// <summary>
-        /// The data is stored in sparse form.
-        /// </summary>
-        Sparse = 0x8000
-    }
-}
diff --git a/DiscUtils/Ntfs/Internals/AttributeListAttribute.cs b/DiscUtils/Ntfs/Internals/AttributeListAttribute.cs
deleted file mode 100644
index a115e3a..0000000
--- a/DiscUtils/Ntfs/Internals/AttributeListAttribute.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs.Internals
-{
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// List of attributes for files that are split over multiple Master File Table entries.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// Files with lots of attribute data (for example that have become very fragmented) contain
-    /// this attribute in their 'base' Master File Table entry.  This attribute acts as an index,
-    /// indicating for each attribute in the file, which Master File Table entry contains the
-    /// attribute.
-    /// </para>
-    /// </remarks>
-    public sealed class AttributeListAttribute : GenericAttribute
-    {
-        private AttributeList _list;
-
-        internal AttributeListAttribute(INtfsContext context, AttributeRecord record)
-            : base(context, record)
-        {
-            byte[] content = Utilities.ReadAll(Content);
-            _list = new AttributeList();
-            _list.ReadFrom(content, 0);
-        }
-
-        /// <summary>
-        /// Gets the entries in this attribute list.
-        /// </summary>
-        public ICollection<AttributeListEntry> Entries
-        {
-            get
-            {
-                List<AttributeListEntry> entries = new List<AttributeListEntry>();
-                foreach (var record in _list)
-                {
-                    entries.Add(new AttributeListEntry(record));
-                }
-
-                return entries;
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/Internals/AttributeListEntry.cs b/DiscUtils/Ntfs/Internals/AttributeListEntry.cs
deleted file mode 100644
index 790d8e6..0000000
--- a/DiscUtils/Ntfs/Internals/AttributeListEntry.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs.Internals
-{
-    /// <summary>
-    /// Represents an entry in an AttributeList attribute.
-    /// </summary>
-    /// <remarks>Each instance of this class points to the actual Master File Table
-    /// entry that contains the attribute.  It is used for files split over multiple
-    /// Master File Table entries.</remarks>
-    public sealed class AttributeListEntry
-    {
-        private AttributeListRecord _record;
-
-        internal AttributeListEntry(AttributeListRecord record)
-        {
-            _record = record;
-        }
-
-        /// <summary>
-        /// Gets the type of the attribute.
-        /// </summary>
-        public AttributeType AttributeType
-        {
-            get { return _record.Type; }
-        }
-
-        /// <summary>
-        /// Gets the name of the attribute (if any).
-        /// </summary>
-        public string AttributeName
-        {
-            get { return _record.Name; }
-        }
-
-        /// <summary>
-        /// Gets the first cluster represented in this attribute (normally 0).
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// For very fragmented files, it can be necessary to split a single attribute
-        /// over multiple Master File Table entries.  This is achieved with multiple attributes
-        /// with the same name and type (one per Master File Table entry), with this field
-        /// determining the logical order of the attributes.
-        /// </para>
-        /// <para>
-        /// The number is the first 'virtual' cluster present (i.e. divide the file's content
-        /// into 'cluster' sized chunks, this is the first of those clusters logically
-        /// represented in the attribute).
-        /// </para>
-        /// </remarks>
-        public long FirstFileCluster
-        {
-            get { return (long)_record.StartVcn; }
-        }
-
-        /// <summary>
-        /// Gets the Master File Table entry that contains the attribute.
-        /// </summary>
-        public MasterFileTableReference MasterFileTableEntry
-        {
-            get { return new MasterFileTableReference(_record.BaseFileReference); }
-        }
-
-        /// <summary>
-        /// Gets the identifier of the attribute.
-        /// </summary>
-        public int AttributeIdentifier
-        {
-            get { return _record.AttributeId; }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/Internals/EntryState.cs b/DiscUtils/Ntfs/Internals/EntryState.cs
deleted file mode 100644
index ad05f7f..0000000
--- a/DiscUtils/Ntfs/Internals/EntryState.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace DiscUtils.Ntfs.Internals
-{
-    /// <summary>
-    /// Flags indicating the state of a Master File Table entry.
-    /// </summary>
-    /// <remarks>
-    /// Used to filter entries in the Master File Table.
-    /// </remarks>
-    [Flags]
-    public enum EntryState
-    {
-        /// <summary>
-        /// No entries match.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// The entry is currently in use.
-        /// </summary>
-        InUse = 1,
-
-        /// <summary>
-        /// The entry is currently not in use.
-        /// </summary>
-        NotInUse = 2,
-
-        /// <summary>
-        /// All entries match.
-        /// </summary>
-        All = 3
-    }
-}
diff --git a/DiscUtils/Ntfs/Internals/EntryStates.cs b/DiscUtils/Ntfs/Internals/EntryStates.cs
deleted file mode 100644
index b85b8a4..0000000
--- a/DiscUtils/Ntfs/Internals/EntryStates.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs.Internals
-{
-    using System;
-
-    /// <summary>
-    /// Flags indicating the state of a Master File Table entry.
-    /// </summary>
-    /// <remarks>
-    /// Used to filter entries in the Master File Table.
-    /// </remarks>
-    [Flags]
-    public enum EntryStates
-    {
-        /// <summary>
-        /// No entries match.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// The entry is currently in use.
-        /// </summary>
-        InUse = 1,
-
-        /// <summary>
-        /// The entry is currently not in use.
-        /// </summary>
-        NotInUse = 2,
-
-        /// <summary>
-        /// All entries match.
-        /// </summary>
-        All = 3
-    }
-}
diff --git a/DiscUtils/Ntfs/Internals/FileNameAttribute.cs b/DiscUtils/Ntfs/Internals/FileNameAttribute.cs
deleted file mode 100644
index de7d5d3..0000000
--- a/DiscUtils/Ntfs/Internals/FileNameAttribute.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs.Internals
-{
-    using System;
-
-    /// <summary>
-    /// Representation of an NTFS File Name attribute.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// Each Master File Table entry (MFT Entry) has one of these attributes for each
-    /// hard link.  Files with a long name and a short name will have at least two of
-    /// these attributes.</para>
-    /// <para>
-    /// The details in this attribute may be inconsistent with similar information in
-    /// the StandardInformationAttribute for a file.  The StandardInformation is
-    /// definitive, this attribute holds a 'cache' of the information.
-    /// </para>
-    /// </remarks>
-    public sealed class FileNameAttribute : GenericAttribute
-    {
-        private FileNameRecord _fnr;
-
-        internal FileNameAttribute(INtfsContext context, AttributeRecord record)
-            : base(context, record)
-        {
-            byte[] content = Utilities.ReadAll(Content);
-            _fnr = new FileNameRecord();
-            _fnr.ReadFrom(content, 0);
-        }
-
-        /// <summary>
-        /// Gets the reference to the parent directory.
-        /// </summary>
-        /// <remarks>
-        /// This attribute stores the name of a file within a directory, this field
-        /// provides the link back to the directory.
-        /// </remarks>
-        public MasterFileTableReference ParentDirectory
-        {
-            get { return new MasterFileTableReference(_fnr.ParentDirectory); }
-        }
-
-        /// <summary>
-        /// Gets the creation time of the file.
-        /// </summary>
-        public DateTime CreationTime
-        {
-            get { return _fnr.CreationTime; }
-        }
-
-        /// <summary>
-        /// Gets the modification time of the file.
-        /// </summary>
-        public DateTime ModificationTime
-        {
-            get { return _fnr.ModificationTime; }
-        }
-
-        /// <summary>
-        /// Gets the last time the Master File Table entry for the file was changed.
-        /// </summary>
-        public DateTime MasterFileTableChangedTime
-        {
-            get { return _fnr.MftChangedTime; }
-        }
-
-        /// <summary>
-        /// Gets the last access time of the file.
-        /// </summary>
-        public DateTime LastAccessTime
-        {
-            get { return _fnr.LastAccessTime; }
-        }
-
-        /// <summary>
-        /// Gets the amount of disk space allocated for the file.
-        /// </summary>
-        public long AllocatedSize
-        {
-            get { return (long)_fnr.AllocatedSize; }
-        }
-
-        /// <summary>
-        /// Gets the amount of data stored in the file.
-        /// </summary>
-        public long RealSize
-        {
-            get { return (long)_fnr.RealSize; }
-        }
-
-        /// <summary>
-        /// Gets the attributes of the file, as stored by NTFS.
-        /// </summary>
-        public NtfsFileAttributes FileAttributes
-        {
-            get { return (NtfsFileAttributes)_fnr.Flags; }
-        }
-
-        /// <summary>
-        /// Gets the extended attributes size, or a reparse tag, depending on the nature of the file.
-        /// </summary>
-        public long ExtendedAttributesSizeOrReparsePointTag
-        {
-            get { return (long)_fnr.EASizeOrReparsePointTag; }
-        }
-
-        /// <summary>
-        /// Gets the namespace of the FileName property.
-        /// </summary>
-        public NtfsNamespace FileNameNamespace
-        {
-            get { return (NtfsNamespace)_fnr.FileNameNamespace; }
-        }
-
-        /// <summary>
-        /// Gets the name of the file within the parent directory.
-        /// </summary>
-        public string FileName
-        {
-            get { return _fnr.FileName; }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/Internals/GenericAttribute.cs b/DiscUtils/Ntfs/Internals/GenericAttribute.cs
deleted file mode 100644
index 2699cec..0000000
--- a/DiscUtils/Ntfs/Internals/GenericAttribute.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs.Internals
-{
-    /// <summary>
-    /// Base class for all attributes within Master File Table entries.
-    /// </summary>
-    /// <remarks>
-    /// More specialized base classes are provided for known attribute types.
-    /// </remarks>
-    public abstract class GenericAttribute
-    {
-        private INtfsContext _context;
-        private AttributeRecord _record;
-
-        internal GenericAttribute(INtfsContext context, AttributeRecord record)
-        {
-            _context = context;
-            _record = record;
-        }
-
-        /// <summary>
-        /// Gets the name of the attribute (if any).
-        /// </summary>
-        public string Name
-        {
-            get { return _record.Name; }
-        }
-
-        /// <summary>
-        /// Gets the type of the attribute.
-        /// </summary>
-        public AttributeType AttributeType
-        {
-            get { return _record.AttributeType; }
-        }
-
-        /// <summary>
-        /// Gets the unique id of the attribute.
-        /// </summary>
-        public int Identifier
-        {
-            get { return _record.AttributeId; }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the attribute content is stored in the MFT record itself.
-        /// </summary>
-        public bool IsResident
-        {
-            get { return !_record.IsNonResident; }
-        }
-
-        /// <summary>
-        /// Gets the flags indicating how the content of the attribute is stored.
-        /// </summary>
-        public AttributeFlags Flags
-        {
-            get { return (AttributeFlags)_record.Flags; }
-        }
-
-        /// <summary>
-        /// Gets the amount of valid data in the attribute's content.
-        /// </summary>
-        public long ContentLength
-        {
-            get { return _record.DataLength; }
-        }
-
-        /// <summary>
-        /// Gets a buffer that can access the content of the attribute.
-        /// </summary>
-        public IBuffer Content
-        {
-            get
-            {
-                IBuffer rawBuffer = _record.GetReadOnlyDataBuffer(_context);
-                return new SubBuffer(rawBuffer, 0, _record.DataLength);
-            }
-        }
-
-        internal static GenericAttribute FromAttributeRecord(INtfsContext context, AttributeRecord record)
-        {
-            switch (record.AttributeType)
-            {
-                case AttributeType.AttributeList:
-                    return new AttributeListAttribute(context, record);
-                case AttributeType.FileName:
-                    return new FileNameAttribute(context, record);
-                case AttributeType.StandardInformation:
-                    return new StandardInformationAttribute(context, record);
-                default:
-                    return new UnknownAttribute(context, record);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/Internals/MasterFileTable.cs b/DiscUtils/Ntfs/Internals/MasterFileTable.cs
deleted file mode 100644
index 03d98de..0000000
--- a/DiscUtils/Ntfs/Internals/MasterFileTable.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs.Internals
-{
-    using System.Collections.Generic;
-    using InternalMasterFileTable = DiscUtils.Ntfs.MasterFileTable;
-
-    /// <summary>
-    /// Provides read-only access to the Master File Table of an NTFS file system.
-    /// </summary>
-    public sealed class MasterFileTable
-    {
-        /// <summary>
-        /// Index of the Master File Table itself.
-        /// </summary>
-        public const long MasterFileTableIndex = 0;
-
-        /// <summary>
-        /// Index of the Master File Table Mirror file.
-        /// </summary>
-        public const long MasterFileTableMirrorIndex = 1;
-
-        /// <summary>
-        /// Index of the Log file.
-        /// </summary>
-        public const long LogFileIndex = 2;
-
-        /// <summary>
-        /// Index of the Volume file.
-        /// </summary>
-        public const long VolumeIndex = 3;
-
-        /// <summary>
-        /// Index of the Attribute Definition file.
-        /// </summary>
-        public const long AttributeDefinitionIndex = 4;
-
-        /// <summary>
-        /// Index of the Root Directory.
-        /// </summary>
-        public const long RootDirectoryIndex = 5;
-
-        /// <summary>
-        /// Index of the Bitmap file.
-        /// </summary>
-        public const long BitmapIndex = 6;
-
-        /// <summary>
-        /// Index of the Boot sector(s).
-        /// </summary>
-        public const long BootIndex = 7;
-
-        /// <summary>
-        /// Index of the Bad Cluster file.
-        /// </summary>
-        public const long BadClusterIndex = 8;
-
-        /// <summary>
-        /// Index of the Security Descriptor file.
-        /// </summary>
-        public const long SecureIndex = 9;
-
-        /// <summary>
-        /// Index of the Uppercase mapping file.
-        /// </summary>
-        public const long UppercaseIndex = 10;
-
-        /// <summary>
-        /// Index of the Optional Extensions directory.
-        /// </summary>
-        public const long ExtendDirectoryIndex = 11;
-
-        /// <summary>
-        /// First index available for 'normal' files.
-        /// </summary>
-        private const uint FirstNormalFileIndex = 24;
-
-        private INtfsContext _context;
-        private InternalMasterFileTable _mft;
-
-        internal MasterFileTable(INtfsContext context, InternalMasterFileTable mft)
-        {
-            _context = context;
-            _mft = mft;
-        }
-
-        /// <summary>
-        /// Gets an entry by index.
-        /// </summary>
-        /// <param name="index">The index of the entry.</param>
-        /// <returns>The entry.</returns>
-        public MasterFileTableEntry this[long index]
-        {
-            get
-            {
-                FileRecord mftRecord = _mft.GetRecord(index, true, true);
-                if (mftRecord != null)
-                {
-                    return new MasterFileTableEntry(_context, mftRecord);
-                }
-                else
-                {
-                    return null;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Enumerates all entries.
-        /// </summary>
-        /// <param name="filter">Filter controlling which entries are returned.</param>
-        /// <returns>An enumeration of entries matching the filter.</returns>
-        public IEnumerable<MasterFileTableEntry> GetEntries(EntryStates filter)
-        {
-            foreach (var record in _mft.Records)
-            {
-                EntryStates state;
-                if ((record.Flags & FileRecordFlags.InUse) != 0)
-                {
-                    state = EntryStates.InUse;
-                }
-                else
-                {
-                    state = EntryStates.NotInUse;
-                }
-
-                if ((state & filter) != 0)
-                {
-                    yield return new MasterFileTableEntry(_context, record);
-                }
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/Internals/MasterFileTableAttribute.cs b/DiscUtils/Ntfs/Internals/MasterFileTableAttribute.cs
deleted file mode 100644
index 935ec5f..0000000
--- a/DiscUtils/Ntfs/Internals/MasterFileTableAttribute.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace DiscUtils.Ntfs.Internals
-{
-    public sealed class MasterFileTableAttribute
-    {
-    }
-}
diff --git a/DiscUtils/Ntfs/Internals/MasterFileTableEntry.cs b/DiscUtils/Ntfs/Internals/MasterFileTableEntry.cs
deleted file mode 100644
index 47acbc3..0000000
--- a/DiscUtils/Ntfs/Internals/MasterFileTableEntry.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs.Internals
-{
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// An entry within the Master File Table.
-    /// </summary>
-    public sealed class MasterFileTableEntry
-    {
-        private INtfsContext _context;
-        private FileRecord _fileRecord;
-
-        internal MasterFileTableEntry(INtfsContext context, FileRecord fileRecord)
-        {
-            _context = context;
-            _fileRecord = fileRecord;
-        }
-
-        /// <summary>
-        /// Gets the index of this entry in the Master File Table.
-        /// </summary>
-        public long Index
-        {
-            get { return _fileRecord.LoadedIndex; }
-        }
-
-        /// <summary>
-        /// Gets the change identifier that is updated each time the file is modified by Windows, relates to the NTFS log file.
-        /// </summary>
-        /// <remarks>
-        /// The NTFS log file provides journalling, preventing meta-data corruption in the event of a system crash.
-        /// </remarks>
-        public long LogFileSequenceNumber
-        {
-            get { return (long)_fileRecord.LogFileSequenceNumber; }
-        }
-
-        /// <summary>
-        /// Gets the revision number of the entry.
-        /// </summary>
-        /// <remarks>
-        /// Each time an entry is allocated or de-allocated, this number is incremented by one.
-        /// </remarks>
-        public int SequenceNumber
-        {
-            get { return _fileRecord.SequenceNumber; }
-        }
-
-        /// <summary>
-        /// Gets the number of hard links referencing this file.
-        /// </summary>
-        public int HardLinkCount
-        {
-            get { return _fileRecord.HardLinkCount; }
-        }
-
-        /// <summary>
-        /// Gets the flags indicating the nature of the entry.
-        /// </summary>
-        public MasterFileTableEntryFlags Flags
-        {
-            get { return (MasterFileTableEntryFlags)_fileRecord.Flags; }
-        }
-
-        /// <summary>
-        /// Gets the identity of the base entry for files split over multiple entries.
-        /// </summary>
-        /// <remarks>
-        /// All entries that form part of the same file have the same value for
-        /// this property.
-        /// </remarks>
-        public MasterFileTableReference BaseRecordReference
-        {
-            get { return new MasterFileTableReference(_fileRecord.BaseFile); }
-        }
-
-        /// <summary>
-        /// Gets the next attribute identity that will be allocated.
-        /// </summary>
-        public int NextAttributeId
-        {
-            get { return _fileRecord.NextAttributeId; }
-        }
-
-        /// <summary>
-        /// Gets the index of this entry in the Master File Table (as stored in the entry itself).
-        /// </summary>
-        /// <remarks>
-        /// Note - older versions of Windows did not store this value, so it may be Zero.
-        /// </remarks>
-        public long SelfIndex
-        {
-            get { return _fileRecord.MasterFileTableIndex; }
-        }
-
-        /// <summary>
-        /// Gets the attributes contained in this entry.
-        /// </summary>
-        public ICollection<GenericAttribute> Attributes
-        {
-            get
-            {
-                List<GenericAttribute> result = new List<GenericAttribute>();
-                foreach (var attr in _fileRecord.Attributes)
-                {
-                    result.Add(GenericAttribute.FromAttributeRecord(_context, attr));
-                }
-
-                return result;
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/Internals/MasterFileTableEntryFlags.cs b/DiscUtils/Ntfs/Internals/MasterFileTableEntryFlags.cs
deleted file mode 100644
index e91b097..0000000
--- a/DiscUtils/Ntfs/Internals/MasterFileTableEntryFlags.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs.Internals
-{
-    using System;
-
-    /// <summary>
-    /// Flags indicating the nature of a Master File Table entry.
-    /// </summary>
-    [Flags]
-    public enum MasterFileTableEntryFlags : int
-    {
-        /// <summary>
-        /// Default value.
-        /// </summary>
-        None = 0x0000,
-
-        /// <summary>
-        /// The entry is currently in use.
-        /// </summary>
-        InUse = 0x0001,
-
-        /// <summary>
-        /// The entry is for a directory (rather than a file).
-        /// </summary>
-        IsDirectory = 0x0002,
-
-        /// <summary>
-        /// The entry is for a file that forms parts of the NTFS meta-data.
-        /// </summary>
-        IsMetaFile = 0x0004,
-
-        /// <summary>
-        /// The entry contains index attributes.
-        /// </summary>
-        HasViewIndex = 0x0008
-    }
-}
diff --git a/DiscUtils/Ntfs/Internals/MasterFileTableRecord.cs b/DiscUtils/Ntfs/Internals/MasterFileTableRecord.cs
deleted file mode 100644
index 439f464..0000000
--- a/DiscUtils/Ntfs/Internals/MasterFileTableRecord.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs.Internals
-{
-    public sealed class MasterFileTableRecord
-    {
-        private FileRecord _fileRecord;
-
-        internal MasterFileTableRecord(FileRecord fileRecord)
-        {
-            _fileRecord = fileRecord;
-        }
-
-        /// <summary>
-        /// Changes each time the file is modified by Windows, relates to the NTFS journal.
-        /// </summary>
-        public long JournalSequenceNumber
-        {
-            get { return (long)_fileRecord.LogFileSequenceNumber; }
-        }
-
-        public int SequenceNumber
-        {
-            get { return _fileRecord.SequenceNumber; }
-        }
-
-        public int HardLinkCount
-        {
-            get { return _fileRecord.HardLinkCount; }
-        }
-
-        public MasterFileTableRecordFlags Flags
-        {
-            get { return (MasterFileTableRecordFlags)_fileRecord.Flags; }
-        }
-
-        public MasterFileTableReference BaseRecordReference
-        {
-            get { return new MasterFileTableReference(_fileRecord.BaseFile); }
-        }
-
-        public int NextAttributeId
-        {
-            get { return _fileRecord.NextAttributeId; }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/Internals/MasterFileTableRecordFlags.cs b/DiscUtils/Ntfs/Internals/MasterFileTableRecordFlags.cs
deleted file mode 100644
index 15d46d4..0000000
--- a/DiscUtils/Ntfs/Internals/MasterFileTableRecordFlags.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs.Internals
-{
-    using System;
-
-    [Flags]
-    public enum MasterFileTableRecordFlags : int
-    {
-        None = 0x0000,
-        InUse = 0x0001,
-        IsDirectory = 0x0002,
-        IsMetaFile = 0x0004,
-        HasViewIndex = 0x0008
-    }
-}
diff --git a/DiscUtils/Ntfs/Internals/MasterFileTableReference.cs b/DiscUtils/Ntfs/Internals/MasterFileTableReference.cs
deleted file mode 100644
index 8ac7ec8..0000000
--- a/DiscUtils/Ntfs/Internals/MasterFileTableReference.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs.Internals
-{
-    /// <summary>
-    /// A reference to a Master File Table entry.
-    /// </summary>
-    public struct MasterFileTableReference
-    {
-        private FileRecordReference _ref;
-
-        internal MasterFileTableReference(FileRecordReference recordRef)
-        {
-            _ref = recordRef;
-        }
-
-        /// <summary>
-        /// Gets the index of the referred entry in the Master File Table.
-        /// </summary>
-        public long RecordIndex
-        {
-            get { return _ref.MftIndex; }
-        }
-
-        /// <summary>
-        /// Gets the revision number of the entry.
-        /// </summary>
-        /// <remarks>
-        /// This value prevents accidental reference to an entry - it will get out
-        /// of sync with the actual entry if the entry is re-allocated or de-allocated.
-        /// </remarks>
-        public int RecordSequenceNumber
-        {
-            get { return _ref.SequenceNumber; }
-        }
-
-        /// <summary>
-        /// Compares to instances for equality.
-        /// </summary>
-        /// <param name="a">The first instance to compare.</param>
-        /// <param name="b">The second instance to compare.</param>
-        /// <returns><code>true</code> if the instances are equivalent, else <code>false</code>.</returns>
-        public static bool operator ==(MasterFileTableReference a, MasterFileTableReference b)
-        {
-            return a._ref == b._ref;
-        }
-
-        /// <summary>
-        /// Compares to instances for equality.
-        /// </summary>
-        /// <param name="a">The first instance to compare.</param>
-        /// <param name="b">The second instance to compare.</param>
-        /// <returns><code>true</code> if the instances are not equivalent, else <code>false</code>.</returns>
-        public static bool operator !=(MasterFileTableReference a, MasterFileTableReference b)
-        {
-            return a._ref != b._ref;
-        }
-
-        /// <summary>
-        /// Compares another object for equality.
-        /// </summary>
-        /// <param name="obj">The object to compare.</param>
-        /// <returns><code>true</code> if the other object is equivalent, else <code>false</code>.</returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null || !(obj is MasterFileTableReference))
-            {
-                return false;
-            }
-
-            return _ref == ((MasterFileTableReference)obj)._ref;
-        }
-
-        /// <summary>
-        /// Gets a hash code for this instance.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            return _ref.GetHashCode();
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/Internals/NtfsFileAttributes.cs b/DiscUtils/Ntfs/Internals/NtfsFileAttributes.cs
deleted file mode 100644
index 1b71731..0000000
--- a/DiscUtils/Ntfs/Internals/NtfsFileAttributes.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs.Internals
-{
-    using System;
-
-    /// <summary>
-    /// File attributes as stored natively by NTFS.
-    /// </summary>
-    [Flags]
-    public enum NtfsFileAttributes
-    {
-        /// <summary>
-        /// No attributes.
-        /// </summary>
-        None = 0x00000000,
-
-        /// <summary>
-        /// The file is read-only.
-        /// </summary>
-        ReadOnly = 0x00000001,
-
-        /// <summary>
-        /// The file is hidden.
-        /// </summary>
-        Hidden = 0x00000002,
-
-        /// <summary>
-        /// The file is part of the Operating System.
-        /// </summary>
-        System = 0x00000004,
-
-        /// <summary>
-        /// The file should be archived.
-        /// </summary>
-        Archive = 0x00000020,
-
-        /// <summary>
-        /// The file is actually a device.
-        /// </summary>
-        Device = 0x00000040,
-
-        /// <summary>
-        /// The file is a 'normal' file.
-        /// </summary>
-        Normal = 0x00000080,
-
-        /// <summary>
-        /// The file is a temporary file.
-        /// </summary>
-        Temporary = 0x00000100,
-
-        /// <summary>
-        /// The file content is stored in sparse form.
-        /// </summary>
-        Sparse = 0x00000200,
-
-        /// <summary>
-        /// The file has a reparse point attached.
-        /// </summary>
-        ReparsePoint = 0x00000400,
-
-        /// <summary>
-        /// The file content is stored compressed.
-        /// </summary>
-        Compressed = 0x00000800,
-
-        /// <summary>
-        /// The file is an 'offline' file.
-        /// </summary>
-        Offline = 0x00001000,
-
-        /// <summary>
-        /// The file is not indexed.
-        /// </summary>
-        NotIndexed = 0x00002000,
-
-        /// <summary>
-        /// The file content is encrypted.
-        /// </summary>
-        Encrypted = 0x00004000,
-
-        /// <summary>
-        /// The file is actually a directory.
-        /// </summary>
-        Directory = 0x10000000,
-
-        /// <summary>
-        /// The file has an index attribute.
-        /// </summary>
-        IndexView = 0x20000000
-    }
-}
diff --git a/DiscUtils/Ntfs/Internals/NtfsNamespace.cs b/DiscUtils/Ntfs/Internals/NtfsNamespace.cs
deleted file mode 100644
index 7f49e14..0000000
--- a/DiscUtils/Ntfs/Internals/NtfsNamespace.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs.Internals
-{
-    /// <summary>
-    /// The known NTFS namespaces.
-    /// </summary>
-    /// <remarks>
-    /// NTFS has multiple namespaces, indicating whether a name is the
-    /// long name for a file, the short name for a file, both, or none.
-    /// </remarks>
-    public enum NtfsNamespace
-    {
-        /// <summary>
-        /// Posix namespace (i.e. long name).
-        /// </summary>
-        Posix = 0,
-
-        /// <summary>
-        /// Windows long file name.
-        /// </summary>
-        Win32 = 1,
-
-        /// <summary>
-        /// DOS (8.3) file name.
-        /// </summary>
-        Dos = 2,
-
-        /// <summary>
-        /// File name that is both the long name and the DOS (8.3) name.
-        /// </summary>
-        Win32AndDos = 3
-    }
-}
diff --git a/DiscUtils/Ntfs/Internals/StandardInformationAttribute.cs b/DiscUtils/Ntfs/Internals/StandardInformationAttribute.cs
deleted file mode 100644
index 04f0d35..0000000
--- a/DiscUtils/Ntfs/Internals/StandardInformationAttribute.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs.Internals
-{
-    using System;
-
-    /// <summary>
-    /// Representation of an NTFS File Name attribute.
-    /// </summary>
-    /// <para>
-    /// The details in this attribute may be inconsistent with similar information in
-    /// the FileNameAttribute(s) for a file.  This attribute is definitive, the
-    /// FileNameAttribute attribute holds a 'cache' of some of the information.
-    /// </para>
-    public sealed class StandardInformationAttribute : GenericAttribute
-    {
-        private StandardInformation _si;
-
-        internal StandardInformationAttribute(INtfsContext context, AttributeRecord record)
-            : base(context, record)
-        {
-            byte[] content = Utilities.ReadAll(Content);
-            _si = new StandardInformation();
-            _si.ReadFrom(content, 0);
-        }
-
-        /// <summary>
-        /// Gets the creation time of the file.
-        /// </summary>
-        public DateTime CreationTime
-        {
-            get { return _si.CreationTime; }
-        }
-
-        /// <summary>
-        /// Gets the modification time of the file.
-        /// </summary>
-        public DateTime ModificationTime
-        {
-            get { return _si.ModificationTime; }
-        }
-
-        /// <summary>
-        /// Gets the last time the Master File Table entry for the file was changed.
-        /// </summary>
-        public DateTime MasterFileTableChangedTime
-        {
-            get { return _si.MftChangedTime; }
-        }
-
-        /// <summary>
-        /// Gets the last access time of the file.
-        /// </summary>
-        public DateTime LastAccessTime
-        {
-            get { return _si.LastAccessTime; }
-        }
-
-        /// <summary>
-        /// Gets the attributes of the file, as stored by NTFS.
-        /// </summary>
-        public NtfsFileAttributes FileAttributes
-        {
-            get { return (NtfsFileAttributes)_si.FileAttributes; }
-        }
-
-        /// <summary>
-        /// Gets the maximum number of file versions (normally 0).
-        /// </summary>
-        public long MaxVersions
-        {
-            get { return _si.MaxVersions; }
-        }
-
-        /// <summary>
-        /// Gets the version number of the file (normally 0).
-        /// </summary>
-        public long Version
-        {
-            get { return _si.Version; }
-        }
-
-        /// <summary>
-        /// Gets the Unknown.
-        /// </summary>
-        public long ClassId
-        {
-            get { return _si.ClassId; }
-        }
-
-        /// <summary>
-        /// Gets the owner identity, for the purposes of quota allocation.
-        /// </summary>
-        public long OwnerId
-        {
-            get { return _si.OwnerId; }
-        }
-
-        /// <summary>
-        /// Gets the identifier of the Security Descriptor for this file.
-        /// </summary>
-        /// <remarks>
-        /// Security Descriptors are stored in the \$Secure meta-data file.
-        /// </remarks>
-        public long SecurityId
-        {
-            get { return _si.SecurityId; }
-        }
-
-        /// <summary>
-        /// Gets the amount charged to the owners quota for this file.
-        /// </summary>
-        public long QuotaCharged
-        {
-            get { return (long)_si.QuotaCharged; }
-        }
-
-        /// <summary>
-        /// Gets the last update sequence number of the file (relates to the user-readable journal).
-        /// </summary>
-        public long JournalSequenceNumber
-        {
-            get { return (long)_si.UpdateSequenceNumber; }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/Internals/UnknownAttribute.cs b/DiscUtils/Ntfs/Internals/UnknownAttribute.cs
deleted file mode 100644
index 25c765a..0000000
--- a/DiscUtils/Ntfs/Internals/UnknownAttribute.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs.Internals
-{
-    internal sealed class UnknownAttribute : GenericAttribute
-    {
-        public UnknownAttribute(INtfsContext context, AttributeRecord record)
-            : base(context, record)
-        {
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/LZNT1.cs b/DiscUtils/Ntfs/LZNT1.cs
deleted file mode 100644
index b7c4f56..0000000
--- a/DiscUtils/Ntfs/LZNT1.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-//
-// Contributions by bsobel:
-//   - Compression algorithm distantly derived from Puyo tools (BSD license)*
-//   - Decompression adjusted to support variety of block sizes
-//
-// (*) Puyo tools implements a different LZ-style algorithm
-//
-
-namespace DiscUtils.Ntfs
-{
-    using DiscUtils.Compression;
-    using System;
-
-    /// <summary>
-    /// Implementation of the LZNT1 algorithm used for compressing NTFS files.
-    /// </summary>
-    /// <remarks>
-    /// Due to apparent bugs in Window's LZNT1 decompressor, it is <b>strongly</b> recommended that
-    /// only the block size of 4096 is used.  Other block sizes corrupt data on decompression.
-    /// </remarks>
-    internal sealed class LZNT1 : BlockCompressor
-    {
-        private const ushort SubBlockIsCompressedFlag = 0x8000;
-        private const ushort SubBlockSizeMask = 0x0fff;
-
-        // LZNT1 appears to ignore the actual block size requested, most likely due to
-        // a bug in the decompressor, which assumes 4KB block size.  To be bug-compatible,
-        // we assume each block is 4KB on decode also.
-        private const int FixedBlockSize = 0x1000;
-
-        private static byte[] s_compressionBits = CalcCompressionBits();
-
-        public LZNT1()
-        {
-            BlockSize = 4096;
-        }
-
-        public override CompressionResult Compress(byte[] source, int sourceOffset, int sourceLength, byte[] compressed, int compressedOffset, ref int compressedLength)
-        {
-            uint sourcePointer = 0;
-            uint sourceCurrentBlock = 0;
-            uint destPointer = 0;
-
-            // Set up the Lz Compression Dictionary 
-            LzWindowDictionary lzDictionary = new LzWindowDictionary();
-            bool nonZeroDataFound = false;
-
-            for (int subBlock = 0; subBlock < sourceLength; subBlock += BlockSize)
-            {
-                lzDictionary.MinMatchAmount = 3;
-                sourceCurrentBlock = sourcePointer;
-
-                uint decompressedSize = (uint)Math.Min(sourceLength - subBlock, BlockSize);
-                uint compressedSize = 0;
-
-                // Start compression 
-                uint headerPosition = destPointer;
-                compressed[compressedOffset + destPointer] = compressed[compressedOffset + destPointer + 1] = 0;
-                destPointer += 2;
-
-                while (sourcePointer - subBlock < decompressedSize)
-                {
-                    if (destPointer + 1 >= compressedLength)
-                    {
-                        return CompressionResult.Incompressible;
-                    }
-
-                    byte bitFlag = 0x0;
-                    uint flagPosition = destPointer;
-
-                    compressed[compressedOffset + destPointer] = bitFlag; // It will be filled in later 
-                    compressedSize++;
-                    destPointer++;
-
-                    for (int i = 0; i < 8; i++)
-                    {
-                        int lengthBits = 16 - s_compressionBits[sourcePointer - subBlock];
-                        ushort lengthMask = (ushort)((1 << s_compressionBits[sourcePointer - subBlock]) - 1);
-
-                        lzDictionary.MaxMatchAmount = Math.Min(1 << lengthBits, BlockSize - 1);
-
-                        int[] lzSearchMatch = lzDictionary.Search(source, sourceOffset + subBlock, (uint)(sourcePointer - subBlock), decompressedSize);
-                        if (lzSearchMatch[1] > 0)
-                        {
-                            // There is a compression match
-                            if (destPointer + 2 >= compressedLength)
-                            {
-                                return CompressionResult.Incompressible;
-                            }
-
-                            bitFlag |= (byte)(1 << i);
-
-                            int rawOffset = lzSearchMatch[0];
-                            int rawLength = lzSearchMatch[1];
-
-                            int convertedOffset = (rawOffset - 1) << lengthBits;
-                            int convertedSize = (rawLength - 3) & ((1 << lengthMask) - 1);
-
-                            ushort convertedData = (ushort)(convertedOffset | convertedSize);
-                            Utilities.WriteBytesLittleEndian(convertedData, compressed, compressedOffset + (int)destPointer);
-
-                            lzDictionary.AddEntryRange(source, sourceOffset + subBlock, (int)(sourcePointer - subBlock), lzSearchMatch[1]);
-                            sourcePointer += (uint)lzSearchMatch[1];
-                            destPointer += 2;
-                            compressedSize += 2;
-                        }
-                        else
-                        {
-                            // There wasn't a match
-                            if (destPointer + 1 >= compressedLength)
-                            {
-                                return CompressionResult.Incompressible;
-                            }
-
-                            bitFlag |= (byte)(0 << i);
-
-                            if (source[sourceOffset + sourcePointer] != 0)
-                            {
-                                nonZeroDataFound = true;
-                            }
-
-                            compressed[compressedOffset + destPointer] = source[sourceOffset + sourcePointer];
-                            lzDictionary.AddEntry(source, sourceOffset + subBlock, (int)(sourcePointer - subBlock));
-
-                            sourcePointer++;
-                            destPointer++;
-                            compressedSize++;
-                        }
-
-                        // Check for out of bounds 
-                        if (sourcePointer - subBlock >= decompressedSize)
-                        {
-                            break;
-                        }
-                    }
-
-                    // Write the real flag. 
-                    compressed[compressedOffset + flagPosition] = bitFlag;
-                }
-
-                // If compressed size >= block size just store block
-                if (compressedSize >= BlockSize)
-                {
-                    // Set the header to indicate non-compressed block
-                    Utilities.WriteBytesLittleEndian((ushort)(0x3000 | (BlockSize - 1)), compressed, compressedOffset + (int)headerPosition);
-
-                    Array.Copy(source, (int)sourceOffset + sourceCurrentBlock, compressed, compressedOffset + headerPosition + 2, BlockSize);
-                    destPointer = (uint)(headerPosition + 2 + BlockSize);
-
-                    // Make sure decompression stops by setting the next two bytes to null, prevents us from having to 
-                    // clear the rest of the array.
-                    compressed[destPointer] = 0;
-                    compressed[destPointer + 1] = 0;
-                }
-                else
-                {
-                    // Set the header to indicate compressed and the right length
-                    Utilities.WriteBytesLittleEndian((ushort)(0xb000 | (compressedSize - 1)), compressed, compressedOffset + (int)headerPosition);
-                }
-
-                lzDictionary.Reset();
-            }
-
-            if (destPointer >= sourceLength)
-            {
-                compressedLength = 0;
-                return CompressionResult.Incompressible;
-            }
-            else if (nonZeroDataFound)
-            {
-                compressedLength = (int)destPointer;
-                return CompressionResult.Compressed;
-            }
-            else
-            {
-                compressedLength = 0;
-                return CompressionResult.AllZeros;
-            }
-        }
-
-        public override int Decompress(byte[] source, int sourceOffset, int sourceLength, byte[] decompressed, int decompressedOffset)
-        {
-            int sourceIdx = 0;
-            int destIdx = 0;
-
-            while (sourceIdx < sourceLength)
-            {
-                ushort header = Utilities.ToUInt16LittleEndian(source, sourceOffset + sourceIdx);
-                sourceIdx += 2;
-
-                // Look for null-terminating sub-block header
-                if (header == 0)
-                {
-                    break;
-                }
-
-                if ((header & SubBlockIsCompressedFlag) == 0)
-                {
-                    int blockSize = (header & SubBlockSizeMask) + 1;
-                    Array.Copy(source, sourceOffset + sourceIdx, decompressed, decompressedOffset + destIdx, blockSize);
-                    sourceIdx += blockSize;
-                    destIdx += blockSize;
-                }
-                else
-                {
-                    // compressed
-                    int destSubBlockStart = destIdx;
-                    int srcSubBlockEnd = sourceIdx + (header & SubBlockSizeMask) + 1;
-                    while (sourceIdx < srcSubBlockEnd)
-                    {
-                        byte tag = source[sourceOffset + sourceIdx];
-                        ++sourceIdx;
-
-                        for (int token = 0; token < 8; ++token)
-                        {
-                            // We might have hit the end of the sub block whilst still working though
-                            // a tag - abort if we have...
-                            if (sourceIdx >= srcSubBlockEnd)
-                            {
-                                break;
-                            }
-
-                            if ((tag & 1) == 0)
-                            {
-                                if (decompressedOffset + destIdx >= decompressed.Length)
-                                {
-                                    return destIdx;
-                                }
-
-                                decompressed[decompressedOffset + destIdx] = source[sourceOffset + sourceIdx];
-                                ++destIdx;
-                                ++sourceIdx;
-                            }
-                            else
-                            {
-                                ushort lengthBits = (ushort)(16 - s_compressionBits[destIdx - destSubBlockStart]);
-                                ushort lengthMask = (ushort)((1 << lengthBits) - 1);
-
-                                ushort phraseToken = Utilities.ToUInt16LittleEndian(source, sourceOffset + sourceIdx);
-                                sourceIdx += 2;
-
-                                int destBackAddr = destIdx - (phraseToken >> lengthBits) - 1;
-                                int length = (phraseToken & lengthMask) + 3;
-
-                                for (int i = 0; i < length; ++i)
-                                {
-                                    decompressed[decompressedOffset + destIdx++] = decompressed[decompressedOffset + destBackAddr++];
-                                }
-                            }
-
-                            tag >>= 1;
-                        }
-                    }
-
-                    // Bug-compatible - if we decompressed less than 4KB, jump to next 4KB boundary.  If
-                    // that would leave less than a 4KB remaining, abort with data decompressed so far.
-                    if (decompressedOffset + destIdx + FixedBlockSize > decompressed.Length)
-                    {
-                        return destIdx;
-                    }
-                    else if (destIdx < destSubBlockStart + FixedBlockSize)
-                    {
-                        int skip = (destSubBlockStart + FixedBlockSize) - destIdx;
-                        Array.Clear(decompressed, decompressedOffset + destIdx, skip);
-                        destIdx += skip;
-                    }
-                }
-            }
-
-            return destIdx;
-        }
-
-        private static byte[] CalcCompressionBits()
-        {
-            byte[] result = new byte[4096];
-            byte offsetBits = 0;
-
-            int y = 0x10;
-            for (int x = 0; x < result.Length; x++)
-            {
-                result[x] = (byte)(4 + offsetBits);
-                if (x == y)
-                {
-                    y <<= 1;
-                    offsetBits++;
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/LzWindowDictionary.cs b/DiscUtils/Ntfs/LzWindowDictionary.cs
deleted file mode 100644
index 0be74f1..0000000
--- a/DiscUtils/Ntfs/LzWindowDictionary.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-//
-// Contributed by bsobel:
-//   - Derived from Puyo tools (BSD license)
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Collections.Generic;
-
-    internal sealed class LzWindowDictionary
-    {
-        /// <summary>
-        /// Index of locations of each possible byte value within the compression window.
-        /// </summary>
-        private List<int>[] _offsetList;
-
-        public LzWindowDictionary()
-        {
-            Initalize();
-
-            // Build the index list, so Lz compression will become significantly faster 
-            _offsetList = new List<int>[0x100];
-            for (int i = 0; i < _offsetList.Length; i++)
-            {
-                _offsetList[i] = new List<int>();
-            }
-        }
-
-        public int MinMatchAmount { get; set; }
-
-        public int MaxMatchAmount { get; set; }
-
-        private int BlockSize { get; set; }
-
-        public void Reset()
-        {
-            Initalize();
-
-            for (int i = 0; i < _offsetList.Length; i++)
-            {
-                _offsetList[i].Clear();
-            }
-        }
-
-        public int[] Search(byte[] decompressedData, int decompressedDataOffset, uint index, uint length)
-        {
-            RemoveOldEntries(decompressedData[decompressedDataOffset + index]); // Remove old entries for this index 
-
-            int[] match = new int[] { 0, 0 };
-
-            if (index < 1 || length - index < MinMatchAmount)
-            {
-                // Can't find matches if there isn't enough data 
-                return match;
-            }
-
-            for (int i = 0; i < _offsetList[decompressedData[decompressedDataOffset + index]].Count; i++)
-            {
-                int matchStart = _offsetList[decompressedData[decompressedDataOffset + index]][i];
-                int matchSize = 1;
-
-                if (index - matchStart > BlockSize)
-                {
-                    break;
-                }
-
-                int maxMatchSize = (int)Math.Min(Math.Min(MaxMatchAmount, BlockSize), Math.Min(length - index, length - matchStart));
-                while (matchSize < maxMatchSize && decompressedData[decompressedDataOffset + index + matchSize] == decompressedData[decompressedDataOffset + matchStart + matchSize])
-                {
-                    matchSize++;
-                }
-
-                if (matchSize >= MinMatchAmount && matchSize > match[1])
-                {
-                    // This is a good match 
-                    match = new int[] { (int)(index - matchStart), matchSize };
-
-                    if (matchSize == MaxMatchAmount)
-                    {
-                        // Don't look for more matches 
-                        break;
-                    }
-                }
-            }
-
-            // Return the real match (or the default 0:0 match). 
-            return match;
-        }
-
-        // Add entries 
-        public void AddEntry(byte[] decompressedData, int decompressedDataOffset, int index)
-        {
-            _offsetList[decompressedData[decompressedDataOffset + index]].Add(index);
-        }
-
-        public void AddEntryRange(byte[] decompressedData, int decompressedDataOffset, int index, int length)
-        {
-            for (int i = 0; i < length; i++)
-            {
-                AddEntry(decompressedData, decompressedDataOffset, index + i);
-            }
-        }
-
-        private void Initalize()
-        {
-            MinMatchAmount = 3;
-            MaxMatchAmount = 18;
-            BlockSize = 4096;
-        }
-
-        private void RemoveOldEntries(byte index)
-        {
-            while (_offsetList[index].Count > 256)
-            {
-                _offsetList[index].RemoveAt(0);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/MasterFileTable.cs b/DiscUtils/Ntfs/MasterFileTable.cs
deleted file mode 100644
index f9d092e..0000000
--- a/DiscUtils/Ntfs/MasterFileTable.cs
+++ /dev/null
@@ -1,522 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-
-    /// <summary>
-    /// Class representing the $MFT file on disk, including mirror.
-    /// </summary>
-    /// <remarks>This class only understands basic record structure, and is
-    /// ignorant of files that span multiple records.  This class should only
-    /// be used by the NtfsFileSystem and File classes.</remarks>
-    internal class MasterFileTable : IDiagnosticTraceable, IDisposable
-    {
-        /// <summary>
-        /// MFT index of the MFT file itself.
-        /// </summary>
-        public const long MftIndex = 0;
-
-        /// <summary>
-        /// MFT index of the MFT Mirror file.
-        /// </summary>
-        public const long MftMirrorIndex = 1;
-
-        /// <summary>
-        /// MFT Index of the Log file.
-        /// </summary>
-        public const long LogFileIndex = 2;
-
-        /// <summary>
-        /// MFT Index of the Volume file.
-        /// </summary>
-        public const long VolumeIndex = 3;
-
-        /// <summary>
-        /// MFT Index of the Attribute Definition file.
-        /// </summary>
-        public const long AttrDefIndex = 4;
-
-        /// <summary>
-        /// MFT Index of the Root Directory.
-        /// </summary>
-        public const long RootDirIndex = 5;
-
-        /// <summary>
-        /// MFT Index of the Bitmap file.
-        /// </summary>
-        public const long BitmapIndex = 6;
-
-        /// <summary>
-        /// MFT Index of the Boot sector(s).
-        /// </summary>
-        public const long BootIndex = 7;
-
-        /// <summary>
-        /// MFT Index of the Bad Bluster file.
-        /// </summary>
-        public const long BadClusIndex = 8;
-
-        /// <summary>
-        /// MFT Index of the Security Descriptor file.
-        /// </summary>
-        public const long SecureIndex = 9;
-
-        /// <summary>
-        /// MFT Index of the Uppercase mapping file.
-        /// </summary>
-        public const long UpCaseIndex = 10;
-
-        /// <summary>
-        /// MFT Index of the Optional Extensions directory.
-        /// </summary>
-        public const long ExtendIndex = 11;
-
-        /// <summary>
-        /// First MFT Index available for 'normal' files.
-        /// </summary>
-        private const uint FirstAvailableMftIndex = 24;
-
-        private File _self;
-        private Bitmap _bitmap;
-        private Stream _recordStream;
-        private ObjectCache<long, FileRecord> _recordCache;
-
-        private int _recordLength;
-        private int _bytesPerSector;
-
-        public MasterFileTable(INtfsContext context)
-        {
-            BiosParameterBlock bpb = context.BiosParameterBlock;
-
-            _recordCache = new ObjectCache<long, FileRecord>();
-            _recordLength = bpb.MftRecordSize;
-            _bytesPerSector = bpb.BytesPerSector;
-
-            // Temporary record stream - until we've bootstrapped the MFT properly
-            _recordStream = new SubStream(context.RawStream, bpb.MftCluster * bpb.SectorsPerCluster * bpb.BytesPerSector, 24 * _recordLength);
-        }
-
-        public int RecordSize
-        {
-            get { return _recordLength; }
-        }
-
-        /// <summary>
-        /// Gets the MFT records directly from the MFT stream - bypassing the record cache.
-        /// </summary>
-        public IEnumerable<FileRecord> Records
-        {
-            get
-            {
-                using (Stream mftStream = _self.OpenStream(AttributeType.Data, null, FileAccess.Read))
-                {
-                    uint index = 0;
-                    while (mftStream.Position < mftStream.Length)
-                    {
-                        byte[] recordData = Utilities.ReadFully(mftStream, _recordLength);
-
-                        if (Utilities.BytesToString(recordData, 0, 4) != "FILE")
-                        {
-                            continue;
-                        }
-
-                        FileRecord record = new FileRecord(_bytesPerSector);
-                        record.FromBytes(recordData, 0);
-                        record.LoadedIndex = index;
-
-                        yield return record;
-
-                        index++;
-                    }
-                }
-            }
-        }
-
-        public void Dispose()
-        {
-            if (_recordStream != null)
-            {
-                _recordStream.Dispose();
-                _recordStream = null;
-            }
-
-            if (_bitmap != null)
-            {
-                _bitmap.Dispose();
-                _bitmap = null;
-            }
-
-            GC.SuppressFinalize(this);
-        }
-
-        public FileRecord GetBootstrapRecord()
-        {
-            _recordStream.Position = 0;
-            byte[] mftSelfRecordData = Utilities.ReadFully(_recordStream, _recordLength);
-            FileRecord mftSelfRecord = new FileRecord(_bytesPerSector);
-            mftSelfRecord.FromBytes(mftSelfRecordData, 0);
-            _recordCache[MftIndex] = mftSelfRecord;
-            return mftSelfRecord;
-        }
-
-        public void Initialize(File file)
-        {
-            _self = file;
-
-            if (_recordStream != null)
-            {
-                _recordStream.Dispose();
-            }
-
-            NtfsStream bitmapStream = _self.GetStream(AttributeType.Bitmap, null);
-            _bitmap = new Bitmap(bitmapStream.Open(FileAccess.ReadWrite), long.MaxValue);
-
-            NtfsStream recordsStream = _self.GetStream(AttributeType.Data, null);
-            _recordStream = recordsStream.Open(FileAccess.ReadWrite);
-        }
-
-        public File InitializeNew(INtfsContext context, long firstBitmapCluster, ulong numBitmapClusters, long firstRecordsCluster, ulong numRecordsClusters)
-        {
-            BiosParameterBlock bpb = context.BiosParameterBlock;
-
-            FileRecord fileRec = new FileRecord(bpb.BytesPerSector, bpb.MftRecordSize, (uint)MftIndex);
-            fileRec.Flags = FileRecordFlags.InUse;
-            fileRec.SequenceNumber = 1;
-            _recordCache[MftIndex] = fileRec;
-
-            _self = new File(context, fileRec);
-
-            StandardInformation.InitializeNewFile(_self, FileAttributeFlags.Hidden | FileAttributeFlags.System);
-
-            NtfsStream recordsStream = _self.CreateStream(AttributeType.Data, null, firstRecordsCluster, numRecordsClusters, (uint)bpb.BytesPerCluster);
-            _recordStream = recordsStream.Open(FileAccess.ReadWrite);
-            Wipe(_recordStream);
-
-            NtfsStream bitmapStream = _self.CreateStream(AttributeType.Bitmap, null, firstBitmapCluster, numBitmapClusters, (uint)bpb.BytesPerCluster);
-            using (Stream s = bitmapStream.Open(FileAccess.ReadWrite))
-            {
-                Wipe(s);
-                s.SetLength(8);
-                _bitmap = new Bitmap(s, long.MaxValue);
-            }
-
-            _recordLength = context.BiosParameterBlock.MftRecordSize;
-            _bytesPerSector = context.BiosParameterBlock.BytesPerSector;
-
-            _bitmap.MarkPresentRange(0, 1);
-
-            // Write the MFT's own record to itself
-            byte[] buffer = new byte[_recordLength];
-            fileRec.ToBytes(buffer, 0);
-            _recordStream.Position = 0;
-            _recordStream.Write(buffer, 0, _recordLength);
-            _recordStream.Flush();
-
-            return _self;
-        }
-
-        public FileRecord AllocateRecord(FileRecordFlags flags, bool isMft)
-        {
-            long index;
-            if (isMft)
-            {
-                // Have to take a lot of care extending the MFT itself, to ensure we never end up unable to
-                // bootstrap the file system via the MFT itself - hence why special records are reserved
-                // for MFT's own MFT record overflow.
-                for (int i = 15; i > 11; --i)
-                {
-                    FileRecord r = GetRecord(i, false);
-                    if (r.BaseFile.SequenceNumber == 0)
-                    {
-                        r.Reset();
-                        r.Flags |= FileRecordFlags.InUse;
-                        WriteRecord(r);
-                        return r;
-                    }
-                }
-
-                throw new IOException("MFT too fragmented - unable to allocate MFT overflow record");
-            }
-            else
-            {
-                index = _bitmap.AllocateFirstAvailable(FirstAvailableMftIndex);
-            }
-
-            if (index * _recordLength >= _recordStream.Length)
-            {
-                // Note: 64 is significant, since bitmap extends by 8 bytes (=64 bits) at a time.
-                long newEndIndex = Utilities.RoundUp(index + 1, 64);
-                _recordStream.SetLength(newEndIndex * _recordLength);
-                for (long i = index; i < newEndIndex; ++i)
-                {
-                    FileRecord record = new FileRecord(_bytesPerSector, _recordLength, (uint)i);
-                    WriteRecord(record);
-                }
-            }
-
-            FileRecord newRecord = GetRecord(index, true);
-            newRecord.ReInitialize(_bytesPerSector, _recordLength, (uint)index);
-
-            _recordCache[index] = newRecord;
-
-            newRecord.Flags = FileRecordFlags.InUse | flags;
-
-            WriteRecord(newRecord);
-            _self.UpdateRecordInMft();
-
-            return newRecord;
-        }
-
-        public FileRecord AllocateRecord(long index, FileRecordFlags flags)
-        {
-            _bitmap.MarkPresent(index);
-
-            FileRecord newRecord = new FileRecord(_bytesPerSector, _recordLength, (uint)index);
-            _recordCache[index] = newRecord;
-            newRecord.Flags = FileRecordFlags.InUse | flags;
-
-            WriteRecord(newRecord);
-            _self.UpdateRecordInMft();
-            return newRecord;
-        }
-
-        public void RemoveRecord(FileRecordReference fileRef)
-        {
-            FileRecord record = GetRecord(fileRef.MftIndex, false);
-            record.Reset();
-            WriteRecord(record);
-
-            _recordCache.Remove(fileRef.MftIndex);
-            _bitmap.MarkAbsent(fileRef.MftIndex);
-            _self.UpdateRecordInMft();
-        }
-
-        public FileRecord GetRecord(FileRecordReference fileReference)
-        {
-            FileRecord result = GetRecord(fileReference.MftIndex, false);
-
-            if (result != null)
-            {
-                if (fileReference.SequenceNumber != 0 && result.SequenceNumber != 0)
-                {
-                    if (fileReference.SequenceNumber != result.SequenceNumber)
-                    {
-                        throw new IOException("Attempt to get an MFT record with an old reference");
-                    }
-                }
-            }
-
-            return result;
-        }
-
-        public FileRecord GetRecord(long index, bool ignoreMagic)
-        {
-            return GetRecord(index, ignoreMagic, false);
-        }
-
-        public FileRecord GetRecord(long index, bool ignoreMagic, bool ignoreBitmap)
-        {
-            if (ignoreBitmap || _bitmap == null || _bitmap.IsPresent(index))
-            {
-                FileRecord result = _recordCache[index];
-                if (result != null)
-                {
-                    return result;
-                }
-
-                if ((index + 1) * _recordLength <= _recordStream.Length)
-                {
-                    _recordStream.Position = index * _recordLength;
-                    byte[] recordBuffer = Utilities.ReadFully(_recordStream, _recordLength);
-
-                    result = new FileRecord(_bytesPerSector);
-                    result.FromBytes(recordBuffer, 0, ignoreMagic);
-                    result.LoadedIndex = (uint)index;
-                }
-                else
-                {
-                    result = new FileRecord(_bytesPerSector, _recordLength, (uint)index);
-                }
-
-                _recordCache[index] = result;
-                return result;
-            }
-
-            return null;
-        }
-
-        public void WriteRecord(FileRecord record)
-        {
-            int recordSize = record.Size;
-            if (recordSize > _recordLength)
-            {
-                throw new IOException("Attempting to write over-sized MFT record");
-            }
-
-            byte[] buffer = new byte[_recordLength];
-            record.ToBytes(buffer, 0);
-
-            _recordStream.Position = record.MasterFileTableIndex * (long)_recordLength;
-            _recordStream.Write(buffer, 0, _recordLength);
-            _recordStream.Flush();
-
-            // We may have modified our own meta-data by extending the data stream, so
-            // make sure our records are up-to-date.
-            if (_self.MftRecordIsDirty)
-            {
-                DirectoryEntry dirEntry = _self.DirectoryEntry;
-                if (dirEntry != null)
-                {
-                    dirEntry.UpdateFrom(_self);
-                }
-
-                _self.UpdateRecordInMft();
-            }
-
-            // Need to update Mirror.  OpenRaw is OK because this is short duration, and we don't
-            // extend or otherwise modify any meta-data, just the content of the Data stream.
-            if (record.MasterFileTableIndex < 4 && _self.Context.GetFileByIndex != null)
-            {
-                File mftMirror = _self.Context.GetFileByIndex(MftMirrorIndex);
-                if (mftMirror != null)
-                {
-                    using (Stream s = mftMirror.OpenStream(AttributeType.Data, null, FileAccess.ReadWrite))
-                    {
-                        s.Position = record.MasterFileTableIndex * (long)_recordLength;
-                        s.Write(buffer, 0, _recordLength);
-                    }
-                }
-            }
-        }
-
-        public long GetRecordOffset(FileRecordReference fileReference)
-        {
-            return fileReference.MftIndex * _recordLength;
-        }
-
-        public ClusterMap GetClusterMap()
-        {
-            int totalClusters = (int)Utilities.Ceil(_self.Context.BiosParameterBlock.TotalSectors64, _self.Context.BiosParameterBlock.SectorsPerCluster);
-
-            ClusterRoles[] clusterToRole = new ClusterRoles[totalClusters];
-            object[] clusterToFile = new object[totalClusters];
-            Dictionary<object, string[]> fileToPaths = new Dictionary<object, string[]>();
-
-            for (int i = 0; i < totalClusters; ++i)
-            {
-                clusterToRole[i] = ClusterRoles.Free;
-            }
-
-            foreach (FileRecord fr in Records)
-            {
-                if (fr.BaseFile.Value != 0 || (fr.Flags & FileRecordFlags.InUse) == 0)
-                {
-                    continue;
-                }
-
-                File f = new File(_self.Context, fr);
-
-                foreach (var stream in f.AllStreams)
-                {
-                    string fileId;
-
-                    if (stream.AttributeType == AttributeType.Data && !string.IsNullOrEmpty(stream.Name))
-                    {
-                        fileId = f.IndexInMft.ToString(CultureInfo.InvariantCulture) + ":" + stream.Name;
-                        fileToPaths[fileId] = Utilities.Map(f.Names, n => n + ":" + stream.Name);
-                    }
-                    else
-                    {
-                        fileId = f.IndexInMft.ToString(CultureInfo.InvariantCulture);
-                        fileToPaths[fileId] = f.Names.ToArray();
-                    }
-
-                    ClusterRoles roles = ClusterRoles.None;
-                    if (f.IndexInMft < MasterFileTable.FirstAvailableMftIndex)
-                    {
-                        roles |= ClusterRoles.SystemFile;
-
-                        if (f.IndexInMft == MasterFileTable.BootIndex)
-                        {
-                            roles |= ClusterRoles.BootArea;
-                        }
-                    }
-                    else
-                    {
-                        roles |= ClusterRoles.DataFile;
-                    }
-
-                    if (stream.AttributeType != AttributeType.Data)
-                    {
-                        roles |= ClusterRoles.Metadata;
-                    }
-
-                    foreach (var range in stream.GetClusters())
-                    {
-                        for (long cluster = range.Offset; cluster < range.Offset + range.Count; ++cluster)
-                        {
-                            clusterToRole[cluster] = roles;
-                            clusterToFile[cluster] = fileId;
-                        }
-                    }
-                }
-            }
-
-            return new ClusterMap(clusterToRole, clusterToFile, fileToPaths);
-        }
-
-        public void Dump(TextWriter writer, string indent)
-        {
-            writer.WriteLine(indent + "MASTER FILE TABLE");
-            writer.WriteLine(indent + "  Record Length: " + _recordLength);
-
-            foreach (var record in Records)
-            {
-                record.Dump(writer, indent + "  ");
-
-                foreach (AttributeRecord attr in record.Attributes)
-                {
-                    attr.Dump(writer, indent + "     ");
-                }
-            }
-        }
-
-        private static void Wipe(Stream s)
-        {
-            s.Position = 0;
-
-            byte[] buffer = new byte[64 * Sizes.OneKiB];
-            int numWiped = 0;
-            while (numWiped < s.Length)
-            {
-                int toWrite = (int)Math.Min(buffer.Length, s.Length - s.Position);
-                s.Write(buffer, 0, toWrite);
-                numWiped += toWrite;
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/NewFileOptions.cs b/DiscUtils/Ntfs/NewFileOptions.cs
deleted file mode 100644
index 8668f32..0000000
--- a/DiscUtils/Ntfs/NewFileOptions.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System.Security.AccessControl;
-
-    /// <summary>
-    /// Options controlling how new NTFS files are created.
-    /// </summary>
-    public sealed class NewFileOptions
-    {
-        /// <summary>
-        /// Initializes a new instance of the NewFileOptions class.
-        /// </summary>
-        public NewFileOptions()
-        {
-            Compressed = null;
-            CreateShortNames = null;
-            SecurityDescriptor = null;
-        }
-
-        /// <summary>
-        /// Gets or sets whether the new file should be compressed.
-        /// </summary>
-        /// <remarks>The default (<c>null</c>) value indicates the file system default behaviour applies.</remarks>
-        public bool? Compressed { get; set; }
-
-        /// <summary>
-        /// Gets or sets whether a short name should be created for the file.
-        /// </summary>
-        /// <remarks>The default (<c>null</c>) value indicates the file system default behaviour applies.</remarks>
-        public bool? CreateShortNames { get; set; }
-
-        /// <summary>
-        /// Gets or sets the security descriptor that to set for the new file.
-        /// </summary>
-        /// <remarks>The default (<c>null</c>) value indicates the security descriptor is inherited.</remarks>
-        public RawSecurityDescriptor SecurityDescriptor { get; set; }
-    }
-}
diff --git a/DiscUtils/Ntfs/NonResidentAttributeBuffer.cs b/DiscUtils/Ntfs/NonResidentAttributeBuffer.cs
deleted file mode 100644
index f064b7a..0000000
--- a/DiscUtils/Ntfs/NonResidentAttributeBuffer.cs
+++ /dev/null
@@ -1,353 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal class NonResidentAttributeBuffer : NonResidentDataBuffer
-    {
-        private File _file;
-        private NtfsAttribute _attribute;
-
-        public NonResidentAttributeBuffer(File file, NtfsAttribute attribute)
-            : base(file.Context, CookRuns(attribute), file.IndexInMft == MasterFileTable.MftIndex)
-        {
-            _file = file;
-            _attribute = attribute;
-
-            switch (attribute.Flags & (AttributeFlags.Compressed | AttributeFlags.Sparse))
-            {
-                case AttributeFlags.Sparse:
-                    _activeStream = new SparseClusterStream(_attribute, _rawStream);
-                    break;
-
-                case AttributeFlags.Compressed:
-                    _activeStream = new CompressedClusterStream(_context, _attribute, _rawStream);
-                    break;
-
-                case AttributeFlags.None:
-                    _activeStream = _rawStream;
-                    break;
-
-                default:
-                    throw new NotImplementedException("Unhandled attribute type '" + attribute.Flags + "'");
-            }
-        }
-
-        public override bool CanWrite
-        {
-            get { return _context.RawStream.CanWrite && _file != null; }
-        }
-
-        public override long Capacity
-        {
-            get { return PrimaryAttributeRecord.DataLength; }
-        }
-
-        private NonResidentAttributeRecord PrimaryAttributeRecord
-        {
-            get { return _attribute.PrimaryRecord as NonResidentAttributeRecord; }
-        }
-
-        public void AlignVirtualClusterCount()
-        {
-            _file.MarkMftRecordDirty();
-            _activeStream.ExpandToClusters(Utilities.Ceil(_attribute.Length, _bytesPerCluster), (NonResidentAttributeRecord)_attribute.LastExtent, false);
-        }
-
-        public override void SetCapacity(long value)
-        {
-            if (!CanWrite)
-            {
-                throw new IOException("Attempt to change length of file not opened for write");
-            }
-
-            if (value == Capacity)
-            {
-                return;
-            }
-
-            _file.MarkMftRecordDirty();
-
-            long newClusterCount = Utilities.Ceil(value, _bytesPerCluster);
-
-            if (value < Capacity)
-            {
-                Truncate(value);
-            }
-            else
-            {
-                _activeStream.ExpandToClusters(newClusterCount, (NonResidentAttributeRecord)_attribute.LastExtent, true);
-
-                PrimaryAttributeRecord.AllocatedLength = _cookedRuns.NextVirtualCluster * _bytesPerCluster;
-            }
-
-            PrimaryAttributeRecord.DataLength = value;
-
-            if (PrimaryAttributeRecord.InitializedDataLength > value)
-            {
-                PrimaryAttributeRecord.InitializedDataLength = value;
-            }
-
-            _cookedRuns.CollapseRuns();
-        }
-
-        public override void Write(long pos, byte[] buffer, int offset, int count)
-        {
-            if (!CanWrite)
-            {
-                throw new IOException("Attempt to write to file not opened for write");
-            }
-
-            if (count == 0)
-            {
-                return;
-            }
-
-            if (pos + count > Capacity)
-            {
-                SetCapacity(pos + count);
-            }
-
-            // Write zeros from end of current initialized data to the start of the new write
-            if (pos > PrimaryAttributeRecord.InitializedDataLength)
-            {
-                InitializeData(pos);
-            }
-
-            int allocatedClusters = 0;
-
-            long focusPos = pos;
-            while (focusPos < pos + count)
-            {
-                long vcn = focusPos / _bytesPerCluster;
-                long remaining = (pos + count) - focusPos;
-                long clusterOffset = focusPos - (vcn * _bytesPerCluster);
-
-                if (vcn * _bytesPerCluster != focusPos || remaining < _bytesPerCluster)
-                {
-                    // Unaligned or short write
-                    int toWrite = (int)Math.Min(remaining, _bytesPerCluster - clusterOffset);
-
-                    _activeStream.ReadClusters(vcn, 1, _ioBuffer, 0);
-                    Array.Copy(buffer, offset + (focusPos - pos), _ioBuffer, clusterOffset, toWrite);
-                    allocatedClusters += _activeStream.WriteClusters(vcn, 1, _ioBuffer, 0);
-
-                    focusPos += toWrite;
-                }
-                else
-                {
-                    // Aligned, full cluster writes...
-                    int fullClusters = (int)(remaining / _bytesPerCluster);
-                    allocatedClusters += _activeStream.WriteClusters(vcn, fullClusters, buffer, (int)(offset + (focusPos - pos)));
-
-                    focusPos += fullClusters * _bytesPerCluster;
-                }
-            }
-
-            if (pos + count > PrimaryAttributeRecord.InitializedDataLength)
-            {
-                _file.MarkMftRecordDirty();
-
-                PrimaryAttributeRecord.InitializedDataLength = pos + count;
-            }
-
-            if (pos + count > PrimaryAttributeRecord.DataLength)
-            {
-                _file.MarkMftRecordDirty();
-
-                PrimaryAttributeRecord.DataLength = pos + count;
-            }
-
-            if ((_attribute.Flags & (AttributeFlags.Compressed | AttributeFlags.Sparse)) != 0)
-            {
-                PrimaryAttributeRecord.CompressedDataSize += allocatedClusters * _bytesPerCluster;
-            }
-
-            _cookedRuns.CollapseRuns();
-        }
-
-        public override void Clear(long pos, int count)
-        {
-            if (!CanWrite)
-            {
-                throw new IOException("Attempt to erase bytes from file not opened for write");
-            }
-
-            if (count == 0)
-            {
-                return;
-            }
-
-            if (pos + count > Capacity)
-            {
-                SetCapacity(pos + count);
-            }
-
-            _file.MarkMftRecordDirty();
-
-            // Write zeros from end of current initialized data to the start of the new write
-            if (pos > PrimaryAttributeRecord.InitializedDataLength)
-            {
-                InitializeData(pos);
-            }
-
-            int releasedClusters = 0;
-
-            long focusPos = pos;
-            while (focusPos < pos + count)
-            {
-                long vcn = focusPos / _bytesPerCluster;
-                long remaining = (pos + count) - focusPos;
-                long clusterOffset = focusPos - (vcn * _bytesPerCluster);
-
-                if (vcn * _bytesPerCluster != focusPos || remaining < _bytesPerCluster)
-                {
-                    // Unaligned or short write
-                    int toClear = (int)Math.Min(remaining, _bytesPerCluster - clusterOffset);
-
-                    if (_activeStream.IsClusterStored(vcn))
-                    {
-                        _activeStream.ReadClusters(vcn, 1, _ioBuffer, 0);
-                        Array.Clear(_ioBuffer, (int)clusterOffset, toClear);
-                        releasedClusters -= _activeStream.WriteClusters(vcn, 1, _ioBuffer, 0);
-                    }
-
-                    focusPos += toClear;
-                }
-                else
-                {
-                    // Aligned, full cluster clears...
-                    int fullClusters = (int)(remaining / _bytesPerCluster);
-                    releasedClusters += _activeStream.ClearClusters(vcn, fullClusters);
-
-                    focusPos += fullClusters * _bytesPerCluster;
-                }
-            }
-
-            if (pos + count > PrimaryAttributeRecord.InitializedDataLength)
-            {
-                PrimaryAttributeRecord.InitializedDataLength = pos + count;
-            }
-
-            if (pos + count > PrimaryAttributeRecord.DataLength)
-            {
-                PrimaryAttributeRecord.DataLength = pos + count;
-            }
-
-            if ((_attribute.Flags & (AttributeFlags.Compressed | AttributeFlags.Sparse)) != 0)
-            {
-                PrimaryAttributeRecord.CompressedDataSize -= releasedClusters * _bytesPerCluster;
-            }
-
-            _cookedRuns.CollapseRuns();
-        }
-
-        private static CookedDataRuns CookRuns(NtfsAttribute attribute)
-        {
-            CookedDataRuns result = new CookedDataRuns();
-
-            foreach (NonResidentAttributeRecord record in attribute.Records)
-            {
-                if (record.StartVcn != result.NextVirtualCluster)
-                {
-                    throw new IOException("Invalid NTFS attribute - non-contiguous data runs");
-                }
-
-                result.Append(record.DataRuns, record);
-            }
-
-            return result;
-        }
-
-        private void InitializeData(long pos)
-        {
-            long initDataLen = PrimaryAttributeRecord.InitializedDataLength;
-            _file.MarkMftRecordDirty();
-
-            int clustersAllocated = 0;
-
-            while (initDataLen < pos)
-            {
-                long vcn = initDataLen / _bytesPerCluster;
-                if (initDataLen % _bytesPerCluster != 0 || pos - initDataLen < _bytesPerCluster)
-                {
-                    int clusterOffset = (int)(initDataLen - (vcn * _bytesPerCluster));
-                    int toClear = (int)Math.Min(_bytesPerCluster - clusterOffset, pos - initDataLen);
-
-                    if (_activeStream.IsClusterStored(vcn))
-                    {
-                        _activeStream.ReadClusters(vcn, 1, _ioBuffer, 0);
-                        Array.Clear(_ioBuffer, clusterOffset, toClear);
-                        clustersAllocated += _activeStream.WriteClusters(vcn, 1, _ioBuffer, 0);
-                    }
-
-                    initDataLen += toClear;
-                }
-                else
-                {
-                    int numClusters = (int)((pos / _bytesPerCluster) - vcn);
-                    clustersAllocated -= _activeStream.ClearClusters(vcn, numClusters);
-
-                    initDataLen += numClusters * _bytesPerCluster;
-                }
-            }
-
-            PrimaryAttributeRecord.InitializedDataLength = pos;
-
-            if ((_attribute.Flags & (AttributeFlags.Compressed | AttributeFlags.Sparse)) != 0)
-            {
-                PrimaryAttributeRecord.CompressedDataSize += clustersAllocated * _bytesPerCluster;
-            }
-        }
-
-        private void Truncate(long value)
-        {
-            long endVcn = Utilities.Ceil(value, _bytesPerCluster);
-
-            // Release the clusters
-            _activeStream.TruncateToClusters(endVcn);
-
-            // First, remove any extents that are now redundant.
-            Dictionary<AttributeReference, AttributeRecord> extentCache = new Dictionary<AttributeReference, AttributeRecord>(_attribute.Extents);
-            foreach (var extent in extentCache)
-            {
-                if (extent.Value.StartVcn >= endVcn)
-                {
-                    NonResidentAttributeRecord record = (NonResidentAttributeRecord)extent.Value;
-                    _file.RemoveAttributeExtent(extent.Key);
-                    _attribute.RemoveExtentCacheSafe(extent.Key);
-                }
-            }
-
-            PrimaryAttributeRecord.LastVcn = Math.Max(0, endVcn - 1);
-            PrimaryAttributeRecord.AllocatedLength = endVcn * _bytesPerCluster;
-            PrimaryAttributeRecord.DataLength = value;
-            PrimaryAttributeRecord.InitializedDataLength = Math.Min(PrimaryAttributeRecord.InitializedDataLength, value);
-
-            _file.MarkMftRecordDirty();
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/NonResidentAttributeRecord.cs b/DiscUtils/Ntfs/NonResidentAttributeRecord.cs
deleted file mode 100644
index 6a1eb5e..0000000
--- a/DiscUtils/Ntfs/NonResidentAttributeRecord.cs
+++ /dev/null
@@ -1,401 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Text;
-
-    internal sealed class NonResidentAttributeRecord : AttributeRecord
-    {
-        private const ushort DefaultCompressionUnitSize = 4;
-
-        private ulong _startingVCN;
-        private ulong _lastVCN;
-        private ushort _dataRunsOffset;
-        private ushort _compressionUnitSize;
-        private ulong _dataAllocatedSize;
-        private ulong _dataRealSize;
-        private ulong _initializedDataSize;
-        private ulong _compressedSize;
-
-        private List<DataRun> _dataRuns;
-
-        public NonResidentAttributeRecord(byte[] buffer, int offset, out int length)
-        {
-            Read(buffer, offset, out length);
-        }
-
-        public NonResidentAttributeRecord(AttributeType type, string name, ushort id, AttributeFlags flags, long firstCluster, ulong numClusters, uint bytesPerCluster)
-            : base(type, name, id, flags)
-        {
-            _nonResidentFlag = 1;
-            _dataRuns = new List<DataRun>();
-            _dataRuns.Add(new DataRun(firstCluster, (long)numClusters, false));
-            _lastVCN = numClusters - 1;
-            _dataAllocatedSize = bytesPerCluster * numClusters;
-            _dataRealSize = bytesPerCluster * numClusters;
-            _initializedDataSize = bytesPerCluster * numClusters;
-
-            if ((flags & (AttributeFlags.Compressed | AttributeFlags.Sparse)) != 0)
-            {
-                _compressionUnitSize = DefaultCompressionUnitSize;
-            }
-        }
-
-        public NonResidentAttributeRecord(AttributeType type, string name, ushort id, AttributeFlags flags, long startVcn, List<DataRun> dataRuns)
-            : base(type, name, id, flags)
-        {
-            _nonResidentFlag = 1;
-            _dataRuns = dataRuns;
-            _startingVCN = (ulong)startVcn;
-
-            if ((flags & (AttributeFlags.Compressed | AttributeFlags.Sparse)) != 0)
-            {
-                _compressionUnitSize = DefaultCompressionUnitSize;
-            }
-
-            if (dataRuns != null && dataRuns.Count != 0)
-            {
-                _lastVCN = _startingVCN;
-                foreach (var run in dataRuns)
-                {
-                    _lastVCN += (ulong)run.RunLength;
-                }
-
-                _lastVCN -= 1;
-            }
-        }
-
-        /// <summary>
-        /// The amount of space occupied by the attribute (in bytes).
-        /// </summary>
-        public override long AllocatedLength
-        {
-            get { return (long)_dataAllocatedSize; }
-            set { _dataAllocatedSize = (ulong)value; }
-        }
-
-        /// <summary>
-        /// The amount of data in the attribute (in bytes).
-        /// </summary>
-        public override long DataLength
-        {
-            get { return (long)_dataRealSize; }
-            set { _dataRealSize = (ulong)value; }
-        }
-
-        /// <summary>
-        /// The amount of initialized data in the attribute (in bytes).
-        /// </summary>
-        public override long InitializedDataLength
-        {
-            get { return (long)_initializedDataSize; }
-            set { _initializedDataSize = (ulong)value; }
-        }
-
-        public long CompressedDataSize
-        {
-            get { return (long)_compressedSize; }
-            set { _compressedSize = (ulong)value; }
-        }
-
-        public override long StartVcn
-        {
-            get { return (long)_startingVCN; }
-        }
-
-        public long LastVcn
-        {
-            get { return (long)_lastVCN; }
-            set { _lastVCN = (ulong)value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the size of a compression unit (in clusters).
-        /// </summary>
-        public int CompressionUnitSize
-        {
-            get { return 1 << _compressionUnitSize; }
-            set { _compressionUnitSize = (ushort)Utilities.Log2(value); }
-        }
-
-        public List<DataRun> DataRuns
-        {
-            get { return _dataRuns; }
-        }
-
-        public override int Size
-        {
-            get
-            {
-                byte nameLength = 0;
-                ushort nameOffset = (ushort)(((Flags & (AttributeFlags.Compressed | AttributeFlags.Sparse)) != 0) ? 0x48 : 0x40);
-                if (Name != null)
-                {
-                    nameLength = (byte)Name.Length;
-                }
-
-                ushort dataOffset = (ushort)Utilities.RoundUp(nameOffset + (nameLength * 2), 8);
-
-                // Write out data first, since we know where it goes...
-                int dataLen = 0;
-                foreach (var run in _dataRuns)
-                {
-                    dataLen += run.Size;
-                }
-
-                dataLen++; // NULL terminator
-
-                return Utilities.RoundUp(dataOffset + dataLen, 8);
-            }
-        }
-
-        public void ReplaceRun(DataRun oldRun, DataRun newRun)
-        {
-            int idx = _dataRuns.IndexOf(oldRun);
-            if (idx < 0)
-            {
-                throw new ArgumentException("Attempt to replace non-existant run", "oldRun");
-            }
-
-            _dataRuns[idx] = newRun;
-        }
-
-        public int RemoveRun(DataRun run)
-        {
-            int idx = _dataRuns.IndexOf(run);
-            if (idx < 0)
-            {
-                throw new ArgumentException("Attempt to remove non-existant run", "run");
-            }
-
-            _dataRuns.RemoveAt(idx);
-            return idx;
-        }
-
-        public void InsertRun(DataRun existingRun, DataRun newRun)
-        {
-            int idx = _dataRuns.IndexOf(existingRun);
-            if (idx < 0)
-            {
-                throw new ArgumentException("Attempt to replace non-existant run", "existingRun");
-            }
-
-            _dataRuns.Insert(idx + 1, newRun);
-        }
-
-        public void InsertRun(int index, DataRun newRun)
-        {
-            _dataRuns.Insert(index, newRun);
-        }
-
-        public override Range<long, long>[] GetClusters()
-        {
-            var cookedRuns = _dataRuns;
-
-            long start = 0;
-            List<Range<long, long>> result = new List<Range<long, long>>(_dataRuns.Count);
-            foreach (var run in cookedRuns)
-            {
-                if (!run.IsSparse)
-                {
-                    start += run.RunOffset;
-                    result.Add(new Range<long, long>(start, run.RunLength));
-                }
-            }
-
-            return result.ToArray();
-        }
-
-        public override IBuffer GetReadOnlyDataBuffer(INtfsContext context)
-        {
-            return new NonResidentDataBuffer(context, this);
-        }
-
-        public override int Write(byte[] buffer, int offset)
-        {
-            ushort headerLength = 0x40;
-            if ((Flags & (AttributeFlags.Compressed | AttributeFlags.Sparse)) != 0)
-            {
-                headerLength += 0x08;
-            }
-
-            byte nameLength = 0;
-            ushort nameOffset = headerLength;
-            if (Name != null)
-            {
-                nameLength = (byte)Name.Length;
-            }
-
-            ushort dataOffset = (ushort)Utilities.RoundUp(headerLength + (nameLength * 2), 8);
-
-            // Write out data first, since we know where it goes...
-            int dataLen = 0;
-            foreach (var run in _dataRuns)
-            {
-                dataLen += run.Write(buffer, offset + dataOffset + dataLen);
-            }
-
-            buffer[offset + dataOffset + dataLen] = 0; // NULL terminator
-            dataLen++;
-
-            int length = (int)Utilities.RoundUp(dataOffset + dataLen, 8);
-
-            Utilities.WriteBytesLittleEndian((uint)_type, buffer, offset + 0x00);
-            Utilities.WriteBytesLittleEndian(length, buffer, offset + 0x04);
-            buffer[offset + 0x08] = _nonResidentFlag;
-            buffer[offset + 0x09] = nameLength;
-            Utilities.WriteBytesLittleEndian(nameOffset, buffer, offset + 0x0A);
-            Utilities.WriteBytesLittleEndian((ushort)_flags, buffer, offset + 0x0C);
-            Utilities.WriteBytesLittleEndian(_attributeId, buffer, offset + 0x0E);
-
-            Utilities.WriteBytesLittleEndian(_startingVCN, buffer, offset + 0x10);
-            Utilities.WriteBytesLittleEndian(_lastVCN, buffer, offset + 0x18);
-            Utilities.WriteBytesLittleEndian(dataOffset, buffer, offset + 0x20);
-            Utilities.WriteBytesLittleEndian(_compressionUnitSize, buffer, offset + 0x22);
-            Utilities.WriteBytesLittleEndian((uint)0, buffer, offset + 0x24); // Padding
-            Utilities.WriteBytesLittleEndian(_dataAllocatedSize, buffer, offset + 0x28);
-            Utilities.WriteBytesLittleEndian(_dataRealSize, buffer, offset + 0x30);
-            Utilities.WriteBytesLittleEndian(_initializedDataSize, buffer, offset + 0x38);
-            if ((Flags & (AttributeFlags.Compressed | AttributeFlags.Sparse)) != 0)
-            {
-                Utilities.WriteBytesLittleEndian(_compressedSize, buffer, offset + 0x40);
-            }
-
-            if (Name != null)
-            {
-                Array.Copy(Encoding.Unicode.GetBytes(Name), 0, buffer, offset + nameOffset, nameLength * 2);
-            }
-
-            return length;
-        }
-
-        public AttributeRecord Split(int suggestedSplitIdx)
-        {
-            int splitIdx;
-            if (suggestedSplitIdx <= 0 || suggestedSplitIdx >= _dataRuns.Count)
-            {
-                splitIdx = _dataRuns.Count / 2;
-            }
-            else
-            {
-                splitIdx = suggestedSplitIdx;
-            }
-
-            long splitVcn = (long)_startingVCN;
-            long splitLcn = 0;
-            for (int i = 0; i < splitIdx; ++i)
-            {
-                splitVcn += _dataRuns[i].RunLength;
-                splitLcn += _dataRuns[i].RunOffset;
-            }
-
-            List<DataRun> newRecordRuns = new List<DataRun>();
-            while (_dataRuns.Count > splitIdx)
-            {
-                DataRun run = _dataRuns[splitIdx];
-
-                _dataRuns.RemoveAt(splitIdx);
-                newRecordRuns.Add(run);
-            }
-
-            // Each extent has implicit start LCN=0, so have to make stored runs match reality.
-            // However, take care not to stomp on 'sparse' runs that may be at the start of the
-            // new extent (indicated by Zero run offset).
-            for (int i = 0; i < newRecordRuns.Count; ++i)
-            {
-                if (!newRecordRuns[i].IsSparse)
-                {
-                    newRecordRuns[i].RunOffset += splitLcn;
-                    break;
-                }
-            }
-
-            _lastVCN = (ulong)splitVcn - 1;
-
-            return new NonResidentAttributeRecord(_type, _name, 0, _flags, splitVcn, newRecordRuns);
-        }
-
-        public override void Dump(TextWriter writer, string indent)
-        {
-            base.Dump(writer, indent);
-            writer.WriteLine(indent + "     Starting VCN: " + _startingVCN);
-            writer.WriteLine(indent + "         Last VCN: " + _lastVCN);
-            writer.WriteLine(indent + "   Comp Unit Size: " + _compressionUnitSize);
-            writer.WriteLine(indent + "   Allocated Size: " + _dataAllocatedSize);
-            writer.WriteLine(indent + "        Real Size: " + _dataRealSize);
-            writer.WriteLine(indent + "   Init Data Size: " + _initializedDataSize);
-            if ((Flags & (AttributeFlags.Compressed | AttributeFlags.Sparse)) != 0)
-            {
-                writer.WriteLine(indent + "  Compressed Size: " + _compressedSize);
-            }
-
-            string runStr = string.Empty;
-
-            foreach (DataRun run in _dataRuns)
-            {
-                runStr += " " + run.ToString();
-            }
-
-            writer.WriteLine(indent + "        Data Runs:" + runStr);
-        }
-
-        protected override void Read(byte[] buffer, int offset, out int length)
-        {
-            _dataRuns = null;
-
-            base.Read(buffer, offset, out length);
-
-            _startingVCN = Utilities.ToUInt64LittleEndian(buffer, offset + 0x10);
-            _lastVCN = Utilities.ToUInt64LittleEndian(buffer, offset + 0x18);
-            _dataRunsOffset = Utilities.ToUInt16LittleEndian(buffer, offset + 0x20);
-            _compressionUnitSize = Utilities.ToUInt16LittleEndian(buffer, offset + 0x22);
-            _dataAllocatedSize = Utilities.ToUInt64LittleEndian(buffer, offset + 0x28);
-            _dataRealSize = Utilities.ToUInt64LittleEndian(buffer, offset + 0x30);
-            _initializedDataSize = Utilities.ToUInt64LittleEndian(buffer, offset + 0x38);
-            if ((Flags & (AttributeFlags.Compressed | AttributeFlags.Sparse)) != 0 && _dataRunsOffset > 0x40)
-            {
-                _compressedSize = Utilities.ToUInt64LittleEndian(buffer, offset + 0x40);
-            }
-
-            _dataRuns = new List<DataRun>();
-            int pos = _dataRunsOffset;
-            while (pos < length)
-            {
-                DataRun run = new DataRun();
-                int len = run.Read(buffer, offset + pos);
-
-                // Length 1 means there was only a header byte (i.e. terminator)
-                if (len == 1)
-                {
-                    break;
-                }
-
-                _dataRuns.Add(run);
-                pos += len;
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/NonResidentDataBuffer.cs b/DiscUtils/Ntfs/NonResidentDataBuffer.cs
deleted file mode 100644
index fa37135..0000000
--- a/DiscUtils/Ntfs/NonResidentDataBuffer.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal class NonResidentDataBuffer : DiscUtils.Buffer, IMappedBuffer
-    {
-        protected INtfsContext _context;
-        protected CookedDataRuns _cookedRuns;
-
-        protected long _bytesPerCluster;
-        protected RawClusterStream _rawStream;
-        protected ClusterStream _activeStream;
-
-        protected byte[] _ioBuffer;
-
-        public NonResidentDataBuffer(INtfsContext context, NonResidentAttributeRecord record)
-            : this(context, new CookedDataRuns(record.DataRuns, record), false)
-        {
-        }
-
-        public NonResidentDataBuffer(INtfsContext context, CookedDataRuns cookedRuns, bool isMft)
-        {
-            _context = context;
-            _cookedRuns = cookedRuns;
-
-            _rawStream = new RawClusterStream(_context, _cookedRuns, isMft);
-            _activeStream = _rawStream;
-
-            _bytesPerCluster = _context.BiosParameterBlock.BytesPerCluster;
-            _ioBuffer = new byte[_bytesPerCluster];
-        }
-
-        public override bool CanRead
-        {
-            get { return _context.RawStream.CanRead; }
-        }
-
-        public override bool CanWrite
-        {
-            get { return false; }
-        }
-
-        public override long Capacity
-        {
-            get { return VirtualClusterCount * _bytesPerCluster; }
-        }
-
-        public long VirtualClusterCount
-        {
-            get { return _cookedRuns.NextVirtualCluster; }
-        }
-
-        public override IEnumerable<StreamExtent> Extents
-        {
-            get
-            {
-                List<StreamExtent> extents = new List<StreamExtent>();
-                foreach (var range in _activeStream.StoredClusters)
-                {
-                    extents.Add(new StreamExtent(range.Offset * _bytesPerCluster, range.Count * _bytesPerCluster));
-                }
-
-                return StreamExtent.Intersect(extents, new StreamExtent(0, Capacity));
-            }
-        }
-
-        public override IEnumerable<StreamExtent> GetExtentsInRange(long start, long count)
-        {
-            return StreamExtent.Intersect(Extents, new StreamExtent(start, count));
-        }
-
-        public long MapPosition(long pos)
-        {
-            long vcn = pos / _bytesPerCluster;
-            int dataRunIdx = _cookedRuns.FindDataRun(vcn, 0);
-
-            if (_cookedRuns[dataRunIdx].IsSparse)
-            {
-                return -1;
-            }
-            else
-            {
-                return (_cookedRuns[dataRunIdx].StartLcn * _bytesPerCluster) + (pos - (_cookedRuns[dataRunIdx].StartVcn * _bytesPerCluster));
-            }
-        }
-
-        public override int Read(long pos, byte[] buffer, int offset, int count)
-        {
-            if (!CanRead)
-            {
-                throw new IOException("Attempt to read from file not opened for read");
-            }
-
-            Utilities.AssertBufferParameters(buffer, offset, count);
-
-            // Limit read to length of attribute
-            int totalToRead = (int)Math.Min(count, Capacity - pos);
-            if (totalToRead <= 0)
-            {
-                return 0;
-            }
-
-            long focusPos = pos;
-            while (focusPos < pos + totalToRead)
-            {
-                long vcn = focusPos / _bytesPerCluster;
-                long remaining = (pos + totalToRead) - focusPos;
-                long clusterOffset = focusPos - (vcn * _bytesPerCluster);
-
-                if (vcn * _bytesPerCluster != focusPos || remaining < _bytesPerCluster)
-                {
-                    // Unaligned or short read
-                    _activeStream.ReadClusters(vcn, 1, _ioBuffer, 0);
-
-                    int toRead = (int)Math.Min(remaining, _bytesPerCluster - clusterOffset);
-
-                    Array.Copy(_ioBuffer, clusterOffset, buffer, offset + (focusPos - pos), toRead);
-
-                    focusPos += toRead;
-                }
-                else
-                {
-                    // Aligned, full cluster reads...
-                    int fullClusters = (int)(remaining / _bytesPerCluster);
-                    _activeStream.ReadClusters(vcn, fullClusters, buffer, (int)(offset + (focusPos - pos)));
-
-                    focusPos += fullClusters * _bytesPerCluster;
-                }
-            }
-
-            return totalToRead;
-        }
-
-        public override void Write(long pos, byte[] buffer, int offset, int count)
-        {
-            throw new NotSupportedException();
-        }
-
-        public override void SetCapacity(long value)
-        {
-            throw new NotSupportedException();
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/NtfsAttribute.cs b/DiscUtils/Ntfs/NtfsAttribute.cs
deleted file mode 100644
index 0e71b4e..0000000
--- a/DiscUtils/Ntfs/NtfsAttribute.cs
+++ /dev/null
@@ -1,413 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-
-    internal class NtfsAttribute : IDiagnosticTraceable
-    {
-        protected File _file;
-        protected FileRecordReference _containingFile;
-        protected AttributeRecord _primaryRecord;
-        protected Dictionary<AttributeReference, AttributeRecord> _extents;
-        private IBuffer _cachedRawBuffer;
-
-        protected NtfsAttribute(File file, FileRecordReference containingFile, AttributeRecord record)
-        {
-            _file = file;
-            _containingFile = containingFile;
-            _primaryRecord = record;
-            _extents = new Dictionary<AttributeReference, AttributeRecord>();
-            _extents.Add(new AttributeReference(containingFile, record.AttributeId), _primaryRecord);
-        }
-
-        public AttributeReference Reference
-        {
-            get
-            {
-                return new AttributeReference(_containingFile, _primaryRecord.AttributeId);
-            }
-        }
-
-        public AttributeType Type
-        {
-            get { return _primaryRecord.AttributeType; }
-        }
-
-        public string Name
-        {
-            get { return _primaryRecord.Name; }
-        }
-
-        public AttributeFlags Flags
-        {
-            get
-            {
-                return _primaryRecord.Flags;
-            }
-
-            set
-            {
-                _primaryRecord.Flags = value;
-                _cachedRawBuffer = null;
-            }
-        }
-
-        public ushort Id
-        {
-            get { return _primaryRecord.AttributeId; }
-        }
-
-        public long Length
-        {
-            get { return _primaryRecord.DataLength; }
-        }
-
-        public AttributeRecord PrimaryRecord
-        {
-            get
-            {
-                return _primaryRecord;
-            }
-        }
-
-        public int CompressionUnitSize
-        {
-            get
-            {
-                NonResidentAttributeRecord firstExtent = FirstExtent as NonResidentAttributeRecord;
-                if (firstExtent == null)
-                {
-                    return 0;
-                }
-                else
-                {
-                    return firstExtent.CompressionUnitSize;
-                }
-            }
-
-            set
-            {
-                NonResidentAttributeRecord firstExtent = FirstExtent as NonResidentAttributeRecord;
-                if (firstExtent != null)
-                {
-                    firstExtent.CompressionUnitSize = value;
-                }
-            }
-        }
-
-        public long CompressedDataSize
-        {
-            get
-            {
-                NonResidentAttributeRecord firstExtent = FirstExtent as NonResidentAttributeRecord;
-                if (firstExtent == null)
-                {
-                    return FirstExtent.AllocatedLength;
-                }
-                else
-                {
-                    return firstExtent.CompressedDataSize;
-                }
-            }
-
-            set
-            {
-                NonResidentAttributeRecord firstExtent = FirstExtent as NonResidentAttributeRecord;
-                if (firstExtent != null)
-                {
-                    firstExtent.CompressedDataSize = value;
-                }
-            }
-        }
-
-        public List<AttributeRecord> Records
-        {
-            get
-            {
-                List<AttributeRecord> records = new List<AttributeRecord>(_extents.Values);
-                records.Sort(AttributeRecord.CompareStartVcns);
-                return records;
-            }
-        }
-
-        public IBuffer RawBuffer
-        {
-            get
-            {
-                if (_cachedRawBuffer == null)
-                {
-                    if (_primaryRecord.IsNonResident)
-                    {
-                        _cachedRawBuffer = new NonResidentAttributeBuffer(_file, this);
-                    }
-                    else
-                    {
-                        _cachedRawBuffer = ((ResidentAttributeRecord)_primaryRecord).DataBuffer;
-                    }
-                }
-
-                return _cachedRawBuffer;
-            }
-        }
-
-        public IDictionary<AttributeReference, AttributeRecord> Extents
-        {
-            get { return _extents; }
-        }
-
-        public AttributeRecord LastExtent
-        {
-            get
-            {
-                AttributeRecord last = null;
-
-                if (_extents != null)
-                {
-                    long lastVcn = 0;
-                    foreach (var extent in _extents)
-                    {
-                        NonResidentAttributeRecord nonResident = extent.Value as NonResidentAttributeRecord;
-                        if (nonResident == null)
-                        {
-                            // Resident attribute, so there can only be one...
-                            return extent.Value;
-                        }
-
-                        if (nonResident.LastVcn >= lastVcn)
-                        {
-                            last = extent.Value;
-                            lastVcn = nonResident.LastVcn;
-                        }
-                    }
-                }
-
-                return last;
-            }
-        }
-
-        public AttributeRecord FirstExtent
-        {
-            get
-            {
-                if (_extents != null)
-                {
-                    foreach (var extent in _extents)
-                    {
-                        NonResidentAttributeRecord nonResident = extent.Value as NonResidentAttributeRecord;
-                        if (nonResident == null)
-                        {
-                            // Resident attribute, so there can only be one...
-                            return extent.Value;
-                        }
-                        else if (nonResident.StartVcn == 0)
-                        {
-                            return extent.Value;
-                        }
-                    }
-                }
-
-                throw new InvalidDataException("Attribute with no initial extent");
-            }
-        }
-
-        public bool IsNonResident
-        {
-            get { return _primaryRecord.IsNonResident; }
-        }
-
-        protected string AttributeTypeName
-        {
-            get
-            {
-                switch (_primaryRecord.AttributeType)
-                {
-                    case AttributeType.StandardInformation:
-                        return "STANDARD INFORMATION";
-                    case AttributeType.FileName:
-                        return "FILE NAME";
-                    case AttributeType.SecurityDescriptor:
-                        return "SECURITY DESCRIPTOR";
-                    case AttributeType.Data:
-                        return "DATA";
-                    case AttributeType.Bitmap:
-                        return "BITMAP";
-                    case AttributeType.VolumeName:
-                        return "VOLUME NAME";
-                    case AttributeType.VolumeInformation:
-                        return "VOLUME INFORMATION";
-                    case AttributeType.IndexRoot:
-                        return "INDEX ROOT";
-                    case AttributeType.IndexAllocation:
-                        return "INDEX ALLOCATION";
-                    case AttributeType.ObjectId:
-                        return "OBJECT ID";
-                    case AttributeType.ReparsePoint:
-                        return "REPARSE POINT";
-                    case AttributeType.AttributeList:
-                        return "ATTRIBUTE LIST";
-                    default:
-                        return "UNKNOWN";
-                }
-            }
-        }
-
-        public static NtfsAttribute FromRecord(File file, FileRecordReference recordFile, AttributeRecord record)
-        {
-            switch (record.AttributeType)
-            {
-                case AttributeType.StandardInformation:
-                    return new StructuredNtfsAttribute<StandardInformation>(file, recordFile, record);
-                case AttributeType.FileName:
-                    return new StructuredNtfsAttribute<FileNameRecord>(file, recordFile, record);
-                case AttributeType.SecurityDescriptor:
-                    return new StructuredNtfsAttribute<SecurityDescriptor>(file, recordFile, record);
-                case AttributeType.Data:
-                    return new NtfsAttribute(file, recordFile, record);
-                case AttributeType.Bitmap:
-                    return new NtfsAttribute(file, recordFile, record);
-                case AttributeType.VolumeName:
-                    return new StructuredNtfsAttribute<VolumeName>(file, recordFile, record);
-                case AttributeType.VolumeInformation:
-                    return new StructuredNtfsAttribute<VolumeInformation>(file, recordFile, record);
-                case AttributeType.IndexRoot:
-                    return new NtfsAttribute(file, recordFile, record);
-                case AttributeType.IndexAllocation:
-                    return new NtfsAttribute(file, recordFile, record);
-                case AttributeType.ObjectId:
-                    return new StructuredNtfsAttribute<ObjectId>(file, recordFile, record);
-                case AttributeType.ReparsePoint:
-                    return new StructuredNtfsAttribute<ReparsePointRecord>(file, recordFile, record);
-                case AttributeType.AttributeList:
-                    return new StructuredNtfsAttribute<AttributeList>(file, recordFile, record);
-                default:
-                    return new NtfsAttribute(file, recordFile, record);
-            }
-        }
-
-        public void SetExtent(FileRecordReference containingFile, AttributeRecord record)
-        {
-            _cachedRawBuffer = null;
-            _containingFile = containingFile;
-            _primaryRecord = record;
-            _extents.Clear();
-            _extents.Add(new AttributeReference(containingFile, record.AttributeId), record);
-        }
-
-        public void AddExtent(FileRecordReference containingFile, AttributeRecord record)
-        {
-            _cachedRawBuffer = null;
-            _extents.Add(new AttributeReference(containingFile, record.AttributeId), record);
-        }
-
-        public void RemoveExtentCacheSafe(AttributeReference reference)
-        {
-            _extents.Remove(reference);
-        }
-
-        public bool ReplaceExtent(AttributeReference oldRef, AttributeReference newRef, AttributeRecord record)
-        {
-            _cachedRawBuffer = null;
-
-            if (!_extents.Remove(oldRef))
-            {
-                return false;
-            }
-            else
-            {
-                if (oldRef.Equals(Reference) || _extents.Count == 0)
-                {
-                    _primaryRecord = record;
-                    _containingFile = newRef.File;
-                }
-
-                _extents.Add(newRef, record);
-                return true;
-            }
-        }
-
-        public Range<long, long>[] GetClusters()
-        {
-            List<Range<long, long>> result = new List<Range<long, long>>();
-
-            foreach (var extent in _extents)
-            {
-                result.AddRange(extent.Value.GetClusters());
-            }
-
-            return result.ToArray();
-        }
-
-        public virtual void Dump(TextWriter writer, string indent)
-        {
-            writer.WriteLine(indent + AttributeTypeName + " ATTRIBUTE (" + (Name == null ? "No Name" : Name) + ")");
-
-            writer.WriteLine(indent + "  Length: " + _primaryRecord.DataLength + " bytes");
-            if (_primaryRecord.DataLength == 0)
-            {
-                writer.WriteLine(indent + "    Data: <none>");
-            }
-            else
-            {
-                try
-                {
-                    using (Stream s = Open(FileAccess.Read))
-                    {
-                        string hex = string.Empty;
-                        byte[] buffer = new byte[32];
-                        int numBytes = s.Read(buffer, 0, buffer.Length);
-                        for (int i = 0; i < numBytes; ++i)
-                        {
-                            hex = hex + string.Format(CultureInfo.InvariantCulture, " {0:X2}", buffer[i]);
-                        }
-
-                        writer.WriteLine(indent + "    Data: " + hex + ((numBytes < s.Length) ? "..." : string.Empty));
-                    }
-                }
-                catch
-                {
-                    writer.WriteLine(indent + "    Data: <can't read>");
-                }
-            }
-
-            _primaryRecord.Dump(writer, indent + "  ");
-        }
-
-        internal SparseStream Open(FileAccess access)
-        {
-            return new BufferStream(GetDataBuffer(), access);
-        }
-
-        internal IMappedBuffer GetDataBuffer()
-        {
-            return new NtfsAttributeBuffer(_file, this);
-        }
-
-        internal long OffsetToAbsolutePos(long offset)
-        {
-            return GetDataBuffer().MapPosition(offset);
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/NtfsAttributeBuffer.cs b/DiscUtils/Ntfs/NtfsAttributeBuffer.cs
deleted file mode 100644
index 33eb64f..0000000
--- a/DiscUtils/Ntfs/NtfsAttributeBuffer.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal class NtfsAttributeBuffer : DiscUtils.Buffer, IMappedBuffer
-    {
-        private File _file;
-        private NtfsAttribute _attribute;
-
-        public NtfsAttributeBuffer(File file, NtfsAttribute attribute)
-        {
-            _file = file;
-            _attribute = attribute;
-        }
-
-        public override bool CanRead
-        {
-            get { return true; }
-        }
-
-        public override bool CanWrite
-        {
-            get { return _file.Context.RawStream.CanWrite; }
-        }
-
-        public override long Capacity
-        {
-            get
-            {
-                return _attribute.PrimaryRecord.DataLength;
-            }
-        }
-
-        public long MapPosition(long pos)
-        {
-            if (_attribute.IsNonResident)
-            {
-                return ((IMappedBuffer)_attribute.RawBuffer).MapPosition(pos);
-            }
-            else
-            {
-                AttributeReference attrRef = new AttributeReference(_file.MftReference, _attribute.PrimaryRecord.AttributeId);
-                ResidentAttributeRecord attrRecord = (ResidentAttributeRecord)_file.GetAttribute(attrRef).PrimaryRecord;
-
-                long attrStart = _file.GetAttributeOffset(attrRef);
-                long mftPos = attrStart + attrRecord.DataOffset + pos;
-
-                return _file.Context.GetFileByIndex(MasterFileTable.MftIndex).GetAttribute(AttributeType.Data, null).OffsetToAbsolutePos(mftPos);
-            }
-        }
-
-        public override int Read(long pos, byte[] buffer, int offset, int count)
-        {
-            var record = _attribute.PrimaryRecord;
-
-            if (!CanRead)
-            {
-                throw new IOException("Attempt to read from file not opened for read");
-            }
-
-            Utilities.AssertBufferParameters(buffer, offset, count);
-
-            if (pos >= Capacity)
-            {
-                return 0;
-            }
-
-            // Limit read to length of attribute
-            int totalToRead = (int)Math.Min(count, Capacity - pos);
-            int toRead = totalToRead;
-
-            // Handle uninitialized bytes at end of attribute
-            if (pos + totalToRead > record.InitializedDataLength)
-            {
-                if (pos >= record.InitializedDataLength)
-                {
-                    // We're just reading zero bytes from the uninitialized area
-                    Array.Clear(buffer, offset, totalToRead);
-                    pos += totalToRead;
-                    return totalToRead;
-                }
-                else
-                {
-                    // Partial read of uninitialized area
-                    Array.Clear(buffer, offset + (int)(record.InitializedDataLength - pos), (int)((pos + toRead) - record.InitializedDataLength));
-                    toRead = (int)(record.InitializedDataLength - pos);
-                }
-            }
-
-            int numRead = 0;
-            while (numRead < toRead)
-            {
-                IBuffer extentBuffer = _attribute.RawBuffer;
-
-                int justRead = extentBuffer.Read(pos + numRead, buffer, offset + numRead, toRead - numRead);
-                if (justRead == 0)
-                {
-                    break;
-                }
-
-                numRead += justRead;
-            }
-
-            return totalToRead;
-        }
-
-        public override void SetCapacity(long value)
-        {
-            if (!CanWrite)
-            {
-                throw new IOException("Attempt to change length of file not opened for write");
-            }
-
-            if (value == Capacity)
-            {
-                return;
-            }
-
-            _attribute.RawBuffer.SetCapacity(value);
-            _file.MarkMftRecordDirty();
-        }
-
-        public override void Write(long pos, byte[] buffer, int offset, int count)
-        {
-            var record = _attribute.PrimaryRecord;
-
-            if (!CanWrite)
-            {
-                throw new IOException("Attempt to write to file not opened for write");
-            }
-
-            Utilities.AssertBufferParameters(buffer, offset, count);
-
-            if (count == 0)
-            {
-                return;
-            }
-
-            _attribute.RawBuffer.Write(pos, buffer, offset, count);
-
-            if (!record.IsNonResident)
-            {
-                _file.MarkMftRecordDirty();
-            }
-        }
-
-        public override void Clear(long pos, int count)
-        {
-            var record = _attribute.PrimaryRecord;
-
-            if (!CanWrite)
-            {
-                throw new IOException("Attempt to write to file not opened for write");
-            }
-
-            if (count == 0)
-            {
-                return;
-            }
-
-            _attribute.RawBuffer.Clear(pos, count);
-
-            if (!record.IsNonResident)
-            {
-                _file.MarkMftRecordDirty();
-            }
-        }
-
-        public override IEnumerable<StreamExtent> GetExtentsInRange(long start, long count)
-        {
-            return StreamExtent.Intersect(_attribute.RawBuffer.GetExtentsInRange(start, count), new StreamExtent(0, Capacity));
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/NtfsContext.cs b/DiscUtils/Ntfs/NtfsContext.cs
deleted file mode 100644
index 21aa5db..0000000
--- a/DiscUtils/Ntfs/NtfsContext.cs
+++ /dev/null
@@ -1,261 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System.IO;
-
-    internal delegate File GetFileByIndexFn(long index);
-
-    internal delegate File GetFileByRefFn(FileRecordReference reference);
-
-    internal delegate Directory GetDirectoryByIndexFn(long index);
-
-    internal delegate Directory GetDirectoryByRefFn(FileRecordReference reference);
-
-    internal delegate File AllocateFileFn(FileRecordFlags flags);
-
-    internal delegate void ForgetFileFn(File file);
-
-    internal interface INtfsContext
-    {
-        Stream RawStream
-        {
-            get;
-        }
-
-        AttributeDefinitions AttributeDefinitions
-        {
-            get;
-        }
-
-        UpperCase UpperCase
-        {
-            get;
-        }
-
-        BiosParameterBlock BiosParameterBlock
-        {
-            get;
-        }
-
-        MasterFileTable Mft
-        {
-            get;
-        }
-
-        ClusterBitmap ClusterBitmap
-        {
-            get;
-        }
-
-        SecurityDescriptors SecurityDescriptors
-        {
-            get;
-        }
-
-        ObjectIds ObjectIds
-        {
-            get;
-        }
-
-        ReparsePoints ReparsePoints
-        {
-            get;
-        }
-
-        Quotas Quotas
-        {
-            get;
-        }
-
-        NtfsOptions Options
-        {
-            get;
-        }
-
-        GetFileByIndexFn GetFileByIndex
-        {
-            get;
-        }
-
-        GetFileByRefFn GetFileByRef
-        {
-            get;
-        }
-
-        GetDirectoryByIndexFn GetDirectoryByIndex
-        {
-            get;
-        }
-
-        GetDirectoryByRefFn GetDirectoryByRef
-        {
-            get;
-        }
-
-        AllocateFileFn AllocateFile
-        {
-            get;
-        }
-
-        ForgetFileFn ForgetFile
-        {
-            get;
-        }
-
-        bool ReadOnly
-        {
-            get;
-        }
-    }
-
-    internal sealed class NtfsContext : INtfsContext
-    {
-        private Stream _rawStream;
-        private AttributeDefinitions _attrDefs;
-        private UpperCase _upperCase;
-        private BiosParameterBlock _bpb;
-        private MasterFileTable _mft;
-        private ClusterBitmap _bitmap;
-        private SecurityDescriptors _securityDescriptors;
-        private ObjectIds _objectIds;
-        private ReparsePoints _reparsePoints;
-        private Quotas _quotas;
-        private NtfsOptions _options;
-        private GetFileByIndexFn _getFileByIndexFn;
-        private GetFileByRefFn _getFileByRefFn;
-        private GetDirectoryByIndexFn _getDirByIndexFn;
-        private GetDirectoryByRefFn _getDirByRefFn;
-        private AllocateFileFn _allocateFileFn;
-        private ForgetFileFn _forgetFileFn;
-        private bool _readOnly;
-
-        public Stream RawStream
-        {
-            get { return _rawStream; }
-            set { _rawStream = value; }
-        }
-
-        public AttributeDefinitions AttributeDefinitions
-        {
-            get { return _attrDefs; }
-            set { _attrDefs = value; }
-        }
-
-        public UpperCase UpperCase
-        {
-            get { return _upperCase; }
-            set { _upperCase = value; }
-        }
-
-        public BiosParameterBlock BiosParameterBlock
-        {
-            get { return _bpb; }
-            set { _bpb = value; }
-        }
-
-        public MasterFileTable Mft
-        {
-            get { return _mft; }
-            set { _mft = value; }
-        }
-
-        public ClusterBitmap ClusterBitmap
-        {
-            get { return _bitmap; }
-            set { _bitmap = value; }
-        }
-
-        public SecurityDescriptors SecurityDescriptors
-        {
-            get { return _securityDescriptors; }
-            set { _securityDescriptors = value; }
-        }
-
-        public ObjectIds ObjectIds
-        {
-            get { return _objectIds; }
-            set { _objectIds = value; }
-        }
-
-        public ReparsePoints ReparsePoints
-        {
-            get { return _reparsePoints; }
-            set { _reparsePoints = value; }
-        }
-
-        public Quotas Quotas
-        {
-            get { return _quotas; }
-            set { _quotas = value; }
-        }
-
-        public NtfsOptions Options
-        {
-            get { return _options; }
-            set { _options = value; }
-        }
-
-        public GetFileByIndexFn GetFileByIndex
-        {
-            get { return _getFileByIndexFn; }
-            set { _getFileByIndexFn = value; }
-        }
-
-        public GetFileByRefFn GetFileByRef
-        {
-            get { return _getFileByRefFn; }
-            set { _getFileByRefFn = value; }
-        }
-
-        public GetDirectoryByIndexFn GetDirectoryByIndex
-        {
-            get { return _getDirByIndexFn; }
-            set { _getDirByIndexFn = value; }
-        }
-
-        public GetDirectoryByRefFn GetDirectoryByRef
-        {
-            get { return _getDirByRefFn; }
-            set { _getDirByRefFn = value; }
-        }
-
-        public AllocateFileFn AllocateFile
-        {
-            get { return _allocateFileFn; }
-            set { _allocateFileFn = value; }
-        }
-
-        public ForgetFileFn ForgetFile
-        {
-            get { return _forgetFileFn; }
-            set { _forgetFileFn = value; }
-        }
-
-        public bool ReadOnly
-        {
-            get { return _readOnly; }
-            set { _readOnly = value; }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/NtfsFileStream.cs b/DiscUtils/Ntfs/NtfsFileStream.cs
deleted file mode 100644
index 91b813f..0000000
--- a/DiscUtils/Ntfs/NtfsFileStream.cs
+++ /dev/null
@@ -1,224 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal sealed class NtfsFileStream : SparseStream
-    {
-        private DirectoryEntry _entry;
-
-        private File _file;
-        private SparseStream _baseStream;
-
-        private bool _isDirty;
-
-        public NtfsFileStream(NtfsFileSystem fileSystem, DirectoryEntry entry, AttributeType attrType, string attrName, FileAccess access)
-        {
-            _entry = entry;
-
-            _file = fileSystem.GetFile(entry.Reference);
-            _baseStream = _file.OpenStream(attrType, attrName, access);
-        }
-
-        public override bool CanRead
-        {
-            get
-            {
-                AssertOpen();
-                return _baseStream.CanRead;
-            }
-        }
-
-        public override bool CanSeek
-        {
-            get
-            {
-                AssertOpen();
-                return _baseStream.CanSeek;
-            }
-        }
-
-        public override bool CanWrite
-        {
-            get
-            {
-                AssertOpen();
-                return _baseStream.CanWrite;
-            }
-        }
-
-        public override long Length
-        {
-            get
-            {
-                AssertOpen();
-                return _baseStream.Length;
-            }
-        }
-
-        public override long Position
-        {
-            get
-            {
-                AssertOpen();
-                return _baseStream.Position;
-            }
-
-            set
-            {
-                AssertOpen();
-                using (new NtfsTransaction())
-                {
-                    _baseStream.Position = value;
-                }
-            }
-        }
-
-        public override IEnumerable<StreamExtent> Extents
-        {
-            get
-            {
-                AssertOpen();
-                return _baseStream.Extents;
-            }
-        }
-
-        public override void Close()
-        {
-            if (_baseStream == null)
-            {
-                return;
-            }
-
-            using (new NtfsTransaction())
-            {
-                base.Close();
-                _baseStream.Close();
-
-                UpdateMetadata();
-
-                _baseStream = null;
-            }
-        }
-
-        public override void Flush()
-        {
-            AssertOpen();
-            using (new NtfsTransaction())
-            {
-                _baseStream.Flush();
-
-                UpdateMetadata();
-            }
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            AssertOpen();
-            Utilities.AssertBufferParameters(buffer, offset, count);
-
-            using (new NtfsTransaction())
-            {
-                return _baseStream.Read(buffer, offset, count);
-            }
-        }
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            AssertOpen();
-            using (new NtfsTransaction())
-            {
-                return _baseStream.Seek(offset, origin);
-            }
-        }
-
-        public override void SetLength(long value)
-        {
-            AssertOpen();
-            using (new NtfsTransaction())
-            {
-                if (value != Length)
-                {
-                    _isDirty = true;
-                    _baseStream.SetLength(value);
-                }
-            }
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            AssertOpen();
-            Utilities.AssertBufferParameters(buffer, offset, count);
-
-            using (new NtfsTransaction())
-            {
-                _isDirty = true;
-                _baseStream.Write(buffer, offset, count);
-            }
-        }
-
-        public override void Clear(int count)
-        {
-            AssertOpen();
-            using (new NtfsTransaction())
-            {
-                _isDirty = true;
-                _baseStream.Clear(count);
-            }
-        }
-
-        private void UpdateMetadata()
-        {
-            if (!_file.Context.ReadOnly)
-            {
-                // Update the standard information attribute - so it reflects the actual file state
-                if (_isDirty)
-                {
-                    _file.Modified();
-                }
-                else
-                {
-                    _file.Accessed();
-                }
-
-                // Update the directory entry used to open the file, so it's accurate
-                _entry.UpdateFrom(_file);
-
-                // Write attribute changes back to the Master File Table
-                _file.UpdateRecordInMft();
-                _isDirty = false;
-            }
-        }
-
-        private void AssertOpen()
-        {
-            if (_baseStream == null)
-            {
-                throw new ObjectDisposedException(_entry.Details.FileName, "Attempt to use closed stream");
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/NtfsFileSystem.cs b/DiscUtils/Ntfs/NtfsFileSystem.cs
deleted file mode 100644
index 78a0c3f..0000000
--- a/DiscUtils/Ntfs/NtfsFileSystem.cs
+++ /dev/null
@@ -1,2440 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using System.Security.AccessControl;
-    using System.Text.RegularExpressions;
-
-    /// <summary>
-    /// Class for accessing NTFS file systems.
-    /// </summary>
-    public sealed class NtfsFileSystem : DiscFileSystem, IClusterBasedFileSystem, IWindowsFileSystem, IDiagnosticTraceable
-    {
-        private const FileAttributes NonSettableFileAttributes = FileAttributes.Directory | FileAttributes.Offline | FileAttributes.ReparsePoint;
-
-        private NtfsContext _context;
-        private VolumeInformation _volumeInfo;
-
-        // Top-level file system structures
-
-        // Working state
-        private ObjectCache<long, File> _fileCache;
-
-        /// <summary>
-        /// Initializes a new instance of the NtfsFileSystem class.
-        /// </summary>
-        /// <param name="stream">The stream containing the NTFS file system.</param>
-        public NtfsFileSystem(Stream stream)
-            : base(new NtfsOptions())
-        {
-            _context = new NtfsContext();
-            _context.RawStream = stream;
-            _context.Options = NtfsOptions;
-
-            _context.GetFileByIndex = GetFile;
-            _context.GetFileByRef = GetFile;
-            _context.GetDirectoryByRef = GetDirectory;
-            _context.GetDirectoryByIndex = GetDirectory;
-            _context.AllocateFile = AllocateFile;
-            _context.ForgetFile = ForgetFile;
-            _context.ReadOnly = !stream.CanWrite;
-
-            _fileCache = new ObjectCache<long, File>();
-
-            stream.Position = 0;
-            byte[] bytes = Utilities.ReadFully(stream, 512);
-
-            _context.BiosParameterBlock = BiosParameterBlock.FromBytes(bytes, 0);
-            if (!IsValidBPB(_context.BiosParameterBlock, stream.Length))
-            {
-                throw new InvalidFileSystemException("BIOS Parameter Block is invalid for an NTFS file system");
-            }
-
-            if (NtfsOptions.ReadCacheEnabled)
-            {
-                BlockCacheSettings cacheSettings = new BlockCacheSettings();
-                cacheSettings.BlockSize = _context.BiosParameterBlock.BytesPerCluster;
-                _context.RawStream = new BlockCacheStream(SparseStream.FromStream(stream, Ownership.None), Ownership.None, cacheSettings);
-            }
-
-            // Bootstrap the Master File Table
-            _context.Mft = new MasterFileTable(_context);
-            File mftFile = new File(_context, _context.Mft.GetBootstrapRecord());
-            _fileCache[MasterFileTable.MftIndex] = mftFile;
-            _context.Mft.Initialize(mftFile);
-
-            // Get volume information (includes version number)
-            File volumeInfoFile = GetFile(MasterFileTable.VolumeIndex);
-            _volumeInfo = volumeInfoFile.GetStream(AttributeType.VolumeInformation, null).GetContent<VolumeInformation>();
-
-            // Initialize access to the other well-known metadata files
-            _context.ClusterBitmap = new ClusterBitmap(GetFile(MasterFileTable.BitmapIndex));
-            _context.AttributeDefinitions = new AttributeDefinitions(GetFile(MasterFileTable.AttrDefIndex));
-            _context.UpperCase = new UpperCase(GetFile(MasterFileTable.UpCaseIndex));
-
-            if (_volumeInfo.Version >= VolumeInformation.VersionW2k)
-            {
-                _context.SecurityDescriptors = new SecurityDescriptors(GetFile(MasterFileTable.SecureIndex));
-                _context.ObjectIds = new ObjectIds(GetFile(GetDirectoryEntry(@"$Extend\$ObjId").Reference));
-                _context.ReparsePoints = new ReparsePoints(GetFile(GetDirectoryEntry(@"$Extend\$Reparse").Reference));
-                _context.Quotas = new Quotas(GetFile(GetDirectoryEntry(@"$Extend\$Quota").Reference));
-            }
-#if false
-            byte[] buffer = new byte[1024];
-            for (int i = 0; i < buffer.Length; ++i)
-            {
-                buffer[i] = 0xFF;
-            }
-
-            using (Stream s = OpenFile("$LogFile", FileMode.Open, FileAccess.ReadWrite))
-            {
-                while (s.Position != s.Length)
-                {
-                    s.Write(buffer, 0, (int)Math.Min(buffer.Length, s.Length - s.Position));
-                }
-            }
-#endif
-        }
-
-        private delegate void StandardInformationModifier(StandardInformation si);
-
-        /// <summary>
-        /// Gets the options that control how the file system is interpreted.
-        /// </summary>
-        public NtfsOptions NtfsOptions
-        {
-            get { return (NtfsOptions)Options; }
-        }
-
-        /// <summary>
-        /// Gets the friendly name for the file system.
-        /// </summary>
-        public override string FriendlyName
-        {
-            get { return "Microsoft NTFS"; }
-        }
-
-        /// <summary>
-        /// Indicates if the file system supports write operations.
-        /// </summary>
-        public override bool CanWrite
-        {
-            // For now, we don't...
-            get { return !_context.ReadOnly; }
-        }
-
-        /// <summary>
-        /// Gets the size of each cluster (in bytes).
-        /// </summary>
-        public long ClusterSize
-        {
-            get { return _context.BiosParameterBlock.BytesPerCluster; }
-        }
-
-        /// <summary>
-        /// Gets the total number of clusters managed by the file system.
-        /// </summary>
-        public long TotalClusters
-        {
-            get { return Utilities.Ceil(_context.BiosParameterBlock.TotalSectors64, _context.BiosParameterBlock.SectorsPerCluster); }
-        }
-
-        /// <summary>
-        /// Gets the volume label.
-        /// </summary>
-        public override string VolumeLabel
-        {
-            get
-            {
-                File volumeFile = GetFile(MasterFileTable.VolumeIndex);
-                NtfsStream volNameStream = volumeFile.GetStream(AttributeType.VolumeName, null);
-                return volNameStream.GetContent<VolumeName>().Name;
-            }
-        }
-
-        private bool CreateShortNames
-        {
-            get
-            {
-                return _context.Options.ShortNameCreation == ShortFileNameOption.Enabled
-                                || (_context.Options.ShortNameCreation == ShortFileNameOption.UseVolumeFlag
-                                    && (_volumeInfo.Flags & VolumeInformationFlags.DisableShortNameCreation) == 0);
-            }
-        }
-
-        /// <summary>
-        /// Initializes a new NTFS file system.
-        /// </summary>
-        /// <param name="stream">The stream to write the new file system to.</param>
-        /// <param name="label">The label for the new file system.</param>
-        /// <param name="diskGeometry">The disk geometry of the disk containing the new file system.</param>
-        /// <param name="firstSector">The first sector of the new file system on the disk.</param>
-        /// <param name="sectorCount">The number of sectors allocated to the new file system on the disk.</param>
-        /// <returns>The newly-initialized file system.</returns>
-        public static NtfsFileSystem Format(
-            Stream stream,
-            string label,
-            Geometry diskGeometry,
-            long firstSector,
-            long sectorCount)
-        {
-            NtfsFormatter formatter = new NtfsFormatter();
-            formatter.Label = label;
-            formatter.DiskGeometry = diskGeometry;
-            formatter.FirstSector = firstSector;
-            formatter.SectorCount = sectorCount;
-            return formatter.Format(stream);
-        }
-
-        /// <summary>
-        /// Initializes a new NTFS file system.
-        /// </summary>
-        /// <param name="stream">The stream to write the new file system to.</param>
-        /// <param name="label">The label for the new file system.</param>
-        /// <param name="diskGeometry">The disk geometry of the disk containing the new file system.</param>
-        /// <param name="firstSector">The first sector of the new file system on the disk.</param>
-        /// <param name="sectorCount">The number of sectors allocated to the new file system on the disk.</param>
-        /// <param name="bootCode">The Operating System's boot code.</param>
-        /// <returns>The newly-initialized file system.</returns>
-        public static NtfsFileSystem Format(
-            Stream stream,
-            string label,
-            Geometry diskGeometry,
-            long firstSector,
-            long sectorCount,
-            byte[] bootCode)
-        {
-            NtfsFormatter formatter = new NtfsFormatter();
-            formatter.Label = label;
-            formatter.DiskGeometry = diskGeometry;
-            formatter.FirstSector = firstSector;
-            formatter.SectorCount = sectorCount;
-            formatter.BootCode = bootCode;
-            return formatter.Format(stream);
-        }
-
-        /// <summary>
-        /// Initializes a new NTFS file system.
-        /// </summary>
-        /// <param name="stream">The stream to write the new file system to.</param>
-        /// <param name="label">The label for the new file system.</param>
-        /// <param name="diskGeometry">The disk geometry of the disk containing the new file system.</param>
-        /// <param name="firstSector">The first sector of the new file system on the disk.</param>
-        /// <param name="sectorCount">The number of sectors allocated to the new file system on the disk.</param>
-        /// <param name="options">The formatting options.</param>
-        /// <returns>The newly-initialized file system.</returns>
-        public static NtfsFileSystem Format(
-            Stream stream,
-            string label,
-            Geometry diskGeometry,
-            long firstSector,
-            long sectorCount,
-            NtfsFormatOptions options)
-        {
-            NtfsFormatter formatter = new NtfsFormatter();
-            formatter.Label = label;
-            formatter.DiskGeometry = diskGeometry;
-            formatter.FirstSector = firstSector;
-            formatter.SectorCount = sectorCount;
-            formatter.BootCode = options.BootCode;
-            formatter.ComputerAccount = options.ComputerAccount;
-            return formatter.Format(stream);
-        }
-
-        /// <summary>
-        /// Initializes a new NTFS file system.
-        /// </summary>
-        /// <param name="volume">The volume to format.</param>
-        /// <param name="label">The label for the new file system.</param>
-        /// <returns>The newly-initialized file system.</returns>
-        public static NtfsFileSystem Format(
-            VolumeInfo volume,
-            string label)
-        {
-            NtfsFormatter formatter = new NtfsFormatter();
-            formatter.Label = label;
-            formatter.DiskGeometry = volume.BiosGeometry ?? Geometry.Null;
-            formatter.FirstSector = volume.PhysicalStartSector;
-            formatter.SectorCount = volume.Length / Sizes.Sector;
-            return formatter.Format(volume.Open());
-        }
-
-        /// <summary>
-        /// Initializes a new NTFS file system.
-        /// </summary>
-        /// <param name="volume">The volume to format.</param>
-        /// <param name="label">The label for the new file system.</param>
-        /// <param name="bootCode">The Operating System's boot code.</param>
-        /// <returns>The newly-initialized file system.</returns>
-        public static NtfsFileSystem Format(
-            VolumeInfo volume,
-            string label,
-            byte[] bootCode)
-        {
-            NtfsFormatter formatter = new NtfsFormatter();
-            formatter.Label = label;
-            formatter.DiskGeometry = volume.BiosGeometry ?? Geometry.Null;
-            formatter.FirstSector = volume.PhysicalStartSector;
-            formatter.SectorCount = volume.Length / Sizes.Sector;
-            formatter.BootCode = bootCode;
-            return formatter.Format(volume.Open());
-        }
-
-        /// <summary>
-        /// Initializes a new NTFS file system.
-        /// </summary>
-        /// <param name="volume">The volume to format.</param>
-        /// <param name="label">The label for the new file system.</param>
-        /// <param name="options">The formatting options.</param>
-        /// <returns>The newly-initialized file system.</returns>
-        public static NtfsFileSystem Format(
-            VolumeInfo volume,
-            string label,
-            NtfsFormatOptions options)
-        {
-            NtfsFormatter formatter = new NtfsFormatter();
-            formatter.Label = label;
-            formatter.DiskGeometry = volume.BiosGeometry ?? Geometry.Null;
-            formatter.FirstSector = volume.PhysicalStartSector;
-            formatter.SectorCount = volume.Length / Sizes.Sector;
-            formatter.BootCode = options.BootCode;
-            formatter.ComputerAccount = options.ComputerAccount;
-            return formatter.Format(volume.Open());
-        }
-
-        /// <summary>
-        /// Detects if a stream contains an NTFS file system.
-        /// </summary>
-        /// <param name="stream">The stream to inspect.</param>
-        /// <returns><c>true</c> if NTFS is detected, else <c>false</c>.</returns>
-        public static bool Detect(Stream stream)
-        {
-            if (stream.Length < 512)
-            {
-                return false;
-            }
-
-            stream.Position = 0;
-            byte[] bytes = Utilities.ReadFully(stream, 512);
-            BiosParameterBlock bpb = BiosParameterBlock.FromBytes(bytes, 0);
-
-            return IsValidBPB(bpb, stream.Length);
-        }
-
-        /// <summary>
-        /// Gets the Master File Table for this file system.
-        /// </summary>
-        /// <remarks>
-        /// Use the returned object to explore the internals of the file system - most people will
-        /// never need to use this.
-        /// </remarks>
-        /// <returns>The Master File Table.</returns>
-        public Internals.MasterFileTable GetMasterFileTable()
-        {
-            return new Internals.MasterFileTable(_context, _context.Mft);
-        }
-
-        /// <summary>
-        /// Copies an existing file to a new file, allowing overwriting of an existing file.
-        /// </summary>
-        /// <param name="sourceFile">The source file.</param>
-        /// <param name="destinationFile">The destination file.</param>
-        /// <param name="overwrite">Whether to permit over-writing of an existing file.</param>
-        public override void CopyFile(string sourceFile, string destinationFile, bool overwrite)
-        {
-            using (new NtfsTransaction())
-            {
-                DirectoryEntry sourceParentDirEntry = GetDirectoryEntry(Utilities.GetDirectoryFromPath(sourceFile));
-                if (sourceParentDirEntry == null || !sourceParentDirEntry.IsDirectory)
-                {
-                    throw new FileNotFoundException("No such file", sourceFile);
-                }
-
-                Directory sourceParentDir = GetDirectory(sourceParentDirEntry.Reference);
-
-                DirectoryEntry sourceEntry = sourceParentDir.GetEntryByName(Utilities.GetFileFromPath(sourceFile));
-                if (sourceEntry == null || sourceEntry.IsDirectory)
-                {
-                    throw new FileNotFoundException("No such file", sourceFile);
-                }
-
-                File origFile = GetFile(sourceEntry.Reference);
-
-                DirectoryEntry destParentDirEntry = GetDirectoryEntry(Utilities.GetDirectoryFromPath(destinationFile));
-                if (destParentDirEntry == null || !destParentDirEntry.IsDirectory)
-                {
-                    throw new FileNotFoundException("Destination directory not found", destinationFile);
-                }
-
-                Directory destParentDir = GetDirectory(destParentDirEntry.Reference);
-
-                DirectoryEntry destDirEntry = destParentDir.GetEntryByName(Utilities.GetFileFromPath(destinationFile));
-                if (destDirEntry != null && !destDirEntry.IsDirectory)
-                {
-                    if (overwrite)
-                    {
-                        if (destDirEntry.Reference.MftIndex == sourceEntry.Reference.MftIndex)
-                        {
-                            throw new IOException("Destination file already exists and is the source file");
-                        }
-
-                        File oldFile = GetFile(destDirEntry.Reference);
-                        destParentDir.RemoveEntry(destDirEntry);
-                        if (oldFile.HardLinkCount == 0)
-                        {
-                            oldFile.Delete();
-                        }
-                    }
-                    else
-                    {
-                        throw new IOException("Destination file already exists");
-                    }
-                }
-
-                File newFile = File.CreateNew(_context, destParentDir.StandardInformation.FileAttributes);
-                foreach (var origStream in origFile.AllStreams)
-                {
-                    NtfsStream newStream = newFile.GetStream(origStream.AttributeType, origStream.Name);
-
-                    switch (origStream.AttributeType)
-                    {
-                        case AttributeType.Data:
-                            if (newStream == null)
-                            {
-                                newStream = newFile.CreateStream(origStream.AttributeType, origStream.Name);
-                            }
-
-                            using (SparseStream s = origStream.Open(FileAccess.Read))
-                            using (SparseStream d = newStream.Open(FileAccess.Write))
-                            {
-                                byte[] buffer = new byte[64 * Sizes.OneKiB];
-                                int numRead;
-
-                                do
-                                {
-                                    numRead = s.Read(buffer, 0, buffer.Length);
-                                    d.Write(buffer, 0, numRead);
-                                }
-                                while (numRead != 0);
-                            }
-
-                            break;
-
-                        case AttributeType.StandardInformation:
-                            StandardInformation newSi = origStream.GetContent<StandardInformation>();
-                            newStream.SetContent<StandardInformation>(newSi);
-                            break;
-                    }
-                }
-
-                AddFileToDirectory(newFile, destParentDir, Utilities.GetFileFromPath(destinationFile), null);
-                destParentDirEntry.UpdateFrom(destParentDir);
-            }
-        }
-
-        /// <summary>
-        /// Creates a directory.
-        /// </summary>
-        /// <param name="path">The path of the new directory.</param>
-        public override void CreateDirectory(string path)
-        {
-            CreateDirectory(path, null);
-        }
-
-        /// <summary>
-        /// Creates a directory.
-        /// </summary>
-        /// <param name="path">The path of the new directory.</param>
-        /// <param name="options">Options controlling attributes of the new Director, or <c>null</c> for defaults.</param>
-        public void CreateDirectory(string path, NewFileOptions options)
-        {
-            using (new NtfsTransaction())
-            {
-                string[] pathElements = path.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries);
-
-                Directory focusDir = GetDirectory(MasterFileTable.RootDirIndex);
-                DirectoryEntry focusDirEntry = focusDir.DirectoryEntry;
-
-                for (int i = 0; i < pathElements.Length; ++i)
-                {
-                    DirectoryEntry childDirEntry = focusDir.GetEntryByName(pathElements[i]);
-                    if (childDirEntry == null)
-                    {
-                        FileAttributeFlags newDirAttrs = focusDir.StandardInformation.FileAttributes;
-                        if (options != null && options.Compressed.HasValue)
-                        {
-                            if (options.Compressed.Value)
-                            {
-                                newDirAttrs |= FileAttributeFlags.Compressed;
-                            }
-                            else
-                            {
-                                newDirAttrs &= ~FileAttributeFlags.Compressed;
-                            }
-                        }
-
-                        Directory childDir = Directory.CreateNew(_context, newDirAttrs);
-                        try
-                        {
-                            childDirEntry = AddFileToDirectory(childDir, focusDir, pathElements[i], options);
-
-                            RawSecurityDescriptor parentSd = DoGetSecurity(focusDir);
-                            RawSecurityDescriptor newSd;
-                            if (options != null && options.SecurityDescriptor != null)
-                            {
-                                newSd = options.SecurityDescriptor;
-                            }
-                            else
-                            {
-                                newSd = SecurityDescriptor.CalcNewObjectDescriptor(parentSd, false);
-                            }
-
-                            DoSetSecurity(childDir, newSd);
-                            childDirEntry.UpdateFrom(childDir);
-
-                            // Update the directory entry by which we found the directory we've just modified
-                            focusDirEntry.UpdateFrom(focusDir);
-
-                            focusDir = childDir;
-                        }
-                        finally
-                        {
-                            if (childDir.HardLinkCount == 0)
-                            {
-                                childDir.Delete();
-                            }
-                        }
-                    }
-                    else
-                    {
-                        focusDir = GetDirectory(childDirEntry.Reference);
-                    }
-
-                    focusDirEntry = childDirEntry;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Deletes a directory.
-        /// </summary>
-        /// <param name="path">The path of the directory to delete.</param>
-        public override void DeleteDirectory(string path)
-        {
-            using (new NtfsTransaction())
-            {
-                if (string.IsNullOrEmpty(path))
-                {
-                    throw new IOException("Unable to delete root directory");
-                }
-
-                string parent = Utilities.GetDirectoryFromPath(path);
-
-                DirectoryEntry parentDirEntry = GetDirectoryEntry(parent);
-                if (parentDirEntry == null || !parentDirEntry.IsDirectory)
-                {
-                    throw new DirectoryNotFoundException("No such directory: " + path);
-                }
-
-                Directory parentDir = GetDirectory(parentDirEntry.Reference);
-
-                DirectoryEntry dirEntry = parentDir.GetEntryByName(Utilities.GetFileFromPath(path));
-                if (dirEntry == null || !dirEntry.IsDirectory)
-                {
-                    throw new DirectoryNotFoundException("No such directory: " + path);
-                }
-
-                Directory dir = GetDirectory(dirEntry.Reference);
-
-                if (!dir.IsEmpty)
-                {
-                    throw new IOException("Unable to delete non-empty directory");
-                }
-
-                if ((dirEntry.Details.FileAttributes & FileAttributes.ReparsePoint) != 0)
-                {
-                    RemoveReparsePoint(dir);
-                }
-
-                RemoveFileFromDirectory(parentDir, dir, Utilities.GetFileFromPath(path));
-
-                if (dir.HardLinkCount == 0)
-                {
-                    dir.Delete();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Deletes a file.
-        /// </summary>
-        /// <param name="path">The path of the file to delete.</param>
-        public override void DeleteFile(string path)
-        {
-            using (new NtfsTransaction())
-            {
-                string attributeName;
-                AttributeType attributeType;
-                string dirEntryPath = ParsePath(path, out attributeName, out attributeType);
-
-                string parentDirPath = Utilities.GetDirectoryFromPath(dirEntryPath);
-
-                DirectoryEntry parentDirEntry = GetDirectoryEntry(parentDirPath);
-                if (parentDirEntry == null || !parentDirEntry.IsDirectory)
-                {
-                    throw new FileNotFoundException("No such file", path);
-                }
-
-                Directory parentDir = GetDirectory(parentDirEntry.Reference);
-
-                DirectoryEntry dirEntry = parentDir.GetEntryByName(Utilities.GetFileFromPath(dirEntryPath));
-                if (dirEntry == null || dirEntry.IsDirectory)
-                {
-                    throw new FileNotFoundException("No such file", path);
-                }
-
-                File file = GetFile(dirEntry.Reference);
-
-                if (string.IsNullOrEmpty(attributeName) && attributeType == AttributeType.Data)
-                {
-                    if ((dirEntry.Details.FileAttributes & FileAttributes.ReparsePoint) != 0)
-                    {
-                        RemoveReparsePoint(file);
-                    }
-
-                    RemoveFileFromDirectory(parentDir, file, Utilities.GetFileFromPath(path));
-
-                    if (file.HardLinkCount == 0)
-                    {
-                        file.Delete();
-                    }
-                }
-                else
-                {
-                    NtfsStream attrStream = file.GetStream(attributeType, attributeName);
-                    if (attrStream == null)
-                    {
-                        throw new FileNotFoundException("No such attribute: " + attributeName, path);
-                    }
-                    else
-                    {
-                        file.RemoveStream(attrStream);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Indicates if a directory exists.
-        /// </summary>
-        /// <param name="path">The path to test.</param>
-        /// <returns>true if the directory exists.</returns>
-        public override bool DirectoryExists(string path)
-        {
-            using (new NtfsTransaction())
-            {
-                // Special case - root directory
-                if (String.IsNullOrEmpty(path))
-                {
-                    return true;
-                }
-                else
-                {
-                    DirectoryEntry dirEntry = GetDirectoryEntry(path);
-                    return dirEntry != null && (dirEntry.Details.FileAttributes & FileAttributes.Directory) != 0;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Indicates if a file exists.
-        /// </summary>
-        /// <param name="path">The path to test.</param>
-        /// <returns>true if the file exists.</returns>
-        public override bool FileExists(string path)
-        {
-            using (new NtfsTransaction())
-            {
-                DirectoryEntry dirEntry = GetDirectoryEntry(path);
-                return dirEntry != null && (dirEntry.Details.FileAttributes & FileAttributes.Directory) == 0;
-            }
-        }
-
-        /// <summary>
-        /// Gets the names of subdirectories in a specified directory matching a specified
-        /// search pattern, using a value to determine whether to search subdirectories.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <param name="searchOption">Indicates whether to search subdirectories.</param>
-        /// <returns>Array of directories matching the search pattern.</returns>
-        public override string[] GetDirectories(string path, string searchPattern, SearchOption searchOption)
-        {
-            using (new NtfsTransaction())
-            {
-                Regex re = Utilities.ConvertWildcardsToRegEx(searchPattern);
-
-                List<string> dirs = new List<string>();
-                DoSearch(dirs, path, re, searchOption == SearchOption.AllDirectories, true, false);
-                return dirs.ToArray();
-            }
-        }
-
-        /// <summary>
-        /// Gets the names of files in a specified directory matching a specified
-        /// search pattern, using a value to determine whether to search subdirectories.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <param name="searchOption">Indicates whether to search subdirectories.</param>
-        /// <returns>Array of files matching the search pattern.</returns>
-        public override string[] GetFiles(string path, string searchPattern, SearchOption searchOption)
-        {
-            using (new NtfsTransaction())
-            {
-                Regex re = Utilities.ConvertWildcardsToRegEx(searchPattern);
-
-                List<string> results = new List<string>();
-                DoSearch(results, path, re, searchOption == SearchOption.AllDirectories, false, true);
-                return results.ToArray();
-            }
-        }
-
-        /// <summary>
-        /// Gets the names of all files and subdirectories in a specified directory.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <returns>Array of files and subdirectories.</returns>
-        public override string[] GetFileSystemEntries(string path)
-        {
-            using (new NtfsTransaction())
-            {
-                DirectoryEntry parentDirEntry = GetDirectoryEntry(path);
-                if (parentDirEntry == null)
-                {
-                    throw new DirectoryNotFoundException(string.Format(CultureInfo.InvariantCulture, "The directory '{0}' does not exist", path));
-                }
-
-                Directory parentDir = GetDirectory(parentDirEntry.Reference);
-
-                return Utilities.Map<DirectoryEntry, string>(parentDir.GetAllEntries(true), (m) => Utilities.CombinePaths(path, m.Details.FileName));
-            }
-        }
-
-        /// <summary>
-        /// Gets the names of files and subdirectories in a specified directory matching a specified
-        /// search pattern.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <returns>Array of files and subdirectories matching the search pattern.</returns>
-        public override string[] GetFileSystemEntries(string path, string searchPattern)
-        {
-            using (new NtfsTransaction())
-            {
-                // TODO: Be smarter, use the B*Tree for better performance when the start of the pattern is known
-                // characters
-                Regex re = Utilities.ConvertWildcardsToRegEx(searchPattern);
-
-                DirectoryEntry parentDirEntry = GetDirectoryEntry(path);
-                if (parentDirEntry == null)
-                {
-                    throw new DirectoryNotFoundException(string.Format(CultureInfo.InvariantCulture, "The directory '{0}' does not exist", path));
-                }
-
-                Directory parentDir = GetDirectory(parentDirEntry.Reference);
-
-                List<string> result = new List<string>();
-                foreach (DirectoryEntry dirEntry in parentDir.GetAllEntries(true))
-                {
-                    if (re.IsMatch(dirEntry.Details.FileName))
-                    {
-                        result.Add(Utilities.CombinePaths(path, dirEntry.Details.FileName));
-                    }
-                }
-
-                return result.ToArray();
-            }
-        }
-
-        /// <summary>
-        /// Moves a directory.
-        /// </summary>
-        /// <param name="sourceDirectoryName">The directory to move.</param>
-        /// <param name="destinationDirectoryName">The target directory name.</param>
-        public override void MoveDirectory(string sourceDirectoryName, string destinationDirectoryName)
-        {
-            using (new NtfsTransaction())
-            {
-                using (new NtfsTransaction())
-                {
-                    DirectoryEntry sourceParentDirEntry = GetDirectoryEntry(Utilities.GetDirectoryFromPath(sourceDirectoryName));
-                    if (sourceParentDirEntry == null || !sourceParentDirEntry.IsDirectory)
-                    {
-                        throw new DirectoryNotFoundException("No such directory: " + sourceDirectoryName);
-                    }
-
-                    Directory sourceParentDir = GetDirectory(sourceParentDirEntry.Reference);
-
-                    DirectoryEntry sourceEntry = sourceParentDir.GetEntryByName(Utilities.GetFileFromPath(sourceDirectoryName));
-                    if (sourceEntry == null || !sourceEntry.IsDirectory)
-                    {
-                        throw new DirectoryNotFoundException("No such directory: " + sourceDirectoryName);
-                    }
-
-                    File file = GetFile(sourceEntry.Reference);
-
-                    DirectoryEntry destParentDirEntry = GetDirectoryEntry(Utilities.GetDirectoryFromPath(destinationDirectoryName));
-                    if (destParentDirEntry == null || !destParentDirEntry.IsDirectory)
-                    {
-                        throw new DirectoryNotFoundException("Destination directory not found: " + destinationDirectoryName);
-                    }
-
-                    Directory destParentDir = GetDirectory(destParentDirEntry.Reference);
-
-                    DirectoryEntry destDirEntry = destParentDir.GetEntryByName(Utilities.GetFileFromPath(destinationDirectoryName));
-                    if (destDirEntry != null)
-                    {
-                        throw new IOException("Destination directory already exists");
-                    }
-
-                    RemoveFileFromDirectory(sourceParentDir, file, sourceEntry.Details.FileName);
-                    AddFileToDirectory(file, destParentDir, Utilities.GetFileFromPath(destinationDirectoryName), null);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Moves a file, allowing an existing file to be overwritten.
-        /// </summary>
-        /// <param name="sourceName">The file to move.</param>
-        /// <param name="destinationName">The target file name.</param>
-        /// <param name="overwrite">Whether to permit a destination file to be overwritten.</param>
-        public override void MoveFile(string sourceName, string destinationName, bool overwrite)
-        {
-            using (new NtfsTransaction())
-            {
-                DirectoryEntry sourceParentDirEntry = GetDirectoryEntry(Utilities.GetDirectoryFromPath(sourceName));
-                if (sourceParentDirEntry == null || !sourceParentDirEntry.IsDirectory)
-                {
-                    throw new FileNotFoundException("No such file", sourceName);
-                }
-
-                Directory sourceParentDir = GetDirectory(sourceParentDirEntry.Reference);
-
-                DirectoryEntry sourceEntry = sourceParentDir.GetEntryByName(Utilities.GetFileFromPath(sourceName));
-                if (sourceEntry == null || sourceEntry.IsDirectory)
-                {
-                    throw new FileNotFoundException("No such file", sourceName);
-                }
-
-                File file = GetFile(sourceEntry.Reference);
-
-                DirectoryEntry destParentDirEntry = GetDirectoryEntry(Utilities.GetDirectoryFromPath(destinationName));
-                if (destParentDirEntry == null || !destParentDirEntry.IsDirectory)
-                {
-                    throw new FileNotFoundException("Destination directory not found", destinationName);
-                }
-
-                Directory destParentDir = GetDirectory(destParentDirEntry.Reference);
-
-                DirectoryEntry destDirEntry = destParentDir.GetEntryByName(Utilities.GetFileFromPath(destinationName));
-                if (destDirEntry != null && !destDirEntry.IsDirectory)
-                {
-                    if (overwrite)
-                    {
-                        if (destDirEntry.Reference.MftIndex == sourceEntry.Reference.MftIndex)
-                        {
-                            throw new IOException("Destination file already exists and is the source file");
-                        }
-
-                        File oldFile = GetFile(destDirEntry.Reference);
-                        destParentDir.RemoveEntry(destDirEntry);
-                        if (oldFile.HardLinkCount == 0)
-                        {
-                            oldFile.Delete();
-                        }
-                    }
-                    else
-                    {
-                        throw new IOException("Destination file already exists");
-                    }
-                }
-
-                RemoveFileFromDirectory(sourceParentDir, file, sourceEntry.Details.FileName);
-                AddFileToDirectory(file, destParentDir, Utilities.GetFileFromPath(destinationName), null);
-            }
-        }
-
-        /// <summary>
-        /// Opens the specified file.
-        /// </summary>
-        /// <param name="path">The full path of the file to open.</param>
-        /// <param name="mode">The file mode for the created stream.</param>
-        /// <param name="access">The access permissions for the returned stream.</param>
-        /// <returns>The new stream.</returns>
-        public override SparseStream OpenFile(string path, FileMode mode, FileAccess access)
-        {
-            return OpenFile(path, mode, access, null);
-        }
-
-        /// <summary>
-        /// Opens the specified file.
-        /// </summary>
-        /// <param name="path">The full path of the file to open.</param>
-        /// <param name="mode">The file mode for the created stream.</param>
-        /// <param name="access">The access permissions for the returned stream.</param>
-        /// <param name="options">Options controlling attributes of a new file, or <c>null</c> for defaults (ignored if file exists).</param>
-        /// <returns>The new stream.</returns>
-        public SparseStream OpenFile(string path, FileMode mode, FileAccess access, NewFileOptions options)
-        {
-            using (new NtfsTransaction())
-            {
-                string attributeName;
-                AttributeType attributeType;
-                string dirEntryPath = ParsePath(path, out attributeName, out attributeType);
-
-                DirectoryEntry entry = GetDirectoryEntry(dirEntryPath);
-                if (entry == null)
-                {
-                    if (mode == FileMode.Open)
-                    {
-                        throw new FileNotFoundException("No such file", path);
-                    }
-                    else
-                    {
-                        entry = CreateNewFile(dirEntryPath, options);
-                    }
-                }
-                else if (mode == FileMode.CreateNew)
-                {
-                    throw new IOException("File already exists");
-                }
-
-                if ((entry.Details.FileAttributes & FileAttributes.Directory) != 0 && attributeType == AttributeType.Data)
-                {
-                    throw new IOException("Attempt to open directory as a file");
-                }
-                else
-                {
-                    File file = GetFile(entry.Reference);
-                    NtfsStream ntfsStream = file.GetStream(attributeType, attributeName);
-
-                    if (ntfsStream == null)
-                    {
-                        if (mode == FileMode.Create || mode == FileMode.OpenOrCreate)
-                        {
-                            ntfsStream = file.CreateStream(attributeType, attributeName);
-                        }
-                        else
-                        {
-                            throw new FileNotFoundException("No such attribute on file", path);
-                        }
-                    }
-
-                    SparseStream stream = new NtfsFileStream(this, entry, attributeType, attributeName, access);
-
-                    if (mode == FileMode.Create || mode == FileMode.Truncate)
-                    {
-                        stream.SetLength(0);
-                    }
-
-                    return stream;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Opens an existing file stream.
-        /// </summary>
-        /// <param name="file">The file containing the stream.</param>
-        /// <param name="type">The type of the stream.</param>
-        /// <param name="name">The name of the stream.</param>
-        /// <param name="access">The desired access to the stream.</param>
-        /// <returns>A stream that can be used to access the file stream.</returns>
-        [Obsolete(@"Use OpenFile with filename:attributename:$attributetype syntax (e.g. \FILE.TXT:STREAM:$DATA)", false)]
-        public SparseStream OpenRawStream(string file, AttributeType type, string name, FileAccess access)
-        {
-            using (new NtfsTransaction())
-            {
-                DirectoryEntry entry = GetDirectoryEntry(file);
-                if (entry == null)
-                {
-                    throw new FileNotFoundException("No such file", file);
-                }
-
-                File fileObj = GetFile(entry.Reference);
-                return fileObj.OpenStream(type, name, access);
-            }
-        }
-
-        /// <summary>
-        /// Gets the attributes of a file or directory.
-        /// </summary>
-        /// <param name="path">The file or directory to inspect.</param>
-        /// <returns>The attributes of the file or directory.</returns>
-        public override FileAttributes GetAttributes(string path)
-        {
-            using (new NtfsTransaction())
-            {
-                DirectoryEntry dirEntry = GetDirectoryEntry(path);
-                if (dirEntry == null)
-                {
-                    throw new FileNotFoundException("File not found", path);
-                }
-                else
-                {
-                    return dirEntry.Details.FileAttributes;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Sets the attributes of a file or directory.
-        /// </summary>
-        /// <param name="path">The file or directory to change.</param>
-        /// <param name="newValue">The new attributes of the file or directory.</param>
-        public override void SetAttributes(string path, FileAttributes newValue)
-        {
-            using (new NtfsTransaction())
-            {
-                DirectoryEntry dirEntry = GetDirectoryEntry(path);
-                if (dirEntry == null)
-                {
-                    throw new FileNotFoundException("File not found", path);
-                }
-
-                FileAttributes oldValue = dirEntry.Details.FileAttributes;
-                FileAttributes changedAttribs = oldValue ^ newValue;
-
-                if (changedAttribs == 0)
-                {
-                    // Abort - nothing changed
-                    return;
-                }
-
-                if ((changedAttribs & NonSettableFileAttributes) != 0)
-                {
-                    throw new ArgumentException("Attempt to change attributes that are read-only", "newValue");
-                }
-
-                File file = GetFile(dirEntry.Reference);
-
-                if ((changedAttribs & FileAttributes.SparseFile) != 0)
-                {
-                    if (dirEntry.IsDirectory)
-                    {
-                        throw new ArgumentException("Attempt to change sparse attribute on a directory", "newValue");
-                    }
-
-                    if ((newValue & FileAttributes.SparseFile) == 0)
-                    {
-                        throw new ArgumentException("Attempt to remove sparse attribute from file", "newValue");
-                    }
-                    else
-                    {
-                        NtfsAttribute ntfsAttr = file.GetAttribute(AttributeType.Data, null);
-                        if ((ntfsAttr.Flags & AttributeFlags.Compressed) != 0)
-                        {
-                            throw new ArgumentException("Attempt to mark compressed file as sparse", "newValue");
-                        }
-
-                        ntfsAttr.Flags |= AttributeFlags.Sparse;
-                        if (ntfsAttr.IsNonResident)
-                        {
-                            ntfsAttr.CompressedDataSize = ntfsAttr.PrimaryRecord.AllocatedLength;
-                            ntfsAttr.CompressionUnitSize = 16;
-                            ((NonResidentAttributeBuffer)ntfsAttr.RawBuffer).AlignVirtualClusterCount();
-                        }
-                    }
-                }
-
-                if ((changedAttribs & FileAttributes.Compressed) != 0 && !dirEntry.IsDirectory)
-                {
-                    if ((newValue & FileAttributes.Compressed) == 0)
-                    {
-                        throw new ArgumentException("Attempt to remove compressed attribute from file", "newValue");
-                    }
-                    else
-                    {
-                        NtfsAttribute ntfsAttr = file.GetAttribute(AttributeType.Data, null);
-                        if ((ntfsAttr.Flags & AttributeFlags.Sparse) != 0)
-                        {
-                            throw new ArgumentException("Attempt to mark sparse file as compressed", "newValue");
-                        }
-
-                        ntfsAttr.Flags |= AttributeFlags.Compressed;
-                        if (ntfsAttr.IsNonResident)
-                        {
-                            ntfsAttr.CompressedDataSize = ntfsAttr.PrimaryRecord.AllocatedLength;
-                            ntfsAttr.CompressionUnitSize = 16;
-                            ((NonResidentAttributeBuffer)ntfsAttr.RawBuffer).AlignVirtualClusterCount();
-                        }
-                    }
-                }
-
-                UpdateStandardInformation(dirEntry, file, delegate (StandardInformation si) { si.FileAttributes = FileNameRecord.SetAttributes(newValue, si.FileAttributes); });
-            }
-        }
-
-        /// <summary>
-        /// Gets the creation time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The creation time.</returns>
-        public override DateTime GetCreationTimeUtc(string path)
-        {
-            using (new NtfsTransaction())
-            {
-                DirectoryEntry dirEntry = GetDirectoryEntry(path);
-                if (dirEntry == null)
-                {
-                    throw new FileNotFoundException("File not found", path);
-                }
-                else
-                {
-                    return dirEntry.Details.CreationTime;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Sets the creation time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public override void SetCreationTimeUtc(string path, DateTime newTime)
-        {
-            using (new NtfsTransaction())
-            {
-                UpdateStandardInformation(path, delegate (StandardInformation si) { si.CreationTime = newTime; });
-            }
-        }
-
-        /// <summary>
-        /// Gets the last access time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The last access time.</returns>
-        public override DateTime GetLastAccessTimeUtc(string path)
-        {
-            using (new NtfsTransaction())
-            {
-                DirectoryEntry dirEntry = GetDirectoryEntry(path);
-                if (dirEntry == null)
-                {
-                    throw new FileNotFoundException("File not found", path);
-                }
-                else
-                {
-                    return dirEntry.Details.LastAccessTime;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Sets the last access time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public override void SetLastAccessTimeUtc(string path, DateTime newTime)
-        {
-            using (new NtfsTransaction())
-            {
-                UpdateStandardInformation(path, delegate (StandardInformation si) { si.LastAccessTime = newTime; });
-            }
-        }
-
-        /// <summary>
-        /// Gets the last modification time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The last write time.</returns>
-        public override DateTime GetLastWriteTimeUtc(string path)
-        {
-            using (new NtfsTransaction())
-            {
-                DirectoryEntry dirEntry = GetDirectoryEntry(path);
-                if (dirEntry == null)
-                {
-                    throw new FileNotFoundException("File not found", path);
-                }
-                else
-                {
-                    return dirEntry.Details.ModificationTime;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Sets the last modification time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public override void SetLastWriteTimeUtc(string path, DateTime newTime)
-        {
-            using (new NtfsTransaction())
-            {
-                UpdateStandardInformation(path, delegate (StandardInformation si) { si.ModificationTime = newTime; });
-            }
-        }
-
-        /// <summary>
-        /// Gets the length of a file.
-        /// </summary>
-        /// <param name="path">The path to the file.</param>
-        /// <returns>The length in bytes.</returns>
-        public override long GetFileLength(string path)
-        {
-            using (new NtfsTransaction())
-            {
-                string attributeName;
-                AttributeType attributeType;
-                string dirEntryPath = ParsePath(path, out attributeName, out attributeType);
-
-                DirectoryEntry dirEntry = GetDirectoryEntry(dirEntryPath);
-                if (dirEntry == null)
-                {
-                    throw new FileNotFoundException("File not found", path);
-                }
-
-                // Ordinary file length request, use info from directory entry for efficiency - if allowed
-                if (NtfsOptions.FileLengthFromDirectoryEntries && attributeName == null && attributeType == AttributeType.Data)
-                {
-                    return (long)dirEntry.Details.RealSize;
-                }
-
-                // Alternate stream / attribute, pull info from attribute record
-                File file = GetFile(dirEntry.Reference);
-                var attr = file.GetAttribute(attributeType, attributeName);
-                if (attr == null)
-                {
-                    throw new FileNotFoundException(string.Format(CultureInfo.InvariantCulture, "No such attribute '{0}({1})'", attributeName, attributeType));
-                }
-
-                return attr.Length;
-            }
-        }
-
-        /// <summary>
-        /// Converts a cluster (index) into an absolute byte position in the underlying stream.
-        /// </summary>
-        /// <param name="cluster">The cluster to convert.</param>
-        /// <returns>The corresponding absolute byte position.</returns>
-        public long ClusterToOffset(long cluster)
-        {
-            return cluster * ClusterSize;
-        }
-
-        /// <summary>
-        /// Converts an absolute byte position in the underlying stream to a cluster (index).
-        /// </summary>
-        /// <param name="offset">The byte position to convert.</param>
-        /// <returns>The cluster containing the specified byte.</returns>
-        public long OffsetToCluster(long offset)
-        {
-            return offset / ClusterSize;
-        }
-
-        /// <summary>
-        /// Converts a file name to the list of clusters occupied by the file's data.
-        /// </summary>
-        /// <param name="path">The path to inspect.</param>
-        /// <returns>The clusters as a list of cluster ranges.</returns>
-        /// <remarks>Note that in some file systems, small files may not have dedicated
-        /// clusters.  Only dedicated clusters will be returned.</remarks>
-        public Range<long, long>[] PathToClusters(string path)
-        {
-            string plainPath;
-            string attributeName;
-            SplitPath(path, out plainPath, out attributeName);
-
-            DirectoryEntry dirEntry = GetDirectoryEntry(plainPath);
-            if (dirEntry == null || dirEntry.IsDirectory)
-            {
-                throw new FileNotFoundException("No such file", path);
-            }
-
-            File file = GetFile(dirEntry.Reference);
-
-            NtfsStream stream = file.GetStream(AttributeType.Data, attributeName);
-            if (stream == null)
-            {
-                throw new FileNotFoundException(string.Format(CultureInfo.InvariantCulture, "File does not contain '{0}' data attribute", attributeName), path);
-            }
-
-            return stream.GetClusters();
-        }
-
-        /// <summary>
-        /// Converts a file name to the extents containing its data.
-        /// </summary>
-        /// <param name="path">The path to inspect.</param>
-        /// <returns>The file extents, as absolute byte positions in the underlying stream.</returns>
-        /// <remarks>Use this method with caution - NTFS supports encrypted, sparse and compressed files
-        /// where bytes are not directly stored in extents.  Small files may be entirely stored in the 
-        /// Master File Table, where corruption protection algorithms mean that some bytes do not contain
-        /// the expected values.  This method merely indicates where file data is stored,
-        /// not what's stored.  To access the contents of a file, use OpenFile.</remarks>
-        public StreamExtent[] PathToExtents(string path)
-        {
-            string plainPath;
-            string attributeName;
-            SplitPath(path, out plainPath, out attributeName);
-
-            DirectoryEntry dirEntry = GetDirectoryEntry(plainPath);
-            if (dirEntry == null || dirEntry.IsDirectory)
-            {
-                throw new FileNotFoundException("No such file", path);
-            }
-
-            File file = GetFile(dirEntry.Reference);
-
-            NtfsStream stream = file.GetStream(AttributeType.Data, attributeName);
-            if (stream == null)
-            {
-                throw new FileNotFoundException(string.Format(CultureInfo.InvariantCulture, "File does not contain '{0}' data attribute", attributeName), path);
-            }
-
-            return stream.GetAbsoluteExtents();
-        }
-
-        /// <summary>
-        /// Gets an object that can convert between clusters and files.
-        /// </summary>
-        /// <returns>The cluster map.</returns>
-        public ClusterMap BuildClusterMap()
-        {
-            return _context.Mft.GetClusterMap();
-        }
-
-        /// <summary>
-        /// Creates an NTFS hard link to an existing file.
-        /// </summary>
-        /// <param name="sourceName">An existing name of the file.</param>
-        /// <param name="destinationName">The name of the new hard link to the file.</param>
-        public void CreateHardLink(string sourceName, string destinationName)
-        {
-            using (new NtfsTransaction())
-            {
-                DirectoryEntry sourceDirEntry = GetDirectoryEntry(sourceName);
-                if (sourceDirEntry == null)
-                {
-                    throw new FileNotFoundException("Source file not found", sourceName);
-                }
-
-                string destinationDirName = Utilities.GetDirectoryFromPath(destinationName);
-                DirectoryEntry destinationDirSelfEntry = GetDirectoryEntry(destinationDirName);
-                if (destinationDirSelfEntry == null || (destinationDirSelfEntry.Details.FileAttributes & FileAttributes.Directory) == 0)
-                {
-                    throw new FileNotFoundException("Destination directory not found", destinationDirName);
-                }
-
-                Directory destinationDir = GetDirectory(destinationDirSelfEntry.Reference);
-                if (destinationDir == null)
-                {
-                    throw new FileNotFoundException("Destination directory not found", destinationDirName);
-                }
-
-                DirectoryEntry destinationDirEntry = GetDirectoryEntry(destinationDir, Utilities.GetFileFromPath(destinationName));
-                if (destinationDirEntry != null)
-                {
-                    throw new IOException("A file with this name already exists: " + destinationName);
-                }
-
-                File file = GetFile(sourceDirEntry.Reference);
-                destinationDir.AddEntry(file, Utilities.GetFileFromPath(destinationName), FileNameNamespace.Posix);
-                destinationDirSelfEntry.UpdateFrom(destinationDir);
-            }
-        }
-
-        /// <summary>
-        /// Gets the number of hard links to a given file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The number of hard links.</returns>
-        /// <remarks>All files have at least one hard link.</remarks>
-        public int GetHardLinkCount(string path)
-        {
-            using (new NtfsTransaction())
-            {
-                DirectoryEntry dirEntry = GetDirectoryEntry(path);
-                if (dirEntry == null)
-                {
-                    throw new FileNotFoundException("File not found", path);
-                }
-
-                File file = GetFile(dirEntry.Reference);
-
-                if (!_context.Options.HideDosFileNames)
-                {
-                    return file.HardLinkCount;
-                }
-                else
-                {
-                    int numHardLinks = 0;
-
-                    foreach (var fnStream in file.GetStreams(AttributeType.FileName, null))
-                    {
-                        var fnr = fnStream.GetContent<FileNameRecord>();
-                        if (fnr.FileNameNamespace != FileNameNamespace.Dos)
-                        {
-                            ++numHardLinks;
-                        }
-                    }
-
-                    return numHardLinks;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Indicates whether the file is known by other names.
-        /// </summary>
-        /// <param name="path">The file to inspect.</param>
-        /// <returns><c>true</c> if the file has other names, else <c>false</c>.</returns>
-        public bool HasHardLinks(string path)
-        {
-            return GetHardLinkCount(path) > 1;
-        }
-
-        /// <summary>
-        /// Gets the security descriptor associated with the file or directory.
-        /// </summary>
-        /// <param name="path">The file or directory to inspect.</param>
-        /// <returns>The security descriptor.</returns>
-        public RawSecurityDescriptor GetSecurity(string path)
-        {
-            using (new NtfsTransaction())
-            {
-                DirectoryEntry dirEntry = GetDirectoryEntry(path);
-                if (dirEntry == null)
-                {
-                    throw new FileNotFoundException("File not found", path);
-                }
-                else
-                {
-                    File file = GetFile(dirEntry.Reference);
-                    return DoGetSecurity(file);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Sets the security descriptor associated with the file or directory.
-        /// </summary>
-        /// <param name="path">The file or directory to change.</param>
-        /// <param name="securityDescriptor">The new security descriptor.</param>
-        public void SetSecurity(string path, RawSecurityDescriptor securityDescriptor)
-        {
-            using (new NtfsTransaction())
-            {
-                DirectoryEntry dirEntry = GetDirectoryEntry(path);
-                if (dirEntry == null)
-                {
-                    throw new FileNotFoundException("File not found", path);
-                }
-                else
-                {
-                    File file = GetFile(dirEntry.Reference);
-                    DoSetSecurity(file, securityDescriptor);
-
-                    // Update the directory entry used to open the file
-                    dirEntry.UpdateFrom(file);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Sets the reparse point data on a file or directory.
-        /// </summary>
-        /// <param name="path">The file to set the reparse point on.</param>
-        /// <param name="reparsePoint">The new reparse point.</param>
-        public void SetReparsePoint(string path, ReparsePoint reparsePoint)
-        {
-            using (new NtfsTransaction())
-            {
-                DirectoryEntry dirEntry = GetDirectoryEntry(path);
-                if (dirEntry == null)
-                {
-                    throw new FileNotFoundException("File not found", path);
-                }
-                else
-                {
-                    File file = GetFile(dirEntry.Reference);
-
-                    NtfsStream stream = file.GetStream(AttributeType.ReparsePoint, null);
-                    if (stream != null)
-                    {
-                        // If there's an existing reparse point, unhook it.
-                        using (Stream contentStream = stream.Open(FileAccess.Read))
-                        {
-                            byte[] oldRpBuffer = Utilities.ReadFully(contentStream, (int)contentStream.Length);
-                            ReparsePointRecord rp = new ReparsePointRecord();
-                            rp.ReadFrom(oldRpBuffer, 0);
-                            _context.ReparsePoints.Remove(rp.Tag, dirEntry.Reference);
-                        }
-                    }
-                    else
-                    {
-                        stream = file.CreateStream(AttributeType.ReparsePoint, null);
-                    }
-
-                    // Set the new content
-                    ReparsePointRecord newRp = new ReparsePointRecord();
-                    newRp.Tag = (uint)reparsePoint.Tag;
-                    newRp.Content = reparsePoint.Content;
-
-                    byte[] contentBuffer = new byte[newRp.Size];
-                    newRp.WriteTo(contentBuffer, 0);
-                    using (Stream contentStream = stream.Open(FileAccess.ReadWrite))
-                    {
-                        contentStream.Write(contentBuffer, 0, contentBuffer.Length);
-                        contentStream.SetLength(contentBuffer.Length);
-                    }
-
-                    // Update the standard information attribute - so it reflects the actual file state
-                    NtfsStream stdInfoStream = file.GetStream(AttributeType.StandardInformation, null);
-                    StandardInformation si = stdInfoStream.GetContent<StandardInformation>();
-                    si.FileAttributes = si.FileAttributes | FileAttributeFlags.ReparsePoint;
-                    stdInfoStream.SetContent(si);
-
-                    // Update the directory entry used to open the file, so it's accurate
-                    dirEntry.Details.EASizeOrReparsePointTag = newRp.Tag;
-                    dirEntry.UpdateFrom(file);
-
-                    // Write attribute changes back to the Master File Table
-                    file.UpdateRecordInMft();
-
-                    // Add the reparse point to the index
-                    _context.ReparsePoints.Add(newRp.Tag, dirEntry.Reference);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the reparse point data associated with a file or directory.
-        /// </summary>
-        /// <param name="path">The file to query.</param>
-        /// <returns>The reparse point information.</returns>
-        public ReparsePoint GetReparsePoint(string path)
-        {
-            using (new NtfsTransaction())
-            {
-                DirectoryEntry dirEntry = GetDirectoryEntry(path);
-                if (dirEntry == null)
-                {
-                    throw new FileNotFoundException("File not found", path);
-                }
-                else
-                {
-                    File file = GetFile(dirEntry.Reference);
-
-                    NtfsStream stream = file.GetStream(AttributeType.ReparsePoint, null);
-                    if (stream != null)
-                    {
-                        ReparsePointRecord rp = new ReparsePointRecord();
-
-                        using (Stream contentStream = stream.Open(FileAccess.Read))
-                        {
-                            byte[] buffer = Utilities.ReadFully(contentStream, (int)contentStream.Length);
-                            rp.ReadFrom(buffer, 0);
-                            return new ReparsePoint((int)rp.Tag, rp.Content);
-                        }
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Removes a reparse point from a file or directory, without deleting the file or directory.
-        /// </summary>
-        /// <param name="path">The path to the file or directory to remove the reparse point from.</param>
-        public void RemoveReparsePoint(string path)
-        {
-            using (new NtfsTransaction())
-            {
-                DirectoryEntry dirEntry = GetDirectoryEntry(path);
-                if (dirEntry == null)
-                {
-                    throw new FileNotFoundException("File not found", path);
-                }
-                else
-                {
-                    File file = GetFile(dirEntry.Reference);
-                    RemoveReparsePoint(file);
-
-                    // Update the directory entry used to open the file, so it's accurate
-                    dirEntry.UpdateFrom(file);
-
-                    // Write attribute changes back to the Master File Table
-                    file.UpdateRecordInMft();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the short name for a given path.
-        /// </summary>
-        /// <param name="path">The path to convert.</param>
-        /// <returns>The short name.</returns>
-        /// <remarks>
-        /// This method only gets the short name for the final part of the path, to
-        /// convert a complete path, call this method repeatedly, once for each path
-        /// segment.  If there is no short name for the given path,<c>null</c> is
-        /// returned.
-        /// </remarks>
-        public string GetShortName(string path)
-        {
-            using (new NtfsTransaction())
-            {
-                string parentPath = Utilities.GetDirectoryFromPath(path);
-                DirectoryEntry parentEntry = GetDirectoryEntry(parentPath);
-                if (parentEntry == null || (parentEntry.Details.FileAttributes & FileAttributes.Directory) == 0)
-                {
-                    throw new DirectoryNotFoundException("Parent directory not found");
-                }
-
-                Directory dir = GetDirectory(parentEntry.Reference);
-                if (dir == null)
-                {
-                    throw new DirectoryNotFoundException("Parent directory not found");
-                }
-
-                DirectoryEntry givenEntry = dir.GetEntryByName(Utilities.GetFileFromPath(path));
-                if (givenEntry == null)
-                {
-                    throw new FileNotFoundException("Path not found", path);
-                }
-
-                if (givenEntry.Details.FileNameNamespace == FileNameNamespace.Dos)
-                {
-                    return givenEntry.Details.FileName;
-                }
-                else if (givenEntry.Details.FileNameNamespace == FileNameNamespace.Win32)
-                {
-                    File file = GetFile(givenEntry.Reference);
-
-                    foreach (var stream in file.GetStreams(AttributeType.FileName, null))
-                    {
-                        FileNameRecord fnr = stream.GetContent<FileNameRecord>();
-                        if (fnr.ParentDirectory.Equals(givenEntry.Details.ParentDirectory)
-                            && fnr.FileNameNamespace == FileNameNamespace.Dos)
-                        {
-                            return fnr.FileName;
-                        }
-                    }
-                }
-
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Sets the short name for a given file or directory.
-        /// </summary>
-        /// <param name="path">The full path to the file or directory to change.</param>
-        /// <param name="shortName">The shortName, which should not include a path.</param>
-        public void SetShortName(string path, string shortName)
-        {
-            if (!Utilities.Is8Dot3(shortName))
-            {
-                throw new ArgumentException("Short name is not a valid 8.3 file name", "shortName");
-            }
-
-            using (new NtfsTransaction())
-            {
-                string parentPath = Utilities.GetDirectoryFromPath(path);
-                DirectoryEntry parentEntry = GetDirectoryEntry(parentPath);
-                if (parentEntry == null || (parentEntry.Details.FileAttributes & FileAttributes.Directory) == 0)
-                {
-                    throw new DirectoryNotFoundException("Parent directory not found");
-                }
-
-                Directory dir = GetDirectory(parentEntry.Reference);
-                if (dir == null)
-                {
-                    throw new DirectoryNotFoundException("Parent directory not found");
-                }
-
-                DirectoryEntry givenEntry = dir.GetEntryByName(Utilities.GetFileFromPath(path));
-                if (givenEntry == null)
-                {
-                    throw new FileNotFoundException("Path not found", path);
-                }
-
-                FileNameNamespace givenNamespace = givenEntry.Details.FileNameNamespace;
-                File file = GetFile(givenEntry.Reference);
-
-                if (givenNamespace == FileNameNamespace.Posix && file.HasWin32OrDosName)
-                {
-                    throw new InvalidOperationException("Cannot set a short name on hard links");
-                }
-
-                // Convert Posix/Win32AndDos to just Win32
-                if (givenEntry.Details.FileNameNamespace != FileNameNamespace.Win32)
-                {
-                    dir.RemoveEntry(givenEntry);
-                    dir.AddEntry(file, givenEntry.Details.FileName, FileNameNamespace.Win32);
-                }
-
-                // Remove any existing Dos names, and set the new one
-                List<NtfsStream> nameStreams = new List<NtfsStream>(file.GetStreams(AttributeType.FileName, null));
-                foreach (var stream in nameStreams)
-                {
-                    FileNameRecord fnr = stream.GetContent<FileNameRecord>();
-                    if (fnr.ParentDirectory.Equals(givenEntry.Details.ParentDirectory)
-                        && fnr.FileNameNamespace == FileNameNamespace.Dos)
-                    {
-                        DirectoryEntry oldEntry = dir.GetEntryByName(fnr.FileName);
-                        dir.RemoveEntry(oldEntry);
-                    }
-                }
-
-                dir.AddEntry(file, shortName, FileNameNamespace.Dos);
-
-                parentEntry.UpdateFrom(dir);
-            }
-        }
-
-        /// <summary>
-        /// Gets the standard file information for a file.
-        /// </summary>
-        /// <param name="path">The full path to the file or directory to query.</param>
-        /// <returns>The standard file information.</returns>
-        public WindowsFileInformation GetFileStandardInformation(string path)
-        {
-            using (new NtfsTransaction())
-            {
-                DirectoryEntry dirEntry = GetDirectoryEntry(path);
-                if (dirEntry == null)
-                {
-                    throw new FileNotFoundException("File not found", path);
-                }
-
-                File file = GetFile(dirEntry.Reference);
-                StandardInformation si = file.StandardInformation;
-
-                return new WindowsFileInformation
-                {
-                    CreationTime = si.CreationTime,
-                    LastAccessTime = si.LastAccessTime,
-                    ChangeTime = si.MftChangedTime,
-                    LastWriteTime = si.ModificationTime,
-                    FileAttributes = StandardInformation.ConvertFlags(si.FileAttributes, file.IsDirectory)
-                };
-            }
-        }
-
-        /// <summary>
-        /// Sets the standard file information for a file.
-        /// </summary>
-        /// <param name="path">The full path to the file or directory to query.</param>
-        /// <param name="info">The standard file information.</param>
-        public void SetFileStandardInformation(string path, WindowsFileInformation info)
-        {
-            using (new NtfsTransaction())
-            {
-                UpdateStandardInformation(
-                    path,
-                    delegate (StandardInformation si)
-                    {
-                        si.CreationTime = info.CreationTime;
-                        si.LastAccessTime = info.LastAccessTime;
-                        si.MftChangedTime = info.ChangeTime;
-                        si.ModificationTime = info.LastWriteTime;
-                        si.FileAttributes = StandardInformation.SetFileAttributes(info.FileAttributes, si.FileAttributes);
-                    });
-            }
-        }
-
-        /// <summary>
-        /// Gets the file id for a given path.
-        /// </summary>
-        /// <param name="path">The path to get the id of.</param>
-        /// <returns>The file id.</returns>
-        /// <remarks>
-        /// The returned file id includes the MFT index of the primary file record for the file.
-        /// The file id can be used to determine if two paths refer to the same actual file.
-        /// The MFT index is held in the lower 48 bits of the id.
-        /// </remarks>
-        public long GetFileId(string path)
-        {
-            using (new NtfsTransaction())
-            {
-                DirectoryEntry dirEntry = GetDirectoryEntry(path);
-                if (dirEntry == null)
-                {
-                    throw new FileNotFoundException("File not found", path);
-                }
-                else
-                {
-                    return (long)dirEntry.Reference.Value;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the names of the alternate data streams for a file.
-        /// </summary>
-        /// <param name="path">The path to the file.</param>
-        /// <returns>
-        /// The list of alternate data streams (or empty, if none).  To access the contents
-        /// of the alternate streams, use OpenFile(path + ":" + name, ...).
-        /// </returns>
-        public string[] GetAlternateDataStreams(string path)
-        {
-            DirectoryEntry dirEntry = GetDirectoryEntry(path);
-            if (dirEntry == null)
-            {
-                throw new FileNotFoundException("File not found", path);
-            }
-
-            File file = GetFile(dirEntry.Reference);
-
-            List<string> names = new List<string>();
-            foreach (var attr in file.AllStreams)
-            {
-                if (attr.AttributeType == AttributeType.Data && !string.IsNullOrEmpty(attr.Name))
-                {
-                    names.Add(attr.Name);
-                }
-            }
-
-            return names.ToArray();
-        }
-
-        /// <summary>
-        /// Reads the boot code of the file system into a byte array.
-        /// </summary>
-        /// <returns>The boot code, or <c>null</c> if not available.</returns>
-        public override byte[] ReadBootCode()
-        {
-            using (Stream s = OpenFile(@"\$Boot", FileMode.Open))
-            {
-                return Utilities.ReadFully(s, (int)s.Length);
-            }
-        }
-
-        /// <summary>
-        /// Updates the BIOS Parameter Block (BPB) of the file system to reflect a new disk geometry.
-        /// </summary>
-        /// <param name="geometry">The disk's new BIOS geometry.</param>
-        /// <remarks>Having an accurate geometry in the BPB is essential for booting some Operating Systems (e.g. Windows XP).</remarks>
-        public void UpdateBiosGeometry(Geometry geometry)
-        {
-            _context.BiosParameterBlock.SectorsPerTrack = (ushort)geometry.SectorsPerTrack;
-            _context.BiosParameterBlock.NumHeads = (ushort)geometry.HeadsPerCylinder;
-
-            _context.RawStream.Position = 0;
-            byte[] bpbSector = Utilities.ReadFully(_context.RawStream, 512);
-
-            _context.BiosParameterBlock.ToBytes(bpbSector, 0);
-
-            _context.RawStream.Position = 0;
-            _context.RawStream.Write(bpbSector, 0, bpbSector.Length);
-        }
-
-        /// <summary>
-        /// Writes a diagnostic dump of key NTFS structures.
-        /// </summary>
-        /// <param name="writer">The writer to receive the dump.</param>
-        /// <param name="linePrefix">The indent to apply to the start of each line of output.</param>
-        public void Dump(TextWriter writer, string linePrefix)
-        {
-            writer.WriteLine(linePrefix + "NTFS File System Dump");
-            writer.WriteLine(linePrefix + "=====================");
-
-            ////_context.Mft.Dump(writer, linePrefix);
-            writer.WriteLine(linePrefix);
-            _context.BiosParameterBlock.Dump(writer, linePrefix);
-
-            if (_context.SecurityDescriptors != null)
-            {
-                writer.WriteLine(linePrefix);
-                _context.SecurityDescriptors.Dump(writer, linePrefix);
-            }
-
-            if (_context.ObjectIds != null)
-            {
-                writer.WriteLine(linePrefix);
-                _context.ObjectIds.Dump(writer, linePrefix);
-            }
-
-            if (_context.ReparsePoints != null)
-            {
-                writer.WriteLine(linePrefix);
-                _context.ReparsePoints.Dump(writer, linePrefix);
-            }
-
-            if (_context.Quotas != null)
-            {
-                writer.WriteLine(linePrefix);
-                _context.Quotas.Dump(writer, linePrefix);
-            }
-
-            writer.WriteLine(linePrefix);
-            GetDirectory(MasterFileTable.RootDirIndex).Dump(writer, linePrefix);
-
-            writer.WriteLine(linePrefix);
-            writer.WriteLine(linePrefix + "FULL FILE LISTING");
-            foreach (var record in _context.Mft.Records)
-            {
-                // Don't go through cache - these are short-lived, and this is (just!) diagnostics
-                File f = new File(_context, record);
-                f.Dump(writer, linePrefix);
-
-                foreach (var stream in f.AllStreams)
-                {
-                    if (stream.AttributeType == AttributeType.IndexRoot)
-                    {
-                        try
-                        {
-                            writer.WriteLine(linePrefix + "  INDEX (" + stream.Name + ")");
-                            f.GetIndex(stream.Name).Dump(writer, linePrefix + "    ");
-                        }
-                        catch (Exception e)
-                        {
-                            writer.WriteLine(linePrefix + "!Exception: " + e);
-                        }
-                    }
-                }
-            }
-
-            writer.WriteLine(linePrefix);
-            writer.WriteLine(linePrefix + "DIRECTORY TREE");
-            writer.WriteLine(linePrefix + @"\ (5)");
-            DumpDirectory(GetDirectory(MasterFileTable.RootDirIndex), writer, linePrefix);  // 5 = Root Dir
-        }
-
-        #region Internal File access methods (exposed via NtfsContext)
-        internal Directory GetDirectory(long index)
-        {
-            return (Directory)GetFile(index);
-        }
-
-        internal Directory GetDirectory(FileRecordReference fileReference)
-        {
-            return (Directory)GetFile(fileReference);
-        }
-
-        internal File GetFile(FileRecordReference fileReference)
-        {
-            FileRecord record = _context.Mft.GetRecord(fileReference);
-            if (record == null)
-            {
-                return null;
-            }
-
-            // Don't create file objects for file record segments that are part of another
-            // logical file.
-            if (record.BaseFile.Value != 0)
-            {
-                return null;
-            }
-
-            File file = _fileCache[fileReference.MftIndex];
-
-            if (file != null && file.MftReference.SequenceNumber != fileReference.SequenceNumber)
-            {
-                file = null;
-            }
-
-            if (file == null)
-            {
-                if ((record.Flags & FileRecordFlags.IsDirectory) != 0)
-                {
-                    file = new Directory(_context, record);
-                }
-                else
-                {
-                    file = new File(_context, record);
-                }
-
-                _fileCache[fileReference.MftIndex] = file;
-            }
-
-            return file;
-        }
-
-        internal File GetFile(long index)
-        {
-            FileRecord record = _context.Mft.GetRecord(index, false);
-            if (record == null)
-            {
-                return null;
-            }
-
-            // Don't create file objects for file record segments that are part of another
-            // logical file.
-            if (record.BaseFile.Value != 0)
-            {
-                return null;
-            }
-
-            File file = _fileCache[index];
-
-            if (file != null && file.MftReference.SequenceNumber != record.SequenceNumber)
-            {
-                file = null;
-            }
-
-            if (file == null)
-            {
-                if ((record.Flags & FileRecordFlags.IsDirectory) != 0)
-                {
-                    file = new Directory(_context, record);
-                }
-                else
-                {
-                    file = new File(_context, record);
-                }
-
-                _fileCache[index] = file;
-            }
-
-            return file;
-        }
-
-        internal File AllocateFile(FileRecordFlags flags)
-        {
-            File result = null;
-            if ((flags & FileRecordFlags.IsDirectory) != 0)
-            {
-                result = new Directory(_context, _context.Mft.AllocateRecord(flags, false));
-            }
-            else
-            {
-                result = new File(_context, _context.Mft.AllocateRecord(flags, false));
-            }
-
-            _fileCache[result.MftReference.MftIndex] = result;
-            return result;
-        }
-
-        internal void ForgetFile(File file)
-        {
-            _fileCache.Remove(file.IndexInMft);
-        }
-
-        #endregion
-
-        internal DirectoryEntry GetDirectoryEntry(string path)
-        {
-            return GetDirectoryEntry(GetDirectory(MasterFileTable.RootDirIndex), path);
-        }
-
-        /// <summary>
-        /// Disposes of this instance.
-        /// </summary>
-        /// <param name="disposing">Whether called from Dispose or from a finalizer.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                if (_context != null && _context.Mft != null)
-                {
-                    _context.Mft.Dispose();
-                    _context.Mft = null;
-                }
-
-                IDisposable disposableCompressor = _context.Options.Compressor as IDisposable;
-                if (disposableCompressor != null)
-                {
-                    disposableCompressor.Dispose();
-                    _context.Options.Compressor = null;
-                }
-            }
-
-            base.Dispose(disposing);
-        }
-
-        private static bool IsValidBPB(BiosParameterBlock bpb, long volumeSize)
-        {
-            if (bpb.SignatureByte != 0x80 || bpb.TotalSectors16 != 0 || bpb.TotalSectors32 != 0
-                || bpb.TotalSectors64 == 0 || bpb.MftRecordSize == 0 || bpb.MftCluster == 0 || bpb.BytesPerSector == 0)
-            {
-                return false;
-            }
-
-            long mftPos = bpb.MftCluster * bpb.SectorsPerCluster * bpb.BytesPerSector;
-            return mftPos < bpb.TotalSectors64 * bpb.BytesPerSector && mftPos < volumeSize;
-        }
-
-        private static void RemoveFileFromDirectory(Directory dir, File file, string name)
-        {
-            List<string> aliases = new List<string>();
-
-            DirectoryEntry dirEntry = dir.GetEntryByName(name);
-            if (dirEntry.Details.FileNameNamespace == FileNameNamespace.Dos
-                || dirEntry.Details.FileNameNamespace == FileNameNamespace.Win32)
-            {
-                foreach (var fnStream in file.GetStreams(AttributeType.FileName, null))
-                {
-                    var fnr = fnStream.GetContent<FileNameRecord>();
-                    if ((fnr.FileNameNamespace == FileNameNamespace.Win32 || fnr.FileNameNamespace == FileNameNamespace.Dos)
-                        && fnr.ParentDirectory.Value == dir.MftReference.Value)
-                    {
-                        aliases.Add(fnr.FileName);
-                    }
-                }
-            }
-            else
-            {
-                aliases.Add(name);
-            }
-
-            foreach (var alias in aliases)
-            {
-                DirectoryEntry de = dir.GetEntryByName(alias);
-                dir.RemoveEntry(de);
-            }
-        }
-
-        private static void SplitPath(string path, out string plainPath, out string attributeName)
-        {
-            plainPath = path;
-            string fileName = Utilities.GetFileFromPath(path);
-            attributeName = null;
-
-            int streamSepPos = fileName.IndexOf(':');
-            if (streamSepPos >= 0)
-            {
-                attributeName = fileName.Substring(streamSepPos + 1);
-                plainPath = plainPath.Substring(0, path.Length - (fileName.Length - streamSepPos));
-            }
-        }
-
-        private static void UpdateStandardInformation(DirectoryEntry dirEntry, File file, StandardInformationModifier modifier)
-        {
-            // Update the standard information attribute - so it reflects the actual file state
-            NtfsStream stream = file.GetStream(AttributeType.StandardInformation, null);
-            StandardInformation si = stream.GetContent<StandardInformation>();
-            modifier(si);
-            stream.SetContent(si);
-
-            // Update the directory entry used to open the file, so it's accurate
-            dirEntry.UpdateFrom(file);
-
-            // Write attribute changes back to the Master File Table
-            file.UpdateRecordInMft();
-        }
-
-        private DirectoryEntry CreateNewFile(string path, NewFileOptions options)
-        {
-            DirectoryEntry result;
-            DirectoryEntry parentDirEntry = GetDirectoryEntry(Utilities.GetDirectoryFromPath(path));
-            Directory parentDir = GetDirectory(parentDirEntry.Reference);
-
-            FileAttributeFlags newFileAttrs = parentDir.StandardInformation.FileAttributes;
-            if (options != null && options.Compressed.HasValue)
-            {
-                if (options.Compressed.Value)
-                {
-                    newFileAttrs |= FileAttributeFlags.Compressed;
-                }
-                else
-                {
-                    newFileAttrs &= ~FileAttributeFlags.Compressed;
-                }
-            }
-
-            File file = File.CreateNew(_context, newFileAttrs);
-            try
-            {
-                result = AddFileToDirectory(file, parentDir, Utilities.GetFileFromPath(path), options);
-
-                RawSecurityDescriptor parentSd = DoGetSecurity(parentDir);
-                RawSecurityDescriptor newSd;
-                if (options != null && options.SecurityDescriptor != null)
-                {
-                    newSd = options.SecurityDescriptor;
-                }
-                else
-                {
-                    newSd = SecurityDescriptor.CalcNewObjectDescriptor(parentSd, false);
-                }
-
-                DoSetSecurity(file, newSd);
-                result.UpdateFrom(file);
-
-                parentDirEntry.UpdateFrom(parentDir);
-            }
-            finally
-            {
-                if (file.HardLinkCount == 0)
-                {
-                    file.Delete();
-                }
-            }
-
-            return result;
-        }
-
-        private DirectoryEntry GetDirectoryEntry(Directory dir, string path)
-        {
-            string[] pathElements = path.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries);
-            return GetDirectoryEntry(dir, pathElements, 0);
-        }
-
-        private void DoSearch(List<string> results, string path, Regex regex, bool subFolders, bool dirs, bool files)
-        {
-            DirectoryEntry parentDirEntry = GetDirectoryEntry(path);
-            if (parentDirEntry == null)
-            {
-                throw new DirectoryNotFoundException(string.Format(CultureInfo.InvariantCulture, "The directory '{0}' was not found", path));
-            }
-
-            Directory parentDir = GetDirectory(parentDirEntry.Reference);
-            if (parentDir == null)
-            {
-                throw new DirectoryNotFoundException(string.Format(CultureInfo.InvariantCulture, "The directory '{0}' was not found", path));
-            }
-
-            foreach (DirectoryEntry de in parentDir.GetAllEntries(true))
-            {
-                bool isDir = (de.Details.FileAttributes & FileAttributes.Directory) != 0;
-
-                if ((isDir && dirs) || (!isDir && files))
-                {
-                    if (regex.IsMatch(de.SearchName))
-                    {
-                        results.Add(Utilities.CombinePaths(path, de.Details.FileName));
-                    }
-                }
-
-                if (subFolders && isDir)
-                {
-                    DoSearch(results, Utilities.CombinePaths(path, de.Details.FileName), regex, subFolders, dirs, files);
-                }
-            }
-        }
-
-        private DirectoryEntry GetDirectoryEntry(Directory dir, string[] pathEntries, int pathOffset)
-        {
-            DirectoryEntry entry;
-
-            if (pathEntries.Length == 0)
-            {
-                return dir.DirectoryEntry;
-            }
-            else
-            {
-                entry = dir.GetEntryByName(pathEntries[pathOffset]);
-                if (entry != null)
-                {
-                    if (pathOffset == pathEntries.Length - 1)
-                    {
-                        return entry;
-                    }
-                    else if ((entry.Details.FileAttributes & FileAttributes.Directory) != 0)
-                    {
-                        return GetDirectoryEntry(GetDirectory(entry.Reference), pathEntries, pathOffset + 1);
-                    }
-                    else
-                    {
-                        throw new IOException(string.Format(CultureInfo.InvariantCulture, "{0} is a file, not a directory", pathEntries[pathOffset]));
-                    }
-                }
-                else
-                {
-                    return null;
-                }
-            }
-        }
-
-        private DirectoryEntry AddFileToDirectory(File file, Directory dir, string name, NewFileOptions options)
-        {
-            DirectoryEntry entry;
-
-            bool createShortNames;
-            if (options != null && options.CreateShortNames.HasValue)
-            {
-                createShortNames = options.CreateShortNames.Value;
-            }
-            else
-            {
-                createShortNames = CreateShortNames;
-            }
-
-            if (createShortNames)
-            {
-                if (Utilities.Is8Dot3(name.ToUpperInvariant()))
-                {
-                    entry = dir.AddEntry(file, name, FileNameNamespace.Win32AndDos);
-                }
-                else
-                {
-                    entry = dir.AddEntry(file, name, FileNameNamespace.Win32);
-                    dir.AddEntry(file, dir.CreateShortName(name), FileNameNamespace.Dos);
-                }
-            }
-            else
-            {
-                entry = dir.AddEntry(file, name, FileNameNamespace.Posix);
-            }
-
-            return entry;
-        }
-
-        private void RemoveReparsePoint(File file)
-        {
-            NtfsStream stream = file.GetStream(AttributeType.ReparsePoint, null);
-            if (stream != null)
-            {
-                ReparsePointRecord rp = new ReparsePointRecord();
-
-                using (Stream contentStream = stream.Open(FileAccess.Read))
-                {
-                    byte[] buffer = Utilities.ReadFully(contentStream, (int)contentStream.Length);
-                    rp.ReadFrom(buffer, 0);
-                }
-
-                file.RemoveStream(stream);
-
-                // Update the standard information attribute - so it reflects the actual file state
-                NtfsStream stdInfoStream = file.GetStream(AttributeType.StandardInformation, null);
-                StandardInformation si = stdInfoStream.GetContent<StandardInformation>();
-                si.FileAttributes = si.FileAttributes & ~FileAttributeFlags.ReparsePoint;
-                stdInfoStream.SetContent(si);
-
-                // Remove the reparse point from the index
-                _context.ReparsePoints.Remove(rp.Tag, file.MftReference);
-            }
-        }
-
-        private RawSecurityDescriptor DoGetSecurity(File file)
-        {
-            NtfsStream legacyStream = file.GetStream(AttributeType.SecurityDescriptor, null);
-            if (legacyStream != null)
-            {
-                return legacyStream.GetContent<SecurityDescriptor>().Descriptor;
-            }
-
-            StandardInformation si = file.StandardInformation;
-            return _context.SecurityDescriptors.GetDescriptorById(si.SecurityId);
-        }
-
-        private void DoSetSecurity(File file, RawSecurityDescriptor securityDescriptor)
-        {
-            NtfsStream legacyStream = file.GetStream(AttributeType.SecurityDescriptor, null);
-            if (legacyStream != null)
-            {
-                SecurityDescriptor sd = new SecurityDescriptor();
-                sd.Descriptor = securityDescriptor;
-                legacyStream.SetContent(sd);
-            }
-            else
-            {
-                uint id = _context.SecurityDescriptors.AddDescriptor(securityDescriptor);
-
-                // Update the standard information attribute - so it reflects the actual file state
-                NtfsStream stream = file.GetStream(AttributeType.StandardInformation, null);
-                StandardInformation si = stream.GetContent<StandardInformation>();
-                si.SecurityId = id;
-                stream.SetContent(si);
-
-                // Write attribute changes back to the Master File Table
-                file.UpdateRecordInMft();
-            }
-        }
-
-        private void DumpDirectory(Directory dir, TextWriter writer, string indent)
-        {
-            foreach (DirectoryEntry dirEntry in dir.GetAllEntries(true))
-            {
-                File file = GetFile(dirEntry.Reference);
-                Directory asDir = file as Directory;
-                writer.WriteLine(indent + "+-" + file.ToString() + " (" + file.IndexInMft + ")");
-
-                // Recurse - but avoid infinite recursion via the root dir...
-                if (asDir != null && file.IndexInMft != 5)
-                {
-                    DumpDirectory(asDir, writer, indent + "| ");
-                }
-            }
-        }
-
-        private void UpdateStandardInformation(string path, StandardInformationModifier modifier)
-        {
-            DirectoryEntry dirEntry = GetDirectoryEntry(path);
-            if (dirEntry == null)
-            {
-                throw new FileNotFoundException("File not found", path);
-            }
-            else
-            {
-                File file = GetFile(dirEntry.Reference);
-
-                UpdateStandardInformation(dirEntry, file, modifier);
-            }
-        }
-
-        private string ParsePath(string path, out string attributeName, out AttributeType attributeType)
-        {
-            string fileName = Utilities.GetFileFromPath(path);
-            attributeName = null;
-            attributeType = AttributeType.Data;
-
-            string[] fileNameElements = fileName.Split(new char[] { ':' }, 3);
-            fileName = fileNameElements[0];
-
-            if (fileNameElements.Length > 1)
-            {
-                attributeName = fileNameElements[1];
-                if (string.IsNullOrEmpty(attributeName))
-                {
-                    attributeName = null;
-                }
-            }
-
-            if (fileNameElements.Length > 2)
-            {
-                string typeName = fileNameElements[2];
-                AttributeDefinitionRecord typeDefn = _context.AttributeDefinitions.Lookup(typeName);
-                if (typeDefn == null)
-                {
-                    throw new FileNotFoundException(string.Format(CultureInfo.InvariantCulture, "No such attribute type '{0}'", typeName), path);
-                }
-
-                attributeType = typeDefn.Type;
-            }
-
-            try
-            {
-                string dirName = Utilities.GetDirectoryFromPath(path);
-                return Utilities.CombinePaths(dirName, fileName);
-            }
-            catch (ArgumentException)
-            {
-                throw new IOException("Invalid path: " + path);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/NtfsFileSystemChecker.cs b/DiscUtils/Ntfs/NtfsFileSystemChecker.cs
deleted file mode 100644
index 6ba0d6a..0000000
--- a/DiscUtils/Ntfs/NtfsFileSystemChecker.cs
+++ /dev/null
@@ -1,618 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using System.Runtime.Serialization;
-    using System.Text;
-
-    /// <summary>
-    /// Class that checks NTFS file system integrity.
-    /// </summary>
-    /// <remarks>Poor relation of chkdsk/fsck.</remarks>
-    public sealed class NtfsFileSystemChecker : DiscFileSystemChecker
-    {
-        private Stream _target;
-
-        private NtfsContext _context;
-        private TextWriter _report;
-        private ReportLevels _reportLevels;
-
-        private ReportLevels _levelsDetected;
-        private ReportLevels _levelsConsideredFail = ReportLevels.Errors;
-
-        /// <summary>
-        /// Initializes a new instance of the NtfsFileSystemChecker class.
-        /// </summary>
-        /// <param name="diskData">The file system to check.</param>
-        public NtfsFileSystemChecker(Stream diskData)
-        {
-            SnapshotStream protectiveStream = new SnapshotStream(diskData, Ownership.None);
-            protectiveStream.Snapshot();
-            protectiveStream.Freeze();
-            _target = protectiveStream;
-        }
-
-        /// <summary>
-        /// Checks the integrity of an NTFS file system held in a stream.
-        /// </summary>
-        /// <param name="reportOutput">A report on issues found.</param>
-        /// <param name="levels">The amount of detail to report.</param>
-        /// <returns><c>true</c> if the file system appears valid, else <c>false</c>.</returns>
-        public override bool Check(TextWriter reportOutput, ReportLevels levels)
-        {
-            _context = new NtfsContext();
-            _context.RawStream = _target;
-            _context.Options = new NtfsOptions();
-
-            _report = reportOutput;
-            _reportLevels = levels;
-            _levelsDetected = ReportLevels.None;
-
-            try
-            {
-                DoCheck();
-            }
-            catch (AbortException ae)
-            {
-                ReportError("File system check aborted: " + ae.ToString());
-                return false;
-            }
-            catch (Exception e)
-            {
-                ReportError("File system check aborted with exception: " + e.ToString());
-                return false;
-            }
-
-            return (_levelsDetected & _levelsConsideredFail) == 0;
-        }
-
-        /// <summary>
-        /// Gets an object that can convert between clusters and files.
-        /// </summary>
-        /// <returns>The cluster map.</returns>
-        public ClusterMap BuildClusterMap()
-        {
-            _context = new NtfsContext();
-            _context.RawStream = _target;
-            _context.Options = new NtfsOptions();
-
-            _context.RawStream.Position = 0;
-            byte[] bytes = Utilities.ReadFully(_context.RawStream, 512);
-
-            _context.BiosParameterBlock = BiosParameterBlock.FromBytes(bytes, 0);
-
-            _context.Mft = new MasterFileTable(_context);
-            File mftFile = new File(_context, _context.Mft.GetBootstrapRecord());
-            _context.Mft.Initialize(mftFile);
-            return _context.Mft.GetClusterMap();
-        }
-
-        private static void Abort()
-        {
-            throw new AbortException();
-        }
-
-        private void DoCheck()
-        {
-            _context.RawStream.Position = 0;
-            byte[] bytes = Utilities.ReadFully(_context.RawStream, 512);
-
-            _context.BiosParameterBlock = BiosParameterBlock.FromBytes(bytes, 0);
-
-            //-----------------------------------------------------------------------
-            // MASTER FILE TABLE
-            //
-
-            // Bootstrap the Master File Table
-            _context.Mft = new MasterFileTable(_context);
-            File mftFile = new File(_context, _context.Mft.GetBootstrapRecord());
-
-            // Verify basic MFT records before initializing the Master File Table
-            PreVerifyMft(mftFile);
-            _context.Mft.Initialize(mftFile);
-
-            // Now the MFT is up and running, do more detailed analysis of it's contents - double-accounted clusters, etc
-            VerifyMft();
-            _context.Mft.Dump(_report, "INFO: ");
-
-            //-----------------------------------------------------------------------
-            // INDEXES
-            //
-
-            // Need UpperCase in order to verify some indexes (i.e. directories).
-            File ucFile = new File(_context, _context.Mft.GetRecord(MasterFileTable.UpCaseIndex, false));
-            _context.UpperCase = new UpperCase(ucFile);
-
-            SelfCheckIndexes();
-
-            //-----------------------------------------------------------------------
-            // DIRECTORIES
-            //
-            VerifyDirectories();
-
-            //-----------------------------------------------------------------------
-            // WELL KNOWN FILES
-            //
-            VerifyWellKnownFilesExist();
-
-            //-----------------------------------------------------------------------
-            // OBJECT IDS
-            //
-            VerifyObjectIds();
-
-            //-----------------------------------------------------------------------
-            // FINISHED
-            //
-
-            // Temporary...
-            using (NtfsFileSystem fs = new NtfsFileSystem(_context.RawStream))
-            {
-                if ((_reportLevels & ReportLevels.Information) != 0)
-                {
-                    ReportDump(fs);
-                }
-            }
-        }
-
-        private void VerifyWellKnownFilesExist()
-        {
-            Directory rootDir = new Directory(_context, _context.Mft.GetRecord(MasterFileTable.RootDirIndex, false));
-
-            DirectoryEntry extendDirEntry = rootDir.GetEntryByName("$Extend");
-            if (extendDirEntry == null)
-            {
-                ReportError("$Extend does not exist in root directory");
-                Abort();
-            }
-
-            Directory extendDir = new Directory(_context, _context.Mft.GetRecord(extendDirEntry.Reference));
-
-            DirectoryEntry objIdDirEntry = extendDir.GetEntryByName("$ObjId");
-            if (objIdDirEntry == null)
-            {
-                ReportError("$ObjId does not exist in $Extend directory");
-                Abort();
-            }
-
-            // Stash ObjectIds
-            _context.ObjectIds = new ObjectIds(new File(_context, _context.Mft.GetRecord(objIdDirEntry.Reference)));
-
-            DirectoryEntry sysVolInfDirEntry = rootDir.GetEntryByName("System Volume Information");
-            if (sysVolInfDirEntry == null)
-            {
-                ReportError("'System Volume Information' does not exist in root directory");
-                Abort();
-            }
-            ////Directory sysVolInfDir = new Directory(_context, _context.Mft.GetRecord(sysVolInfDirEntry.Reference));
-        }
-
-        private void VerifyObjectIds()
-        {
-            foreach (FileRecord fr in _context.Mft.Records)
-            {
-                if (fr.BaseFile.Value != 0)
-                {
-                    File f = new File(_context, fr);
-                    foreach (var stream in f.AllStreams)
-                    {
-                        if (stream.AttributeType == AttributeType.ObjectId)
-                        {
-                            ObjectId objId = stream.GetContent<ObjectId>();
-                            ObjectIdRecord objIdRec;
-                            if (!_context.ObjectIds.TryGetValue(objId.Id, out objIdRec))
-                            {
-                                ReportError("ObjectId {0} for file {1} is not indexed", objId.Id, f.BestName);
-                            }
-                            else if (objIdRec.MftReference != f.MftReference)
-                            {
-                                ReportError("ObjectId {0} for file {1} points to {2}", objId.Id, f.BestName, objIdRec.MftReference);
-                            }
-                        }
-                    }
-                }
-            }
-
-            foreach (var objIdRec in _context.ObjectIds.All)
-            {
-                if (_context.Mft.GetRecord(objIdRec.Value.MftReference) == null)
-                {
-                    ReportError("ObjectId {0} refers to non-existant file {1}", objIdRec.Key, objIdRec.Value.MftReference);
-                }
-            }
-        }
-
-        private void VerifyDirectories()
-        {
-            foreach (FileRecord fr in _context.Mft.Records)
-            {
-                if (fr.BaseFile.Value != 0)
-                {
-                    continue;
-                }
-
-                File f = new File(_context, fr);
-                foreach (var stream in f.AllStreams)
-                {
-                    if (stream.AttributeType == AttributeType.IndexRoot && stream.Name == "$I30")
-                    {
-                        IndexView<FileNameRecord, FileRecordReference> dir = new IndexView<FileNameRecord, FileRecordReference>(f.GetIndex("$I30"));
-                        foreach (var entry in dir.Entries)
-                        {
-                            FileRecord refFile = _context.Mft.GetRecord(entry.Value);
-
-                            // Make sure each referenced file actually exists...
-                            if (refFile == null)
-                            {
-                                ReportError("Directory {0} references non-existent file {1}", f, entry.Key);
-                            }
-
-                            File referencedFile = new File(_context, refFile);
-                            StandardInformation si = referencedFile.StandardInformation;
-                            if (si.CreationTime != entry.Key.CreationTime || si.MftChangedTime != entry.Key.MftChangedTime
-                                || si.ModificationTime != entry.Key.ModificationTime)
-                            {
-                                ReportInfo("Directory entry {0} in {1} is out of date", entry.Key, f);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        private void SelfCheckIndexes()
-        {
-            foreach (FileRecord fr in _context.Mft.Records)
-            {
-                File f = new File(_context, fr);
-                foreach (var stream in f.AllStreams)
-                {
-                    if (stream.AttributeType == AttributeType.IndexRoot)
-                    {
-                        SelfCheckIndex(f, stream.Name);
-                    }
-                }
-            }
-        }
-
-        private void SelfCheckIndex(File file, string name)
-        {
-            ReportInfo("About to self-check index {0} in file {1} (MFT:{2})", name, file.BestName, file.IndexInMft);
-
-            IndexRoot root = file.GetStream(AttributeType.IndexRoot, name).GetContent<IndexRoot>();
-
-            byte[] rootBuffer;
-            using (Stream s = file.OpenStream(AttributeType.IndexRoot, name, FileAccess.Read))
-            {
-                rootBuffer = Utilities.ReadFully(s, (int)s.Length);
-            }
-
-            Bitmap indexBitmap = null;
-            if (file.GetStream(AttributeType.Bitmap, name) != null)
-            {
-                indexBitmap = new Bitmap(file.OpenStream(AttributeType.Bitmap, name, FileAccess.Read), long.MaxValue);
-            }
-
-            if (!SelfCheckIndexNode(rootBuffer, IndexRoot.HeaderOffset, indexBitmap, root, file.BestName, name))
-            {
-                ReportError("Index {0} in file {1} (MFT:{2}) has corrupt IndexRoot attribute", name, file.BestName, file.IndexInMft);
-            }
-            else
-            {
-                ReportInfo("Self-check of index {0} in file {1} (MFT:{2}) complete", name, file.BestName, file.IndexInMft);
-            }
-        }
-
-        private bool SelfCheckIndexNode(byte[] buffer, int offset, Bitmap bitmap, IndexRoot root, string fileName, string indexName)
-        {
-            bool ok = true;
-
-            IndexHeader header = new IndexHeader(buffer, offset);
-
-            IndexEntry lastEntry = null;
-
-            IComparer<byte[]> collator = root.GetCollator(_context.UpperCase);
-
-            int pos = (int)header.OffsetToFirstEntry;
-            while (pos < header.TotalSizeOfEntries)
-            {
-                IndexEntry entry = new IndexEntry(indexName == "$I30");
-                entry.Read(buffer, offset + pos);
-                pos += entry.Size;
-
-                if ((entry.Flags & IndexEntryFlags.Node) != 0)
-                {
-                    long bitmapIdx = entry.ChildrenVirtualCluster / Utilities.Ceil(root.IndexAllocationSize, _context.BiosParameterBlock.SectorsPerCluster * _context.BiosParameterBlock.BytesPerSector);
-                    if (!bitmap.IsPresent(bitmapIdx))
-                    {
-                        ReportError("Index entry {0} is non-leaf, but child vcn {1} is not in bitmap at index {2}", Index.EntryAsString(entry, fileName, indexName), entry.ChildrenVirtualCluster, bitmapIdx);
-                    }
-                }
-
-                if ((entry.Flags & IndexEntryFlags.End) != 0)
-                {
-                    if (pos != header.TotalSizeOfEntries)
-                    {
-                        ReportError("Found END index entry {0}, but not at end of node", Index.EntryAsString(entry, fileName, indexName));
-                        ok = false;
-                    }
-                }
-
-                if (lastEntry != null && collator.Compare(lastEntry.KeyBuffer, entry.KeyBuffer) >= 0)
-                {
-                    ReportError("Found entries out of order {0} was before {1}", Index.EntryAsString(lastEntry, fileName, indexName), Index.EntryAsString(entry, fileName, indexName));
-                    ok = false;
-                }
-
-                lastEntry = entry;
-            }
-
-            return ok;
-        }
-
-        private void PreVerifyMft(File file)
-        {
-            int recordLength = _context.BiosParameterBlock.MftRecordSize;
-            int bytesPerSector = _context.BiosParameterBlock.BytesPerSector;
-
-            // Check out the MFT's clusters
-            foreach (var range in file.GetAttribute(AttributeType.Data, null).GetClusters())
-            {
-                if (!VerifyClusterRange(range))
-                {
-                    ReportError("Corrupt cluster range in MFT data attribute {0}", range.ToString());
-                    Abort();
-                }
-            }
-
-            foreach (var range in file.GetAttribute(AttributeType.Bitmap, null).GetClusters())
-            {
-                if (!VerifyClusterRange(range))
-                {
-                    ReportError("Corrupt cluster range in MFT bitmap attribute {0}", range.ToString());
-                    Abort();
-                }
-            }
-
-            using (Stream mftStream = file.OpenStream(AttributeType.Data, null, FileAccess.Read))
-            using (Stream bitmapStream = file.OpenStream(AttributeType.Bitmap, null, FileAccess.Read))
-            {
-                Bitmap bitmap = new Bitmap(bitmapStream, long.MaxValue);
-
-                long index = 0;
-                while (mftStream.Position < mftStream.Length)
-                {
-                    byte[] recordData = Utilities.ReadFully(mftStream, recordLength);
-
-                    string magic = Utilities.BytesToString(recordData, 0, 4);
-                    if (magic != "FILE")
-                    {
-                        if (bitmap.IsPresent(index))
-                        {
-                            ReportError("Invalid MFT record magic at index {0} - was ({2},{3},{4},{5}) \"{1}\"", index, magic.Trim('\0'), (int)magic[0], (int)magic[1], (int)magic[2], (int)magic[3]);
-                        }
-                    }
-                    else
-                    {
-                        if (!VerifyMftRecord(recordData, bitmap.IsPresent(index), bytesPerSector))
-                        {
-                            ReportError("Invalid MFT record at index {0}", index);
-                            StringBuilder bldr = new StringBuilder();
-                            for (int i = 0; i < recordData.Length; ++i)
-                            {
-                                bldr.Append(string.Format(CultureInfo.InvariantCulture, " {0:X2}", recordData[i]));
-                            }
-
-                            ReportInfo("MFT record binary data for index {0}:{1}", index, bldr.ToString());
-                        }
-                    }
-
-                    index++;
-                }
-            }
-        }
-
-        private void VerifyMft()
-        {
-            // Cluster allocation check - check for double allocations
-            Dictionary<long, string> clusterMap = new Dictionary<long, string>();
-            foreach (FileRecord fr in _context.Mft.Records)
-            {
-                if ((fr.Flags & FileRecordFlags.InUse) != 0)
-                {
-                    File f = new File(_context, fr);
-                    foreach (NtfsAttribute attr in f.AllAttributes)
-                    {
-                        string attrKey = fr.MasterFileTableIndex + ":" + attr.Id;
-
-                        foreach (var range in attr.GetClusters())
-                        {
-                            if (!VerifyClusterRange(range))
-                            {
-                                ReportError("Attribute {0} contains bad cluster range {1}", attrKey, range);
-                            }
-
-                            for (long cluster = range.Offset; cluster < range.Offset + range.Count; ++cluster)
-                            {
-                                string existingKey;
-                                if (clusterMap.TryGetValue(cluster, out existingKey))
-                                {
-                                    ReportError("Two attributes referencing cluster {0} (0x{0:X16}) - {1} and {2} (as MftIndex:AttrId)", cluster, existingKey, attrKey);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        private bool VerifyMftRecord(byte[] recordData, bool presentInBitmap, int bytesPerSector)
-        {
-            bool ok = true;
-
-            //
-            // Verify the attributes seem OK...
-            //
-            byte[] tempBuffer = new byte[recordData.Length];
-            Array.Copy(recordData, tempBuffer, tempBuffer.Length);
-            GenericFixupRecord genericRecord = new GenericFixupRecord(bytesPerSector);
-            genericRecord.FromBytes(tempBuffer, 0);
-
-            int pos = Utilities.ToUInt16LittleEndian(genericRecord.Content, 0x14);
-            while (Utilities.ToUInt32LittleEndian(genericRecord.Content, pos) != 0xFFFFFFFF)
-            {
-                int attrLen;
-                try
-                {
-                    AttributeRecord ar = AttributeRecord.FromBytes(genericRecord.Content, pos, out attrLen);
-                    if (attrLen != ar.Size)
-                    {
-                        ReportError("Attribute size is different to calculated size.  AttrId={0}", ar.AttributeId);
-                        ok = false;
-                    }
-
-                    if (ar.IsNonResident)
-                    {
-                        NonResidentAttributeRecord nrr = (NonResidentAttributeRecord)ar;
-                        if (nrr.DataRuns.Count > 0)
-                        {
-                            long totalVcn = 0;
-                            foreach (var run in nrr.DataRuns)
-                            {
-                                totalVcn += run.RunLength;
-                            }
-
-                            if (totalVcn != nrr.LastVcn - nrr.StartVcn + 1)
-                            {
-                                ReportError("Declared VCNs doesn't match data runs.  AttrId={0}", ar.AttributeId);
-                                ok = false;
-                            }
-                        }
-                    }
-                }
-                catch
-                {
-                    ReportError("Failure parsing attribute at pos={0}", pos);
-                    return false;
-                }
-
-                pos += attrLen;
-            }
-
-            //
-            // Now consider record as a whole
-            //
-            FileRecord record = new FileRecord(bytesPerSector);
-            record.FromBytes(recordData, 0);
-
-            bool inUse = (record.Flags & FileRecordFlags.InUse) != 0;
-            if (inUse != presentInBitmap)
-            {
-                ReportError("MFT bitmap and record in-use flag don't agree.  Mft={0}, Record={1}", presentInBitmap ? "InUse" : "Free", inUse ? "InUse" : "Free");
-                ok = false;
-            }
-
-            if (record.Size != record.RealSize)
-            {
-                ReportError("MFT record real size is different to calculated size.  Stored in MFT={0}, Calculated={1}", record.RealSize, record.Size);
-                ok = false;
-            }
-
-            if (Utilities.ToUInt32LittleEndian(recordData, (int)record.RealSize - 8) != uint.MaxValue)
-            {
-                ReportError("MFT record is not correctly terminated with 0xFFFFFFFF");
-                ok = false;
-            }
-
-            return ok;
-        }
-
-        private bool VerifyClusterRange(Range<long, long> range)
-        {
-            bool ok = true;
-            if (range.Offset < 0)
-            {
-                ReportError("Invalid cluster range {0} - negative start", range);
-                ok = false;
-            }
-
-            if (range.Count <= 0)
-            {
-                ReportError("Invalid cluster range {0} - negative/zero count", range);
-                ok = false;
-            }
-
-            if ((range.Offset + range.Count) * _context.BiosParameterBlock.BytesPerCluster > _context.RawStream.Length)
-            {
-                ReportError("Invalid cluster range {0} - beyond end of disk", range);
-                ok = false;
-            }
-
-            return ok;
-        }
-
-        private void ReportDump(IDiagnosticTraceable toDump)
-        {
-            _levelsDetected |= ReportLevels.Information;
-            if ((_reportLevels & ReportLevels.Information) != 0)
-            {
-                toDump.Dump(_report, "INFO: ");
-            }
-        }
-
-        private void ReportInfo(string str, params object[] args)
-        {
-            _levelsDetected |= ReportLevels.Information;
-            if ((_reportLevels & ReportLevels.Information) != 0)
-            {
-                _report.WriteLine("INFO: " + str, args);
-            }
-        }
-
-        private void ReportError(string str, params object[] args)
-        {
-            _levelsDetected |= ReportLevels.Errors;
-            if ((_reportLevels & ReportLevels.Errors) != 0)
-            {
-                _report.WriteLine("ERROR: " + str, args);
-            }
-        }
-
-        [Serializable]
-        private sealed class AbortException : InvalidFileSystemException
-        {
-            public AbortException()
-                : base()
-            {
-            }
-
-            private AbortException(SerializationInfo info, StreamingContext ctxt)
-                : base(info, ctxt)
-            {
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/NtfsFormatOptions.cs b/DiscUtils/Ntfs/NtfsFormatOptions.cs
deleted file mode 100644
index af4f02e..0000000
--- a/DiscUtils/Ntfs/NtfsFormatOptions.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System.Security.Principal;
-
-    /// <summary>
-    /// Class representing NTFS formatting options.
-    /// </summary>
-    public sealed class NtfsFormatOptions
-    {
-        /// <summary>
-        /// Gets or sets the NTFS bootloader code to put in the formatted file system.
-        /// </summary>
-        public byte[] BootCode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the SID of the computer account that notionally formatted the file system.
-        /// </summary>
-        /// <remarks>
-        /// Certain ACLs in the file system will refer to the 'local' administrator of the indicated
-        /// computer account.
-        /// </remarks>
-        public SecurityIdentifier ComputerAccount { get; set; }
-    }
-}
diff --git a/DiscUtils/Ntfs/NtfsFormatter.cs b/DiscUtils/Ntfs/NtfsFormatter.cs
deleted file mode 100644
index fcd7954..0000000
--- a/DiscUtils/Ntfs/NtfsFormatter.cs
+++ /dev/null
@@ -1,341 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.IO;
-    using System.Security.AccessControl;
-    using System.Security.Principal;
-
-    internal class NtfsFormatter
-    {
-        private int _clusterSize;
-        private int _mftRecordSize;
-        private int _indexBufferSize;
-        private long _bitmapCluster;
-        private long _mftMirrorCluster;
-        private long _mftCluster;
-
-        private NtfsContext _context;
-
-        public string Label { get; set; }
-
-        public Geometry DiskGeometry { get; set; }
-
-        public long FirstSector { get; set; }
-
-        public long SectorCount { get; set; }
-
-        public byte[] BootCode { get; set; }
-
-        public SecurityIdentifier ComputerAccount { get; set; }
-
-        public NtfsFileSystem Format(Stream stream)
-        {
-            _context = new NtfsContext();
-            _context.Options = new NtfsOptions();
-            _context.RawStream = stream;
-            _context.AttributeDefinitions = new AttributeDefinitions();
-
-            string localAdminString = (ComputerAccount == null)
-                    ? "LA"
-                    : new SecurityIdentifier(WellKnownSidType.AccountAdministratorSid, ComputerAccount).ToString();
-
-            using (new NtfsTransaction())
-            {
-                _clusterSize = 4096;
-                _mftRecordSize = 1024;
-                _indexBufferSize = 4096;
-
-                long totalClusters = ((SectorCount - 1) * Sizes.Sector) / _clusterSize;
-
-                // Allocate a minimum of 8KB for the boot loader, but allow for more
-                int numBootClusters = Utilities.Ceil(Math.Max((int)(8 * Sizes.OneKiB), BootCode == null ? 0 : BootCode.Length), _clusterSize);
-
-                // Place MFT mirror in the middle of the volume
-                _mftMirrorCluster = totalClusters / 2;
-                uint numMftMirrorClusters = 1;
-
-                // The bitmap is also near the middle
-                _bitmapCluster = _mftMirrorCluster + 13;
-                int numBitmapClusters = (int)Utilities.Ceil(totalClusters / 8, _clusterSize);
-
-                // The MFT bitmap goes 'near' the start - approx 10% in - but ensure we avoid the bootloader
-                long mftBitmapCluster = Math.Max(3 + (totalClusters / 10), numBootClusters);
-                int numMftBitmapClusters = 1;
-
-                // The MFT follows it's bitmap
-                _mftCluster = mftBitmapCluster + numMftBitmapClusters;
-                int numMftClusters = 8;
-
-                if (_mftCluster + numMftClusters > _mftMirrorCluster
-                    || _bitmapCluster + numBitmapClusters >= totalClusters)
-                {
-                    throw new IOException("Unable to determine initial layout of NTFS metadata - disk may be too small");
-                }
-
-                CreateBiosParameterBlock(stream, numBootClusters * _clusterSize);
-
-                _context.Mft = new MasterFileTable(_context);
-                File mftFile = _context.Mft.InitializeNew(_context, mftBitmapCluster, (ulong)numMftBitmapClusters, (long)_mftCluster, (ulong)numMftClusters);
-
-                File bitmapFile = CreateFixedSystemFile(MasterFileTable.BitmapIndex, _bitmapCluster, (ulong)numBitmapClusters, true);
-                _context.ClusterBitmap = new ClusterBitmap(bitmapFile);
-                _context.ClusterBitmap.MarkAllocated(0, numBootClusters);
-                _context.ClusterBitmap.MarkAllocated(_bitmapCluster, numBitmapClusters);
-                _context.ClusterBitmap.MarkAllocated(mftBitmapCluster, numMftBitmapClusters);
-                _context.ClusterBitmap.MarkAllocated(_mftCluster, numMftClusters);
-                _context.ClusterBitmap.SetTotalClusters(totalClusters);
-                bitmapFile.UpdateRecordInMft();
-
-                File mftMirrorFile = CreateFixedSystemFile(MasterFileTable.MftMirrorIndex, _mftMirrorCluster, numMftMirrorClusters, true);
-
-                File logFile = CreateSystemFile(MasterFileTable.LogFileIndex);
-                using (Stream s = logFile.OpenStream(AttributeType.Data, null, FileAccess.ReadWrite))
-                {
-                    s.SetLength(Math.Min(Math.Max(2 * Sizes.OneMiB, (totalClusters / 500) * (long)_clusterSize), 64 * Sizes.OneMiB));
-                    byte[] buffer = new byte[1024 * 1024];
-                    for (int i = 0; i < buffer.Length; ++i)
-                    {
-                        buffer[i] = 0xFF;
-                    }
-
-                    long totalWritten = 0;
-                    while (totalWritten < s.Length)
-                    {
-                        int toWrite = (int)Math.Min(s.Length - totalWritten, buffer.Length);
-                        s.Write(buffer, 0, toWrite);
-                        totalWritten += toWrite;
-                    }
-                }
-
-                File volumeFile = CreateSystemFile(MasterFileTable.VolumeIndex);
-                NtfsStream volNameStream = volumeFile.CreateStream(AttributeType.VolumeName, null);
-                volNameStream.SetContent(new VolumeName(Label ?? "New Volume"));
-                NtfsStream volInfoStream = volumeFile.CreateStream(AttributeType.VolumeInformation, null);
-                volInfoStream.SetContent(new VolumeInformation(3, 1, VolumeInformationFlags.None));
-                SetSecurityAttribute(volumeFile, "O:" + localAdminString + "G:BAD:(A;;0x12019f;;;SY)(A;;0x12019f;;;BA)");
-                volumeFile.UpdateRecordInMft();
-
-                _context.GetFileByIndex = delegate (long index) { return new File(_context, _context.Mft.GetRecord(index, false)); };
-                _context.AllocateFile = delegate (FileRecordFlags frf) { return new File(_context, _context.Mft.AllocateRecord(frf, false)); };
-
-                File attrDefFile = CreateSystemFile(MasterFileTable.AttrDefIndex);
-                _context.AttributeDefinitions.WriteTo(attrDefFile);
-                SetSecurityAttribute(attrDefFile, "O:" + localAdminString + "G:BAD:(A;;FR;;;SY)(A;;FR;;;BA)");
-                attrDefFile.UpdateRecordInMft();
-
-                File bootFile = CreateFixedSystemFile(MasterFileTable.BootIndex, 0, (uint)numBootClusters, false);
-                SetSecurityAttribute(bootFile, "O:" + localAdminString + "G:BAD:(A;;FR;;;SY)(A;;FR;;;BA)");
-                bootFile.UpdateRecordInMft();
-
-                File badClusFile = CreateSystemFile(MasterFileTable.BadClusIndex);
-                badClusFile.CreateStream(AttributeType.Data, "$Bad");
-                badClusFile.UpdateRecordInMft();
-
-                File secureFile = CreateSystemFile(MasterFileTable.SecureIndex, FileRecordFlags.HasViewIndex);
-                secureFile.RemoveStream(secureFile.GetStream(AttributeType.Data, null));
-                _context.SecurityDescriptors = SecurityDescriptors.Initialize(secureFile);
-                secureFile.UpdateRecordInMft();
-
-                File upcaseFile = CreateSystemFile(MasterFileTable.UpCaseIndex);
-                _context.UpperCase = UpperCase.Initialize(upcaseFile);
-                upcaseFile.UpdateRecordInMft();
-
-                File objIdFile = File.CreateNew(_context, FileRecordFlags.IsMetaFile | FileRecordFlags.HasViewIndex, FileAttributeFlags.None);
-                objIdFile.RemoveStream(objIdFile.GetStream(AttributeType.Data, null));
-                objIdFile.CreateIndex("$O", (AttributeType)0, AttributeCollationRule.MultipleUnsignedLongs);
-                objIdFile.UpdateRecordInMft();
-
-                File reparseFile = File.CreateNew(_context, FileRecordFlags.IsMetaFile | FileRecordFlags.HasViewIndex, FileAttributeFlags.None);
-                reparseFile.CreateIndex("$R", (AttributeType)0, AttributeCollationRule.MultipleUnsignedLongs);
-                reparseFile.UpdateRecordInMft();
-
-                File quotaFile = File.CreateNew(_context, FileRecordFlags.IsMetaFile | FileRecordFlags.HasViewIndex, FileAttributeFlags.None);
-                Quotas.Initialize(quotaFile);
-
-                Directory extendDir = CreateSystemDirectory(MasterFileTable.ExtendIndex);
-                extendDir.AddEntry(objIdFile, "$ObjId", FileNameNamespace.Win32AndDos);
-                extendDir.AddEntry(reparseFile, "$Reparse", FileNameNamespace.Win32AndDos);
-                extendDir.AddEntry(quotaFile, "$Quota", FileNameNamespace.Win32AndDos);
-                extendDir.UpdateRecordInMft();
-
-                Directory rootDir = CreateSystemDirectory(MasterFileTable.RootDirIndex);
-                rootDir.AddEntry(mftFile, "$MFT", FileNameNamespace.Win32AndDos);
-                rootDir.AddEntry(mftMirrorFile, "$MFTMirr", FileNameNamespace.Win32AndDos);
-                rootDir.AddEntry(logFile, "$LogFile", FileNameNamespace.Win32AndDos);
-                rootDir.AddEntry(volumeFile, "$Volume", FileNameNamespace.Win32AndDos);
-                rootDir.AddEntry(attrDefFile, "$AttrDef", FileNameNamespace.Win32AndDos);
-                rootDir.AddEntry(rootDir, ".", FileNameNamespace.Win32AndDos);
-                rootDir.AddEntry(bitmapFile, "$Bitmap", FileNameNamespace.Win32AndDos);
-                rootDir.AddEntry(bootFile, "$Boot", FileNameNamespace.Win32AndDos);
-                rootDir.AddEntry(badClusFile, "$BadClus", FileNameNamespace.Win32AndDos);
-                rootDir.AddEntry(secureFile, "$Secure", FileNameNamespace.Win32AndDos);
-                rootDir.AddEntry(upcaseFile, "$UpCase", FileNameNamespace.Win32AndDos);
-                rootDir.AddEntry(extendDir, "$Extend", FileNameNamespace.Win32AndDos);
-                SetSecurityAttribute(rootDir, "O:" + localAdminString + "G:BUD:(A;OICI;FA;;;BA)(A;OICI;FA;;;SY)(A;OICIIO;GA;;;CO)(A;OICI;0x1200a9;;;BU)(A;CI;LC;;;BU)(A;CIIO;DC;;;BU)(A;;0x1200a9;;;WD)");
-                rootDir.UpdateRecordInMft();
-
-                // A number of records are effectively 'reserved'
-                for (long i = MasterFileTable.ExtendIndex + 1; i <= 15; i++)
-                {
-                    File f = CreateSystemFile(i);
-                    SetSecurityAttribute(f, "O:S-1-5-21-1708537768-746137067-1060284298-1003G:BAD:(A;;0x12019f;;;SY)(A;;0x12019f;;;BA)");
-                    f.UpdateRecordInMft();
-                }
-            }
-
-            // XP-style security permissions setup
-            NtfsFileSystem ntfs = new NtfsFileSystem(stream);
-
-            ntfs.SetSecurity(@"$MFT", new RawSecurityDescriptor("O:" + localAdminString + "G:BAD:(A;;FR;;;SY)(A;;FR;;;BA)"));
-            ntfs.SetSecurity(@"$MFTMirr", new RawSecurityDescriptor("O:" + localAdminString + "G:BAD:(A;;FR;;;SY)(A;;FR;;;BA)"));
-            ntfs.SetSecurity(@"$LogFile", new RawSecurityDescriptor("O:" + localAdminString + "G:BAD:(A;;FR;;;SY)(A;;FR;;;BA)"));
-            ntfs.SetSecurity(@"$Bitmap", new RawSecurityDescriptor("O:" + localAdminString + "G:BAD:(A;;FR;;;SY)(A;;FR;;;BA)"));
-            ntfs.SetSecurity(@"$BadClus", new RawSecurityDescriptor("O:" + localAdminString + "G:BAD:(A;;FR;;;SY)(A;;FR;;;BA)"));
-            ntfs.SetSecurity(@"$UpCase", new RawSecurityDescriptor("O:" + localAdminString + "G:BAD:(A;;FR;;;SY)(A;;FR;;;BA)"));
-            ntfs.SetSecurity(@"$Secure", new RawSecurityDescriptor("O:" + localAdminString + "G:BAD:(A;;0x12019f;;;SY)(A;;0x12019f;;;BA)"));
-            ntfs.SetSecurity(@"$Extend", new RawSecurityDescriptor("O:" + localAdminString + "G:BAD:(A;;0x12019f;;;SY)(A;;0x12019f;;;BA)"));
-            ntfs.SetSecurity(@"$Extend\$Quota", new RawSecurityDescriptor("O:" + localAdminString + "G:BAD:(A;;0x12019f;;;SY)(A;;0x12019f;;;BA)"));
-            ntfs.SetSecurity(@"$Extend\$ObjId", new RawSecurityDescriptor("O:" + localAdminString + "G:BAD:(A;;0x12019f;;;SY)(A;;0x12019f;;;BA)"));
-            ntfs.SetSecurity(@"$Extend\$Reparse", new RawSecurityDescriptor("O:" + localAdminString + "G:BAD:(A;;0x12019f;;;SY)(A;;0x12019f;;;BA)"));
-
-            ntfs.CreateDirectory("System Volume Information");
-            ntfs.SetAttributes("System Volume Information", FileAttributes.Hidden | FileAttributes.System | FileAttributes.Directory);
-            ntfs.SetSecurity("System Volume Information", new RawSecurityDescriptor("O:BAG:SYD:(A;OICI;FA;;;SY)"));
-
-            using (Stream s = ntfs.OpenFile(@"System Volume Information\MountPointManagerRemoteDatabase", FileMode.Create))
-            {
-            }
-
-            ntfs.SetAttributes(@"System Volume Information\MountPointManagerRemoteDatabase", FileAttributes.Hidden | FileAttributes.System | FileAttributes.Archive);
-            ntfs.SetSecurity(@"System Volume Information\MountPointManagerRemoteDatabase", new RawSecurityDescriptor("O:BAG:SYD:(A;;FA;;;SY)"));
-            return ntfs;
-        }
-
-        private static void SetSecurityAttribute(File file, string secDesc)
-        {
-            NtfsStream rootSecurityStream = file.CreateStream(AttributeType.SecurityDescriptor, null);
-            SecurityDescriptor sd = new SecurityDescriptor();
-            sd.Descriptor = new RawSecurityDescriptor(secDesc);
-            rootSecurityStream.SetContent(sd);
-        }
-
-        private File CreateFixedSystemFile(long mftIndex, long firstCluster, ulong numClusters, bool wipe)
-        {
-            BiosParameterBlock bpb = _context.BiosParameterBlock;
-
-            if (wipe)
-            {
-                byte[] wipeBuffer = new byte[bpb.BytesPerCluster];
-                _context.RawStream.Position = firstCluster * bpb.BytesPerCluster;
-                for (ulong i = 0; i < numClusters; ++i)
-                {
-                    _context.RawStream.Write(wipeBuffer, 0, wipeBuffer.Length);
-                }
-            }
-
-            FileRecord fileRec = _context.Mft.AllocateRecord((uint)mftIndex, FileRecordFlags.None);
-            fileRec.Flags = FileRecordFlags.InUse;
-            fileRec.SequenceNumber = (ushort)mftIndex;
-
-            File file = new File(_context, fileRec);
-
-            StandardInformation.InitializeNewFile(file, FileAttributeFlags.Hidden | FileAttributeFlags.System);
-
-            file.CreateStream(AttributeType.Data, null, firstCluster, numClusters, (uint)bpb.BytesPerCluster);
-
-            file.UpdateRecordInMft();
-
-            if (_context.ClusterBitmap != null)
-            {
-                _context.ClusterBitmap.MarkAllocated(firstCluster, (long)numClusters);
-            }
-
-            return file;
-        }
-
-        private File CreateSystemFile(long mftIndex)
-        {
-            return CreateSystemFile(mftIndex, FileRecordFlags.None);
-        }
-
-        private File CreateSystemFile(long mftIndex, FileRecordFlags flags)
-        {
-            FileRecord fileRec = _context.Mft.AllocateRecord((uint)mftIndex, flags);
-            fileRec.SequenceNumber = (ushort)mftIndex;
-
-            File file = new File(_context, fileRec);
-
-            StandardInformation.InitializeNewFile(file, FileAttributeFlags.Hidden | FileAttributeFlags.System | FileRecord.ConvertFlags(flags));
-
-            file.CreateStream(AttributeType.Data, null);
-
-            file.UpdateRecordInMft();
-
-            return file;
-        }
-
-        private Directory CreateSystemDirectory(long mftIndex)
-        {
-            FileRecord fileRec = _context.Mft.AllocateRecord((uint)mftIndex, FileRecordFlags.None);
-            fileRec.Flags = FileRecordFlags.InUse | FileRecordFlags.IsDirectory;
-            fileRec.SequenceNumber = (ushort)mftIndex;
-
-            Directory dir = new Directory(_context, fileRec);
-
-            StandardInformation.InitializeNewFile(dir, FileAttributeFlags.Hidden | FileAttributeFlags.System);
-
-            dir.CreateIndex("$I30", AttributeType.FileName, AttributeCollationRule.Filename);
-
-            dir.UpdateRecordInMft();
-
-            return dir;
-        }
-
-        private void CreateBiosParameterBlock(Stream stream, int bootFileSize)
-        {
-            byte[] bootSectors = new byte[bootFileSize];
-
-            if (BootCode != null)
-            {
-                Array.Copy(BootCode, 0, bootSectors, 0, BootCode.Length);
-            }
-
-            BiosParameterBlock bpb = BiosParameterBlock.Initialized(DiskGeometry, _clusterSize, (uint)FirstSector, SectorCount, _mftRecordSize, _indexBufferSize);
-            bpb.MftCluster = _mftCluster;
-            bpb.MftMirrorCluster = _mftMirrorCluster;
-            bpb.ToBytes(bootSectors, 0);
-
-            // Primary goes at the start of the partition
-            stream.Position = 0;
-            stream.Write(bootSectors, 0, bootSectors.Length);
-
-            // Backup goes at the end of the data in the partition
-            stream.Position = (SectorCount - 1) * Sizes.Sector;
-            stream.Write(bootSectors, 0, Sizes.Sector);
-
-            _context.BiosParameterBlock = bpb;
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/NtfsOptions.cs b/DiscUtils/Ntfs/NtfsOptions.cs
deleted file mode 100644
index 7ac8989..0000000
--- a/DiscUtils/Ntfs/NtfsOptions.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using DiscUtils.Compression;
-
-    /// <summary>
-    /// Class whose instances hold options controlling how <see cref="NtfsFileSystem"/> works.
-    /// </summary>
-    public sealed class NtfsOptions : DiscFileSystemOptions
-    {
-        private bool _hideMetaFiles;
-        private bool _hideHiddenFiles;
-        private bool _hideSystemFiles;
-        private bool _hideDosFileNames;
-        private ShortFileNameOption _shortNameCreation;
-        private BlockCompressor _compressor;
-        private bool _readCache;
-        private bool _fileLengthFromDirectoryEntries;
-
-        internal NtfsOptions()
-        {
-            _hideMetaFiles = true;
-            _hideHiddenFiles = true;
-            _hideSystemFiles = true;
-            _hideDosFileNames = true;
-            _compressor = new LZNT1();
-            _readCache = true;
-            _fileLengthFromDirectoryEntries = true;
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to include file system meta-files when enumerating directories.
-        /// </summary>
-        /// <remarks>Meta-files are those with an MFT (Master File Table) index less than 24.</remarks>
-        public bool HideMetafiles
-        {
-            get { return _hideMetaFiles; }
-            set { _hideMetaFiles = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to include hidden files when enumerating directories.
-        /// </summary>
-        public bool HideHiddenFiles
-        {
-            get { return _hideHiddenFiles; }
-            set { _hideHiddenFiles = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to include system files when enumerating directories.
-        /// </summary>
-        public bool HideSystemFiles
-        {
-            get { return _hideSystemFiles; }
-            set { _hideSystemFiles = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to hide DOS (8.3-style) file names when enumerating directories.
-        /// </summary>
-        public bool HideDosFileNames
-        {
-            get { return _hideDosFileNames; }
-            set { _hideDosFileNames = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether short (8.3) file names are created automatically.
-        /// </summary>
-        public ShortFileNameOption ShortNameCreation
-        {
-            get { return _shortNameCreation; }
-            set { _shortNameCreation = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the compression algorithm used for compressing files.
-        /// </summary>
-        public BlockCompressor Compressor
-        {
-            get { return _compressor; }
-            set { _compressor = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether NTFS-level read caching is used.
-        /// </summary>
-        public bool ReadCacheEnabled
-        {
-            get { return _readCache; }
-            set { _readCache = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether file length information comes from directory entries or file data.
-        /// </summary>
-        /// <remarks>
-        /// <para>The default (<c>true</c>) is that file length information is supplied by the directory entry
-        /// for a file.  In some circumstances that information may be inaccurate - specifically for files with multiple
-        /// hard links, the directory entries are only updated for the hard link used to open the file.</para>
-        /// <para>Setting this value to <c>false</c>, will always retrieve the latest information from the underlying
-        /// NTFS attribute information, which reflects the true size of the file.</para>
-        /// </remarks>
-        public bool FileLengthFromDirectoryEntries
-        {
-            get { return _fileLengthFromDirectoryEntries; }
-            set { _fileLengthFromDirectoryEntries = value; }
-        }
-
-        /// <summary>
-        /// Returns a string representation of the file system options.
-        /// </summary>
-        /// <returns>A string of the form Show: XX XX XX.</returns>
-        public override string ToString()
-        {
-            return "Show: Normal " + (HideMetafiles ? string.Empty : "Meta ") + (HideHiddenFiles ? string.Empty : "Hidden ") + (HideSystemFiles ? string.Empty : "System ") + (HideDosFileNames ? string.Empty : "ShortNames ");
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/NtfsStream.cs b/DiscUtils/Ntfs/NtfsStream.cs
deleted file mode 100644
index 40eebb4..0000000
--- a/DiscUtils/Ntfs/NtfsStream.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal class NtfsStream
-    {
-        private File _file;
-        private NtfsAttribute _attr;
-
-        public NtfsStream(File file, NtfsAttribute attr)
-        {
-            _file = file;
-            _attr = attr;
-        }
-
-        public NtfsAttribute Attribute
-        {
-            get { return _attr; }
-        }
-
-        public AttributeType AttributeType
-        {
-            get { return _attr.Type; }
-        }
-
-        public string Name
-        {
-            get { return _attr.Name; }
-        }
-
-        /// <summary>
-        /// Gets the content of a stream.
-        /// </summary>
-        /// <typeparam name="T">The stream's content structure.</typeparam>
-        /// <returns>The content.</returns>
-        public T GetContent<T>()
-            where T : IByteArraySerializable, IDiagnosticTraceable, new()
-        {
-            byte[] buffer;
-            using (Stream s = Open(FileAccess.Read))
-            {
-                buffer = Utilities.ReadFully(s, (int)s.Length);
-            }
-
-            T value = new T();
-            value.ReadFrom(buffer, 0);
-            return value;
-        }
-
-        /// <summary>
-        /// Sets the content of a stream.
-        /// </summary>
-        /// <typeparam name="T">The stream's content structure.</typeparam>
-        /// <param name="value">The new value for the stream.</param>
-        public void SetContent<T>(T value)
-            where T : IByteArraySerializable, IDiagnosticTraceable, new()
-        {
-            byte[] buffer = new byte[value.Size];
-            value.WriteTo(buffer, 0);
-            using (Stream s = Open(FileAccess.Write))
-            {
-                s.Write(buffer, 0, buffer.Length);
-                s.SetLength(buffer.Length);
-            }
-        }
-
-        public SparseStream Open(FileAccess access)
-        {
-            return _attr.Open(access);
-        }
-
-        internal Range<long, long>[] GetClusters()
-        {
-            return _attr.GetClusters();
-        }
-
-        internal StreamExtent[] GetAbsoluteExtents()
-        {
-            List<StreamExtent> result = new List<StreamExtent>();
-
-            long clusterSize = _file.Context.BiosParameterBlock.BytesPerCluster;
-            if (_attr.IsNonResident)
-            {
-                Range<long, long>[] clusters = _attr.GetClusters();
-                foreach (var clusterRange in clusters)
-                {
-                    result.Add(new StreamExtent(clusterRange.Offset * clusterSize, clusterRange.Count * clusterSize));
-                }
-            }
-            else
-            {
-                result.Add(new StreamExtent(_attr.OffsetToAbsolutePos(0), _attr.Length));
-            }
-
-            return result.ToArray();
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/NtfsTransaction.cs b/DiscUtils/Ntfs/NtfsTransaction.cs
deleted file mode 100644
index f7978bd..0000000
--- a/DiscUtils/Ntfs/NtfsTransaction.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-
-    internal sealed class NtfsTransaction : IDisposable
-    {
-        [ThreadStatic]
-        private static NtfsTransaction s_instance;
-
-        private bool _ownRecord;
-
-        private DateTime _timestamp;
-
-        public NtfsTransaction()
-        {
-            if (s_instance == null)
-            {
-                s_instance = this;
-                _timestamp = DateTime.UtcNow;
-                _ownRecord = true;
-            }
-        }
-
-        public static NtfsTransaction Current
-        {
-            get { return s_instance; }
-        }
-
-        public DateTime Timestamp
-        {
-            get { return _timestamp; }
-        }
-
-        public void Dispose()
-        {
-            if (_ownRecord)
-            {
-                s_instance = null;
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/ObjectId.cs b/DiscUtils/Ntfs/ObjectId.cs
deleted file mode 100644
index df484b0..0000000
--- a/DiscUtils/Ntfs/ObjectId.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.IO;
-
-    internal sealed class ObjectId : IByteArraySerializable, IDiagnosticTraceable
-    {
-        public Guid Id;
-
-        public int Size
-        {
-            get { return 16; }
-        }
-
-        public int ReadFrom(byte[] buffer, int offset)
-        {
-            Id = Utilities.ToGuidLittleEndian(buffer, offset);
-            return 16;
-        }
-
-        public void WriteTo(byte[] buffer, int offset)
-        {
-            Utilities.WriteBytesLittleEndian(Id, buffer, offset);
-        }
-
-        public void Dump(TextWriter writer, string indent)
-        {
-            writer.WriteLine(indent + "  Object ID: " + Id);
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/ObjectIdRecord.cs b/DiscUtils/Ntfs/ObjectIdRecord.cs
deleted file mode 100644
index 59dd958..0000000
--- a/DiscUtils/Ntfs/ObjectIdRecord.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Globalization;
-
-    internal sealed class ObjectIdRecord : IByteArraySerializable
-    {
-        public FileRecordReference MftReference;
-        public Guid BirthVolumeId;
-        public Guid BirthObjectId;
-        public Guid BirthDomainId;
-
-        public int Size
-        {
-            get { return 0x38; }
-        }
-
-        public int ReadFrom(byte[] buffer, int offset)
-        {
-            MftReference = new FileRecordReference();
-            MftReference.ReadFrom(buffer, offset);
-
-            BirthVolumeId = Utilities.ToGuidLittleEndian(buffer, offset + 0x08);
-            BirthObjectId = Utilities.ToGuidLittleEndian(buffer, offset + 0x18);
-            BirthDomainId = Utilities.ToGuidLittleEndian(buffer, offset + 0x28);
-            return 0x38;
-        }
-
-        public void WriteTo(byte[] buffer, int offset)
-        {
-            MftReference.WriteTo(buffer, offset);
-            Utilities.WriteBytesLittleEndian(BirthVolumeId, buffer, offset + 0x08);
-            Utilities.WriteBytesLittleEndian(BirthObjectId, buffer, offset + 0x18);
-            Utilities.WriteBytesLittleEndian(BirthDomainId, buffer, offset + 0x28);
-        }
-
-        public override string ToString()
-        {
-            return string.Format(CultureInfo.InvariantCulture, "[Data-MftRef:{0},BirthVolId:{1},BirthObjId:{2},BirthDomId:{3}]", MftReference, BirthVolumeId, BirthObjectId, BirthDomainId);
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/ObjectIds.cs b/DiscUtils/Ntfs/ObjectIds.cs
deleted file mode 100644
index cda68cf..0000000
--- a/DiscUtils/Ntfs/ObjectIds.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-
-    internal sealed class ObjectIds
-    {
-        private IndexView<IndexKey, ObjectIdRecord> _index;
-        private File _file;
-
-        public ObjectIds(File file)
-        {
-            _file = file;
-            _index = new IndexView<IndexKey, ObjectIdRecord>(file.GetIndex("$O"));
-        }
-
-        internal IEnumerable<KeyValuePair<Guid, ObjectIdRecord>> All
-        {
-            get
-            {
-                foreach (var record in _index.Entries)
-                {
-                    yield return new KeyValuePair<Guid, ObjectIdRecord>(record.Key.Id, record.Value);
-                }
-            }
-        }
-
-        internal void Add(Guid objId, FileRecordReference mftRef, Guid birthId, Guid birthVolumeId, Guid birthDomainId)
-        {
-            IndexKey newKey = new IndexKey();
-            newKey.Id = objId;
-
-            ObjectIdRecord newData = new ObjectIdRecord();
-            newData.MftReference = mftRef;
-            newData.BirthObjectId = birthId;
-            newData.BirthVolumeId = birthVolumeId;
-            newData.BirthDomainId = birthDomainId;
-
-            _index[newKey] = newData;
-            _file.UpdateRecordInMft();
-        }
-
-        internal void Remove(Guid objId)
-        {
-            IndexKey key = new IndexKey();
-            key.Id = objId;
-
-            _index.Remove(key);
-            _file.UpdateRecordInMft();
-        }
-
-        internal bool TryGetValue(Guid objId, out ObjectIdRecord value)
-        {
-            IndexKey key = new IndexKey();
-            key.Id = objId;
-
-            return _index.TryGetValue(key, out value);
-        }
-
-        internal void Dump(TextWriter writer, string indent)
-        {
-            writer.WriteLine(indent + "OBJECT ID INDEX");
-
-            foreach (var entry in _index.Entries)
-            {
-                writer.WriteLine(indent + "  OBJECT ID INDEX ENTRY");
-                writer.WriteLine(indent + "             Id: " + entry.Key.Id);
-                writer.WriteLine(indent + "  MFT Reference: " + entry.Value.MftReference);
-                writer.WriteLine(indent + "   Birth Volume: " + entry.Value.BirthVolumeId);
-                writer.WriteLine(indent + "       Birth Id: " + entry.Value.BirthObjectId);
-                writer.WriteLine(indent + "   Birth Domain: " + entry.Value.BirthDomainId);
-            }
-        }
-
-        internal sealed class IndexKey : IByteArraySerializable
-        {
-            public Guid Id;
-
-            public int Size
-            {
-                get { return 16; }
-            }
-
-            public int ReadFrom(byte[] buffer, int offset)
-            {
-                Id = Utilities.ToGuidLittleEndian(buffer, offset + 0);
-                return 16;
-            }
-
-            public void WriteTo(byte[] buffer, int offset)
-            {
-                Utilities.WriteBytesLittleEndian(Id, buffer, offset + 0);
-            }
-
-            public override string ToString()
-            {
-                return string.Format(CultureInfo.InvariantCulture, "[Key-Id:{0}]", Id);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/Quotas.cs b/DiscUtils/Ntfs/Quotas.cs
deleted file mode 100644
index f568f20..0000000
--- a/DiscUtils/Ntfs/Quotas.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Globalization;
-    using System.IO;
-    using System.Security.Principal;
-
-    internal sealed class Quotas
-    {
-        private IndexView<OwnerKey, OwnerRecord> _ownerIndex;
-        private IndexView<OwnerRecord, QuotaRecord> _quotaIndex;
-
-        public Quotas(File file)
-        {
-            _ownerIndex = new IndexView<OwnerKey, OwnerRecord>(file.GetIndex("$O"));
-            _quotaIndex = new IndexView<OwnerRecord, QuotaRecord>(file.GetIndex("$Q"));
-        }
-
-        public static Quotas Initialize(File file)
-        {
-            Index ownerIndex = file.CreateIndex("$O", (AttributeType)0, AttributeCollationRule.Sid);
-            Index quotaIndox = file.CreateIndex("$Q", (AttributeType)0, AttributeCollationRule.UnsignedLong);
-
-            IndexView<OwnerKey, OwnerRecord> ownerIndexView = new IndexView<OwnerKey, OwnerRecord>(ownerIndex);
-            IndexView<OwnerRecord, QuotaRecord> quotaIndexView = new IndexView<OwnerRecord, QuotaRecord>(quotaIndox);
-
-            OwnerKey adminSid = new OwnerKey(new SecurityIdentifier(WellKnownSidType.BuiltinAdministratorsSid, null));
-            OwnerRecord adminOwnerId = new OwnerRecord(256);
-
-            ownerIndexView[adminSid] = adminOwnerId;
-
-            quotaIndexView[new OwnerRecord(1)] = new QuotaRecord(null);
-            quotaIndexView[adminOwnerId] = new QuotaRecord(adminSid.Sid);
-
-            return new Quotas(file);
-        }
-
-        public void Dump(TextWriter writer, string indent)
-        {
-            writer.WriteLine(indent + "QUOTAS");
-
-            writer.WriteLine(indent + "  OWNER INDEX");
-            foreach (var entry in _ownerIndex.Entries)
-            {
-                writer.WriteLine(indent + "    OWNER INDEX ENTRY");
-                writer.WriteLine(indent + "            SID: " + entry.Key.Sid);
-                writer.WriteLine(indent + "       Owner Id: " + entry.Value.OwnerId);
-            }
-
-            writer.WriteLine(indent + "  QUOTA INDEX");
-            foreach (var entry in _quotaIndex.Entries)
-            {
-                writer.WriteLine(indent + "    QUOTA INDEX ENTRY");
-                writer.WriteLine(indent + "           Owner Id: " + entry.Key.OwnerId);
-                writer.WriteLine(indent + "           User SID: " + entry.Value.Sid);
-                writer.WriteLine(indent + "            Changed: " + entry.Value.ChangeTime);
-                writer.WriteLine(indent + "           Exceeded: " + entry.Value.ExceededTime);
-                writer.WriteLine(indent + "         Bytes Used: " + entry.Value.BytesUsed);
-                writer.WriteLine(indent + "              Flags: " + entry.Value.Flags);
-                writer.WriteLine(indent + "         Hard Limit: " + entry.Value.HardLimit);
-                writer.WriteLine(indent + "      Warning Limit: " + entry.Value.WarningLimit);
-                writer.WriteLine(indent + "            Version: " + entry.Value.Version);
-            }
-        }
-
-        internal sealed class OwnerKey : IByteArraySerializable
-        {
-            public SecurityIdentifier Sid;
-
-            public OwnerKey()
-            {
-            }
-
-            public OwnerKey(SecurityIdentifier sid)
-            {
-                Sid = sid;
-            }
-
-            public int Size
-            {
-                get { return Sid.BinaryLength; }
-            }
-
-            public int ReadFrom(byte[] buffer, int offset)
-            {
-                Sid = new SecurityIdentifier(buffer, offset);
-                return Sid.BinaryLength;
-            }
-
-            public void WriteTo(byte[] buffer, int offset)
-            {
-                Sid.GetBinaryForm(buffer, offset);
-            }
-
-            public override string ToString()
-            {
-                return string.Format(CultureInfo.InvariantCulture, "[Sid:{0}]", Sid);
-            }
-        }
-
-        internal sealed class OwnerRecord : IByteArraySerializable
-        {
-            public int OwnerId;
-
-            public OwnerRecord()
-            {
-            }
-
-            public OwnerRecord(int ownerId)
-            {
-                OwnerId = ownerId;
-            }
-
-            public int Size
-            {
-                get { return 4; }
-            }
-
-            public int ReadFrom(byte[] buffer, int offset)
-            {
-                OwnerId = Utilities.ToInt32LittleEndian(buffer, offset);
-                return 4;
-            }
-
-            public void WriteTo(byte[] buffer, int offset)
-            {
-                Utilities.WriteBytesLittleEndian(OwnerId, buffer, offset);
-            }
-
-            public override string ToString()
-            {
-                return "[OwnerId:" + OwnerId + "]";
-            }
-        }
-
-        internal sealed class QuotaRecord : IByteArraySerializable
-        {
-            public int Version;
-            public int Flags;
-            public long BytesUsed;
-            public DateTime ChangeTime;
-            public long WarningLimit;
-            public long HardLimit;
-            public long ExceededTime;
-            public SecurityIdentifier Sid;
-
-            public QuotaRecord()
-            {
-            }
-
-            public QuotaRecord(SecurityIdentifier sid)
-            {
-                Version = 2;
-                Flags = 1;
-                ChangeTime = DateTime.UtcNow;
-                WarningLimit = -1;
-                HardLimit = -1;
-                Sid = sid;
-            }
-
-            public int Size
-            {
-                get { return 0x30 + (Sid == null ? 0 : Sid.BinaryLength); }
-            }
-
-            public int ReadFrom(byte[] buffer, int offset)
-            {
-                Version = Utilities.ToInt32LittleEndian(buffer, offset);
-                Flags = Utilities.ToInt32LittleEndian(buffer, offset + 0x04);
-                BytesUsed = Utilities.ToInt64LittleEndian(buffer, offset + 0x08);
-                ChangeTime = DateTime.FromFileTimeUtc(Utilities.ToInt64LittleEndian(buffer, offset + 0x10));
-                WarningLimit = Utilities.ToInt64LittleEndian(buffer, offset + 0x18);
-                HardLimit = Utilities.ToInt64LittleEndian(buffer, offset + 0x20);
-                ExceededTime = Utilities.ToInt64LittleEndian(buffer, offset + 0x28);
-                if (buffer.Length - offset > 0x30)
-                {
-                    Sid = new SecurityIdentifier(buffer, offset + 0x30);
-                    return 0x30 + Sid.BinaryLength;
-                }
-
-                return 0x30;
-            }
-
-            public void WriteTo(byte[] buffer, int offset)
-            {
-                Utilities.WriteBytesLittleEndian(Version, buffer, offset);
-                Utilities.WriteBytesLittleEndian(Flags, buffer, offset + 0x04);
-                Utilities.WriteBytesLittleEndian(BytesUsed, buffer, offset + 0x08);
-                Utilities.WriteBytesLittleEndian(ChangeTime.ToFileTimeUtc(), buffer, offset + 0x10);
-                Utilities.WriteBytesLittleEndian(WarningLimit, buffer, offset + 0x18);
-                Utilities.WriteBytesLittleEndian(HardLimit, buffer, offset + 0x20);
-                Utilities.WriteBytesLittleEndian(ExceededTime, buffer, offset + 0x28);
-                if (Sid != null)
-                {
-                    Sid.GetBinaryForm(buffer, offset + 0x30);
-                }
-            }
-
-            public override string ToString()
-            {
-                return "[V:" + Version + ",F:" + Flags + ",BU:" + BytesUsed + ",CT:" + ChangeTime + ",WL:" + WarningLimit + ",HL:" + HardLimit + ",ET:" + ExceededTime + ",SID:" + Sid + "]";
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/RawClusterStream.cs b/DiscUtils/Ntfs/RawClusterStream.cs
deleted file mode 100644
index afd8bd9..0000000
--- a/DiscUtils/Ntfs/RawClusterStream.cs
+++ /dev/null
@@ -1,368 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using DiscUtils;
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-
-    /// <summary>
-    /// Low-level non-resident attribute operations.
-    /// </summary>
-    /// <remarks>
-    /// Responsible for:
-    /// * Cluster Allocation / Release
-    /// * Reading clusters from disk
-    /// * Writing clusters to disk
-    /// * Substituting zeros for 'sparse'/'unallocated' clusters
-    /// Not responsible for:
-    /// * Compression / Decompression
-    /// * Extending attributes.
-    /// </remarks>
-    internal sealed class RawClusterStream : ClusterStream
-    {
-        private INtfsContext _context;
-        private Stream _fsStream;
-        private int _bytesPerCluster;
-        private CookedDataRuns _cookedRuns;
-        private bool _isMft;
-
-        public RawClusterStream(INtfsContext context, CookedDataRuns cookedRuns, bool isMft)
-        {
-            _context = context;
-            _cookedRuns = cookedRuns;
-            _isMft = isMft;
-
-            _fsStream = _context.RawStream;
-            _bytesPerCluster = context.BiosParameterBlock.BytesPerCluster;
-        }
-
-        public override long AllocatedClusterCount
-        {
-            get
-            {
-                long total = 0;
-                for (int i = 0; i < _cookedRuns.Count; ++i)
-                {
-                    CookedDataRun run = _cookedRuns[i];
-                    total += run.IsSparse ? 0 : run.Length;
-                }
-
-                return total;
-            }
-        }
-
-        public override IEnumerable<Range<long, long>> StoredClusters
-        {
-            get
-            {
-                Range<long, long> lastVcnRange = null;
-                List<Range<long, long>> ranges = new List<Range<long, long>>();
-
-                int runCount = _cookedRuns.Count;
-                for (int i = 0; i < runCount; i++)
-                {
-                    CookedDataRun cookedRun = _cookedRuns[i];
-                    if (!cookedRun.IsSparse)
-                    {
-                        long startPos = cookedRun.StartVcn;
-                        if (lastVcnRange != null && lastVcnRange.Offset + lastVcnRange.Count == startPos)
-                        {
-                            lastVcnRange = new Range<long, long>(lastVcnRange.Offset, lastVcnRange.Count + cookedRun.Length);
-                            ranges[ranges.Count - 1] = lastVcnRange;
-                        }
-                        else
-                        {
-                            lastVcnRange = new Range<long, long>(cookedRun.StartVcn, cookedRun.Length);
-                            ranges.Add(lastVcnRange);
-                        }
-                    }
-                }
-
-                return ranges;
-            }
-        }
-
-        public override bool IsClusterStored(long vcn)
-        {
-            int runIdx = _cookedRuns.FindDataRun(vcn, 0);
-            return !_cookedRuns[runIdx].IsSparse;
-        }
-
-        public bool AreAllClustersStored(long vcn, int count)
-        {
-            int runIdx = 0;
-            long focusVcn = vcn;
-            while (focusVcn < vcn + count)
-            {
-                runIdx = _cookedRuns.FindDataRun(focusVcn, runIdx);
-
-                CookedDataRun run = _cookedRuns[runIdx];
-                if (run.IsSparse)
-                {
-                    return false;
-                }
-
-                focusVcn = run.StartVcn + run.Length;
-            }
-
-            return true;
-        }
-
-        public override void ExpandToClusters(long numVirtualClusters, NonResidentAttributeRecord extent, bool allocate)
-        {
-            long totalVirtualClusters = _cookedRuns.NextVirtualCluster;
-            if (totalVirtualClusters < numVirtualClusters)
-            {
-                NonResidentAttributeRecord realExtent = extent;
-                if (realExtent == null)
-                {
-                    realExtent = _cookedRuns.Last.AttributeExtent;
-                }
-
-                DataRun newRun = new DataRun(0, numVirtualClusters - totalVirtualClusters, true);
-                realExtent.DataRuns.Add(newRun);
-                _cookedRuns.Append(newRun, extent);
-                realExtent.LastVcn = numVirtualClusters - 1;
-            }
-
-            if (allocate)
-            {
-                AllocateClusters(totalVirtualClusters, (int)(numVirtualClusters - totalVirtualClusters));
-            }
-        }
-
-        public override void TruncateToClusters(long numVirtualClusters)
-        {
-            if (numVirtualClusters < _cookedRuns.NextVirtualCluster)
-            {
-                ReleaseClusters(numVirtualClusters, (int)(_cookedRuns.NextVirtualCluster - numVirtualClusters));
-
-                int runIdx = _cookedRuns.FindDataRun(numVirtualClusters, 0);
-
-                if (numVirtualClusters != _cookedRuns[runIdx].StartVcn)
-                {
-                    _cookedRuns.SplitRun(runIdx, numVirtualClusters);
-                    runIdx++;
-                }
-
-                _cookedRuns.TruncateAt(runIdx);
-            }
-        }
-
-        public int AllocateClusters(long startVcn, int count)
-        {
-            if (startVcn + count > _cookedRuns.NextVirtualCluster)
-            {
-                throw new IOException("Attempt to allocate unknown clusters");
-            }
-
-            int totalAllocated = 0;
-            int runIdx = 0;
-
-            long focus = startVcn;
-            while (focus < startVcn + count)
-            {
-                runIdx = _cookedRuns.FindDataRun(focus, runIdx);
-                CookedDataRun run = _cookedRuns[runIdx];
-
-                if (run.IsSparse)
-                {
-                    if (focus != run.StartVcn)
-                    {
-                        _cookedRuns.SplitRun(runIdx, focus);
-                        runIdx++;
-                        run = _cookedRuns[runIdx];
-                    }
-
-                    long numClusters = Math.Min((startVcn + count) - focus, run.Length);
-                    if (numClusters != run.Length)
-                    {
-                        _cookedRuns.SplitRun(runIdx, focus + numClusters);
-                        run = _cookedRuns[runIdx];
-                    }
-
-                    long nextCluster = -1;
-                    for (int i = runIdx - 1; i >= 0; --i)
-                    {
-                        if (!_cookedRuns[i].IsSparse)
-                        {
-                            nextCluster = _cookedRuns[i].StartLcn + _cookedRuns[i].Length;
-                            break;
-                        }
-                    }
-
-                    var alloced = _context.ClusterBitmap.AllocateClusters(numClusters, nextCluster, _isMft, AllocatedClusterCount);
-
-                    List<DataRun> runs = new List<DataRun>();
-
-                    long lcn = runIdx == 0 ? 0 : _cookedRuns[runIdx - 1].StartLcn;
-                    foreach (var allocation in alloced)
-                    {
-                        runs.Add(new DataRun(allocation.First - lcn, allocation.Second, false));
-                        lcn = allocation.First;
-                    }
-
-                    _cookedRuns.MakeNonSparse(runIdx, runs);
-
-                    totalAllocated += (int)numClusters;
-                    focus += numClusters;
-                }
-                else
-                {
-                    focus = run.StartVcn + run.Length;
-                }
-            }
-
-            return totalAllocated;
-        }
-
-        public int ReleaseClusters(long startVcn, int count)
-        {
-            int runIdx = 0;
-
-            int totalReleased = 0;
-
-            long focus = startVcn;
-            while (focus < startVcn + count)
-            {
-                runIdx = _cookedRuns.FindDataRun(focus, runIdx);
-                CookedDataRun run = _cookedRuns[runIdx];
-
-                if (run.IsSparse)
-                {
-                    focus += run.Length;
-                }
-                else
-                {
-                    if (focus != run.StartVcn)
-                    {
-                        _cookedRuns.SplitRun(runIdx, focus);
-                        runIdx++;
-                        run = _cookedRuns[runIdx];
-                    }
-
-                    long numClusters = Math.Min((startVcn + count) - focus, run.Length);
-                    if (numClusters != run.Length)
-                    {
-                        _cookedRuns.SplitRun(runIdx, focus + numClusters);
-                        run = _cookedRuns[runIdx];
-                    }
-
-                    _context.ClusterBitmap.FreeClusters(new Range<long, long>(run.StartLcn, run.Length));
-                    _cookedRuns.MakeSparse(runIdx);
-                    totalReleased += (int)run.Length;
-
-                    focus += numClusters;
-                }
-            }
-
-            return totalReleased;
-        }
-
-        public override void ReadClusters(long startVcn, int count, byte[] buffer, int offset)
-        {
-            Utilities.AssertBufferParameters(buffer, offset, count * _bytesPerCluster);
-
-            int runIdx = 0;
-            int totalRead = 0;
-            while (totalRead < count)
-            {
-                long focusVcn = startVcn + totalRead;
-
-                runIdx = _cookedRuns.FindDataRun(focusVcn, runIdx);
-                CookedDataRun run = _cookedRuns[runIdx];
-
-                int toRead = (int)Math.Min(count - totalRead, run.Length - (focusVcn - run.StartVcn));
-
-                if (run.IsSparse)
-                {
-                    Array.Clear(buffer, offset + (totalRead * _bytesPerCluster), toRead * _bytesPerCluster);
-                }
-                else
-                {
-                    long lcn = _cookedRuns[runIdx].StartLcn + (focusVcn - run.StartVcn);
-                    _fsStream.Position = lcn * _bytesPerCluster;
-                    int numRead = Utilities.ReadFully(_fsStream, buffer, offset + (totalRead * _bytesPerCluster), toRead * _bytesPerCluster);
-                    if (numRead != toRead * _bytesPerCluster)
-                    {
-                        throw new IOException(string.Format(CultureInfo.InvariantCulture, "Short read, reading {0} clusters starting at LCN {1}", toRead, lcn));
-                    }
-                }
-
-                totalRead += toRead;
-            }
-        }
-
-        public override int WriteClusters(long startVcn, int count, byte[] buffer, int offset)
-        {
-            Utilities.AssertBufferParameters(buffer, offset, count * _bytesPerCluster);
-
-            int runIdx = 0;
-            int totalWritten = 0;
-            while (totalWritten < count)
-            {
-                long focusVcn = startVcn + totalWritten;
-
-                runIdx = _cookedRuns.FindDataRun(focusVcn, runIdx);
-                CookedDataRun run = _cookedRuns[runIdx];
-
-                if (run.IsSparse)
-                {
-                    throw new NotImplementedException("Writing to sparse datarun");
-                }
-
-                int toWrite = (int)Math.Min(count - totalWritten, run.Length - (focusVcn - run.StartVcn));
-
-                long lcn = _cookedRuns[runIdx].StartLcn + (focusVcn - run.StartVcn);
-                _fsStream.Position = lcn * _bytesPerCluster;
-                _fsStream.Write(buffer, offset + (totalWritten * _bytesPerCluster), toWrite * _bytesPerCluster);
-
-                totalWritten += toWrite;
-            }
-
-            return 0;
-        }
-
-        public override int ClearClusters(long startVcn, int count)
-        {
-            byte[] zeroBuffer = new byte[16 * _bytesPerCluster];
-
-            int clustersAllocated = 0;
-
-            int numWritten = 0;
-            while (numWritten < count)
-            {
-                int toWrite = Math.Min(count - numWritten, 16);
-
-                clustersAllocated += WriteClusters(startVcn + numWritten, toWrite, zeroBuffer, 0);
-
-                numWritten += toWrite;
-            }
-
-            return -clustersAllocated;
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/ReparsePointRecord.cs b/DiscUtils/Ntfs/ReparsePointRecord.cs
deleted file mode 100644
index 2647450..0000000
--- a/DiscUtils/Ntfs/ReparsePointRecord.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Globalization;
-    using System.IO;
-
-    internal sealed class ReparsePointRecord : IByteArraySerializable, IDiagnosticTraceable
-    {
-        public uint Tag;
-        public byte[] Content;
-
-        public int Size
-        {
-            get { return 8 + Content.Length; }
-        }
-
-        public int ReadFrom(byte[] buffer, int offset)
-        {
-            Tag = Utilities.ToUInt32LittleEndian(buffer, offset);
-            ushort length = Utilities.ToUInt16LittleEndian(buffer, offset + 4);
-            Content = new byte[length];
-            Array.Copy(buffer, offset + 8, Content, 0, length);
-            return 8 + length;
-        }
-
-        public void WriteTo(byte[] buffer, int offset)
-        {
-            Utilities.WriteBytesLittleEndian(Tag, buffer, offset);
-            Utilities.WriteBytesLittleEndian((ushort)Content.Length, buffer, offset + 4);
-            Utilities.WriteBytesLittleEndian((ushort)0, buffer, offset + 6);
-            Array.Copy(Content, 0, buffer, offset + 8, Content.Length);
-        }
-
-        public void Dump(TextWriter writer, string linePrefix)
-        {
-            writer.WriteLine(linePrefix + "                Tag: " + Tag.ToString("x", CultureInfo.InvariantCulture));
-
-            string hex = string.Empty;
-            for (int i = 0; i < Math.Min(Content.Length, 32); ++i)
-            {
-                hex = hex + string.Format(CultureInfo.InvariantCulture, " {0:X2}", Content[i]);
-            }
-
-            writer.WriteLine(linePrefix + "               Data:" + hex + (Content.Length > 32 ? "..." : string.Empty));
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/ReparsePoints.cs b/DiscUtils/Ntfs/ReparsePoints.cs
deleted file mode 100644
index 37f78aa..0000000
--- a/DiscUtils/Ntfs/ReparsePoints.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System.Globalization;
-    using System.IO;
-
-    internal class ReparsePoints
-    {
-        private IndexView<Key, Data> _index;
-        private File _file;
-
-        public ReparsePoints(File file)
-        {
-            _file = file;
-            _index = new IndexView<Key, Data>(file.GetIndex("$R"));
-        }
-
-        internal void Add(uint tag, FileRecordReference file)
-        {
-            Key newKey = new Key();
-            newKey.Tag = tag;
-            newKey.File = file;
-
-            Data data = new Data();
-
-            _index[newKey] = data;
-            _file.UpdateRecordInMft();
-        }
-
-        internal void Remove(uint tag, FileRecordReference file)
-        {
-            Key key = new Key();
-            key.Tag = tag;
-            key.File = file;
-
-            _index.Remove(key);
-            _file.UpdateRecordInMft();
-        }
-
-        internal void Dump(TextWriter writer, string indent)
-        {
-            writer.WriteLine(indent + "REPARSE POINT INDEX");
-
-            foreach (var entry in _index.Entries)
-            {
-                writer.WriteLine(indent + "  REPARSE POINT INDEX ENTRY");
-                writer.WriteLine(indent + "            Tag: " + entry.Key.Tag.ToString("x", CultureInfo.InvariantCulture));
-                writer.WriteLine(indent + "  MFT Reference: " + entry.Key.File);
-            }
-        }
-
-        internal sealed class Key : IByteArraySerializable
-        {
-            public uint Tag;
-            public FileRecordReference File;
-
-            public int Size
-            {
-                get { return 12; }
-            }
-
-            public int ReadFrom(byte[] buffer, int offset)
-            {
-                Tag = Utilities.ToUInt32LittleEndian(buffer, offset);
-                File = new FileRecordReference(Utilities.ToUInt64LittleEndian(buffer, offset + 4));
-                return 12;
-            }
-
-            public void WriteTo(byte[] buffer, int offset)
-            {
-                Utilities.WriteBytesLittleEndian(Tag, buffer, offset);
-                Utilities.WriteBytesLittleEndian(File.Value, buffer, offset + 4);
-                ////Utilities.WriteBytesLittleEndian((uint)0, buffer, offset + 12);
-            }
-
-            public override string ToString()
-            {
-                return string.Format(CultureInfo.InvariantCulture, "{0:x}:", Tag) + File;
-            }
-        }
-
-        internal sealed class Data : IByteArraySerializable
-        {
-            public int Size
-            {
-                get { return 0; }
-            }
-
-            public int ReadFrom(byte[] buffer, int offset)
-            {
-                return 0;
-            }
-
-            public void WriteTo(byte[] buffer, int offset)
-            {
-            }
-
-            public override string ToString()
-            {
-                return "<no data>";
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/ResidentAttributeRecord.cs b/DiscUtils/Ntfs/ResidentAttributeRecord.cs
deleted file mode 100644
index 1b6b710..0000000
--- a/DiscUtils/Ntfs/ResidentAttributeRecord.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.IO;
-    using System.Text;
-
-    internal sealed class ResidentAttributeRecord : AttributeRecord
-    {
-        private byte _indexedFlag;
-        private SparseMemoryBuffer _memoryBuffer;
-
-        public ResidentAttributeRecord(byte[] buffer, int offset, out int length)
-        {
-            Read(buffer, offset, out length);
-        }
-
-        public ResidentAttributeRecord(AttributeType type, string name, ushort id, bool indexed, AttributeFlags flags)
-            : base(type, name, id, flags)
-        {
-            _nonResidentFlag = 0;
-            _indexedFlag = (byte)(indexed ? 1 : 0);
-            _memoryBuffer = new SparseMemoryBuffer(1024);
-        }
-
-        public override long AllocatedLength
-        {
-            get { return Utilities.RoundUp(DataLength, 8); }
-            set { throw new NotSupportedException(); }
-        }
-
-        public override long StartVcn
-        {
-            get { return 0; }
-        }
-
-        public override long DataLength
-        {
-            get { return _memoryBuffer.Capacity; }
-            set { throw new NotSupportedException(); }
-        }
-
-        /// <summary>
-        /// The amount of initialized data in the attribute (in bytes).
-        /// </summary>
-        public override long InitializedDataLength
-        {
-            get { return (long)DataLength; }
-            set { throw new NotSupportedException(); }
-        }
-
-        public override int Size
-        {
-            get
-            {
-                byte nameLength = 0;
-                ushort nameOffset = 0x18;
-                if (Name != null)
-                {
-                    nameLength = (byte)Name.Length;
-                }
-
-                ushort dataOffset = (ushort)Utilities.RoundUp(nameOffset + (nameLength * 2), 8);
-                return (int)Utilities.RoundUp(dataOffset + _memoryBuffer.Capacity, 8);
-            }
-        }
-
-        public int DataOffset
-        {
-            get
-            {
-                byte nameLength = 0;
-                if (Name != null)
-                {
-                    nameLength = (byte)Name.Length;
-                }
-
-                return Utilities.RoundUp(0x18 + (nameLength * 2), 8);
-            }
-        }
-
-        public IBuffer DataBuffer
-        {
-            get { return _memoryBuffer; }
-        }
-
-        public override IBuffer GetReadOnlyDataBuffer(INtfsContext context)
-        {
-            return _memoryBuffer;
-        }
-
-        public override Range<long, long>[] GetClusters()
-        {
-            return new Range<long, long>[0];
-        }
-
-        public override int Write(byte[] buffer, int offset)
-        {
-            byte nameLength = 0;
-            ushort nameOffset = 0;
-            if (Name != null)
-            {
-                nameOffset = 0x18;
-                nameLength = (byte)Name.Length;
-            }
-
-            ushort dataOffset = (ushort)Utilities.RoundUp(0x18 + (nameLength * 2), 8);
-            int length = (int)Utilities.RoundUp(dataOffset + _memoryBuffer.Capacity, 8);
-
-            Utilities.WriteBytesLittleEndian((uint)_type, buffer, offset + 0x00);
-            Utilities.WriteBytesLittleEndian(length, buffer, offset + 0x04);
-            buffer[offset + 0x08] = _nonResidentFlag;
-            buffer[offset + 0x09] = nameLength;
-            Utilities.WriteBytesLittleEndian(nameOffset, buffer, offset + 0x0A);
-            Utilities.WriteBytesLittleEndian((ushort)_flags, buffer, offset + 0x0C);
-            Utilities.WriteBytesLittleEndian(_attributeId, buffer, offset + 0x0E);
-            Utilities.WriteBytesLittleEndian((int)_memoryBuffer.Capacity, buffer, offset + 0x10);
-            Utilities.WriteBytesLittleEndian(dataOffset, buffer, offset + 0x14);
-            buffer[offset + 0x16] = _indexedFlag;
-            buffer[offset + 0x17] = 0; // Padding
-
-            if (Name != null)
-            {
-                Array.Copy(Encoding.Unicode.GetBytes(Name), 0, buffer, offset + nameOffset, nameLength * 2);
-            }
-
-            _memoryBuffer.Read(0, buffer, offset + dataOffset, (int)_memoryBuffer.Capacity);
-
-            return (int)length;
-        }
-
-        public override void Dump(TextWriter writer, string indent)
-        {
-            base.Dump(writer, indent);
-            writer.WriteLine(indent + "     Data Length: " + DataLength);
-            writer.WriteLine(indent + "         Indexed: " + _indexedFlag);
-        }
-
-        protected override void Read(byte[] buffer, int offset, out int length)
-        {
-            base.Read(buffer, offset, out length);
-
-            uint dataLength = Utilities.ToUInt32LittleEndian(buffer, offset + 0x10);
-            ushort dataOffset = Utilities.ToUInt16LittleEndian(buffer, offset + 0x14);
-            _indexedFlag = buffer[offset + 0x16];
-
-            if (dataOffset + dataLength > length)
-            {
-                throw new IOException("Corrupt attribute, data outside of attribute");
-            }
-
-            _memoryBuffer = new SparseMemoryBuffer(1024);
-            _memoryBuffer.Write(0, buffer, offset + dataOffset, (int)dataLength);
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/SecurityDescriptor.cs b/DiscUtils/Ntfs/SecurityDescriptor.cs
deleted file mode 100644
index dc6a1e3..0000000
--- a/DiscUtils/Ntfs/SecurityDescriptor.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System.IO;
-    using System.Security.AccessControl;
-
-    internal sealed class SecurityDescriptor : IByteArraySerializable, IDiagnosticTraceable
-    {
-        private RawSecurityDescriptor _securityDescriptor;
-
-        public SecurityDescriptor()
-        {
-        }
-
-        public SecurityDescriptor(RawSecurityDescriptor secDesc)
-        {
-            _securityDescriptor = secDesc;
-        }
-
-        public RawSecurityDescriptor Descriptor
-        {
-            get { return _securityDescriptor; }
-            set { _securityDescriptor = value; }
-        }
-
-        public int Size
-        {
-            get
-            {
-                return _securityDescriptor.BinaryLength;
-            }
-        }
-
-        public uint CalcHash()
-        {
-            byte[] buffer = new byte[Size];
-            WriteTo(buffer, 0);
-            uint hash = 0;
-            for (int i = 0; i < buffer.Length / 4; ++i)
-            {
-                hash = Utilities.ToUInt32LittleEndian(buffer, i * 4) + ((hash << 3) | (hash >> 29));
-            }
-
-            return hash;
-        }
-
-        public int ReadFrom(byte[] buffer, int offset)
-        {
-            _securityDescriptor = new RawSecurityDescriptor(buffer, offset);
-            return _securityDescriptor.BinaryLength;
-        }
-
-        public void WriteTo(byte[] buffer, int offset)
-        {
-            // Write out the security descriptor manually because on NTFS the DACL is written
-            // before the Owner & Group.  Writing the components in the same order means the
-            // hashes will match for identical Security Descriptors.
-            ControlFlags controlFlags = _securityDescriptor.ControlFlags;
-            buffer[offset + 0x00] = 1;
-            buffer[offset + 0x01] = _securityDescriptor.ResourceManagerControl;
-            Utilities.WriteBytesLittleEndian((ushort)controlFlags, buffer, offset + 0x02);
-
-            // Blank out offsets, will fill later
-            for (int i = 0x04; i < 0x14; ++i)
-            {
-                buffer[offset + i] = 0;
-            }
-
-            int pos = 0x14;
-
-            RawAcl discAcl = _securityDescriptor.DiscretionaryAcl;
-            if ((controlFlags & ControlFlags.DiscretionaryAclPresent) != 0 && discAcl != null)
-            {
-                Utilities.WriteBytesLittleEndian(pos, buffer, offset + 0x10);
-                discAcl.GetBinaryForm(buffer, offset + pos);
-                pos += _securityDescriptor.DiscretionaryAcl.BinaryLength;
-            }
-            else
-            {
-                Utilities.WriteBytesLittleEndian((int)0, buffer, offset + 0x10);
-            }
-
-            RawAcl sysAcl = _securityDescriptor.SystemAcl;
-            if ((controlFlags & ControlFlags.SystemAclPresent) != 0 && sysAcl != null)
-            {
-                Utilities.WriteBytesLittleEndian(pos, buffer, offset + 0x0C);
-                sysAcl.GetBinaryForm(buffer, offset + pos);
-                pos += _securityDescriptor.SystemAcl.BinaryLength;
-            }
-            else
-            {
-                Utilities.WriteBytesLittleEndian((int)0, buffer, offset + 0x0C);
-            }
-
-            Utilities.WriteBytesLittleEndian(pos, buffer, offset + 0x04);
-            _securityDescriptor.Owner.GetBinaryForm(buffer, offset + pos);
-            pos += _securityDescriptor.Owner.BinaryLength;
-
-            Utilities.WriteBytesLittleEndian(pos, buffer, offset + 0x08);
-            _securityDescriptor.Group.GetBinaryForm(buffer, offset + pos);
-            pos += _securityDescriptor.Group.BinaryLength;
-
-            if (pos != _securityDescriptor.BinaryLength)
-            {
-                throw new IOException("Failed to write Security Descriptor correctly");
-            }
-        }
-
-        public void Dump(TextWriter writer, string indent)
-        {
-            writer.WriteLine(indent + "Descriptor: " + _securityDescriptor.GetSddlForm(AccessControlSections.All));
-        }
-
-        internal static RawSecurityDescriptor CalcNewObjectDescriptor(RawSecurityDescriptor parent, bool isContainer)
-        {
-            RawAcl sacl = InheritAcl(parent.SystemAcl, isContainer);
-            RawAcl dacl = InheritAcl(parent.DiscretionaryAcl, isContainer);
-
-            return new RawSecurityDescriptor(parent.ControlFlags, parent.Owner, parent.Group, sacl, dacl);
-        }
-
-        private static RawAcl InheritAcl(RawAcl parentAcl, bool isContainer)
-        {
-            AceFlags inheritTest = isContainer ? AceFlags.ContainerInherit : AceFlags.ObjectInherit;
-
-            RawAcl newAcl = null;
-            if (parentAcl != null)
-            {
-                newAcl = new RawAcl(parentAcl.Revision, parentAcl.Count);
-                foreach (GenericAce ace in parentAcl)
-                {
-                    if ((ace.AceFlags & inheritTest) != 0)
-                    {
-                        GenericAce newAce = ace.Copy();
-
-                        AceFlags newFlags = ace.AceFlags;
-                        if ((newFlags & AceFlags.NoPropagateInherit) != 0)
-                        {
-                            newFlags &= ~(AceFlags.ContainerInherit | AceFlags.ObjectInherit | AceFlags.NoPropagateInherit);
-                        }
-
-                        newFlags &= ~AceFlags.InheritOnly;
-                        newFlags |= AceFlags.Inherited;
-
-                        newAce.AceFlags = newFlags;
-                        newAcl.InsertAce(newAcl.Count, newAce);
-                    }
-                }
-            }
-
-            return newAcl;
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/SecurityDescriptorRecord.cs b/DiscUtils/Ntfs/SecurityDescriptorRecord.cs
deleted file mode 100644
index d7bf66b..0000000
--- a/DiscUtils/Ntfs/SecurityDescriptorRecord.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-
-    internal sealed class SecurityDescriptorRecord : IByteArraySerializable
-    {
-        public uint Hash;
-        public uint Id;
-        public long OffsetInFile;
-        public uint EntrySize;
-        public byte[] SecurityDescriptor;
-
-        public int Size
-        {
-            get { return SecurityDescriptor.Length + 0x14; }
-        }
-
-        public bool Read(byte[] buffer, int offset)
-        {
-            Hash = Utilities.ToUInt32LittleEndian(buffer, offset + 0x00);
-            Id = Utilities.ToUInt32LittleEndian(buffer, offset + 0x04);
-            OffsetInFile = Utilities.ToInt64LittleEndian(buffer, offset + 0x08);
-            EntrySize = Utilities.ToUInt32LittleEndian(buffer, offset + 0x10);
-
-            if (EntrySize > 0)
-            {
-                SecurityDescriptor = new byte[EntrySize - 0x14];
-                Array.Copy(buffer, offset + 0x14, SecurityDescriptor, 0, SecurityDescriptor.Length);
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        public int ReadFrom(byte[] buffer, int offset)
-        {
-            Read(buffer, offset);
-            return SecurityDescriptor.Length + 0x14;
-        }
-
-        public void WriteTo(byte[] buffer, int offset)
-        {
-            EntrySize = (uint)Size;
-
-            Utilities.WriteBytesLittleEndian(Hash, buffer, offset + 0x00);
-            Utilities.WriteBytesLittleEndian(Id, buffer, offset + 0x04);
-            Utilities.WriteBytesLittleEndian(OffsetInFile, buffer, offset + 0x08);
-            Utilities.WriteBytesLittleEndian(EntrySize, buffer, offset + 0x10);
-
-            Array.Copy(SecurityDescriptor, 0, buffer, offset + 0x14, SecurityDescriptor.Length);
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/SecurityDescriptors.cs b/DiscUtils/Ntfs/SecurityDescriptors.cs
deleted file mode 100644
index 13e796c..0000000
--- a/DiscUtils/Ntfs/SecurityDescriptors.cs
+++ /dev/null
@@ -1,383 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Globalization;
-    using System.IO;
-    using System.Security.AccessControl;
-
-    internal sealed class SecurityDescriptors : IDiagnosticTraceable
-    {
-        // File consists of pairs of duplicate blocks (one after the other), providing
-        // redundancy.  When a pair is full, the next pair is used.
-        private const int BlockSize = 0x40000;
-
-        private File _file;
-        private IndexView<HashIndexKey, HashIndexData> _hashIndex;
-        private IndexView<IdIndexKey, IdIndexData> _idIndex;
-        private uint _nextId;
-        private long _nextSpace;
-
-        public SecurityDescriptors(File file)
-        {
-            _file = file;
-            _hashIndex = new IndexView<HashIndexKey, HashIndexData>(file.GetIndex("$SDH"));
-            _idIndex = new IndexView<IdIndexKey, IdIndexData>(file.GetIndex("$SII"));
-
-            foreach (var entry in _idIndex.Entries)
-            {
-                if (entry.Key.Id > _nextId)
-                {
-                    _nextId = entry.Key.Id;
-                }
-
-                long end = entry.Value.SdsOffset + entry.Value.SdsLength;
-                if (end > _nextSpace)
-                {
-                    _nextSpace = end;
-                }
-            }
-
-            if (_nextId == 0)
-            {
-                _nextId = 256;
-            }
-            else
-            {
-                _nextId++;
-            }
-
-            _nextSpace = Utilities.RoundUp(_nextSpace, 16);
-        }
-
-        public static SecurityDescriptors Initialize(File file)
-        {
-            file.CreateIndex("$SDH", (AttributeType)0, AttributeCollationRule.SecurityHash);
-            file.CreateIndex("$SII", (AttributeType)0, AttributeCollationRule.UnsignedLong);
-            file.CreateStream(AttributeType.Data, "$SDS");
-
-            return new SecurityDescriptors(file);
-        }
-
-        public RawSecurityDescriptor GetDescriptorById(uint id)
-        {
-            IdIndexData data;
-            if (_idIndex.TryGetValue(new IdIndexKey(id), out data))
-            {
-                return ReadDescriptor(data).Descriptor;
-            }
-
-            return null;
-        }
-
-        public uint AddDescriptor(RawSecurityDescriptor newDescriptor)
-        {
-            // Search to see if this is a known descriptor
-            SecurityDescriptor newDescObj = new SecurityDescriptor(newDescriptor);
-            uint newHash = newDescObj.CalcHash();
-            byte[] newByteForm = new byte[newDescObj.Size];
-            newDescObj.WriteTo(newByteForm, 0);
-
-            foreach (var entry in _hashIndex.FindAll(new HashFinder(newHash)))
-            {
-                SecurityDescriptor stored = ReadDescriptor(entry.Value);
-
-                byte[] storedByteForm = new byte[stored.Size];
-                stored.WriteTo(storedByteForm, 0);
-
-                if (Utilities.AreEqual(newByteForm, storedByteForm))
-                {
-                    return entry.Value.Id;
-                }
-            }
-
-            long offset = _nextSpace;
-
-            // Write the new descriptor to the end of the existing descriptors
-            SecurityDescriptorRecord record = new SecurityDescriptorRecord();
-            record.SecurityDescriptor = newByteForm;
-            record.Hash = newHash;
-            record.Id = _nextId;
-
-            // If we'd overflow into our duplicate block, skip over it to the
-            // start of the next block
-            if (((offset + record.Size) / BlockSize) % 2 == 1)
-            {
-                _nextSpace = Utilities.RoundUp(offset, BlockSize * 2);
-                offset = _nextSpace;
-            }
-
-            record.OffsetInFile = offset;
-
-            byte[] buffer = new byte[record.Size];
-            record.WriteTo(buffer, 0);
-
-            using (Stream s = _file.OpenStream(AttributeType.Data, "$SDS", FileAccess.ReadWrite))
-            {
-                s.Position = _nextSpace;
-                s.Write(buffer, 0, buffer.Length);
-                s.Position = BlockSize + _nextSpace;
-                s.Write(buffer, 0, buffer.Length);
-            }
-
-            // Make the next descriptor land at the end of this one
-            _nextSpace = Utilities.RoundUp(_nextSpace + buffer.Length, 16);
-            _nextId++;
-
-            // Update the indexes
-            HashIndexData hashIndexData = new HashIndexData();
-            hashIndexData.Hash = record.Hash;
-            hashIndexData.Id = record.Id;
-            hashIndexData.SdsOffset = record.OffsetInFile;
-            hashIndexData.SdsLength = (int)record.EntrySize;
-
-            HashIndexKey hashIndexKey = new HashIndexKey();
-            hashIndexKey.Hash = record.Hash;
-            hashIndexKey.Id = record.Id;
-
-            _hashIndex[hashIndexKey] = hashIndexData;
-
-            IdIndexData idIndexData = new IdIndexData();
-            idIndexData.Hash = record.Hash;
-            idIndexData.Id = record.Id;
-            idIndexData.SdsOffset = record.OffsetInFile;
-            idIndexData.SdsLength = (int)record.EntrySize;
-
-            IdIndexKey idIndexKey = new IdIndexKey();
-            idIndexKey.Id = record.Id;
-
-            _idIndex[idIndexKey] = idIndexData;
-
-            _file.UpdateRecordInMft();
-
-            return record.Id;
-        }
-
-        public void Dump(TextWriter writer, string indent)
-        {
-            writer.WriteLine(indent + "SECURITY DESCRIPTORS");
-
-            using (Stream s = _file.OpenStream(AttributeType.Data, "$SDS", FileAccess.Read))
-            {
-                byte[] buffer = Utilities.ReadFully(s, (int)s.Length);
-
-                foreach (var entry in _idIndex.Entries)
-                {
-                    int pos = (int)entry.Value.SdsOffset;
-
-                    SecurityDescriptorRecord rec = new SecurityDescriptorRecord();
-                    if (!rec.Read(buffer, pos))
-                    {
-                        break;
-                    }
-
-                    string secDescStr = "--unknown--";
-                    if (rec.SecurityDescriptor[0] != 0)
-                    {
-                        RawSecurityDescriptor sd = new RawSecurityDescriptor(rec.SecurityDescriptor, 0);
-                        secDescStr = sd.GetSddlForm(AccessControlSections.All);
-                    }
-
-                    writer.WriteLine(indent + "  SECURITY DESCRIPTOR RECORD");
-                    writer.WriteLine(indent + "           Hash: " + rec.Hash);
-                    writer.WriteLine(indent + "             Id: " + rec.Id);
-                    writer.WriteLine(indent + "    File Offset: " + rec.OffsetInFile);
-                    writer.WriteLine(indent + "           Size: " + rec.EntrySize);
-                    writer.WriteLine(indent + "          Value: " + secDescStr);
-                }
-            }
-        }
-
-        private SecurityDescriptor ReadDescriptor(IndexData data)
-        {
-            using (Stream s = _file.OpenStream(AttributeType.Data, "$SDS", FileAccess.Read))
-            {
-                s.Position = data.SdsOffset;
-                byte[] buffer = Utilities.ReadFully(s, data.SdsLength);
-
-                SecurityDescriptorRecord record = new SecurityDescriptorRecord();
-                record.Read(buffer, 0);
-
-                return new SecurityDescriptor(new RawSecurityDescriptor(record.SecurityDescriptor, 0));
-            }
-        }
-
-        internal abstract class IndexData
-        {
-            public uint Hash;
-            public uint Id;
-            public long SdsOffset;
-            public int SdsLength;
-
-            public override string ToString()
-            {
-                return string.Format(CultureInfo.InvariantCulture, "[Data-Hash:{0},Id:{1},SdsOffset:{2},SdsLength:{3}]", Hash, Id, SdsOffset, SdsLength);
-            }
-        }
-
-        internal sealed class HashIndexKey : IByteArraySerializable
-        {
-            public uint Hash;
-            public uint Id;
-
-            public int Size
-            {
-                get { return 8; }
-            }
-
-            public int ReadFrom(byte[] buffer, int offset)
-            {
-                Hash = Utilities.ToUInt32LittleEndian(buffer, offset + 0);
-                Id = Utilities.ToUInt32LittleEndian(buffer, offset + 4);
-                return 8;
-            }
-
-            public void WriteTo(byte[] buffer, int offset)
-            {
-                Utilities.WriteBytesLittleEndian(Hash, buffer, offset + 0);
-                Utilities.WriteBytesLittleEndian(Id, buffer, offset + 4);
-            }
-
-            public override string ToString()
-            {
-                return string.Format(CultureInfo.InvariantCulture, "[Key-Hash:{0},Id:{1}]", Hash, Id);
-            }
-        }
-
-        internal sealed class HashIndexData : IndexData, IByteArraySerializable
-        {
-            public int Size
-            {
-                get { return 0x14; }
-            }
-
-            public int ReadFrom(byte[] buffer, int offset)
-            {
-                Hash = Utilities.ToUInt32LittleEndian(buffer, offset + 0x00);
-                Id = Utilities.ToUInt32LittleEndian(buffer, offset + 0x04);
-                SdsOffset = Utilities.ToInt64LittleEndian(buffer, offset + 0x08);
-                SdsLength = Utilities.ToInt32LittleEndian(buffer, offset + 0x10);
-                return 0x14;
-            }
-
-            public void WriteTo(byte[] buffer, int offset)
-            {
-                Utilities.WriteBytesLittleEndian(Hash, buffer, offset + 0x00);
-                Utilities.WriteBytesLittleEndian(Id, buffer, offset + 0x04);
-                Utilities.WriteBytesLittleEndian(SdsOffset, buffer, offset + 0x08);
-                Utilities.WriteBytesLittleEndian(SdsLength, buffer, offset + 0x10);
-                ////Array.Copy(new byte[] { (byte)'I', 0, (byte)'I', 0 }, 0, buffer, offset + 0x14, 4);
-            }
-        }
-
-        internal sealed class IdIndexKey : IByteArraySerializable
-        {
-            public uint Id;
-
-            public IdIndexKey()
-            {
-            }
-
-            public IdIndexKey(uint id)
-            {
-                Id = id;
-            }
-
-            public int Size
-            {
-                get { return 4; }
-            }
-
-            public int ReadFrom(byte[] buffer, int offset)
-            {
-                Id = Utilities.ToUInt32LittleEndian(buffer, offset + 0);
-                return 4;
-            }
-
-            public void WriteTo(byte[] buffer, int offset)
-            {
-                Utilities.WriteBytesLittleEndian(Id, buffer, offset + 0);
-            }
-
-            public override string ToString()
-            {
-                return string.Format(CultureInfo.InvariantCulture, "[Key-Id:{0}]", Id);
-            }
-        }
-
-        internal sealed class IdIndexData : IndexData, IByteArraySerializable
-        {
-            public int Size
-            {
-                get { return 0x14; }
-            }
-
-            public int ReadFrom(byte[] buffer, int offset)
-            {
-                Hash = Utilities.ToUInt32LittleEndian(buffer, offset + 0x00);
-                Id = Utilities.ToUInt32LittleEndian(buffer, offset + 0x04);
-                SdsOffset = Utilities.ToInt64LittleEndian(buffer, offset + 0x08);
-                SdsLength = Utilities.ToInt32LittleEndian(buffer, offset + 0x10);
-                return 0x14;
-            }
-
-            public void WriteTo(byte[] buffer, int offset)
-            {
-                Utilities.WriteBytesLittleEndian(Hash, buffer, offset + 0x00);
-                Utilities.WriteBytesLittleEndian(Id, buffer, offset + 0x04);
-                Utilities.WriteBytesLittleEndian(SdsOffset, buffer, offset + 0x08);
-                Utilities.WriteBytesLittleEndian(SdsLength, buffer, offset + 0x10);
-            }
-        }
-
-        private class HashFinder : IComparable<HashIndexKey>
-        {
-            private uint _toMatch;
-
-            public HashFinder(uint toMatch)
-            {
-                _toMatch = toMatch;
-            }
-
-            public int CompareTo(uint otherHash)
-            {
-                if (_toMatch < otherHash)
-                {
-                    return -1;
-                }
-                else if (_toMatch > otherHash)
-                {
-                    return 1;
-                }
-
-                return 0;
-            }
-
-            public int CompareTo(HashIndexKey other)
-            {
-                return CompareTo(other.Hash);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/ShortFileNameOption.cs b/DiscUtils/Ntfs/ShortFileNameOption.cs
deleted file mode 100644
index 98aba9d..0000000
--- a/DiscUtils/Ntfs/ShortFileNameOption.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    /// <summary>
-    /// Controls whether short file names are created automatically.
-    /// </summary>
-    public enum ShortFileNameOption
-    {
-        /// <summary>
-        /// Creates short file names, unless they've been disabled in NTFS.
-        /// </summary>
-        UseVolumeFlag,
-
-        /// <summary>
-        /// Does not create short names, ignoring the NTFS setting.
-        /// </summary>
-        Disabled,
-
-        /// <summary>
-        /// Always creates short names, ignoring the NTFS setting.
-        /// </summary>
-        Enabled
-    }
-}
diff --git a/DiscUtils/Ntfs/SparseClusterStream.cs b/DiscUtils/Ntfs/SparseClusterStream.cs
deleted file mode 100644
index a3c994c..0000000
--- a/DiscUtils/Ntfs/SparseClusterStream.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System.Collections.Generic;
-
-    internal sealed class SparseClusterStream : ClusterStream
-    {
-        private NtfsAttribute _attr;
-        private RawClusterStream _rawStream;
-
-        public SparseClusterStream(NtfsAttribute attr, RawClusterStream rawStream)
-        {
-            _attr = attr;
-            _rawStream = rawStream;
-        }
-
-        public override long AllocatedClusterCount
-        {
-            get { return _rawStream.AllocatedClusterCount; }
-        }
-
-        public override IEnumerable<Range<long, long>> StoredClusters
-        {
-            get { return _rawStream.StoredClusters; }
-        }
-
-        public override bool IsClusterStored(long vcn)
-        {
-            return _rawStream.IsClusterStored(vcn);
-        }
-
-        public override void ExpandToClusters(long numVirtualClusters, NonResidentAttributeRecord extent, bool allocate)
-        {
-            _rawStream.ExpandToClusters(CompressionStart(numVirtualClusters), extent, false);
-        }
-
-        public override void TruncateToClusters(long numVirtualClusters)
-        {
-            long alignedNum = CompressionStart(numVirtualClusters);
-            _rawStream.TruncateToClusters(alignedNum);
-            if (alignedNum != numVirtualClusters)
-            {
-                _rawStream.ReleaseClusters(numVirtualClusters, (int)(alignedNum - numVirtualClusters));
-            }
-        }
-
-        public override void ReadClusters(long startVcn, int count, byte[] buffer, int offset)
-        {
-            _rawStream.ReadClusters(startVcn, count, buffer, offset);
-        }
-
-        public override int WriteClusters(long startVcn, int count, byte[] buffer, int offset)
-        {
-            int clustersAllocated = 0;
-            clustersAllocated += _rawStream.AllocateClusters(startVcn, count);
-            clustersAllocated += _rawStream.WriteClusters(startVcn, count, buffer, offset);
-            return clustersAllocated;
-        }
-
-        public override int ClearClusters(long startVcn, int count)
-        {
-            return _rawStream.ReleaseClusters(startVcn, count);
-        }
-
-        private long CompressionStart(long vcn)
-        {
-            return Utilities.RoundUp(vcn, _attr.CompressionUnitSize);
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/StandardInformation.cs b/DiscUtils/Ntfs/StandardInformation.cs
deleted file mode 100644
index 82237bb..0000000
--- a/DiscUtils/Ntfs/StandardInformation.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.IO;
-
-    internal sealed class StandardInformation : IByteArraySerializable, IDiagnosticTraceable
-    {
-        public DateTime CreationTime;
-        public DateTime ModificationTime;
-        public DateTime MftChangedTime;
-        public DateTime LastAccessTime;
-        public FileAttributeFlags FileAttributes;
-        public uint MaxVersions;
-        public uint Version;
-        public uint ClassId;
-        public uint OwnerId;
-        public uint SecurityId;
-        public ulong QuotaCharged;
-        public ulong UpdateSequenceNumber;
-
-        private bool _haveExtraFields = true;
-
-        public int Size
-        {
-            get { return _haveExtraFields ? 0x48 : 0x30; }
-        }
-
-        public static StandardInformation InitializeNewFile(File file, FileAttributeFlags flags)
-        {
-            DateTime now = DateTime.UtcNow;
-
-            NtfsStream siStream = file.CreateStream(AttributeType.StandardInformation, null);
-            StandardInformation si = new StandardInformation();
-            si.CreationTime = now;
-            si.ModificationTime = now;
-            si.MftChangedTime = now;
-            si.LastAccessTime = now;
-            si.FileAttributes = flags;
-            siStream.SetContent(si);
-
-            return si;
-        }
-
-        public int ReadFrom(byte[] buffer, int offset)
-        {
-            CreationTime = ReadDateTime(buffer, 0x00);
-            ModificationTime = ReadDateTime(buffer, 0x08);
-            MftChangedTime = ReadDateTime(buffer, 0x10);
-            LastAccessTime = ReadDateTime(buffer, 0x18);
-            FileAttributes = (FileAttributeFlags)Utilities.ToUInt32LittleEndian(buffer, 0x20);
-            MaxVersions = Utilities.ToUInt32LittleEndian(buffer, 0x24);
-            Version = Utilities.ToUInt32LittleEndian(buffer, 0x28);
-            ClassId = Utilities.ToUInt32LittleEndian(buffer, 0x2C);
-
-            if (buffer.Length > 0x30)
-            {
-                OwnerId = Utilities.ToUInt32LittleEndian(buffer, 0x30);
-                SecurityId = Utilities.ToUInt32LittleEndian(buffer, 0x34);
-                QuotaCharged = Utilities.ToUInt64LittleEndian(buffer, 0x38);
-                UpdateSequenceNumber = Utilities.ToUInt64LittleEndian(buffer, 0x40);
-                _haveExtraFields = true;
-                return 0x48;
-            }
-            else
-            {
-                _haveExtraFields = false;
-                return 0x30;
-            }
-        }
-
-        public void WriteTo(byte[] buffer, int offset)
-        {
-            Utilities.WriteBytesLittleEndian(CreationTime.ToFileTimeUtc(), buffer, 0x00);
-            Utilities.WriteBytesLittleEndian(ModificationTime.ToFileTimeUtc(), buffer, 0x08);
-            Utilities.WriteBytesLittleEndian(MftChangedTime.ToFileTimeUtc(), buffer, 0x10);
-            Utilities.WriteBytesLittleEndian(LastAccessTime.ToFileTimeUtc(), buffer, 0x18);
-            Utilities.WriteBytesLittleEndian((uint)FileAttributes, buffer, 0x20);
-            Utilities.WriteBytesLittleEndian(MaxVersions, buffer, 0x24);
-            Utilities.WriteBytesLittleEndian(Version, buffer, 0x28);
-            Utilities.WriteBytesLittleEndian(ClassId, buffer, 0x2C);
-
-            if (_haveExtraFields)
-            {
-                Utilities.WriteBytesLittleEndian(OwnerId, buffer, 0x30);
-                Utilities.WriteBytesLittleEndian(SecurityId, buffer, 0x34);
-                Utilities.WriteBytesLittleEndian(QuotaCharged, buffer, 0x38);
-                Utilities.WriteBytesLittleEndian(UpdateSequenceNumber, buffer, 0x38);
-            }
-        }
-
-        public void Dump(TextWriter writer, string indent)
-        {
-            writer.WriteLine(indent + "      Creation Time: " + CreationTime);
-            writer.WriteLine(indent + "  Modification Time: " + ModificationTime);
-            writer.WriteLine(indent + "   MFT Changed Time: " + MftChangedTime);
-            writer.WriteLine(indent + "   Last Access Time: " + LastAccessTime);
-            writer.WriteLine(indent + "   File Permissions: " + FileAttributes);
-            writer.WriteLine(indent + "       Max Versions: " + MaxVersions);
-            writer.WriteLine(indent + "            Version: " + Version);
-            writer.WriteLine(indent + "           Class Id: " + ClassId);
-            writer.WriteLine(indent + "        Security Id: " + SecurityId);
-            writer.WriteLine(indent + "      Quota Charged: " + QuotaCharged);
-            writer.WriteLine(indent + "     Update Seq Num: " + UpdateSequenceNumber);
-        }
-
-        internal static FileAttributes ConvertFlags(FileAttributeFlags flags, bool isDirectory)
-        {
-            FileAttributes result = (FileAttributes)(((uint)flags) & 0xFFFF);
-
-            if (isDirectory)
-            {
-                result |= System.IO.FileAttributes.Directory;
-            }
-
-            return result;
-        }
-
-        internal static FileAttributeFlags SetFileAttributes(FileAttributes newAttributes, FileAttributeFlags existing)
-        {
-            return (FileAttributeFlags)(((uint)existing & 0xFFFF0000) | ((uint)newAttributes & 0xFFFF));
-        }
-
-        private static DateTime ReadDateTime(byte[] buffer, int offset)
-        {
-            try
-            {
-                return DateTime.FromFileTimeUtc(Utilities.ToInt64LittleEndian(buffer, offset));
-            }
-            catch (ArgumentException)
-            {
-                return DateTime.FromFileTimeUtc(0);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/StructuredNtfsAttribute.cs b/DiscUtils/Ntfs/StructuredNtfsAttribute.cs
deleted file mode 100644
index 80b5f18..0000000
--- a/DiscUtils/Ntfs/StructuredNtfsAttribute.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System.IO;
-
-    internal class StructuredNtfsAttribute<T> : NtfsAttribute
-        where T : IByteArraySerializable, IDiagnosticTraceable, new()
-    {
-        private T _structure;
-        private bool _initialized;
-        private bool _hasContent;
-
-        public StructuredNtfsAttribute(File file, FileRecordReference containingFile, AttributeRecord record)
-            : base(file, containingFile, record)
-        {
-            _structure = new T();
-        }
-
-        public T Content
-        {
-            get
-            {
-                Initialize();
-                return _structure;
-            }
-
-            set
-            {
-                _structure = value;
-                _hasContent = true;
-            }
-        }
-
-        public bool HasContent
-        {
-            get
-            {
-                Initialize();
-                return _hasContent;
-            }
-        }
-
-        public void Save()
-        {
-            byte[] buffer = new byte[_structure.Size];
-            _structure.WriteTo(buffer, 0);
-            using (Stream s = Open(FileAccess.Write))
-            {
-                s.Write(buffer, 0, buffer.Length);
-                s.SetLength(buffer.Length);
-            }
-        }
-
-        public override string ToString()
-        {
-            Initialize();
-            return _structure.ToString();
-        }
-
-        public override void Dump(TextWriter writer, string indent)
-        {
-            Initialize();
-            writer.WriteLine(indent + AttributeTypeName + " ATTRIBUTE (" + (Name == null ? "No Name" : Name) + ")");
-            _structure.Dump(writer, indent + "  ");
-
-            _primaryRecord.Dump(writer, indent + "  ");
-        }
-
-        private void Initialize()
-        {
-            if (!_initialized)
-            {
-                using (Stream s = Open(FileAccess.Read))
-                {
-                    byte[] buffer = Utilities.ReadFully(s, (int)Length);
-                    _structure.ReadFrom(buffer, 0);
-                    _hasContent = s.Length != 0;
-                }
-
-                _initialized = true;
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/UpperCase.cs b/DiscUtils/Ntfs/UpperCase.cs
deleted file mode 100644
index 7788c14..0000000
--- a/DiscUtils/Ntfs/UpperCase.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal sealed class UpperCase : IComparer<string>
-    {
-        private char[] _table;
-
-        public UpperCase(File file)
-        {
-            using (Stream s = file.OpenStream(AttributeType.Data, null, FileAccess.Read))
-            {
-                _table = new char[s.Length / 2];
-
-                byte[] buffer = Utilities.ReadFully(s, (int)s.Length);
-
-                for (int i = 0; i < _table.Length; ++i)
-                {
-                    _table[i] = (char)Utilities.ToUInt16LittleEndian(buffer, i * 2);
-                }
-            }
-        }
-
-        public int Compare(string x, string y)
-        {
-            int compLen = Math.Min(x.Length, y.Length);
-            for (int i = 0; i < compLen; ++i)
-            {
-                int result = _table[x[i]] - _table[y[i]];
-                if (result != 0)
-                {
-                    return result;
-                }
-            }
-
-            // Identical out to the shortest string, so length is now the
-            // determining factor.
-            return x.Length - y.Length;
-        }
-
-        public int Compare(byte[] x, int xOffset, int xLength, byte[] y, int yOffset, int yLength)
-        {
-            int compLen = Math.Min(xLength, yLength) / 2;
-            for (int i = 0; i < compLen; ++i)
-            {
-                char xCh = (char)(x[xOffset + (i * 2)] | (x[xOffset + ((i * 2) + 1)] << 8));
-                char yCh = (char)(y[yOffset + (i * 2)] | (y[yOffset + ((i * 2) + 1)] << 8));
-
-                int result = _table[xCh] - _table[yCh];
-                if (result != 0)
-                {
-                    return result;
-                }
-            }
-
-            // Identical out to the shortest string, so length is now the
-            // determining factor.
-            return xLength - yLength;
-        }
-
-        internal static UpperCase Initialize(File file)
-        {
-            byte[] buffer = new byte[(char.MaxValue + 1) * 2];
-            for (int i = Char.MinValue; i <= char.MaxValue; ++i)
-            {
-                Utilities.WriteBytesLittleEndian((ushort)char.ToUpperInvariant((char)i), buffer, i * 2);
-            }
-
-            using (Stream s = file.OpenStream(AttributeType.Data, null, FileAccess.ReadWrite))
-            {
-                s.Write(buffer, 0, buffer.Length);
-            }
-
-            return new UpperCase(file);
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/VolumeInformation.cs b/DiscUtils/Ntfs/VolumeInformation.cs
deleted file mode 100644
index cd77c31..0000000
--- a/DiscUtils/Ntfs/VolumeInformation.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System.IO;
-
-    internal sealed class VolumeInformation : IByteArraySerializable, IDiagnosticTraceable
-    {
-        public const int VersionNt4 = 0x0102;
-        public const int VersionW2k = 0x0300;
-        public const int VersionXp = 0x0301;
-
-        private byte _majorVersion;
-        private byte _minorVersion;
-        private VolumeInformationFlags _flags;
-
-        public VolumeInformation()
-        {
-        }
-
-        public VolumeInformation(byte major, byte minor, VolumeInformationFlags flags)
-        {
-            _majorVersion = major;
-            _minorVersion = minor;
-            _flags = flags;
-        }
-
-        public VolumeInformationFlags Flags
-        {
-            get { return _flags; }
-        }
-
-        public int Version
-        {
-            get { return ((int)_majorVersion) << 8 | _minorVersion; }
-        }
-
-        public int Size
-        {
-            get { return 0x0C; }
-        }
-
-        public int ReadFrom(byte[] buffer, int offset)
-        {
-            _majorVersion = buffer[offset + 0x08];
-            _minorVersion = buffer[offset + 0x09];
-            _flags = (VolumeInformationFlags)Utilities.ToUInt16LittleEndian(buffer, offset + 0x0A);
-            return 0x0C;
-        }
-
-        public void WriteTo(byte[] buffer, int offset)
-        {
-            Utilities.WriteBytesLittleEndian((ulong)0, buffer, offset + 0x00);
-            buffer[offset + 0x08] = _majorVersion;
-            buffer[offset + 0x09] = _minorVersion;
-            Utilities.WriteBytesLittleEndian((ushort)_flags, buffer, offset + 0x0A);
-        }
-
-        public void Dump(TextWriter writer, string indent)
-        {
-            writer.WriteLine(indent + "  Version: " + _majorVersion + "." + _minorVersion);
-            writer.WriteLine(indent + "    Flags: " + _flags);
-        }
-    }
-}
diff --git a/DiscUtils/Ntfs/VolumeInformationFlags.cs b/DiscUtils/Ntfs/VolumeInformationFlags.cs
deleted file mode 100644
index ee23294..0000000
--- a/DiscUtils/Ntfs/VolumeInformationFlags.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System;
-
-    [Flags]
-    internal enum VolumeInformationFlags : ushort
-    {
-        None = 0x00,
-        Dirty = 0x01,
-        ResizeLogFile = 0x02,
-        UpgradeOnMount = 0x04,
-        MountedOnNT4 = 0x08,
-        DeleteUSNUnderway = 0x10,
-        RepairObjectIds = 0x20,
-        DisableShortNameCreation = 0x80,
-        ModifiedByChkDsk = 0x8000
-    }
-}
diff --git a/DiscUtils/Ntfs/VolumeName.cs b/DiscUtils/Ntfs/VolumeName.cs
deleted file mode 100644
index 41969d5..0000000
--- a/DiscUtils/Ntfs/VolumeName.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Ntfs
-{
-    using System.IO;
-    using System.Text;
-
-    internal sealed class VolumeName : IByteArraySerializable, IDiagnosticTraceable
-    {
-        private string _name;
-
-        public VolumeName()
-        {
-        }
-
-        public VolumeName(string name)
-        {
-            _name = name;
-        }
-
-        public string Name
-        {
-            get { return _name; }
-        }
-
-        public int Size
-        {
-            get { return Encoding.Unicode.GetByteCount(_name); }
-        }
-
-        public int ReadFrom(byte[] buffer, int offset)
-        {
-            _name = Encoding.Unicode.GetString(buffer, offset, buffer.Length - offset);
-            return buffer.Length - offset;
-        }
-
-        public void WriteTo(byte[] buffer, int offset)
-        {
-            Encoding.Unicode.GetBytes(_name, 0, _name.Length, buffer, offset);
-        }
-
-        public void Dump(TextWriter writer, string indent)
-        {
-            writer.WriteLine(indent + "  Volume Name: " + _name);
-        }
-    }
-}
diff --git a/DiscUtils/Numbers.cs b/DiscUtils/Numbers.cs
deleted file mode 100644
index 6bc2a10..0000000
--- a/DiscUtils/Numbers.cs
+++ /dev/null
@@ -1,258 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-
-    internal static class Numbers<T>
-        where T : struct, IComparable<T>, IEquatable<T>
-    {
-        public static readonly T Zero = default(T);
-        public static readonly T One = GetOne();
-        public static readonly DualParamFn Add = GetAdd();
-        public static readonly DualParamFn Subtract = GetSubtract();
-        public static readonly DualParamFn Multiply = GetMultiply();
-        public static readonly DualParamFn Divide = GetDivide();
-        public static readonly DualParamFn RoundUp = GetRoundUp();
-        public static readonly DualParamFn RoundDown = GetRoundDown();
-        public static readonly DualParamFn Ceil = GetCeil();
-        public static readonly ConvertLongFn ConvertLong = GetConvertLong();
-        public static readonly ConvertIntFn ConvertInt = GetConvertInt();
-
-        public delegate T NoParamFn();
-
-        public delegate T DualParamFn(T a, T b);
-
-        public delegate bool ComparisonFn(T a, T b);
-
-        public delegate T ConvertLongFn(long a);
-
-        public delegate T ConvertIntFn(int a);
-
-        private delegate long LongNoParamFn();
-
-        private delegate long LongDualParamFn(long a, long b);
-
-        private delegate long LongConvertLongFn(long x);
-
-        private delegate long LongConvertIntFn(int x);
-
-        private delegate int IntNoParamFn();
-
-        private delegate int IntDualParamFn(int a, int b);
-
-        private delegate int IntConvertLongFn(long x);
-
-        private delegate int IntConvertIntFn(int x);
-
-        public static bool GreaterThan(T a, T b)
-        {
-            return a.CompareTo(b) > 0;
-        }
-
-        public static bool GreaterThanOrEqual(T a, T b)
-        {
-            return a.CompareTo(b) >= 0;
-        }
-
-        public static bool LessThan(T a, T b)
-        {
-            return a.CompareTo(b) < 0;
-        }
-
-        public static bool LessThanOrEqual(T a, T b)
-        {
-            return a.CompareTo(b) <= 0;
-        }
-
-        public static bool Equal(T a, T b)
-        {
-            return a.CompareTo(b) == 0;
-        }
-
-        public static bool NotEqual(T a, T b)
-        {
-            return a.CompareTo(b) != 0;
-        }
-
-        private static T GetOne()
-        {
-            if (typeof(T) == typeof(long))
-            {
-                return ((NoParamFn)(object)new LongNoParamFn(() => { return 1; }))();
-            }
-            else if (typeof(T) == typeof(int))
-            {
-                return ((NoParamFn)(object)new IntNoParamFn(() => { return 1; }))();
-            }
-            else
-            {
-                throw new NotSupportedException();
-            }
-        }
-
-        private static ConvertLongFn GetConvertLong()
-        {
-            if (typeof(T) == typeof(long))
-            {
-                return (ConvertLongFn)(object)new LongConvertLongFn((long x) => { return x; });
-            }
-            else if (typeof(T) == typeof(int))
-            {
-                return (ConvertLongFn)(object)new IntConvertLongFn((long x) => { return (int)x; });
-            }
-            else
-            {
-                throw new NotSupportedException();
-            }
-        }
-
-        private static ConvertIntFn GetConvertInt()
-        {
-            if (typeof(T) == typeof(long))
-            {
-                return (ConvertIntFn)(object)new LongConvertIntFn((int x) => { return x; });
-            }
-            else if (typeof(T) == typeof(int))
-            {
-                return (ConvertIntFn)(object)new IntConvertIntFn((int x) => { return x; });
-            }
-            else
-            {
-                throw new NotSupportedException();
-            }
-        }
-
-        private static DualParamFn GetAdd()
-        {
-            if (typeof(T) == typeof(long))
-            {
-                return (DualParamFn)(object)new LongDualParamFn((long a, long b) => { return a + b; });
-            }
-            else if (typeof(T) == typeof(int))
-            {
-                return (DualParamFn)(object)new IntDualParamFn((int a, int b) => { return a + b; });
-            }
-            else
-            {
-                throw new NotSupportedException();
-            }
-        }
-
-        private static DualParamFn GetSubtract()
-        {
-            if (typeof(T) == typeof(long))
-            {
-                return (DualParamFn)(object)new LongDualParamFn((long a, long b) => { return a - b; });
-            }
-            else if (typeof(T) == typeof(int))
-            {
-                return (DualParamFn)(object)new IntDualParamFn((int a, int b) => { return a - b; });
-            }
-            else
-            {
-                throw new NotSupportedException();
-            }
-        }
-
-        private static DualParamFn GetMultiply()
-        {
-            if (typeof(T) == typeof(long))
-            {
-                return (DualParamFn)(object)new LongDualParamFn((long a, long b) => { return a * b; });
-            }
-            else if (typeof(T) == typeof(int))
-            {
-                return (DualParamFn)(object)new IntDualParamFn((int a, int b) => { return a * b; });
-            }
-            else
-            {
-                throw new NotSupportedException();
-            }
-        }
-
-        private static DualParamFn GetDivide()
-        {
-            if (typeof(T) == typeof(long))
-            {
-                return (DualParamFn)(object)new LongDualParamFn((long a, long b) => { return a / b; });
-            }
-            else if (typeof(T) == typeof(int))
-            {
-                return (DualParamFn)(object)new IntDualParamFn((int a, int b) => { return a / b; });
-            }
-            else
-            {
-                throw new NotSupportedException();
-            }
-        }
-
-        private static DualParamFn GetRoundUp()
-        {
-            if (typeof(T) == typeof(long))
-            {
-                return (DualParamFn)(object)new LongDualParamFn((long a, long b) => { return ((a + b - 1) / b) * b; });
-            }
-            else if (typeof(T) == typeof(int))
-            {
-                return (DualParamFn)(object)new IntDualParamFn((int a, int b) => { return ((a + b - 1) / b) * b; });
-            }
-            else
-            {
-                throw new NotSupportedException();
-            }
-        }
-
-        private static DualParamFn GetRoundDown()
-        {
-            if (typeof(T) == typeof(long))
-            {
-                return (DualParamFn)(object)new LongDualParamFn((long a, long b) => { return (a / b) * b; });
-            }
-            else if (typeof(T) == typeof(int))
-            {
-                return (DualParamFn)(object)new IntDualParamFn((int a, int b) => { return (a / b) * b; });
-            }
-            else
-            {
-                throw new NotSupportedException();
-            }
-        }
-
-        private static DualParamFn GetCeil()
-        {
-            if (typeof(T) == typeof(long))
-            {
-                return (DualParamFn)(object)new LongDualParamFn((long a, long b) => { return (a + b - 1) / b; });
-            }
-            else if (typeof(T) == typeof(int))
-            {
-                return (DualParamFn)(object)new IntDualParamFn((int a, int b) => { return (a + b - 1) / b; });
-            }
-            else
-            {
-                throw new NotSupportedException();
-            }
-        }
-    }
-}
diff --git a/DiscUtils/ObjectCache.cs b/DiscUtils/ObjectCache.cs
deleted file mode 100644
index 0c51485..0000000
--- a/DiscUtils/ObjectCache.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// Caches objects.
-    /// </summary>
-    /// <typeparam name="K">The type of the object key.</typeparam>
-    /// <typeparam name="V">The type of the objects to cache.</typeparam>
-    /// <remarks>
-    /// Can be use for two purposes - to ensure there is only one instance of a given object,
-    /// and to prevent the need to recreate objects that are expensive to create.
-    /// </remarks>
-    internal class ObjectCache<K, V>
-    {
-        private const int MostRecentListSize = 20;
-        private const int PruneGap = 500;
-
-        private Dictionary<K, WeakReference> _entries;
-        private List<KeyValuePair<K, V>> _recent;
-        private int _nextPruneCount;
-
-        public ObjectCache()
-        {
-            _entries = new Dictionary<K, WeakReference>();
-            _recent = new List<KeyValuePair<K, V>>();
-        }
-
-        public V this[K key]
-        {
-            get
-            {
-                for (int i = 0; i < _recent.Count; ++i)
-                {
-                    KeyValuePair<K, V> recentEntry = _recent[i];
-                    if (recentEntry.Key.Equals(key))
-                    {
-                        MakeMostRecent(i);
-                        return recentEntry.Value;
-                    }
-                }
-
-                WeakReference wRef;
-                if (_entries.TryGetValue(key, out wRef))
-                {
-                    V val = (V)wRef.Target;
-                    if (val != null)
-                    {
-                        MakeMostRecent(key, val);
-                    }
-
-                    return val;
-                }
-
-                return default(V);
-            }
-
-            set
-            {
-                _entries[key] = new WeakReference(value);
-                MakeMostRecent(key, value);
-                PruneEntries();
-            }
-        }
-
-        internal void Remove(K key)
-        {
-            for (int i = 0; i < _recent.Count; ++i)
-            {
-                if (_recent[i].Key.Equals(key))
-                {
-                    _recent.RemoveAt(i);
-                    break;
-                }
-            }
-
-            _entries.Remove(key);
-        }
-
-        private void PruneEntries()
-        {
-            _nextPruneCount++;
-
-            if (_nextPruneCount > PruneGap)
-            {
-                List<K> toPrune = new List<K>();
-                foreach (var entry in _entries)
-                {
-                    if (!entry.Value.IsAlive)
-                    {
-                        toPrune.Add(entry.Key);
-                    }
-                }
-
-                foreach (var key in toPrune)
-                {
-                    _entries.Remove(key);
-                }
-
-                _nextPruneCount = 0;
-            }
-        }
-
-        private void MakeMostRecent(int i)
-        {
-            if (i == 0)
-            {
-                return;
-            }
-
-            KeyValuePair<K, V> entry = _recent[i];
-            _recent.RemoveAt(i);
-            _recent.Insert(0, entry);
-        }
-
-        private void MakeMostRecent(K key, V val)
-        {
-            while (_recent.Count >= MostRecentListSize)
-            {
-                _recent.RemoveAt(_recent.Count - 1);
-            }
-
-            _recent.Insert(0, new KeyValuePair<K, V>(key, val));
-        }
-    }
-}
diff --git a/DiscUtils/Ownership.cs b/DiscUtils/Ownership.cs
deleted file mode 100644
index e379c2d..0000000
--- a/DiscUtils/Ownership.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    /// <summary>
-    /// Enumeration used to indicate transfer of disposable objects.
-    /// </summary>
-    public enum Ownership
-    {
-        /// <summary>
-        /// Indicates there is no transfer of ownership.
-        /// </summary>
-        None,
-
-        /// <summary>
-        /// Indicates ownership of the stream is transfered, the owner should dispose of the stream when appropriate.
-        /// </summary>
-        Dispose
-    }
-}
diff --git a/DiscUtils/Partitions/BiosExtendedPartitionTable.cs b/DiscUtils/Partitions/BiosExtendedPartitionTable.cs
deleted file mode 100644
index ae6f44a..0000000
--- a/DiscUtils/Partitions/BiosExtendedPartitionTable.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Partitions
-{
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal class BiosExtendedPartitionTable
-    {
-        private Stream _disk;
-        private uint _firstSector;
-
-        public BiosExtendedPartitionTable(Stream disk, uint firstSector)
-        {
-            _disk = disk;
-            _firstSector = firstSector;
-        }
-
-        public BiosPartitionRecord[] GetPartitions()
-        {
-            List<BiosPartitionRecord> result = new List<BiosPartitionRecord>();
-
-            uint partPos = _firstSector;
-            while (partPos != 0)
-            {
-                _disk.Position = ((long)partPos) * Utilities.SectorSize;
-                byte[] sector = Utilities.ReadFully(_disk, Utilities.SectorSize);
-                if (sector[510] != 0x55 || sector[511] != 0xAA)
-                {
-                    throw new IOException("Invalid extended partition sector");
-                }
-
-                uint nextPartPos = 0;
-                for (int offset = 0x1BE; offset <= 0x1EE; offset += 0x10)
-                {
-                    BiosPartitionRecord thisPart = new BiosPartitionRecord(sector, offset, partPos, -1);
-
-                    if (thisPart.StartCylinder != 0 || thisPart.StartHead != 0 || thisPart.StartSector != 0)
-                    {
-                        if (thisPart.PartitionType != 0x05 && thisPart.PartitionType != 0x0F)
-                        {
-                            result.Add(thisPart);
-                        }
-                        else
-                        {
-                            nextPartPos = _firstSector + thisPart.LBAStart;
-                        }
-                    }
-                }
-
-                partPos = nextPartPos;
-            }
-
-            return result.ToArray();
-        }
-
-        /// <summary>
-        /// Gets all of the disk ranges containing partition table data.
-        /// </summary>
-        /// <returns>Set of stream extents, indicated as byte offset from the start of the disk.</returns>
-        public IEnumerable<StreamExtent> GetMetadataDiskExtents()
-        {
-            List<StreamExtent> extents = new List<StreamExtent>();
-
-            uint partPos = _firstSector;
-            while (partPos != 0)
-            {
-                extents.Add(new StreamExtent(((long)partPos) * Utilities.SectorSize, Utilities.SectorSize));
-
-                _disk.Position = ((long)partPos) * Utilities.SectorSize;
-                byte[] sector = Utilities.ReadFully(_disk, Utilities.SectorSize);
-                if (sector[510] != 0x55 || sector[511] != 0xAA)
-                {
-                    throw new IOException("Invalid extended partition sector");
-                }
-
-                uint nextPartPos = 0;
-                for (int offset = 0x1BE; offset <= 0x1EE; offset += 0x10)
-                {
-                    BiosPartitionRecord thisPart = new BiosPartitionRecord(sector, offset, partPos, -1);
-
-                    if (thisPart.StartCylinder != 0 || thisPart.StartHead != 0 || thisPart.StartSector != 0)
-                    {
-                        if (thisPart.PartitionType == 0x05 || thisPart.PartitionType == 0x0F)
-                        {
-                            nextPartPos = _firstSector + thisPart.LBAStart;
-                        }
-                    }
-                }
-
-                partPos = nextPartPos;
-            }
-
-            return extents;
-        }
-    }
-}
diff --git a/DiscUtils/Partitions/BiosPartitionInfo.cs b/DiscUtils/Partitions/BiosPartitionInfo.cs
deleted file mode 100644
index e6d9f9c..0000000
--- a/DiscUtils/Partitions/BiosPartitionInfo.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Partitions
-{
-    using System;
-
-    /// <summary>
-    /// Provides access to partition records in a BIOS (MBR) partition table.
-    /// </summary>
-    public sealed class BiosPartitionInfo : PartitionInfo
-    {
-        private BiosPartitionRecord _record;
-        private BiosPartitionTable _table;
-
-        internal BiosPartitionInfo(BiosPartitionTable table, BiosPartitionRecord record)
-        {
-            _table = table;
-            _record = record;
-        }
-
-        /// <summary>
-        /// Gets the first sector of the partion (relative to start of disk) as a Logical Block Address.
-        /// </summary>
-        public override long FirstSector
-        {
-            get { return _record.LBAStartAbsolute; }
-        }
-
-        /// <summary>
-        /// Gets the last sector of the partion (relative to start of disk) as a Logical Block Address (inclusive).
-        /// </summary>
-        public override long LastSector
-        {
-            get { return _record.LBAStartAbsolute + _record.LBALength - 1; }
-        }
-
-        /// <summary>
-        /// Always returns <see cref="System.Guid"/>.Empty.
-        /// </summary>
-        public override Guid GuidType
-        {
-            get { return Guid.Empty; }
-        }
-
-        /// <summary>
-        /// Gets the type of the partition.
-        /// </summary>
-        public override byte BiosType
-        {
-            get { return _record.PartitionType; }
-        }
-
-        /// <summary>
-        /// Gets the type of the partition as a string.
-        /// </summary>
-        public override string TypeAsString
-        {
-            get { return _record.FriendlyPartitionType; }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this partition is active (bootable).
-        /// </summary>
-        public bool IsActive
-        {
-            get { return _record.Status != 0; }
-        }
-
-        /// <summary>
-        /// Gets the start of the partition as a CHS address.
-        /// </summary>
-        public ChsAddress Start
-        {
-            get { return new ChsAddress(_record.StartCylinder, _record.StartHead, _record.StartSector); }
-        }
-
-        /// <summary>
-        /// Gets the end (inclusive) of the partition as a CHS address.
-        /// </summary>
-        public ChsAddress End
-        {
-            get { return new ChsAddress(_record.EndCylinder, _record.EndHead, _record.EndSector); }
-        }
-
-        /// <summary>
-        /// Gets the index of the partition in the primary partition table, or <c>-1</c> if not a primary partition.
-        /// </summary>
-        public int PrimaryIndex
-        {
-            get { return _record.Index; }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the partition is a primary (rather than extended) partition.
-        /// </summary>
-        public bool IsPrimary
-        {
-            get { return PrimaryIndex >= 0; }
-        }
-
-        internal override PhysicalVolumeType VolumeType
-        {
-            get { return PhysicalVolumeType.BiosPartition; }
-        }
-
-        /// <summary>
-        /// Opens a stream to access the content of the partition.
-        /// </summary>
-        /// <returns>The new stream.</returns>
-        public override SparseStream Open()
-        {
-            return _table.Open(_record);
-        }
-    }
-}
diff --git a/DiscUtils/Partitions/BiosPartitionRecord.cs b/DiscUtils/Partitions/BiosPartitionRecord.cs
deleted file mode 100644
index c8aa8f6..0000000
--- a/DiscUtils/Partitions/BiosPartitionRecord.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Partitions
-{
-    using System;
-
-    internal class BiosPartitionRecord : IComparable<BiosPartitionRecord>
-    {
-        private uint _lbaOffset;
-
-        private byte _status;
-        private ushort _startCylinder;
-        private byte _startHead;
-        private byte _startSector;
-        private byte _type;
-        private ushort _endCylinder;
-        private byte _endHead;
-        private byte _endSector;
-        private uint _lbaStart;
-        private uint _lbaLength;
-        private int _index;
-
-        public BiosPartitionRecord()
-        {
-        }
-
-        public BiosPartitionRecord(byte[] data, int offset, uint lbaOffset, int index)
-        {
-            _lbaOffset = lbaOffset;
-
-            _status = data[offset];
-            _startHead = data[offset + 1];
-            _startSector = (byte)(data[offset + 2] & 0x3F);
-            _startCylinder = (ushort)(data[offset + 3] | ((data[offset + 2] & 0xC0) << 2));
-            _type = data[offset + 4];
-            _endHead = data[offset + 5];
-            _endSector = (byte)(data[offset + 6] & 0x3F);
-            _endCylinder = (ushort)(data[offset + 7] | ((data[offset + 6] & 0xC0) << 2));
-            _lbaStart = Utilities.ToUInt32LittleEndian(data, offset + 8);
-            _lbaLength = Utilities.ToUInt32LittleEndian(data, offset + 12);
-            _index = index;
-        }
-
-        public bool IsValid
-        {
-            get
-            {
-                return _endHead != 0 || _endSector != 0 || _endCylinder != 0 || _lbaLength != 0;
-            }
-        }
-
-        public byte Status
-        {
-            get { return _status; }
-            set { _status = value; }
-        }
-
-        public ushort StartCylinder
-        {
-            get { return _startCylinder; }
-            set { _startCylinder = value; }
-        }
-
-        public byte StartHead
-        {
-            get { return _startHead; }
-            set { _startHead = value; }
-        }
-
-        public byte StartSector
-        {
-            get { return _startSector; }
-            set { _startSector = value; }
-        }
-
-        public byte PartitionType
-        {
-            get { return _type; }
-            set { _type = value; }
-        }
-
-        public string FriendlyPartitionType
-        {
-            get { return BiosPartitionTypes.ToString(_type); }
-        }
-
-        public ushort EndCylinder
-        {
-            get { return _endCylinder; }
-            set { _endCylinder = value; }
-        }
-
-        public byte EndHead
-        {
-            get { return _endHead; }
-            set { _endHead = value; }
-        }
-
-        public byte EndSector
-        {
-            get { return _endSector; }
-            set { _endSector = value; }
-        }
-
-        public uint LBAStart
-        {
-            get { return _lbaStart; }
-            set { _lbaStart = value; }
-        }
-
-        public uint LBALength
-        {
-            get { return _lbaLength; }
-            set { _lbaLength = value; }
-        }
-
-        public uint LBAStartAbsolute
-        {
-            get { return _lbaStart + _lbaOffset; }
-        }
-
-        public int Index
-        {
-            get { return _index; }
-        }
-
-        public int CompareTo(BiosPartitionRecord other)
-        {
-            return LBAStartAbsolute.CompareTo(other.LBAStartAbsolute);
-        }
-
-        internal void WriteTo(byte[] buffer, int offset)
-        {
-            buffer[offset] = _status;
-            buffer[offset + 1] = _startHead;
-            buffer[offset + 2] = (byte)((_startSector & 0x3F) | ((_startCylinder >> 2) & 0xC0));
-            buffer[offset + 3] = (byte)_startCylinder;
-            buffer[offset + 4] = _type;
-            buffer[offset + 5] = _endHead;
-            buffer[offset + 6] = (byte)((_endSector & 0x3F) | ((_endCylinder >> 2) & 0xC0));
-            buffer[offset + 7] = (byte)_endCylinder;
-            Utilities.WriteBytesLittleEndian((uint)_lbaStart, buffer, offset + 8);
-            Utilities.WriteBytesLittleEndian((uint)_lbaLength, buffer, offset + 12);
-        }
-    }
-}
diff --git a/DiscUtils/Partitions/BiosPartitionTable.cs b/DiscUtils/Partitions/BiosPartitionTable.cs
deleted file mode 100644
index fd6cca3..0000000
--- a/DiscUtils/Partitions/BiosPartitionTable.cs
+++ /dev/null
@@ -1,712 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Partitions
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Globalization;
-    using System.IO;
-
-    /// <summary>
-    /// Represents a BIOS (MBR) Partition Table.
-    /// </summary>
-    public sealed class BiosPartitionTable : PartitionTable
-    {
-        private Stream _diskData;
-        private Geometry _diskGeometry;
-
-        /// <summary>
-        /// Initializes a new instance of the BiosPartitionTable class.
-        /// </summary>
-        /// <param name="disk">The disk containing the partition table.</param>
-        public BiosPartitionTable(VirtualDisk disk)
-        {
-            Init(disk.Content, disk.BiosGeometry);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the BiosPartitionTable class.
-        /// </summary>
-        /// <param name="disk">The stream containing the disk data.</param>
-        /// <param name="diskGeometry">The geometry of the disk.</param>
-        public BiosPartitionTable(Stream disk, Geometry diskGeometry)
-        {
-            Init(disk, diskGeometry);
-        }
-
-        /// <summary>
-        /// Gets the GUID that uniquely identifies this disk, if supported (else returns <c>null</c>).
-        /// </summary>
-        public override Guid DiskGuid
-        {
-            get { return Guid.Empty; }
-        }
-
-        /// <summary>
-        /// Gets a collection of the partitions for storing Operating System file-systems.
-        /// </summary>
-        public ReadOnlyCollection<BiosPartitionInfo> BiosUserPartitions
-        {
-            get
-            {
-                List<BiosPartitionInfo> result = new List<BiosPartitionInfo>();
-                foreach (BiosPartitionRecord r in GetAllRecords())
-                {
-                    if (r.IsValid)
-                    {
-                        result.Add(new BiosPartitionInfo(this, r));
-                    }
-                }
-
-                return new ReadOnlyCollection<BiosPartitionInfo>(result);
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection of the partitions for storing Operating System file-systems.
-        /// </summary>
-        public override ReadOnlyCollection<PartitionInfo> Partitions
-        {
-            get
-            {
-                List<PartitionInfo> result = new List<PartitionInfo>();
-                foreach (BiosPartitionRecord r in GetAllRecords())
-                {
-                    if (r.IsValid)
-                    {
-                        result.Add(new BiosPartitionInfo(this, r));
-                    }
-                }
-
-                return new ReadOnlyCollection<PartitionInfo>(result);
-            }
-        }
-
-        /// <summary>
-        /// Makes a best guess at the geometry of a disk.
-        /// </summary>
-        /// <param name="disk">String containing the disk image to detect the geometry from.</param>
-        /// <returns>The detected geometry.</returns>
-        public static Geometry DetectGeometry(Stream disk)
-        {
-            if (disk.Length >= Utilities.SectorSize)
-            {
-                disk.Position = 0;
-                byte[] bootSector = Utilities.ReadFully(disk, Utilities.SectorSize);
-                if (bootSector[510] == 0x55 && bootSector[511] == 0xAA)
-                {
-                    byte maxHead = 0;
-                    byte maxSector = 0;
-                    foreach (var record in ReadPrimaryRecords(bootSector))
-                    {
-                        maxHead = Math.Max(maxHead, record.EndHead);
-                        maxSector = Math.Max(maxSector, record.EndSector);
-                    }
-
-                    if (maxHead > 0 && maxSector > 0)
-                    {
-                        int cylSize = (maxHead + 1) * maxSector * 512;
-                        return new Geometry((int)Utilities.Ceil(disk.Length, cylSize), maxHead + 1, maxSector);
-                    }
-                }
-            }
-
-            return Geometry.FromCapacity(disk.Length);
-        }
-
-        /// <summary>
-        /// Indicates if a stream contains a valid partition table.
-        /// </summary>
-        /// <param name="disk">The stream to inspect.</param>
-        /// <returns><c>true</c> if the partition table is valid, else <c>false</c>.</returns>
-        public static bool IsValid(Stream disk)
-        {
-            if (disk.Length < Utilities.SectorSize)
-            {
-                return false;
-            }
-
-            disk.Position = 0;
-            byte[] bootSector = Utilities.ReadFully(disk, Utilities.SectorSize);
-
-            // Check for the 'bootable sector' marker
-            if (bootSector[510] != 0x55 || bootSector[511] != 0xAA)
-            {
-                return false;
-            }
-
-            List<StreamExtent> knownPartitions = new List<StreamExtent>();
-            foreach (var record in ReadPrimaryRecords(bootSector))
-            {
-                // If the partition extends beyond the end of the disk, this is probably an invalid partition table
-                if (record.LBALength != 0xFFFFFFFF && (record.LBAStart + (long)record.LBALength) * Sizes.Sector > disk.Length)
-                {
-                    return false;
-                }
-
-                if (record.LBALength > 0)
-                {
-                    StreamExtent[] thisPartitionExtents = new StreamExtent[] { new StreamExtent(record.LBAStart, record.LBALength) };
-
-                    // If the partition intersects another partition, this is probably an invalid partition table
-                    foreach (var overlap in StreamExtent.Intersect(knownPartitions, thisPartitionExtents))
-                    {
-                        return false;
-                    }
-
-                    knownPartitions = new List<StreamExtent>(StreamExtent.Union(knownPartitions, thisPartitionExtents));
-                }
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// Creates a new partition table on a disk.
-        /// </summary>
-        /// <param name="disk">The disk to initialize.</param>
-        /// <returns>An object to access the newly created partition table.</returns>
-        public static BiosPartitionTable Initialize(VirtualDisk disk)
-        {
-            return Initialize(disk.Content, disk.BiosGeometry);
-        }
-
-        /// <summary>
-        /// Creates a new partition table on a disk containing a single partition.
-        /// </summary>
-        /// <param name="disk">The disk to initialize.</param>
-        /// <param name="type">The partition type for the single partition.</param>
-        /// <returns>An object to access the newly created partition table.</returns>
-        public static BiosPartitionTable Initialize(VirtualDisk disk, WellKnownPartitionType type)
-        {
-            BiosPartitionTable table = Initialize(disk.Content, disk.BiosGeometry);
-            table.Create(type, true);
-            return table;
-        }
-
-        /// <summary>
-        /// Creates a new partition table on a disk.
-        /// </summary>
-        /// <param name="disk">The stream containing the disk data.</param>
-        /// <param name="diskGeometry">The geometry of the disk.</param>
-        /// <returns>An object to access the newly created partition table.</returns>
-        public static BiosPartitionTable Initialize(Stream disk, Geometry diskGeometry)
-        {
-            Stream data = disk;
-
-            byte[] bootSector;
-            if (data.Length >= Utilities.SectorSize)
-            {
-                data.Position = 0;
-                bootSector = Utilities.ReadFully(data, Utilities.SectorSize);
-            }
-            else
-            {
-                bootSector = new byte[Utilities.SectorSize];
-            }
-
-            // Wipe all four 16-byte partition table entries
-            Array.Clear(bootSector, 0x01BE, 16 * 4);
-
-            // Marker bytes
-            bootSector[510] = 0x55;
-            bootSector[511] = 0xAA;
-
-            data.Position = 0;
-            data.Write(bootSector, 0, bootSector.Length);
-
-            return new BiosPartitionTable(disk, diskGeometry);
-        }
-
-        /// <summary>
-        /// Creates a new partition that encompasses the entire disk.
-        /// </summary>
-        /// <param name="type">The partition type.</param>
-        /// <param name="active">Whether the partition is active (bootable).</param>
-        /// <returns>The index of the partition.</returns>
-        /// <remarks>The partition table must be empty before this method is called,
-        /// otherwise IOException is thrown.</remarks>
-        public override int Create(WellKnownPartitionType type, bool active)
-        {
-            Geometry allocationGeometry = new Geometry(_diskData.Length, _diskGeometry.HeadsPerCylinder, _diskGeometry.SectorsPerTrack, _diskGeometry.BytesPerSector);
-
-            ChsAddress start = new ChsAddress(0, 1, 1);
-            ChsAddress last = allocationGeometry.LastSector;
-
-            long startLba = allocationGeometry.ToLogicalBlockAddress(start);
-            long lastLba = allocationGeometry.ToLogicalBlockAddress(last);
-
-            return CreatePrimaryByCylinder(0, allocationGeometry.Cylinders - 1, ConvertType(type, (lastLba - startLba) * Utilities.SectorSize), active);
-        }
-
-        /// <summary>
-        /// Creates a new primary partition with a target size.
-        /// </summary>
-        /// <param name="size">The target size (in bytes).</param>
-        /// <param name="type">The partition type.</param>
-        /// <param name="active">Whether the partition is active (bootable).</param>
-        /// <returns>The index of the new partition.</returns>
-        public override int Create(long size, WellKnownPartitionType type, bool active)
-        {
-            int cylinderCapacity = _diskGeometry.SectorsPerTrack * _diskGeometry.HeadsPerCylinder * _diskGeometry.BytesPerSector;
-            int numCylinders = (int)(size / cylinderCapacity);
-
-            int startCylinder = FindCylinderGap(numCylinders);
-
-            return CreatePrimaryByCylinder(startCylinder, startCylinder + numCylinders - 1, ConvertType(type, size), active);
-        }
-
-        /// <summary>
-        /// Creates a new aligned partition that encompasses the entire disk.
-        /// </summary>
-        /// <param name="type">The partition type.</param>
-        /// <param name="active">Whether the partition is active (bootable).</param>
-        /// <param name="alignment">The alignment (in bytes).</param>
-        /// <returns>The index of the partition.</returns>
-        /// <remarks>The partition table must be empty before this method is called,
-        /// otherwise IOException is thrown.</remarks>
-        /// <remarks>
-        /// Traditionally partitions were aligned to the physical structure of the underlying disk,
-        /// however with modern storage greater efficiency is acheived by aligning partitions on
-        /// large values that are a power of two.
-        /// </remarks>
-        public override int CreateAligned(WellKnownPartitionType type, bool active, int alignment)
-        {
-            Geometry allocationGeometry = new Geometry(_diskData.Length, _diskGeometry.HeadsPerCylinder, _diskGeometry.SectorsPerTrack, _diskGeometry.BytesPerSector);
-
-            ChsAddress start = new ChsAddress(0, 1, 1);
-
-            long startLba = Utilities.RoundUp(allocationGeometry.ToLogicalBlockAddress(start), alignment / _diskGeometry.BytesPerSector);
-            long lastLba = Utilities.RoundDown(_diskData.Length / _diskGeometry.BytesPerSector, alignment / _diskGeometry.BytesPerSector);
-
-            return CreatePrimaryBySector(startLba, lastLba - 1, ConvertType(type, (lastLba - startLba) * _diskGeometry.BytesPerSector), active);
-        }
-
-        /// <summary>
-        /// Creates a new aligned partition with a target size.
-        /// </summary>
-        /// <param name="size">The target size (in bytes).</param>
-        /// <param name="type">The partition type.</param>
-        /// <param name="active">Whether the partition is active (bootable).</param>
-        /// <param name="alignment">The alignment (in bytes).</param>
-        /// <returns>The index of the new partition.</returns>
-        /// <remarks>
-        /// Traditionally partitions were aligned to the physical structure of the underlying disk,
-        /// however with modern storage greater efficiency is achieved by aligning partitions on
-        /// large values that are a power of two.
-        /// </remarks>
-        public override int CreateAligned(long size, WellKnownPartitionType type, bool active, int alignment)
-        {
-            if (size < _diskGeometry.BytesPerSector)
-            {
-                throw new ArgumentOutOfRangeException("size", size, "size must be at least one sector");
-            }
-
-            if (alignment % _diskGeometry.BytesPerSector != 0)
-            {
-                throw new ArgumentException("Alignment is not a multiple of the sector size");
-            }
-
-            if (size % alignment != 0)
-            {
-                throw new ArgumentException("Size is not a multiple of the alignment");
-            }
-
-            long sectorLength = size / _diskGeometry.BytesPerSector;
-            long start = FindGap(size / _diskGeometry.BytesPerSector, alignment / _diskGeometry.BytesPerSector);
-
-            return CreatePrimaryBySector(start, start + sectorLength - 1, ConvertType(type, sectorLength * Utilities.SectorSize), active);
-        }
-
-        /// <summary>
-        /// Deletes a partition at a given index.
-        /// </summary>
-        /// <param name="index">The index of the partition.</param>
-        public override void Delete(int index)
-        {
-            WriteRecord(index, new BiosPartitionRecord());
-        }
-
-        /// <summary>
-        /// Creates a new Primary Partition that occupies whole cylinders, for best compatibility.
-        /// </summary>
-        /// <param name="first">The first cylinder to include in the partition (inclusive).</param>
-        /// <param name="last">The last cylinder to include in the partition (inclusive).</param>
-        /// <param name="type">The BIOS (MBR) type of the new partition.</param>
-        /// <param name="markActive">Whether to mark the partition active (bootable).</param>
-        /// <returns>The index of the new partition.</returns>
-        /// <remarks>If the cylinder 0 is given, the first track will not be used, to reserve space
-        /// for the meta-data at the start of the disk.</remarks>
-        public int CreatePrimaryByCylinder(int first, int last, byte type, bool markActive)
-        {
-            if (first < 0)
-            {
-                throw new ArgumentOutOfRangeException("first", first, "First cylinder must be Zero or greater");
-            }
-
-            if (last <= first)
-            {
-                throw new ArgumentException("Last cylinder must be greater than first");
-            }
-
-            long lbaStart = (first == 0) ? _diskGeometry.ToLogicalBlockAddress(0, 1, 1) : _diskGeometry.ToLogicalBlockAddress(first, 0, 1);
-            long lbaLast = _diskGeometry.ToLogicalBlockAddress(last, _diskGeometry.HeadsPerCylinder - 1, _diskGeometry.SectorsPerTrack);
-
-            return CreatePrimaryBySector(lbaStart, lbaLast, type, markActive);
-        }
-
-        /// <summary>
-        /// Creates a new Primary Partition, specified by Logical Block Addresses.
-        /// </summary>
-        /// <param name="first">The LBA address of the first sector (inclusive).</param>
-        /// <param name="last">The LBA address of the last sector (inclusive).</param>
-        /// <param name="type">The BIOS (MBR) type of the new partition.</param>
-        /// <param name="markActive">Whether to mark the partition active (bootable).</param>
-        /// <returns>The index of the new partition.</returns>
-        public int CreatePrimaryBySector(long first, long last, byte type, bool markActive)
-        {
-            if (first >= last)
-            {
-                throw new ArgumentException("The first sector in a partition must be before the last");
-            }
-
-            if ((last + 1) * _diskGeometry.BytesPerSector > _diskData.Length)
-            {
-                throw new ArgumentOutOfRangeException("last", last, "The last sector extends beyond the end of the disk");
-            }
-
-            BiosPartitionRecord[] existing = GetPrimaryRecords();
-
-            BiosPartitionRecord newRecord = new BiosPartitionRecord();
-            ChsAddress startAddr = _diskGeometry.ToChsAddress(first);
-            ChsAddress endAddr = _diskGeometry.ToChsAddress(last);
-
-            // Because C/H/S addresses can max out at lower values than the LBA values,
-            // the special tuple (1023, 254, 63) is used.
-            if (startAddr.Cylinder > 1023)
-            {
-                startAddr = new ChsAddress(1023, 254, 63);
-            }
-
-            if (endAddr.Cylinder > 1023)
-            {
-                endAddr = new ChsAddress(1023, 254, 63);
-            }
-
-            newRecord.StartCylinder = (ushort)startAddr.Cylinder;
-            newRecord.StartHead = (byte)startAddr.Head;
-            newRecord.StartSector = (byte)startAddr.Sector;
-            newRecord.EndCylinder = (ushort)endAddr.Cylinder;
-            newRecord.EndHead = (byte)endAddr.Head;
-            newRecord.EndSector = (byte)endAddr.Sector;
-            newRecord.LBAStart = (uint)first;
-            newRecord.LBALength = (uint)(last - first + 1);
-            newRecord.PartitionType = type;
-            newRecord.Status = (byte)(markActive ? 0x80 : 0x00);
-
-            // First check for overlap with existing partition...
-            foreach (var r in existing)
-            {
-                if (Utilities.RangesOverlap((uint)first, (uint)last + 1, r.LBAStartAbsolute, r.LBAStartAbsolute + r.LBALength))
-                {
-                    throw new IOException("New partition overlaps with existing partition");
-                }
-            }
-
-            // Now look for empty partition
-            for (int i = 0; i < 4; ++i)
-            {
-                if (!existing[i].IsValid)
-                {
-                    WriteRecord(i, newRecord);
-                    return i;
-                }
-            }
-
-            throw new IOException("No primary partition slots available");
-        }
-
-        /// <summary>
-        /// Sets the active partition.
-        /// </summary>
-        /// <param name="index">The index of the primary partition to mark bootable, or <c>-1</c> for none.</param>
-        /// <remarks>The supplied index is the index within the primary partition, see <c>PrimaryIndex</c> on <c>BiosPartitionInfo</c>.</remarks>
-        public void SetActivePartition(int index)
-        {
-            List<BiosPartitionRecord> records = new List<BiosPartitionRecord>(GetPrimaryRecords());
-
-            for (int i = 0; i < records.Count; ++i)
-            {
-                records[i].Status = (i == index) ? (byte)0x80 : (byte)0x00;
-                WriteRecord(i, records[i]);
-            }
-        }
-
-        /// <summary>
-        /// Gets all of the disk ranges containing partition table metadata.
-        /// </summary>
-        /// <returns>Set of stream extents, indicated as byte offset from the start of the disk.</returns>
-        public IEnumerable<StreamExtent> GetMetadataDiskExtents()
-        {
-            List<StreamExtent> extents = new List<StreamExtent>();
-
-            extents.Add(new StreamExtent(0, Sizes.Sector));
-
-            foreach (BiosPartitionRecord primaryRecord in GetPrimaryRecords())
-            {
-                if (primaryRecord.IsValid)
-                {
-                    if (IsExtendedPartition(primaryRecord))
-                    {
-                        extents.AddRange(new BiosExtendedPartitionTable(_diskData, primaryRecord.LBAStart).GetMetadataDiskExtents());
-                    }
-                }
-            }
-
-            return extents;
-        }
-
-        /// <summary>
-        /// Updates the CHS fields in partition records to reflect a new BIOS geometry.
-        /// </summary>
-        /// <param name="geometry">The disk's new BIOS geometry.</param>
-        /// <remarks>The partitions are not relocated to a cylinder boundary, just the CHS fields are updated on the
-        /// assumption the LBA fields are definitive.</remarks>
-        public void UpdateBiosGeometry(Geometry geometry)
-        {
-            _diskData.Position = 0;
-            byte[] bootSector = Utilities.ReadFully(_diskData, Utilities.SectorSize);
-
-            BiosPartitionRecord[] records = ReadPrimaryRecords(bootSector);
-            for (int i = 0; i < records.Length; ++i)
-            {
-                BiosPartitionRecord record = records[i];
-                if (record.IsValid)
-                {
-                    ChsAddress newStartAddress = geometry.ToChsAddress(record.LBAStartAbsolute);
-                    if (newStartAddress.Cylinder > 1023)
-                    {
-                        newStartAddress = new ChsAddress(1023, geometry.HeadsPerCylinder - 1, geometry.SectorsPerTrack);
-                    }
-
-                    ChsAddress newEndAddress = geometry.ToChsAddress(record.LBAStartAbsolute + record.LBALength - 1);
-                    if (newEndAddress.Cylinder > 1023)
-                    {
-                        newEndAddress = new ChsAddress(1023, geometry.HeadsPerCylinder - 1, geometry.SectorsPerTrack);
-                    }
-
-                    record.StartCylinder = (ushort)newStartAddress.Cylinder;
-                    record.StartHead = (byte)newStartAddress.Head;
-                    record.StartSector = (byte)newStartAddress.Sector;
-                    record.EndCylinder = (ushort)newEndAddress.Cylinder;
-                    record.EndHead = (byte)newEndAddress.Head;
-                    record.EndSector = (byte)newEndAddress.Sector;
-
-                    WriteRecord(i, record);
-                }
-            }
-
-            _diskGeometry = geometry;
-        }
-
-        internal SparseStream Open(BiosPartitionRecord record)
-        {
-            return new SubStream(_diskData, Ownership.None, ((long)record.LBAStartAbsolute) * _diskGeometry.BytesPerSector, ((long)record.LBALength) * _diskGeometry.BytesPerSector);
-        }
-
-        private static BiosPartitionRecord[] ReadPrimaryRecords(byte[] bootSector)
-        {
-            BiosPartitionRecord[] records = new BiosPartitionRecord[4];
-            for (int i = 0; i < 4; ++i)
-            {
-                records[i] = new BiosPartitionRecord(bootSector, 0x01BE + (i * 0x10), 0, i);
-            }
-
-            return records;
-        }
-
-        private static bool IsExtendedPartition(BiosPartitionRecord r)
-        {
-            return r.PartitionType == BiosPartitionTypes.Extended || r.PartitionType == BiosPartitionTypes.ExtendedLba;
-        }
-
-        private static byte ConvertType(WellKnownPartitionType type, long size)
-        {
-            switch (type)
-            {
-                case WellKnownPartitionType.WindowsFat:
-                    if (size < 512 * Sizes.OneMiB)
-                    {
-                        return BiosPartitionTypes.Fat16;
-                    }
-                    else if (size < 1023 * (long)254 * 63 * 512)
-                    {
-                        // Max BIOS size
-                        return BiosPartitionTypes.Fat32;
-                    }
-                    else
-                    {
-                        return BiosPartitionTypes.Fat32Lba;
-                    }
-
-                case WellKnownPartitionType.WindowsNtfs:
-                    return BiosPartitionTypes.Ntfs;
-                case WellKnownPartitionType.Linux:
-                    return BiosPartitionTypes.LinuxNative;
-                case WellKnownPartitionType.LinuxSwap:
-                    return BiosPartitionTypes.LinuxSwap;
-                case WellKnownPartitionType.LinuxLvm:
-                    return BiosPartitionTypes.LinuxLvm;
-                default:
-                    throw new ArgumentException(String.Format(CultureInfo.InvariantCulture, "Unrecognized partition type: '{0}'", type), "type");
-            }
-        }
-
-        private BiosPartitionRecord[] GetAllRecords()
-        {
-            List<BiosPartitionRecord> newList = new List<BiosPartitionRecord>();
-
-            foreach (BiosPartitionRecord primaryRecord in GetPrimaryRecords())
-            {
-                if (primaryRecord.IsValid)
-                {
-                    if (IsExtendedPartition(primaryRecord))
-                    {
-                        newList.AddRange(GetExtendedRecords(primaryRecord));
-                    }
-                    else
-                    {
-                        newList.Add(primaryRecord);
-                    }
-                }
-            }
-
-            return newList.ToArray();
-        }
-
-        private BiosPartitionRecord[] GetPrimaryRecords()
-        {
-            _diskData.Position = 0;
-            byte[] bootSector = Utilities.ReadFully(_diskData, Utilities.SectorSize);
-
-            return ReadPrimaryRecords(bootSector);
-        }
-
-        private BiosPartitionRecord[] GetExtendedRecords(BiosPartitionRecord r)
-        {
-            return new BiosExtendedPartitionTable(_diskData, r.LBAStart).GetPartitions();
-        }
-
-        private void WriteRecord(int i, BiosPartitionRecord newRecord)
-        {
-            _diskData.Position = 0;
-            byte[] bootSector = Utilities.ReadFully(_diskData, Utilities.SectorSize);
-            newRecord.WriteTo(bootSector, 0x01BE + (i * 16));
-            _diskData.Position = 0;
-            _diskData.Write(bootSector, 0, bootSector.Length);
-        }
-
-        private int FindCylinderGap(int numCylinders)
-        {
-            var list = Utilities.Filter<List<BiosPartitionRecord>, BiosPartitionRecord>(GetPrimaryRecords(), (r) => r.IsValid);
-            list.Sort();
-
-            int startCylinder = 0;
-            foreach (var r in list)
-            {
-                int existingStart = r.StartCylinder;
-                int existingEnd = r.EndCylinder;
-
-                // LBA can represent bigger disk locations than CHS, so assume the LBA to be definitive in the case where it
-                // appears the CHS address has been truncated.
-                if (r.LBAStart > _diskGeometry.ToLogicalBlockAddress(r.StartCylinder, r.StartHead, r.StartSector))
-                {
-                    existingStart = _diskGeometry.ToChsAddress((int)r.LBAStart).Cylinder;
-                }
-
-                if (r.LBAStart + r.LBALength > _diskGeometry.ToLogicalBlockAddress(r.EndCylinder, r.EndHead, r.EndSector))
-                {
-                    existingEnd = _diskGeometry.ToChsAddress((int)(r.LBAStart + r.LBALength)).Cylinder;
-                }
-
-                if (!Utilities.RangesOverlap(startCylinder, startCylinder + numCylinders - 1, existingStart, existingEnd))
-                {
-                    break;
-                }
-                else
-                {
-                    startCylinder = existingEnd + 1;
-                }
-            }
-
-            return startCylinder;
-        }
-
-        private long FindGap(long numSectors, long alignmentSectors)
-        {
-            var list = Utilities.Filter<List<BiosPartitionRecord>, BiosPartitionRecord>(GetPrimaryRecords(), (r) => r.IsValid);
-            list.Sort();
-
-            long startSector = Utilities.RoundUp(_diskGeometry.ToLogicalBlockAddress(0, 1, 1), alignmentSectors);
-
-            int idx = 0;
-            while (idx < list.Count)
-            {
-                var entry = list[idx];
-                while (idx < list.Count && startSector >= entry.LBAStartAbsolute + entry.LBALength)
-                {
-                    idx++;
-                    entry = list[idx];
-                }
-
-                if (Utilities.RangesOverlap(startSector, startSector + numSectors, entry.LBAStartAbsolute, entry.LBAStartAbsolute + entry.LBALength))
-                {
-                    startSector = Utilities.RoundUp(entry.LBAStartAbsolute + entry.LBALength, alignmentSectors);
-                }
-
-                idx++;
-            }
-
-            if (_diskGeometry.TotalSectorsLong - startSector < numSectors)
-            {
-                throw new IOException(string.Format(CultureInfo.InvariantCulture, "Unable to find free space of {0} sectors", numSectors));
-            }
-
-            return startSector;
-        }
-
-        private void Init(Stream disk, Geometry diskGeometry)
-        {
-            _diskData = disk;
-            _diskGeometry = diskGeometry;
-
-            _diskData.Position = 0;
-            byte[] bootSector = Utilities.ReadFully(_diskData, Utilities.SectorSize);
-            if (bootSector[510] != 0x55 || bootSector[511] != 0xAA)
-            {
-                throw new IOException("Invalid boot sector - no magic number 0xAA55");
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Partitions/BiosPartitionTypes.cs b/DiscUtils/Partitions/BiosPartitionTypes.cs
deleted file mode 100644
index 96da403..0000000
--- a/DiscUtils/Partitions/BiosPartitionTypes.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Partitions
-{
-    /// <summary>
-    /// Convenient access to well-known BIOS (MBR) Partition Types.
-    /// </summary>
-    public static class BiosPartitionTypes
-    {
-        /// <summary>
-        /// Microsoft FAT12 (fewer than 32,680 sectors in the volume).
-        /// </summary>
-        public const byte Fat12 = 0x01;
-
-        /// <summary>
-        /// Microsoft FAT16 (32,680–65,535 sectors or 16 MB–33 MB).
-        /// </summary>
-        public const byte Fat16Small = 0x04;
-
-        /// <summary>
-        /// Extended Partition (contains other partitions).
-        /// </summary>
-        public const byte Extended = 0x05;
-
-        /// <summary>
-        /// Microsoft BIGDOS FAT16 (33 MB–4 GB).
-        /// </summary>
-        public const byte Fat16 = 0x06;
-
-        /// <summary>
-        /// Installable File System (NTFS).
-        /// </summary>
-        public const byte Ntfs = 0x07;
-
-        /// <summary>
-        /// Microsoft FAT32.
-        /// </summary>
-        public const byte Fat32 = 0x0B;
-
-        /// <summary>
-        /// Microsoft FAT32, accessed using Int13h BIOS LBA extensions.
-        /// </summary>
-        public const byte Fat32Lba = 0x0C;
-
-        /// <summary>
-        /// Microsoft BIGDOS FAT16, accessed using Int13h BIOS LBA extensions.
-        /// </summary>
-        public const byte Fat16Lba = 0x0E;
-
-        /// <summary>
-        /// Extended Partition (contains other partitions), accessed using Int13h BIOS LBA extensions.
-        /// </summary>
-        public const byte ExtendedLba = 0x0F;
-
-        /// <summary>
-        /// Windows Logical Disk Manager dynamic volume.
-        /// </summary>
-        public const byte WindowsDynamicVolume = 0x42;
-
-        /// <summary>
-        /// Linux Swap.
-        /// </summary>
-        public const byte LinuxSwap = 0x82;
-
-        /// <summary>
-        /// Linux Native (ext2 and friends).
-        /// </summary>
-        public const byte LinuxNative = 0x83;
-
-        /// <summary>
-        /// Linux Logical Volume Manager (LVM).
-        /// </summary>
-        public const byte LinuxLvm = 0x8E;
-
-        /// <summary>
-        /// GUID Partition Table (GPT) protective partition, fills entire disk.
-        /// </summary>
-        public const byte GptProtective = 0xEE;
-
-        /// <summary>
-        /// EFI System partition on an MBR disk.
-        /// </summary>
-        public const byte EfiSystem = 0xEF;
-
-        /// <summary>
-        /// Provides a string representation of some known BIOS partition types.
-        /// </summary>
-        /// <param name="type">The partition type to represent as a string.</param>
-        /// <returns>The string representation.</returns>
-        public static string ToString(byte type)
-        {
-            switch (type)
-            {
-                case 0x00: return "Unused";
-                case 0x01: return "FAT12";
-                case 0x02: return "XENIX root";
-                case 0x03: return "XENIX /usr";
-                case 0x04: return "FAT16 (<32M)";
-                case 0x05: return "Extended (non-LBA)";
-                case 0x06: return "FAT16 (>32M)";
-                case 0x07: return "IFS (NTFS or HPFS)";
-                case 0x0B: return "FAT32 (non-LBA)";
-                case 0x0C: return "FAT32 (LBA)";
-                case 0x0E: return "FAT16 (LBA)";
-                case 0x0F: return "Extended (LBA)";
-                case 0x11: return "Hidden FAT12";
-                case 0x12: return "Vendor Config/Recovery/Diagnostics";
-                case 0x14: return "Hidden FAT16 (<32M)";
-                case 0x16: return "Hidden FAT16 (>32M)";
-                case 0x17: return "Hidden IFS (NTFS or HPFS)";
-                case 0x1B: return "Hidden FAT32 (non-LBA)";
-                case 0x1C: return "Hidden FAT32 (LBA)";
-                case 0x1E: return "Hidden FAT16 (LBA)";
-                case 0x27: return "Windows Recovery Environment";
-                case 0x42: return "Windows Dynamic Volume";
-                case 0x80: return "Minix v1.1 - v1.4a";
-                case 0x81: return "Minix / Early Linux";
-                case 0x82: return "Linux Swap";
-                case 0x83: return "Linux Native";
-                case 0x84: return "Hibernation";
-                case 0x8E: return "Linux LVM";
-                case 0xA0: return "Laptop Hibernation";
-                case 0xA8: return "Mac OS-X";
-                case 0xAB: return "Mac OS-X Boot";
-                case 0xAF: return "Mac OS-X HFS";
-                case 0xC0: return "NTFT";
-                case 0xDE: return "Dell OEM";
-                case 0xEE: return "GPT Protective";
-                case 0xEF: return "EFI";
-                case 0xFB: return "VMware File System";
-                case 0xFC: return "VMware Swap";
-                case 0xFE: return "IBM OEM";
-                default: return "Unknown";
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Partitions/BiosPartitionedDiskBuilder.cs b/DiscUtils/Partitions/BiosPartitionedDiskBuilder.cs
deleted file mode 100644
index 83cb659..0000000
--- a/DiscUtils/Partitions/BiosPartitionedDiskBuilder.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Partitions
-{
-    using System;
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// Builds a stream with the contents of a BIOS partitioned disk.
-    /// </summary>
-    /// <remarks>
-    /// This class assembles a disk image dynamically in memory.  The
-    /// constructed stream will read data from the partition content
-    /// streams only when a client of this class tries to read from
-    /// that partition.
-    /// </remarks>
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1001:TypesThatOwnDisposableFieldsShouldBeDisposable", Justification = "SparseMemoryStream holds no resources")]
-    public class BiosPartitionedDiskBuilder : StreamBuilder
-    {
-        private long _capacity;
-        private BiosPartitionTable _partitionTable;
-        private Geometry _biosGeometry;
-        private SparseMemoryStream _bootSectors;
-
-        private Dictionary<int, BuilderExtent> _partitionContents;
-
-        /// <summary>
-        /// Initializes a new instance of the BiosPartitionedDiskBuilder class.
-        /// </summary>
-        /// <param name="capacity">The capacity of the disk (in bytes).</param>
-        /// <param name="biosGeometry">The BIOS geometry of the disk.</param>
-        public BiosPartitionedDiskBuilder(long capacity, Geometry biosGeometry)
-        {
-            _capacity = capacity;
-            _biosGeometry = biosGeometry;
-
-            _bootSectors = new SparseMemoryStream();
-            _bootSectors.SetLength(capacity);
-            _partitionTable = BiosPartitionTable.Initialize(_bootSectors, _biosGeometry);
-
-            _partitionContents = new Dictionary<int, BuilderExtent>();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the BiosPartitionedDiskBuilder class.
-        /// </summary>
-        /// <param name="capacity">The capacity of the disk (in bytes).</param>
-        /// <param name="bootSectors">The boot sector(s) of the disk.</param>
-        /// <param name="biosGeometry">The BIOS geometry of the disk.</param>
-        [Obsolete("Use the variant that takes VirtualDisk, this method breaks for disks with extended partitions", false)]
-        public BiosPartitionedDiskBuilder(long capacity, byte[] bootSectors, Geometry biosGeometry)
-        {
-            if (bootSectors == null)
-            {
-                throw new ArgumentNullException("bootSectors");
-            }
-
-            _capacity = capacity;
-            _biosGeometry = biosGeometry;
-
-            _bootSectors = new SparseMemoryStream();
-            _bootSectors.SetLength(capacity);
-            _bootSectors.Write(bootSectors, 0, bootSectors.Length);
-            _partitionTable = new BiosPartitionTable(_bootSectors, biosGeometry);
-
-            _partitionContents = new Dictionary<int, BuilderExtent>();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the BiosPartitionedDiskBuilder class by
-        /// cloning the partition structure of a source disk.
-        /// </summary>
-        /// <param name="sourceDisk">The disk to clone.</param>
-        public BiosPartitionedDiskBuilder(VirtualDisk sourceDisk)
-        {
-            if (sourceDisk == null)
-            {
-                throw new ArgumentNullException("sourceDisk");
-            }
-
-            _capacity = sourceDisk.Capacity;
-            _biosGeometry = sourceDisk.BiosGeometry;
-
-            _bootSectors = new SparseMemoryStream();
-            _bootSectors.SetLength(_capacity);
-
-            foreach (var extent in new BiosPartitionTable(sourceDisk).GetMetadataDiskExtents())
-            {
-                sourceDisk.Content.Position = extent.Start;
-                byte[] buffer = Utilities.ReadFully(sourceDisk.Content, (int)extent.Length);
-                _bootSectors.Position = extent.Start;
-                _bootSectors.Write(buffer, 0, buffer.Length);
-            }
-
-            _partitionTable = new BiosPartitionTable(_bootSectors, _biosGeometry);
-
-            _partitionContents = new Dictionary<int, BuilderExtent>();
-        }
-
-        /// <summary>
-        /// Gets the partition table in the disk.
-        /// </summary>
-        public BiosPartitionTable PartitionTable
-        {
-            get { return _partitionTable; }
-        }
-
-        /// <summary>
-        /// Sets a stream representing the content of a partition in the partition table.
-        /// </summary>
-        /// <param name="index">The index of the partition.</param>
-        /// <param name="stream">The stream with the contents of the partition.</param>
-        public void SetPartitionContent(int index, SparseStream stream)
-        {
-            _partitionContents[index] = new BuilderSparseStreamExtent(_partitionTable[index].FirstSector * Sizes.Sector, stream);
-        }
-
-        /// <summary>
-        /// Updates the CHS fields in partition records to reflect a new BIOS geometry.
-        /// </summary>
-        /// <param name="geometry">The disk's new BIOS geometry.</param>
-        /// <remarks>The partitions are not relocated to a cylinder boundary, just the CHS fields are updated on the
-        /// assumption the LBA fields are definitive.</remarks>
-        public void UpdateBiosGeometry(Geometry geometry)
-        {
-            _partitionTable.UpdateBiosGeometry(geometry);
-            _biosGeometry = geometry;
-        }
-
-        internal override List<BuilderExtent> FixExtents(out long totalLength)
-        {
-            totalLength = _capacity;
-
-            List<BuilderExtent> extents = new List<BuilderExtent>();
-
-            foreach (var extent in _partitionTable.GetMetadataDiskExtents())
-            {
-                _bootSectors.Position = extent.Start;
-                byte[] buffer = Utilities.ReadFully(_bootSectors, (int)extent.Length);
-
-                extents.Add(new BuilderBufferExtent(extent.Start, buffer));
-            }
-
-            extents.AddRange(_partitionContents.Values);
-            return extents;
-        }
-    }
-}
diff --git a/DiscUtils/Partitions/DefaultPartitionTableFactory.cs b/DiscUtils/Partitions/DefaultPartitionTableFactory.cs
deleted file mode 100644
index 049f1b3..0000000
--- a/DiscUtils/Partitions/DefaultPartitionTableFactory.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Partitions
-{
-    using System.IO;
-
-    [PartitionTableFactory]
-    internal sealed class DefaultPartitionTableFactory : PartitionTableFactory
-    {
-        public override bool DetectIsPartitioned(Stream s)
-        {
-            return BiosPartitionTable.IsValid(s);
-        }
-
-        public override PartitionTable DetectPartitionTable(VirtualDisk disk)
-        {
-            if (BiosPartitionTable.IsValid(disk.Content))
-            {
-                BiosPartitionTable table = new BiosPartitionTable(disk);
-                if (table.Count == 1 && table[0].BiosType == BiosPartitionTypes.GptProtective)
-                {
-                    return new GuidPartitionTable(disk);
-                }
-                else
-                {
-                    return table;
-                }
-            }
-            else
-            {
-                return null;
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Partitions/GptEntry.cs b/DiscUtils/Partitions/GptEntry.cs
deleted file mode 100644
index 281922b..0000000
--- a/DiscUtils/Partitions/GptEntry.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Partitions
-{
-    using System;
-    using System.Text;
-
-    internal class GptEntry : IComparable<GptEntry>
-    {
-        public Guid PartitionType;
-        public Guid Identity;
-        public long FirstUsedLogicalBlock;
-        public long LastUsedLogicalBlock;
-        public ulong Attributes;
-        public string Name;
-
-        public GptEntry()
-        {
-            PartitionType = Guid.Empty;
-            Identity = Guid.Empty;
-            Name = string.Empty;
-        }
-
-        public string FriendlyPartitionType
-        {
-            get
-            {
-                switch (PartitionType.ToString().ToUpperInvariant())
-                {
-                    case "00000000-0000-0000-0000-000000000000": return "Unused";
-                    case "024DEE41-33E7-11D3-9D69-0008C781F39F": return "MBR Partition Scheme";
-                    case "C12A7328-F81F-11D2-BA4B-00A0C93EC93B": return "EFI System";
-                    case "21686148-6449-6E6F-744E-656564454649": return "BIOS Boot";
-                    case "E3C9E316-0B5C-4DB8-817D-F92DF00215AE": return "Microsoft Reserved";
-                    case "EBD0A0A2-B9E5-4433-87C0-68B6B72699C7": return "Windows Basic Data";
-                    case "5808C8AA-7E8F-42E0-85D2-E1E90434CFB3": return "Windows Logical Disk Manager Metadata";
-                    case "AF9B60A0-1431-4F62-BC68-3311714A69AD": return "Windows Logical Disk Manager Data";
-                    case "75894C1E-3AEB-11D3-B7C1-7B03A0000000": return "HP-UX Data";
-                    case "E2A1E728-32E3-11D6-A682-7B03A0000000": return "HP-UX Service";
-                    case "A19D880F-05FC-4D3B-A006-743F0F84911E": return "Linux RAID";
-                    case "0657FD6D-A4AB-43C4-84E5-0933C84B4F4F": return "Linux Swap";
-                    case "E6D6D379-F507-44C2-A23C-238F2A3DF928": return "Linux Logical Volume Manager";
-                    case "83BD6B9D-7F41-11DC-BE0B-001560B84F0F": return "FreeBSD Boot";
-                    case "516E7CB4-6ECF-11D6-8FF8-00022D09712B": return "FreeBSD Data";
-                    case "516E7CB5-6ECF-11D6-8FF8-00022D09712B": return "FreeBSD Swap";
-                    case "516E7CB6-6ECF-11D6-8FF8-00022D09712B": return "FreeBSD Unix File System";
-                    case "516E7CB8-6ECF-11D6-8FF8-00022D09712B": return "FreeBSD Vinum volume manager";
-                    case "516E7CBA-6ECF-11D6-8FF8-00022D09712B": return "FreeBSD ZFS";
-                    case "48465300-0000-11AA-AA11-00306543ECAC": return "Mac OS X HFS+";
-                    case "55465300-0000-11AA-AA11-00306543ECAC": return "Mac OS X UFS";
-                    case "6A898CC3-1DD2-11B2-99A6-080020736631": return "Mac OS X ZFS";
-                    case "52414944-0000-11AA-AA11-00306543ECAC": return "Mac OS X RAID";
-                    case "52414944-5F4F-11AA-AA11-00306543ECAC": return "Mac OS X RAID, Offline";
-                    case "426F6F74-0000-11AA-AA11-00306543ECAC": return "Mac OS X Boot";
-                    case "4C616265-6C00-11AA-AA11-00306543ECAC": return "Mac OS X Label";
-                    case "49F48D32-B10E-11DC-B99B-0019D1879648": return "NetBSD Swap";
-                    case "49F48D5A-B10E-11DC-B99B-0019D1879648": return "NetBSD Fast File System";
-                    case "49F48D82-B10E-11DC-B99B-0019D1879648": return "NetBSD Log-Structed File System";
-                    case "49F48DAA-B10E-11DC-B99B-0019D1879648": return "NetBSD RAID";
-                    case "2DB519C4-B10F-11DC-B99B-0019D1879648": return "NetBSD Concatenated";
-                    case "2DB519EC-B10F-11DC-B99B-0019D1879648": return "NetBSD Encrypted";
-                    default: return "Unknown";
-                }
-            }
-        }
-
-        public void ReadFrom(byte[] buffer, int offset)
-        {
-            PartitionType = Utilities.ToGuidLittleEndian(buffer, offset + 0);
-            Identity = Utilities.ToGuidLittleEndian(buffer, offset + 16);
-            FirstUsedLogicalBlock = Utilities.ToInt64LittleEndian(buffer, offset + 32);
-            LastUsedLogicalBlock = Utilities.ToInt64LittleEndian(buffer, offset + 40);
-            Attributes = Utilities.ToUInt64LittleEndian(buffer, offset + 48);
-            Name = Encoding.Unicode.GetString(buffer, offset + 56, 72).TrimEnd(new char[] { '\0' });
-        }
-
-        public void WriteTo(byte[] buffer, int offset)
-        {
-            Utilities.WriteBytesLittleEndian(PartitionType, buffer, offset + 0);
-            Utilities.WriteBytesLittleEndian(Identity, buffer, offset + 16);
-            Utilities.WriteBytesLittleEndian(FirstUsedLogicalBlock, buffer, offset + 32);
-            Utilities.WriteBytesLittleEndian(LastUsedLogicalBlock, buffer, offset + 40);
-            Utilities.WriteBytesLittleEndian(Attributes, buffer, offset + 48);
-            Encoding.Unicode.GetBytes(Name + new string('\0', 36), 0, 36, buffer, offset + 56);
-        }
-
-        public int CompareTo(GptEntry other)
-        {
-            return FirstUsedLogicalBlock.CompareTo(other.FirstUsedLogicalBlock);
-        }
-    }
-}
diff --git a/DiscUtils/Partitions/GptHeader.cs b/DiscUtils/Partitions/GptHeader.cs
deleted file mode 100644
index eef965a..0000000
--- a/DiscUtils/Partitions/GptHeader.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Partitions
-{
-    using System;
-
-    internal class GptHeader
-    {
-        public const string GptSignature = "EFI PART";
-
-        public string Signature;
-        public uint Version;
-        public int HeaderSize;
-        public uint Crc;
-        public long HeaderLba;
-        public long AlternateHeaderLba;
-        public long FirstUsable;
-        public long LastUsable;
-        public Guid DiskGuid;
-        public long PartitionEntriesLba;
-        public uint PartitionEntryCount;
-        public int PartitionEntrySize;
-        public uint EntriesCrc;
-
-        public byte[] Buffer;
-
-        public GptHeader(int sectorSize)
-        {
-            Signature = GptSignature;
-            Version = 0x00010000;
-            HeaderSize = 92;
-            Buffer = new byte[sectorSize];
-        }
-
-        public GptHeader(GptHeader toCopy)
-        {
-            Signature = toCopy.Signature;
-            Version = toCopy.Version;
-            HeaderSize = toCopy.HeaderSize;
-            Crc = toCopy.Crc;
-            HeaderLba = toCopy.HeaderLba;
-            AlternateHeaderLba = toCopy.AlternateHeaderLba;
-            FirstUsable = toCopy.FirstUsable;
-            LastUsable = toCopy.LastUsable;
-            DiskGuid = toCopy.DiskGuid;
-            PartitionEntriesLba = toCopy.PartitionEntriesLba;
-            PartitionEntryCount = toCopy.PartitionEntryCount;
-            PartitionEntrySize = toCopy.PartitionEntrySize;
-            EntriesCrc = toCopy.EntriesCrc;
-
-            Buffer = new byte[toCopy.Buffer.Length];
-            Array.Copy(toCopy.Buffer, Buffer, Buffer.Length);
-        }
-
-        public bool ReadFrom(byte[] buffer, int offset)
-        {
-            Signature = Utilities.BytesToString(buffer, offset + 0, 8);
-            Version = Utilities.ToUInt32LittleEndian(buffer, offset + 8);
-            HeaderSize = Utilities.ToInt32LittleEndian(buffer, offset + 12);
-            Crc = Utilities.ToUInt32LittleEndian(buffer, offset + 16);
-            HeaderLba = Utilities.ToInt64LittleEndian(buffer, offset + 24);
-            AlternateHeaderLba = Utilities.ToInt64LittleEndian(buffer, offset + 32);
-            FirstUsable = Utilities.ToInt64LittleEndian(buffer, offset + 40);
-            LastUsable = Utilities.ToInt64LittleEndian(buffer, offset + 48);
-            DiskGuid = Utilities.ToGuidLittleEndian(buffer, offset + 56);
-            PartitionEntriesLba = Utilities.ToInt64LittleEndian(buffer, offset + 72);
-            PartitionEntryCount = Utilities.ToUInt32LittleEndian(buffer, offset + 80);
-            PartitionEntrySize = Utilities.ToInt32LittleEndian(buffer, offset + 84);
-            EntriesCrc = Utilities.ToUInt32LittleEndian(buffer, offset + 88);
-
-            // In case the header has new fields unknown to us, store the entire header
-            // as a byte array
-            Buffer = new byte[HeaderSize];
-            Array.Copy(buffer, offset, Buffer, 0, HeaderSize);
-
-            // Reject obviously invalid data
-            if (Signature != GptSignature || HeaderSize == 0)
-            {
-                return false;
-            }
-
-            return Crc == CalcCrc(buffer, offset, HeaderSize);
-        }
-
-        public void WriteTo(byte[] buffer, int offset)
-        {
-            // First, copy the cached header to allow for unknown fields
-            Array.Copy(Buffer, 0, buffer, offset, Buffer.Length);
-
-            // Next, write the fields
-            Utilities.StringToBytes(Signature, buffer, offset + 0, 8);
-            Utilities.WriteBytesLittleEndian(Version, buffer, offset + 8);
-            Utilities.WriteBytesLittleEndian(HeaderSize, buffer, offset + 12);
-            Utilities.WriteBytesLittleEndian((uint)0, buffer, offset + 16);
-            Utilities.WriteBytesLittleEndian(HeaderLba, buffer, offset + 24);
-            Utilities.WriteBytesLittleEndian(AlternateHeaderLba, buffer, offset + 32);
-            Utilities.WriteBytesLittleEndian(FirstUsable, buffer, offset + 40);
-            Utilities.WriteBytesLittleEndian(LastUsable, buffer, offset + 48);
-            Utilities.WriteBytesLittleEndian(DiskGuid, buffer, offset + 56);
-            Utilities.WriteBytesLittleEndian(PartitionEntriesLba, buffer, offset + 72);
-            Utilities.WriteBytesLittleEndian(PartitionEntryCount, buffer, offset + 80);
-            Utilities.WriteBytesLittleEndian(PartitionEntrySize, buffer, offset + 84);
-            Utilities.WriteBytesLittleEndian(EntriesCrc, buffer, offset + 88);
-
-            // Calculate & write the CRC
-            Utilities.WriteBytesLittleEndian(CalcCrc(buffer, offset, HeaderSize), buffer, offset + 16);
-
-            // Update the cached copy - re-allocate the buffer to allow for HeaderSize potentially having changed
-            Buffer = new byte[HeaderSize];
-            Array.Copy(buffer, offset, Buffer, 0, HeaderSize);
-        }
-
-        internal static uint CalcCrc(byte[] buffer, int offset, int count)
-        {
-            byte[] temp = new byte[count];
-            Array.Copy(buffer, offset, temp, 0, count);
-
-            // Reset CRC field
-            Utilities.WriteBytesLittleEndian((uint)0, temp, 16);
-
-            return Crc32LittleEndian.Compute(Crc32Algorithm.Common, temp, 0, count);
-        }
-    }
-}
diff --git a/DiscUtils/Partitions/GuidPartitionInfo.cs b/DiscUtils/Partitions/GuidPartitionInfo.cs
deleted file mode 100644
index 24037c7..0000000
--- a/DiscUtils/Partitions/GuidPartitionInfo.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Partitions
-{
-    using System;
-
-    /// <summary>
-    /// Provides access to partition records in a GUID partition table.
-    /// </summary>
-    public sealed class GuidPartitionInfo : PartitionInfo
-    {
-        private GuidPartitionTable _table;
-        private GptEntry _entry;
-
-        internal GuidPartitionInfo(GuidPartitionTable table, GptEntry entry)
-        {
-            _table = table;
-            _entry = entry;
-        }
-
-        /// <summary>
-        /// Gets the first sector of the partion (relative to start of disk) as a Logical Block Address.
-        /// </summary>
-        public override long FirstSector
-        {
-            get { return _entry.FirstUsedLogicalBlock; }
-        }
-
-        /// <summary>
-        /// Gets the last sector of the partion (relative to start of disk) as a Logical Block Address (inclusive).
-        /// </summary>
-        public override long LastSector
-        {
-            get { return _entry.LastUsedLogicalBlock; }
-        }
-
-        /// <summary>
-        /// Gets the type of the partition, as a GUID.
-        /// </summary>
-        public override Guid GuidType
-        {
-            get { return _entry.PartitionType; }
-        }
-
-        /// <summary>
-        /// Always returns Zero.
-        /// </summary>
-        public override byte BiosType
-        {
-            get { return 0; }
-        }
-
-        /// <summary>
-        /// Gets the type of the partition as a string.
-        /// </summary>
-        public override string TypeAsString
-        {
-            get { return _entry.FriendlyPartitionType; }
-        }
-
-        /// <summary>
-        /// Gets the name of the partition.
-        /// </summary>
-        public string Name
-        {
-            get { return _entry.Name; }
-        }
-
-        /// <summary>
-        /// Gets the attributes of the partition.
-        /// </summary>
-        public long Attributes
-        {
-            get { return (long)_entry.Attributes; }
-        }
-
-        /// <summary>
-        /// Gets the unique identity of this specific partition.
-        /// </summary>
-        public Guid Identity
-        {
-            get { return _entry.Identity; }
-        }
-
-        internal override PhysicalVolumeType VolumeType
-        {
-            get { return PhysicalVolumeType.GptPartition; }
-        }
-
-        /// <summary>
-        /// Opens a stream to access the content of the partition.
-        /// </summary>
-        /// <returns>The new stream.</returns>
-        public override SparseStream Open()
-        {
-            return _table.Open(_entry);
-        }
-    }
-}
diff --git a/DiscUtils/Partitions/GuidPartitionTable.cs b/DiscUtils/Partitions/GuidPartitionTable.cs
deleted file mode 100644
index 5f41346..0000000
--- a/DiscUtils/Partitions/GuidPartitionTable.cs
+++ /dev/null
@@ -1,651 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Partitions
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Globalization;
-    using System.IO;
-
-    /// <summary>
-    /// Represents a GUID Partition Table.
-    /// </summary>
-    public sealed class GuidPartitionTable : PartitionTable
-    {
-        private Stream _diskData;
-        private Geometry _diskGeometry;
-        private GptHeader _primaryHeader;
-        private GptHeader _secondaryHeader;
-        private byte[] _entryBuffer;
-
-        /// <summary>
-        /// Initializes a new instance of the GuidPartitionTable class.
-        /// </summary>
-        /// <param name="disk">The disk containing the partition table.</param>
-        public GuidPartitionTable(VirtualDisk disk)
-        {
-            Init(disk.Content, disk.Geometry);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the GuidPartitionTable class.
-        /// </summary>
-        /// <param name="disk">The stream containing the disk data.</param>
-        /// <param name="diskGeometry">The geometry of the disk.</param>
-        public GuidPartitionTable(Stream disk, Geometry diskGeometry)
-        {
-            Init(disk, diskGeometry);
-        }
-
-        /// <summary>
-        /// Gets the first sector of the disk available to hold partitions.
-        /// </summary>
-        public long FirstUsableSector
-        {
-            get { return _primaryHeader.FirstUsable; }
-        }
-
-        /// <summary>
-        /// Gets the last sector of the disk available to hold partitions.
-        /// </summary>
-        public long LastUsableSector
-        {
-            get { return _primaryHeader.LastUsable; }
-        }
-
-        /// <summary>
-        /// Gets the unique GPT identifier for this disk.
-        /// </summary>
-        public override Guid DiskGuid
-        {
-            get { return _primaryHeader.DiskGuid; }
-        }
-
-        /// <summary>
-        /// Gets a collection of the partitions for storing Operating System file-systems.
-        /// </summary>
-        public override ReadOnlyCollection<PartitionInfo> Partitions
-        {
-            get
-            {
-                return new ReadOnlyCollection<PartitionInfo>(Utilities.Map<GptEntry, GuidPartitionInfo>(GetAllEntries(), (e) => new GuidPartitionInfo(this, e)));
-            }
-        }
-
-        /// <summary>
-        /// Creates a new partition table on a disk.
-        /// </summary>
-        /// <param name="disk">The disk to initialize.</param>
-        /// <returns>An object to access the newly created partition table.</returns>
-        public static GuidPartitionTable Initialize(VirtualDisk disk)
-        {
-            return Initialize(disk.Content, disk.Geometry);
-        }
-
-        /// <summary>
-        /// Creates a new partition table on a disk.
-        /// </summary>
-        /// <param name="disk">The stream containing the disk data.</param>
-        /// <param name="diskGeometry">The geometry of the disk.</param>
-        /// <returns>An object to access the newly created partition table.</returns>
-        public static GuidPartitionTable Initialize(Stream disk, Geometry diskGeometry)
-        {
-            // Create the protective MBR partition record.
-            BiosPartitionTable pt = BiosPartitionTable.Initialize(disk, diskGeometry);
-            pt.CreatePrimaryByCylinder(0, diskGeometry.Cylinders - 1, BiosPartitionTypes.GptProtective, false);
-
-            // Create the GPT headers, and blank-out the entry areas
-            const int EntryCount = 128;
-            const int EntrySize = 128;
-
-            int entrySectors = ((EntryCount * EntrySize) + diskGeometry.BytesPerSector - 1) / diskGeometry.BytesPerSector;
-
-            byte[] entriesBuffer = new byte[EntryCount * EntrySize];
-
-            // Prepare primary header
-            GptHeader header = new GptHeader(diskGeometry.BytesPerSector);
-            header.HeaderLba = 1;
-            header.AlternateHeaderLba = (disk.Length / diskGeometry.BytesPerSector) - 1;
-            header.FirstUsable = header.HeaderLba + entrySectors + 1;
-            header.LastUsable = header.AlternateHeaderLba - entrySectors - 1;
-            header.DiskGuid = Guid.NewGuid();
-            header.PartitionEntriesLba = 2;
-            header.PartitionEntryCount = EntryCount;
-            header.PartitionEntrySize = EntrySize;
-            header.EntriesCrc = CalcEntriesCrc(entriesBuffer);
-
-            // Write the primary header
-            byte[] headerBuffer = new byte[diskGeometry.BytesPerSector];
-            header.WriteTo(headerBuffer, 0);
-            disk.Position = header.HeaderLba * diskGeometry.BytesPerSector;
-            disk.Write(headerBuffer, 0, headerBuffer.Length);
-
-            // Calc alternate header
-            header.HeaderLba = header.AlternateHeaderLba;
-            header.AlternateHeaderLba = 1;
-            header.PartitionEntriesLba = header.HeaderLba - entrySectors;
-
-            // Write the alternate header
-            header.WriteTo(headerBuffer, 0);
-            disk.Position = header.HeaderLba * diskGeometry.BytesPerSector;
-            disk.Write(headerBuffer, 0, headerBuffer.Length);
-
-            return new GuidPartitionTable(disk, diskGeometry);
-        }
-
-        /// <summary>
-        /// Creates a new partition table on a disk containing a single partition.
-        /// </summary>
-        /// <param name="disk">The disk to initialize.</param>
-        /// <param name="type">The partition type for the single partition.</param>
-        /// <returns>An object to access the newly created partition table.</returns>
-        public static GuidPartitionTable Initialize(VirtualDisk disk, WellKnownPartitionType type)
-        {
-            GuidPartitionTable pt = Initialize(disk);
-            pt.Create(type, true);
-            return pt;
-        }
-
-        /// <summary>
-        /// Creates a new partition that encompasses the entire disk.
-        /// </summary>
-        /// <param name="type">The partition type.</param>
-        /// <param name="active">Whether the partition is active (bootable).</param>
-        /// <returns>The index of the partition.</returns>
-        /// <remarks>The partition table must be empty before this method is called,
-        /// otherwise IOException is thrown.</remarks>
-        public override int Create(WellKnownPartitionType type, bool active)
-        {
-            List<GptEntry> allEntries = new List<GptEntry>(GetAllEntries());
-
-            EstablishReservedPartition(allEntries);
-
-            // Fill the rest of the disk with the requested partition
-            long start = FirstAvailableSector(allEntries);
-            long end = FindLastFreeSector(start, allEntries);
-
-            return Create(start, end, GuidPartitionTypes.Convert(type), 0, "Data Partition");
-        }
-
-        /// <summary>
-        /// Creates a new primary partition with a target size.
-        /// </summary>
-        /// <param name="size">The target size (in bytes).</param>
-        /// <param name="type">The partition type.</param>
-        /// <param name="active">Whether the partition is active (bootable).</param>
-        /// <returns>The index of the new partition.</returns>
-        public override int Create(long size, WellKnownPartitionType type, bool active)
-        {
-            if (size < _diskGeometry.BytesPerSector)
-            {
-                throw new ArgumentOutOfRangeException("size", size, "size must be at least one sector");
-            }
-
-            long sectorLength = size / _diskGeometry.BytesPerSector;
-            long start = FindGap(size / _diskGeometry.BytesPerSector, 1);
-
-            return Create(start, start + sectorLength - 1, GuidPartitionTypes.Convert(type), 0, "Data Partition");
-        }
-
-        /// <summary>
-        /// Creates a new aligned partition that encompasses the entire disk.
-        /// </summary>
-        /// <param name="type">The partition type.</param>
-        /// <param name="active">Whether the partition is active (bootable).</param>
-        /// <param name="alignment">The alignment (in bytes).</param>
-        /// <returns>The index of the partition.</returns>
-        /// <remarks>The partition table must be empty before this method is called,
-        /// otherwise IOException is thrown.</remarks>
-        /// <remarks>
-        /// Traditionally partitions were aligned to the physical structure of the underlying disk,
-        /// however with modern storage greater efficiency is acheived by aligning partitions on
-        /// large values that are a power of two.
-        /// </remarks>
-        public override int CreateAligned(WellKnownPartitionType type, bool active, int alignment)
-        {
-            if (alignment % _diskGeometry.BytesPerSector != 0)
-            {
-                throw new ArgumentException("Alignment is not a multiple of the sector size");
-            }
-
-            List<GptEntry> allEntries = new List<GptEntry>(GetAllEntries());
-
-            EstablishReservedPartition(allEntries);
-
-            // Fill the rest of the disk with the requested partition
-            long start = Utilities.RoundUp(FirstAvailableSector(allEntries), alignment / _diskGeometry.BytesPerSector);
-            long end = Utilities.RoundDown(FindLastFreeSector(start, allEntries) + 1, alignment / _diskGeometry.BytesPerSector);
-
-            if (end <= start)
-            {
-                throw new IOException("No available space");
-            }
-
-            return Create(start, end - 1, GuidPartitionTypes.Convert(type), 0, "Data Partition");
-        }
-
-        /// <summary>
-        /// Creates a new aligned partition with a target size.
-        /// </summary>
-        /// <param name="size">The target size (in bytes).</param>
-        /// <param name="type">The partition type.</param>
-        /// <param name="active">Whether the partition is active (bootable).</param>
-        /// <param name="alignment">The alignment (in bytes).</param>
-        /// <returns>The index of the new partition.</returns>
-        /// <remarks>
-        /// Traditionally partitions were aligned to the physical structure of the underlying disk,
-        /// however with modern storage greater efficiency is achieved by aligning partitions on
-        /// large values that are a power of two.
-        /// </remarks>
-        public override int CreateAligned(long size, WellKnownPartitionType type, bool active, int alignment)
-        {
-            if (size < _diskGeometry.BytesPerSector)
-            {
-                throw new ArgumentOutOfRangeException("size", size, "size must be at least one sector");
-            }
-
-            if (alignment % _diskGeometry.BytesPerSector != 0)
-            {
-                throw new ArgumentException("Alignment is not a multiple of the sector size");
-            }
-
-            if (size % alignment != 0)
-            {
-                throw new ArgumentException("Size is not a multiple of the alignment");
-            }
-
-            long sectorLength = size / _diskGeometry.BytesPerSector;
-            long start = FindGap(size / _diskGeometry.BytesPerSector, alignment / _diskGeometry.BytesPerSector);
-
-            return Create(start, start + sectorLength - 1, GuidPartitionTypes.Convert(type), 0, "Data Partition");
-        }
-
-        /// <summary>
-        /// Creates a new GUID partition on the disk.
-        /// </summary>
-        /// <param name="startSector">The first sector of the partition.</param>
-        /// <param name="endSector">The last sector of the partition.</param>
-        /// <param name="type">The partition type.</param>
-        /// <param name="attributes">The partition attributes.</param>
-        /// <param name="name">The name of the partition.</param>
-        /// <returns>The index of the new partition.</returns>
-        /// <remarks>No checking is performed on the parameters, the caller is
-        /// responsible for ensuring that the partition does not overlap other partitions.</remarks>
-        public int Create(long startSector, long endSector, Guid type, long attributes, string name)
-        {
-            GptEntry newEntry = CreateEntry(startSector, endSector, type, attributes, name);
-            return GetEntryIndex(newEntry.Identity);
-        }
-
-        /// <summary>
-        /// Deletes a partition at a given index.
-        /// </summary>
-        /// <param name="index">The index of the partition.</param>
-        public override void Delete(int index)
-        {
-            int offset = GetPartitionOffset(index);
-            Array.Clear(_entryBuffer, offset, _primaryHeader.PartitionEntrySize);
-            Write();
-        }
-
-        internal SparseStream Open(GptEntry entry)
-        {
-            long start = entry.FirstUsedLogicalBlock * _diskGeometry.BytesPerSector;
-            long end = (entry.LastUsedLogicalBlock + 1) * _diskGeometry.BytesPerSector;
-            return new SubStream(_diskData, start, end - start);
-        }
-
-        private static uint CalcEntriesCrc(byte[] buffer)
-        {
-            return Crc32LittleEndian.Compute(Crc32Algorithm.Common, buffer, 0, buffer.Length);
-        }
-
-        private static int CountEntries<T>(ICollection<T> values, Func<T, bool> pred)
-        {
-            int count = 0;
-
-            foreach (var val in values)
-            {
-                if (pred(val))
-                {
-                    ++count;
-                }
-            }
-
-            return count;
-        }
-
-        private void Init(Stream disk, Geometry diskGeometry)
-        {
-            BiosPartitionTable bpt;
-            try
-            {
-                bpt = new BiosPartitionTable(disk, diskGeometry);
-            }
-            catch (IOException ioe)
-            {
-                throw new IOException("Invalid GPT disk, protective MBR table not present or invalid", ioe);
-            }
-
-            if (bpt.Count != 1 || bpt[0].BiosType != BiosPartitionTypes.GptProtective)
-            {
-                throw new IOException("Invalid GPT disk, protective MBR table is not valid");
-            }
-
-            _diskData = disk;
-            _diskGeometry = diskGeometry;
-
-            disk.Position = diskGeometry.BytesPerSector;
-            byte[] sector = Utilities.ReadFully(disk, diskGeometry.BytesPerSector);
-
-            _primaryHeader = new GptHeader(diskGeometry.BytesPerSector);
-            if (!_primaryHeader.ReadFrom(sector, 0) || !ReadEntries(_primaryHeader))
-            {
-                disk.Position = disk.Length - diskGeometry.BytesPerSector;
-                disk.Read(sector, 0, sector.Length);
-                _secondaryHeader = new GptHeader(diskGeometry.BytesPerSector);
-                if (!_secondaryHeader.ReadFrom(sector, 0) || !ReadEntries(_secondaryHeader))
-                {
-                    throw new IOException("No valid GUID Partition Table found");
-                }
-
-                // Generate from the primary table from the secondary one
-                _primaryHeader = new GptHeader(_secondaryHeader);
-                _primaryHeader.HeaderLba = _secondaryHeader.AlternateHeaderLba;
-                _primaryHeader.AlternateHeaderLba = _secondaryHeader.HeaderLba;
-                _primaryHeader.PartitionEntriesLba = 2;
-
-                // If the disk is writeable, fix up the primary partition table based on the
-                // (valid) secondary table.
-                if (disk.CanWrite)
-                {
-                    WritePrimaryHeader();
-                }
-            }
-
-            if (_secondaryHeader == null)
-            {
-                _secondaryHeader = new GptHeader(diskGeometry.BytesPerSector);
-                disk.Position = disk.Length - diskGeometry.BytesPerSector;
-                disk.Read(sector, 0, sector.Length);
-                if (!_secondaryHeader.ReadFrom(sector, 0) || !ReadEntries(_secondaryHeader))
-                {
-                    // Generate from the secondary table from the primary one
-                    _secondaryHeader = new GptHeader(_primaryHeader);
-                    _secondaryHeader.HeaderLba = _secondaryHeader.AlternateHeaderLba;
-                    _secondaryHeader.AlternateHeaderLba = _secondaryHeader.HeaderLba;
-                    _secondaryHeader.PartitionEntriesLba = _secondaryHeader.HeaderLba - Utilities.RoundUp(_secondaryHeader.PartitionEntryCount * _secondaryHeader.PartitionEntrySize, diskGeometry.BytesPerSector);
-
-                    // If the disk is writeable, fix up the secondary partition table based on the
-                    // (valid) primary table.
-                    if (disk.CanWrite)
-                    {
-                        WriteSecondaryHeader();
-                    }
-                }
-            }
-        }
-
-        private void EstablishReservedPartition(List<GptEntry> allEntries)
-        {
-            // If no MicrosoftReserved partition, and no Microsoft Data partitions, and the disk
-            // has a 'reasonable' size free, create a Microsoft Reserved partition.
-            if (CountEntries(allEntries, e => e.PartitionType == GuidPartitionTypes.MicrosoftReserved) == 0
-                && CountEntries(allEntries, e => e.PartitionType == GuidPartitionTypes.WindowsBasicData) == 0
-                && _diskGeometry.Capacity > 512 * 1024 * 1024)
-            {
-                long reservedStart = FirstAvailableSector(allEntries);
-                long reservedEnd = FindLastFreeSector(reservedStart, allEntries);
-
-                if ((reservedEnd - reservedStart + 1) * _diskGeometry.BytesPerSector > 512 * 1024 * 1024)
-                {
-                    long size = ((_diskGeometry.Capacity < (16 * 1024L * 1024 * 1024)) ? 32 : 128) * 1024 * 1024;
-                    reservedEnd = reservedStart + (size / _diskGeometry.BytesPerSector) - 1;
-
-                    int reservedOffset = GetFreeEntryOffset();
-                    GptEntry newReservedEntry = new GptEntry();
-                    newReservedEntry.PartitionType = GuidPartitionTypes.MicrosoftReserved;
-                    newReservedEntry.Identity = Guid.NewGuid();
-                    newReservedEntry.FirstUsedLogicalBlock = reservedStart;
-                    newReservedEntry.LastUsedLogicalBlock = reservedEnd;
-                    newReservedEntry.Attributes = 0;
-                    newReservedEntry.Name = "Microsoft reserved partition";
-                    newReservedEntry.WriteTo(_entryBuffer, reservedOffset);
-                    allEntries.Add(newReservedEntry);
-                }
-            }
-        }
-
-        private GptEntry CreateEntry(long startSector, long endSector, Guid type, long attributes, string name)
-        {
-            if (endSector < startSector)
-            {
-                throw new ArgumentException("The end sector is before the start sector");
-            }
-
-            int offset = GetFreeEntryOffset();
-            GptEntry newEntry = new GptEntry();
-            newEntry.PartitionType = type;
-            newEntry.Identity = Guid.NewGuid();
-            newEntry.FirstUsedLogicalBlock = startSector;
-            newEntry.LastUsedLogicalBlock = endSector;
-            newEntry.Attributes = (ulong)attributes;
-            newEntry.Name = name;
-            newEntry.WriteTo(_entryBuffer, offset);
-
-            // Commit changes to disk
-            Write();
-
-            return newEntry;
-        }
-
-        private long FindGap(long numSectors, long alignmentSectors)
-        {
-            List<GptEntry> list = new List<GptEntry>(GetAllEntries());
-            list.Sort();
-
-            long startSector = Utilities.RoundUp(_primaryHeader.FirstUsable, alignmentSectors);
-            foreach (var entry in list)
-            {
-                if (!Utilities.RangesOverlap(startSector, startSector + numSectors - 1, entry.FirstUsedLogicalBlock, entry.LastUsedLogicalBlock))
-                {
-                    break;
-                }
-                else
-                {
-                    startSector = Utilities.RoundUp(entry.LastUsedLogicalBlock + 1, alignmentSectors);
-                }
-            }
-
-            if (_diskGeometry.TotalSectorsLong - startSector < numSectors)
-            {
-                throw new IOException(string.Format(CultureInfo.InvariantCulture, "Unable to find free space of {0} sectors", numSectors));
-            }
-
-            return startSector;
-        }
-
-        private long FirstAvailableSector(List<GptEntry> allEntries)
-        {
-            long start = _primaryHeader.FirstUsable;
-
-            foreach (GptEntry entry in allEntries)
-            {
-                if (entry.LastUsedLogicalBlock >= start)
-                {
-                    start = entry.LastUsedLogicalBlock + 1;
-                }
-            }
-
-            return start;
-        }
-
-        private long FindLastFreeSector(long start, List<GptEntry> allEntries)
-        {
-            long end = _primaryHeader.LastUsable;
-
-            foreach (GptEntry entry in allEntries)
-            {
-                if (entry.LastUsedLogicalBlock > start && entry.FirstUsedLogicalBlock <= end)
-                {
-                    end = entry.FirstUsedLogicalBlock - 1;
-                }
-            }
-
-            return end;
-        }
-
-        private void Write()
-        {
-            WritePrimaryHeader();
-            WriteSecondaryHeader();
-        }
-
-        private void WritePrimaryHeader()
-        {
-            byte[] buffer = new byte[_diskGeometry.BytesPerSector];
-            _primaryHeader.EntriesCrc = CalcEntriesCrc();
-            _primaryHeader.WriteTo(buffer, 0);
-            _diskData.Position = _diskGeometry.BytesPerSector;
-            _diskData.Write(buffer, 0, buffer.Length);
-
-            _diskData.Position = 2 * _diskGeometry.BytesPerSector;
-            _diskData.Write(_entryBuffer, 0, _entryBuffer.Length);
-        }
-
-        private void WriteSecondaryHeader()
-        {
-            byte[] buffer = new byte[_diskGeometry.BytesPerSector];
-            _secondaryHeader.EntriesCrc = CalcEntriesCrc();
-            _secondaryHeader.WriteTo(buffer, 0);
-            _diskData.Position = _diskData.Length - _diskGeometry.BytesPerSector;
-            _diskData.Write(buffer, 0, buffer.Length);
-
-            _diskData.Position = _secondaryHeader.PartitionEntriesLba * _diskGeometry.BytesPerSector;
-            _diskData.Write(_entryBuffer, 0, _entryBuffer.Length);
-        }
-
-        private bool ReadEntries(GptHeader header)
-        {
-            _diskData.Position = header.PartitionEntriesLba * _diskGeometry.BytesPerSector;
-            _entryBuffer = Utilities.ReadFully(_diskData, (int)(header.PartitionEntrySize * header.PartitionEntryCount));
-            if (header.EntriesCrc != CalcEntriesCrc())
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        private uint CalcEntriesCrc()
-        {
-            return Crc32LittleEndian.Compute(Crc32Algorithm.Common, _entryBuffer, 0, _entryBuffer.Length);
-        }
-
-        private IEnumerable<GptEntry> GetAllEntries()
-        {
-            for (int i = 0; i < _primaryHeader.PartitionEntryCount; ++i)
-            {
-                GptEntry entry = new GptEntry();
-                entry.ReadFrom(_entryBuffer, i * _primaryHeader.PartitionEntrySize);
-                if (entry.PartitionType != Guid.Empty)
-                {
-                    yield return entry;
-                }
-            }
-        }
-
-        private int GetPartitionOffset(int index)
-        {
-            bool found = false;
-            int entriesSoFar = 0;
-            int position = 0;
-
-            while (!found && position < _primaryHeader.PartitionEntryCount)
-            {
-                GptEntry entry = new GptEntry();
-                entry.ReadFrom(_entryBuffer, position * _primaryHeader.PartitionEntrySize);
-                if (entry.PartitionType != Guid.Empty)
-                {
-                    if (index == entriesSoFar)
-                    {
-                        found = true;
-                        break;
-                    }
-
-                    entriesSoFar++;
-                }
-
-                position++;
-            }
-
-            if (found)
-            {
-                return position * _primaryHeader.PartitionEntrySize;
-            }
-            else
-            {
-                throw new IOException(string.Format(CultureInfo.InvariantCulture, "No such partition: {0}", index));
-            }
-        }
-
-        private int GetEntryIndex(Guid identity)
-        {
-            int index = 0;
-
-            for (int i = 0; i < _primaryHeader.PartitionEntryCount; ++i)
-            {
-                GptEntry entry = new GptEntry();
-                entry.ReadFrom(_entryBuffer, i * _primaryHeader.PartitionEntrySize);
-
-                if (entry.Identity == identity)
-                {
-                    return index;
-                }
-                else if (entry.PartitionType != Guid.Empty)
-                {
-                    index++;
-                }
-            }
-
-            throw new IOException("No such partition");
-        }
-
-        private int GetFreeEntryOffset()
-        {
-            for (int i = 0; i < _primaryHeader.PartitionEntryCount; ++i)
-            {
-                GptEntry entry = new GptEntry();
-                entry.ReadFrom(_entryBuffer, i * _primaryHeader.PartitionEntrySize);
-
-                if (entry.PartitionType == Guid.Empty)
-                {
-                    return i * _primaryHeader.PartitionEntrySize;
-                }
-            }
-
-            throw new IOException("No free partition entries available");
-        }
-    }
-}
diff --git a/DiscUtils/Partitions/GuidPartitionTypes.cs b/DiscUtils/Partitions/GuidPartitionTypes.cs
deleted file mode 100644
index 7fce76d..0000000
--- a/DiscUtils/Partitions/GuidPartitionTypes.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Partitions
-{
-    using System;
-
-    /// <summary>
-    /// Convenient access to well known GPT partition types.
-    /// </summary>
-    public static class GuidPartitionTypes
-    {
-        /// <summary>
-        /// EFI system partition.
-        /// </summary>
-        public static readonly Guid EfiSystem = new Guid("C12A7328-F81F-11D2-BA4B-00A0C93EC93B");
-
-        /// <summary>
-        /// BIOS boot partition.
-        /// </summary>
-        public static readonly Guid BiosBoot = new Guid("21686148-6449-6E6F-744E-656564454649");
-
-        /// <summary>
-        /// Microsoft reserved partition.
-        /// </summary>
-        public static readonly Guid MicrosoftReserved = new Guid("E3C9E316-0B5C-4DB8-817D-F92DF00215AE");
-
-        /// <summary>
-        /// Windows basic data partition.
-        /// </summary>
-        public static readonly Guid WindowsBasicData = new Guid("EBD0A0A2-B9E5-4433-87C0-68B6B72699C7");
-
-        /// <summary>
-        /// Linux LVM partition.
-        /// </summary>
-        public static readonly Guid LinuxLvm = new Guid("E6D6D379-F507-44C2-A23C-238F2A3DF928");
-
-        /// <summary>
-        /// Linux swap partition.
-        /// </summary>
-        public static readonly Guid LinuxSwap = new Guid("0657FD6D-A4AB-43C4-84E5-0933C84B4F4F");
-
-        /// <summary>
-        /// Windows Logical Disk Manager metadata.
-        /// </summary>
-        public static readonly Guid WindowsLdmMetadata = new Guid("5808C8AA-7E8F-42E0-85D2-E1E90434CFB3");
-
-        /// <summary>
-        /// Windows Logical Disk Manager data.
-        /// </summary>
-        public static readonly Guid WindowsLdmData = new Guid("AF9B60A0-1431-4F62-BC68-3311714A69AD");
-
-        /// <summary>
-        /// Converts a well known partition type to a Guid.
-        /// </summary>
-        /// <param name="wellKnown">The value to convert.</param>
-        /// <returns>The GUID value.</returns>
-        internal static Guid Convert(WellKnownPartitionType wellKnown)
-        {
-            switch (wellKnown)
-            {
-                case WellKnownPartitionType.Linux:
-                case WellKnownPartitionType.WindowsFat:
-                case WellKnownPartitionType.WindowsNtfs:
-                    return WindowsBasicData;
-                case WellKnownPartitionType.LinuxLvm:
-                    return LinuxLvm;
-                case WellKnownPartitionType.LinuxSwap:
-                    return LinuxSwap;
-                default:
-                    throw new ArgumentException("Unknown partition type");
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Partitions/PartitionInfo.cs b/DiscUtils/Partitions/PartitionInfo.cs
deleted file mode 100644
index 9b90b89..0000000
--- a/DiscUtils/Partitions/PartitionInfo.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Partitions
-{
-    using System;
-    using System.Globalization;
-
-    /// <summary>
-    /// Base class representing a disk partition.
-    /// </summary>
-    /// <remarks>The purpose of this class is to provide a minimal view of a partition,
-    /// such that callers can access existing partitions without specific knowledge of
-    /// the partitioning system.</remarks>
-    public abstract class PartitionInfo
-    {
-        /// <summary>
-        /// Gets the first sector of the partion (relative to start of disk) as a Logical Block Address.
-        /// </summary>
-        public abstract long FirstSector { get; }
-
-        /// <summary>
-        /// Gets the last sector of the partion (relative to start of disk) as a Logical Block Address (inclusive).
-        /// </summary>
-        public abstract long LastSector { get; }
-
-        /// <summary>
-        /// Gets the length of the partition in sectors.
-        /// </summary>
-        public virtual long SectorCount
-        {
-            get { return 1 + LastSector - FirstSector; }
-        }
-
-        /// <summary>
-        /// Gets the type of the partition, as a GUID, when available.
-        /// </summary>
-        /// <remarks><see cref="System.Guid"/>.Empty for MBR-style partitions.</remarks>
-        public abstract Guid GuidType { get; }
-
-        /// <summary>
-        /// Gets the type of the partition, in legacy BIOS form, when available.
-        /// </summary>
-        /// <remarks>Zero for GUID-style partitions.</remarks>
-        public abstract byte BiosType { get; }
-
-        /// <summary>
-        /// Gets the partition type as a 'friendly' string.
-        /// </summary>
-        public abstract string TypeAsString { get; }
-
-        /// <summary>
-        /// Gets the physical volume type for this type of partition.
-        /// </summary>
-        internal abstract PhysicalVolumeType VolumeType
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Opens a stream that accesses the partition's contents.
-        /// </summary>
-        /// <returns>The new stream.</returns>
-        public abstract SparseStream Open();
-
-        /// <summary>
-        /// Gets a summary of the partition information as 'first - last (type)'.
-        /// </summary>
-        /// <returns>A string representation of the partition information.</returns>
-        public override string ToString()
-        {
-            return String.Format(CultureInfo.InvariantCulture, "0x{0:X} - 0x{1:X} ({2})", FirstSector, LastSector, TypeAsString);
-        }
-    }
-}
diff --git a/DiscUtils/Partitions/PartitionTable.cs b/DiscUtils/Partitions/PartitionTable.cs
deleted file mode 100644
index 971c163..0000000
--- a/DiscUtils/Partitions/PartitionTable.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Partitions
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.IO;
-
-    /// <summary>
-    /// Base class for classes which represent a disk partitioning scheme.
-    /// </summary>
-    /// <remarks>After modifying the table, by creating or deleting a partition assume that any
-    /// previously stored partition indexes of higher value are no longer valid.  Re-enumerate
-    /// the partitions to discover the next index-to-partition mapping.</remarks>
-    public abstract class PartitionTable
-    {
-        private static List<PartitionTableFactory> s_factories;
-
-        /// <summary>
-        /// Gets the GUID that uniquely identifies this disk, if supported (else returns <c>null</c>).
-        /// </summary>
-        public abstract Guid DiskGuid { get; }
-
-        /// <summary>
-        /// Gets the list of partitions that contain user data (i.e. non-system / empty).
-        /// </summary>
-        public abstract ReadOnlyCollection<PartitionInfo> Partitions { get; }
-
-        /// <summary>
-        /// Gets the number of User partitions on the disk.
-        /// </summary>
-        public int Count
-        {
-            get { return Partitions.Count; }
-        }
-
-        private static List<PartitionTableFactory> Factories
-        {
-            get
-            {
-                if (s_factories == null)
-                {
-                    List<PartitionTableFactory> factories = new List<PartitionTableFactory>();
-
-                    foreach (var type in typeof(VolumeManager).Assembly.GetTypes())
-                    {
-                        foreach (PartitionTableFactoryAttribute attr in Attribute.GetCustomAttributes(type, typeof(PartitionTableFactoryAttribute), false))
-                        {
-                            factories.Add((PartitionTableFactory)Activator.CreateInstance(type));
-                        }
-                    }
-
-                    s_factories = factories;
-                }
-
-                return s_factories;
-            }
-        }
-
-        /// <summary>
-        /// Gets information about a particular User partition.
-        /// </summary>
-        /// <param name="index">The index of the partition.</param>
-        /// <returns>Information about the partition.</returns>
-        public PartitionInfo this[int index]
-        {
-            get { return Partitions[index]; }
-        }
-
-        /// <summary>
-        /// Determines if a disk is partitioned with a known partitioning scheme.
-        /// </summary>
-        /// <param name="content">The content of the disk to check.</param>
-        /// <returns><c>true</c> if the disk is partitioned, else <c>false</c>.</returns>
-        public static bool IsPartitioned(Stream content)
-        {
-            foreach (var partTableFactory in Factories)
-            {
-                if (partTableFactory.DetectIsPartitioned(content))
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Determines if a disk is partitioned with a known partitioning scheme.
-        /// </summary>
-        /// <param name="disk">The disk to check.</param>
-        /// <returns><c>true</c> if the disk is partitioned, else <c>false</c>.</returns>
-        public static bool IsPartitioned(VirtualDisk disk)
-        {
-            return IsPartitioned(disk.Content);
-        }
-
-        /// <summary>
-        /// Gets all of the partition tables found on a disk.
-        /// </summary>
-        /// <param name="disk">The disk to inspect.</param>
-        /// <returns>It is rare for a disk to have multiple partition tables, but theoretically
-        /// possible.</returns>
-        public static IList<PartitionTable> GetPartitionTables(VirtualDisk disk)
-        {
-            List<PartitionTable> tables = new List<PartitionTable>();
-
-            foreach (var factory in Factories)
-            {
-                PartitionTable table = factory.DetectPartitionTable(disk);
-                if (table != null)
-                {
-                    tables.Add(table);
-                }
-            }
-
-            return tables;
-        }
-
-        /// <summary>
-        /// Gets all of the partition tables found on a disk.
-        /// </summary>
-        /// <param name="contentStream">The content of the disk to inspect.</param>
-        /// <returns>It is rare for a disk to have multiple partition tables, but theoretically
-        /// possible.</returns>
-        public static IList<PartitionTable> GetPartitionTables(Stream contentStream)
-        {
-            return GetPartitionTables(new Raw.Disk(contentStream, Ownership.None));
-        }
-
-        /// <summary>
-        /// Creates a new partition that encompasses the entire disk.
-        /// </summary>
-        /// <param name="type">The partition type.</param>
-        /// <param name="active">Whether the partition is active (bootable).</param>
-        /// <returns>The index of the partition.</returns>
-        /// <remarks>The partition table must be empty before this method is called,
-        /// otherwise IOException is thrown.</remarks>
-        public abstract int Create(WellKnownPartitionType type, bool active);
-
-        /// <summary>
-        /// Creates a new partition with a target size.
-        /// </summary>
-        /// <param name="size">The target size (in bytes).</param>
-        /// <param name="type">The partition type.</param>
-        /// <param name="active">Whether the partition is active (bootable).</param>
-        /// <returns>The index of the new partition.</returns>
-        public abstract int Create(long size, WellKnownPartitionType type, bool active);
-
-        /// <summary>
-        /// Creates a new aligned partition that encompasses the entire disk.
-        /// </summary>
-        /// <param name="type">The partition type.</param>
-        /// <param name="active">Whether the partition is active (bootable).</param>
-        /// <param name="alignment">The alignment (in byte).</param>
-        /// <returns>The index of the partition.</returns>
-        /// <remarks>The partition table must be empty before this method is called,
-        /// otherwise IOException is thrown.</remarks>
-        /// <remarks>
-        /// Traditionally partitions were aligned to the physical structure of the underlying disk,
-        /// however with modern storage greater efficiency is acheived by aligning partitions on
-        /// large values that are a power of two.
-        /// </remarks>
-        public abstract int CreateAligned(WellKnownPartitionType type, bool active, int alignment);
-
-        /// <summary>
-        /// Creates a new aligned partition with a target size.
-        /// </summary>
-        /// <param name="size">The target size (in bytes).</param>
-        /// <param name="type">The partition type.</param>
-        /// <param name="active">Whether the partition is active (bootable).</param>
-        /// <param name="alignment">The alignment (in byte).</param>
-        /// <returns>The index of the new partition.</returns>
-        /// <remarks>
-        /// Traditionally partitions were aligned to the physical structure of the underlying disk,
-        /// however with modern storage greater efficiency is achieved by aligning partitions on
-        /// large values that are a power of two.
-        /// </remarks>
-        public abstract int CreateAligned(long size, WellKnownPartitionType type, bool active, int alignment);
-
-        /// <summary>
-        /// Deletes a partition at a given index.
-        /// </summary>
-        /// <param name="index">The index of the partition.</param>
-        public abstract void Delete(int index);
-    }
-}
diff --git a/DiscUtils/Partitions/PartitionTableFactory.cs b/DiscUtils/Partitions/PartitionTableFactory.cs
deleted file mode 100644
index 19ec3da..0000000
--- a/DiscUtils/Partitions/PartitionTableFactory.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Partitions
-{
-    using System.IO;
-
-    internal abstract class PartitionTableFactory
-    {
-        public abstract bool DetectIsPartitioned(Stream s);
-
-        public abstract PartitionTable DetectPartitionTable(VirtualDisk disk);
-    }
-}
diff --git a/DiscUtils/Partitions/PartitionTableFactoryAttribute.cs b/DiscUtils/Partitions/PartitionTableFactoryAttribute.cs
deleted file mode 100644
index 5cb4cbb..0000000
--- a/DiscUtils/Partitions/PartitionTableFactoryAttribute.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Partitions
-{
-    using System;
-
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
-    internal sealed class PartitionTableFactoryAttribute : Attribute
-    {
-    }
-}
diff --git a/DiscUtils/Partitions/WellKnownPartitionType.cs b/DiscUtils/Partitions/WellKnownPartitionType.cs
deleted file mode 100644
index c91e573..0000000
--- a/DiscUtils/Partitions/WellKnownPartitionType.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Partitions
-{
-    /// <summary>
-    /// Enumeration of partition-table technology neutral partition types.
-    /// </summary>
-    public enum WellKnownPartitionType
-    {
-        /// <summary>
-        /// Windows FAT-based partition.
-        /// </summary>
-        WindowsFat = 0,
-
-        /// <summary>
-        /// Windows NTFS-based partition.
-        /// </summary>
-        WindowsNtfs = 1,
-
-        /// <summary>
-        /// Linux native file system.
-        /// </summary>
-        Linux = 2,
-
-        /// <summary>
-        /// Linux swap.
-        /// </summary>
-        LinuxSwap = 3,
-
-        /// <summary>
-        /// Linux Logical Volume Manager (LVM).
-        /// </summary>
-        LinuxLvm = 4,
-    }
-}
diff --git a/DiscUtils/PhysicalVolumeInfo.cs b/DiscUtils/PhysicalVolumeInfo.cs
deleted file mode 100644
index 83176cc..0000000
--- a/DiscUtils/PhysicalVolumeInfo.cs
+++ /dev/null
@@ -1,241 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using DiscUtils.Partitions;
-    using System;
-    using System.Globalization;
-
-    /// <summary>
-    /// Enumeration of possible types of physical volume.
-    /// </summary>
-    public enum PhysicalVolumeType
-    {
-        /// <summary>
-        /// Unknown type.
-        /// </summary>
-        None,
-
-        /// <summary>
-        /// Physical volume encompasses the entire disk.
-        /// </summary>
-        EntireDisk,
-
-        /// <summary>
-        /// Physical volume is defined by a BIOS-style partition table.
-        /// </summary>
-        BiosPartition,
-
-        /// <summary>
-        /// Physical volume is defined by a GUID partition table.
-        /// </summary>
-        GptPartition,
-
-        /// <summary>
-        /// Physical volume is defined by an Apple partition map.
-        /// </summary>
-        ApplePartition
-    }
-
-    /// <summary>
-    /// Information about a physical disk volume, which may be a partition or an entire disk.
-    /// </summary>
-    public sealed class PhysicalVolumeInfo : VolumeInfo
-    {
-        private string _diskId;
-        private VirtualDisk _disk;
-        private SparseStreamOpenDelegate _streamOpener;
-        private PhysicalVolumeType _type;
-        private PartitionInfo _partitionInfo;
-
-        /// <summary>
-        /// Initializes a new instance of the PhysicalVolumeInfo class.
-        /// </summary>
-        /// <param name="diskId">The containing disk's identity.</param>
-        /// <param name="disk">The disk containing the partition.</param>
-        /// <param name="partitionInfo">Information about the partition.</param>
-        /// <remarks>Use this constructor to represent a (BIOS or GPT) partition.</remarks>
-        internal PhysicalVolumeInfo(
-            string diskId,
-            VirtualDisk disk,
-            PartitionInfo partitionInfo)
-        {
-            _diskId = diskId;
-            _disk = disk;
-            _streamOpener = partitionInfo.Open;
-            _type = partitionInfo.VolumeType;
-            _partitionInfo = partitionInfo;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the PhysicalVolumeInfo class.
-        /// </summary>
-        /// <param name="diskId">The identity of the disk.</param>
-        /// <param name="disk">The disk itself.</param>
-        /// <remarks>Use this constructor to represent an entire disk as a single volume.</remarks>
-        internal PhysicalVolumeInfo(
-            string diskId,
-            VirtualDisk disk)
-        {
-            _diskId = diskId;
-            _disk = disk;
-            _streamOpener = delegate { return new SubStream(disk.Content, Ownership.None, 0, disk.Capacity); };
-            _type = PhysicalVolumeType.EntireDisk;
-        }
-
-        /// <summary>
-        /// Gets the type of the volume.
-        /// </summary>
-        public PhysicalVolumeType VolumeType
-        {
-            get { return _type; }
-        }
-
-        /// <summary>
-        /// Gets the signature of the disk containing the volume (only valid for partition-type volumes).
-        /// </summary>
-        public int DiskSignature
-        {
-            get { return (_type != PhysicalVolumeType.EntireDisk) ? _disk.Signature : 0; }
-        }
-
-        /// <summary>
-        /// Gets the unique identity of the disk containing the volume, if known.
-        /// </summary>
-        public Guid DiskIdentity
-        {
-            get { return (_type != PhysicalVolumeType.EntireDisk) ? _disk.Partitions.DiskGuid : Guid.Empty; }
-        }
-
-        /// <summary>
-        /// Gets the one-byte BIOS type for this volume, which indicates the content.
-        /// </summary>
-        public override byte BiosType
-        {
-            get { return (_partitionInfo == null) ? (byte)0 : _partitionInfo.BiosType; }
-        }
-
-        /// <summary>
-        /// Gets the size of the volume, in bytes.
-        /// </summary>
-        public override long Length
-        {
-            get { return (_partitionInfo == null) ? _disk.Capacity : _partitionInfo.SectorCount * _disk.SectorSize; }
-        }
-
-        /// <summary>
-        /// Gets the stable identity for this physical volume.
-        /// </summary>
-        /// <remarks>The stability of the identity depends the disk structure.
-        /// In some cases the identity may include a simple index, when no other information
-        /// is available.  Best practice is to add disks to the Volume Manager in a stable 
-        /// order, if the stability of this identity is paramount.</remarks>
-        public override string Identity
-        {
-            get
-            {
-                if (_type == PhysicalVolumeType.GptPartition)
-                {
-                    return "VPG" + PartitionIdentity.ToString("B");
-                }
-                else
-                {
-                    string partId;
-                    switch (_type)
-                    {
-                        case PhysicalVolumeType.EntireDisk:
-                            partId = "PD";
-                            break;
-                        case PhysicalVolumeType.BiosPartition:
-                        case PhysicalVolumeType.ApplePartition:
-                            partId = "PO" + (_partitionInfo.FirstSector * _disk.SectorSize).ToString("X", CultureInfo.InvariantCulture);
-                            break;
-                        default:
-                            partId = "P*";
-                            break;
-                    }
-
-                    return "VPD:" + _diskId + ":" + partId;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the disk geometry of the underlying storage medium, if any (may be null).
-        /// </summary>
-        public override Geometry PhysicalGeometry
-        {
-            get { return _disk.Geometry; }
-        }
-
-        /// <summary>
-        /// Gets the disk geometry of the underlying storage medium (as used in BIOS calls), may be null.
-        /// </summary>
-        public override Geometry BiosGeometry
-        {
-            get { return _disk.BiosGeometry; }
-        }
-
-        /// <summary>
-        /// Gets the offset of this volume in the underlying storage medium, if any (may be Zero).
-        /// </summary>
-        public override long PhysicalStartSector
-        {
-            get { return _type == PhysicalVolumeType.EntireDisk ? 0 : _partitionInfo.FirstSector; }
-        }
-
-        /// <summary>
-        /// Gets the unique identity of the physical partition, if known.
-        /// </summary>
-        public Guid PartitionIdentity
-        {
-            get
-            {
-                GuidPartitionInfo gpi = _partitionInfo as GuidPartitionInfo;
-                if (gpi != null)
-                {
-                    return gpi.Identity;
-                }
-
-                return Guid.Empty;
-            }
-        }
-
-        /// <summary>
-        /// Gets the underlying partition (if any).
-        /// </summary>
-        internal PartitionInfo Partition
-        {
-            get { return _partitionInfo; }
-        }
-
-        /// <summary>
-        /// Opens the volume, providing access to its contents.
-        /// </summary>
-        /// <returns>A stream that can be used to access the volume.</returns>
-        public override SparseStream Open()
-        {
-            return _streamOpener();
-        }
-    }
-}
diff --git a/DiscUtils/PumpProgressEventArgs.cs b/DiscUtils/PumpProgressEventArgs.cs
deleted file mode 100644
index 382ae6c..0000000
--- a/DiscUtils/PumpProgressEventArgs.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-
-    /// <summary>
-    /// Event arguments indicating progress on pumping a stream.
-    /// </summary>
-    public class PumpProgressEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Gets or sets the number of bytes read from <c>InputStream</c>.
-        /// </summary>
-        public long BytesRead { get; set; }
-
-        /// <summary>
-        /// Gets or sets the number of bytes written to <c>OutputStream</c>.
-        /// </summary>
-        public long BytesWritten { get; set; }
-
-        /// <summary>
-        /// Gets or sets the absolute position in <c>InputStream</c>.
-        /// </summary>
-        public long SourcePosition { get; set; }
-
-        /// <summary>
-        /// Gets or sets the absolute position in <c>OutputStream</c>.
-        /// </summary>
-        public long DestinationPosition { get; set; }
-    }
-}
diff --git a/DiscUtils/Range.cs b/DiscUtils/Range.cs
deleted file mode 100644
index 9bcc534..0000000
--- a/DiscUtils/Range.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// Represents a range of values.
-    /// </summary>
-    /// <typeparam name="TOffset">The type of the offset element.</typeparam>
-    /// <typeparam name="TCount">The type of the size element.</typeparam>
-    public class Range<TOffset, TCount> : IEquatable<Range<TOffset, TCount>>
-        where TOffset : IEquatable<TOffset>
-        where TCount : IEquatable<TCount>
-    {
-        private TOffset _offset;
-        private TCount _count;
-
-        /// <summary>
-        /// Initializes a new instance of the Range class.
-        /// </summary>
-        /// <param name="offset">The offset (i.e. start) of the range.</param>
-        /// <param name="count">The size of the range.</param>
-        public Range(TOffset offset, TCount count)
-        {
-            _offset = offset;
-            _count = count;
-        }
-
-        /// <summary>
-        /// Gets the offset (i.e. start) of the range.
-        /// </summary>
-        public TOffset Offset
-        {
-            get { return _offset; }
-        }
-
-        /// <summary>
-        /// Gets the size of the range.
-        /// </summary>
-        public TCount Count
-        {
-            get { return _count; }
-        }
-
-        /// <summary>
-        /// Merges sets of ranges into chunks.
-        /// </summary>
-        /// <param name="ranges">The ranges to merge.</param>
-        /// <param name="chunkSize">The size of each chunk.</param>
-        /// <returns>Ranges combined into larger chunks.</returns>
-        /// <typeparam name="T">The type of the offset and count in the ranges.</typeparam>
-        public static IEnumerable<Range<T, T>> Chunked<T>(IEnumerable<Range<T, T>> ranges, T chunkSize)
-            where T : struct, IEquatable<T>, IComparable<T>
-        {
-            T? chunkStart = Numbers<T>.Zero;
-            T chunkLength = Numbers<T>.Zero;
-
-            foreach (var range in ranges)
-            {
-                if (Numbers<T>.NotEqual(range.Count, Numbers<T>.Zero))
-                {
-                    T rangeStart = Numbers<T>.RoundDown(range.Offset, chunkSize);
-                    T rangeNext = Numbers<T>.RoundUp(Numbers<T>.Add(range.Offset, range.Count), chunkSize);
-
-                    if (chunkStart.HasValue && Numbers<T>.GreaterThan(rangeStart, Numbers<T>.Add(chunkStart.Value, chunkLength)))
-                    {
-                        // This extent is non-contiguous (in terms of blocks), so write out the last range and start new
-                        yield return new Range<T, T>(chunkStart.Value, chunkLength);
-                        chunkStart = rangeStart;
-                    }
-                    else if (!chunkStart.HasValue)
-                    {
-                        // First extent, so start first range
-                        chunkStart = rangeStart;
-                    }
-
-                    // Set the length of the current range, based on the end of this extent
-                    chunkLength = Numbers<T>.Subtract(rangeNext, chunkStart.Value);
-                }
-            }
-
-            // Final range (if any ranges at all) hasn't been returned yet, so do that now
-            if (chunkStart.HasValue)
-            {
-                yield return new Range<T, T>(chunkStart.Value, chunkLength);
-            }
-        }
-
-        /// <summary>
-        /// Returns a string representation of the extent as [start:+length].
-        /// </summary>
-        /// <returns>The string representation.</returns>
-        public override string ToString()
-        {
-            return "[" + _offset + ":+" + _count + "]";
-        }
-
-        #region IEquatable<Range<TOffset,TCount>> Members
-
-        /// <summary>
-        /// Compares this range to another.
-        /// </summary>
-        /// <param name="other">The range to compare.</param>
-        /// <returns><c>true</c> if the ranges are equivalent, else <c>false</c>.</returns>
-        public bool Equals(Range<TOffset, TCount> other)
-        {
-            if (other == null)
-            {
-                return false;
-            }
-
-            return _offset.Equals(other.Offset) && _count.Equals(other._count);
-        }
-
-        #endregion
-    }
-}
diff --git a/DiscUtils/Raw/Disk.cs b/DiscUtils/Raw/Disk.cs
deleted file mode 100644
index 64142fb..0000000
--- a/DiscUtils/Raw/Disk.cs
+++ /dev/null
@@ -1,223 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Raw
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    /// <summary>
-    /// Represents a raw disk image.
-    /// </summary>
-    /// <remarks>This disk format is simply an uncompressed capture of all blocks on a disk.</remarks>
-    public sealed class Disk : VirtualDisk
-    {
-        private DiskImageFile _file;
-
-        /// <summary>
-        /// Initializes a new instance of the Disk class.
-        /// </summary>
-        /// <param name="stream">The stream to read.</param>
-        /// <param name="ownsStream">Indicates if the new instance should control the lifetime of the stream.</param>
-        public Disk(Stream stream, Ownership ownsStream)
-            : this(stream, ownsStream, null)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the Disk class.
-        /// </summary>
-        /// <param name="stream">The stream to read.</param>
-        /// <param name="ownsStream">Indicates if the new instance should control the lifetime of the stream.</param>
-        /// <param name="geometry">The emulated geometry of the disk.</param>
-        public Disk(Stream stream, Ownership ownsStream, Geometry geometry)
-        {
-            _file = new DiskImageFile(stream, ownsStream, geometry);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the Disk class.
-        /// </summary>
-        /// <param name="path">The path to the disk image.</param>
-        public Disk(string path)
-        {
-            _file = new DiskImageFile(new FileStream(path, FileMode.Open, FileAccess.ReadWrite, FileShare.None), Ownership.Dispose, null);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the Disk class.
-        /// </summary>
-        /// <param name="path">The path to the disk image.</param>
-        /// <param name="access">The access requested to the disk.</param>
-        public Disk(string path, FileAccess access)
-        {
-            FileShare share = (access == FileAccess.Read) ? FileShare.Read : FileShare.None;
-            _file = new DiskImageFile(new FileStream(path, FileMode.Open, access, share), Ownership.Dispose, null);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the Disk class.
-        /// </summary>
-        /// <param name="file">The contents of the disk.</param>
-        private Disk(DiskImageFile file)
-        {
-            _file = file;
-        }
-
-        /// <summary>
-        /// Gets the geometry of the disk.
-        /// </summary>
-        public override Geometry Geometry
-        {
-            get { return _file.Geometry; }
-        }
-
-        /// <summary>
-        /// Gets the type of disk represented by this object.
-        /// </summary>
-        public override VirtualDiskClass DiskClass
-        {
-            get { return _file.DiskType; }
-        }
-
-        /// <summary>
-        /// Gets the capacity of the disk (in bytes).
-        /// </summary>
-        public override long Capacity
-        {
-            get { return _file.Capacity; }
-        }
-
-        /// <summary>
-        /// Gets the content of the disk as a stream.
-        /// </summary>
-        /// <remarks>Note the returned stream is not guaranteed to be at any particular position.  The actual position
-        /// will depend on the last partition table/file system activity, since all access to the disk contents pass
-        /// through a single stream instance.  Set the stream position before accessing the stream.</remarks>
-        public override SparseStream Content
-        {
-            get { return _file.Content; }
-        }
-
-        /// <summary>
-        /// Gets the layers that make up the disk.
-        /// </summary>
-        public override IEnumerable<VirtualDiskLayer> Layers
-        {
-            get { yield return _file; }
-        }
-
-        /// <summary>
-        /// Gets information about the type of disk.
-        /// </summary>
-        /// <remarks>This property provides access to meta-data about the disk format, for example whether the
-        /// BIOS geometry is preserved in the disk file.</remarks>
-        public override VirtualDiskTypeInfo DiskTypeInfo
-        {
-            get { return DiskFactory.MakeDiskTypeInfo(); }
-        }
-
-        /// <summary>
-        /// Initializes a stream as an unformatted disk.
-        /// </summary>
-        /// <param name="stream">The stream to initialize.</param>
-        /// <param name="ownsStream">Indicates if the new instance controls the lifetime of the stream.</param>
-        /// <param name="capacity">The desired capacity of the new disk.</param>
-        /// <returns>An object that accesses the stream as a disk.</returns>
-        public static Disk Initialize(Stream stream, Ownership ownsStream, long capacity)
-        {
-            return Initialize(stream, ownsStream, capacity, null);
-        }
-
-        /// <summary>
-        /// Initializes a stream as an unformatted disk.
-        /// </summary>
-        /// <param name="stream">The stream to initialize.</param>
-        /// <param name="ownsStream">Indicates if the new instance controls the lifetime of the stream.</param>
-        /// <param name="capacity">The desired capacity of the new disk.</param>
-        /// <param name="geometry">The desired geometry of the new disk, or <c>null</c> for default.</param>
-        /// <returns>An object that accesses the stream as a disk.</returns>
-        public static Disk Initialize(Stream stream, Ownership ownsStream, long capacity, Geometry geometry)
-        {
-            return new Disk(DiskImageFile.Initialize(stream, ownsStream, capacity, geometry));
-        }
-
-        /// <summary>
-        /// Initializes a stream as an unformatted floppy disk.
-        /// </summary>
-        /// <param name="stream">The stream to initialize.</param>
-        /// <param name="ownsStream">Indicates if the new instance controls the lifetime of the stream.</param>
-        /// <param name="type">The type of floppy disk image to create.</param>
-        /// <returns>An object that accesses the stream as a disk.</returns>
-        public static Disk Initialize(Stream stream, Ownership ownsStream, FloppyDiskType type)
-        {
-            return new Disk(DiskImageFile.Initialize(stream, ownsStream, type));
-        }
-
-        /// <summary>
-        /// Create a new differencing disk, possibly within an existing disk.
-        /// </summary>
-        /// <param name="fileSystem">The file system to create the disk on.</param>
-        /// <param name="path">The path (or URI) for the disk to create.</param>
-        /// <returns>The newly created disk.</returns>
-        public override VirtualDisk CreateDifferencingDisk(DiscFileSystem fileSystem, string path)
-        {
-            throw new NotSupportedException("Differencing disks not supported for raw disks");
-        }
-
-        /// <summary>
-        /// Create a new differencing disk.
-        /// </summary>
-        /// <param name="path">The path (or URI) for the disk to create.</param>
-        /// <returns>The newly created disk.</returns>
-        public override VirtualDisk CreateDifferencingDisk(string path)
-        {
-            throw new NotSupportedException("Differencing disks not supported for raw disks");
-        }
-
-        /// <summary>
-        /// Disposes of underlying resources.
-        /// </summary>
-        /// <param name="disposing">Set to <c>true</c> if called within Dispose(),
-        /// else <c>false</c>.</param>
-        protected override void Dispose(bool disposing)
-        {
-            try
-            {
-                if (disposing)
-                {
-                    if (_file != null)
-                    {
-                        _file.Dispose();
-                    }
-
-                    _file = null;
-                }
-            }
-            finally
-            {
-                base.Dispose(disposing);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Raw/DiskFactory.cs b/DiscUtils/Raw/DiskFactory.cs
deleted file mode 100644
index 17dc483..0000000
--- a/DiscUtils/Raw/DiskFactory.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Raw
-{
-    using System;
-    using System.IO;
-
-    [VirtualDiskFactory("RAW", ".img,.ima,.vfd,.flp,.bif")]
-    internal sealed class DiskFactory : VirtualDiskFactory
-    {
-        public override string[] Variants
-        {
-            get { return new string[] { }; }
-        }
-
-        public override VirtualDiskTypeInfo GetDiskTypeInformation(string variant)
-        {
-            return MakeDiskTypeInfo();
-        }
-
-        public override DiskImageBuilder GetImageBuilder(string variant)
-        {
-            throw new NotSupportedException();
-        }
-
-        public override VirtualDisk CreateDisk(FileLocator locator, string variant, string path, VirtualDiskParameters diskParameters)
-        {
-            return Disk.Initialize(locator.Open(path, FileMode.Create, FileAccess.ReadWrite, FileShare.None), Ownership.Dispose, diskParameters.Capacity, diskParameters.Geometry);
-        }
-
-        public override VirtualDisk OpenDisk(string path, FileAccess access)
-        {
-            return new Disk(path, access);
-        }
-
-        public override VirtualDisk OpenDisk(FileLocator locator, string path, FileAccess access)
-        {
-            FileShare share = access == FileAccess.Read ? FileShare.Read : FileShare.None;
-            return new Disk(locator.Open(path, FileMode.Open, access, share), Ownership.Dispose);
-        }
-
-        public override VirtualDiskLayer OpenDiskLayer(FileLocator locator, string path, FileAccess access)
-        {
-            return null;
-        }
-
-        internal static VirtualDiskTypeInfo MakeDiskTypeInfo()
-        {
-            return new VirtualDiskTypeInfo()
-            {
-                Name = "RAW",
-                Variant = string.Empty,
-                CanBeHardDisk = true,
-                DeterministicGeometry = true,
-                PreservesBiosGeometry = false,
-                CalcGeometry = c => Geometry.FromCapacity(c),
-            };
-        }
-    }
-}
diff --git a/DiscUtils/Raw/DiskImageFile.cs b/DiscUtils/Raw/DiskImageFile.cs
deleted file mode 100644
index a092d69..0000000
--- a/DiscUtils/Raw/DiskImageFile.cs
+++ /dev/null
@@ -1,258 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Raw
-{
-    using DiscUtils.Partitions;
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Represents a single raw disk image file.
-    /// </summary>
-    public sealed class DiskImageFile : VirtualDiskLayer
-    {
-        private SparseStream _content;
-        private Ownership _ownsContent;
-        private Geometry _geometry;
-
-        /// <summary>
-        /// Initializes a new instance of the DiskImageFile class.
-        /// </summary>
-        /// <param name="stream">The stream to interpret.</param>
-        public DiskImageFile(Stream stream)
-            : this(stream, Ownership.None, null)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the DiskImageFile class.
-        /// </summary>
-        /// <param name="stream">The stream to interpret.</param>
-        /// <param name="ownsStream">Indicates if the new instance should control the lifetime of the stream.</param>
-        /// <param name="geometry">The emulated geometry of the disk.</param>
-        public DiskImageFile(Stream stream, Ownership ownsStream, Geometry geometry)
-        {
-            _content = stream as SparseStream;
-            _ownsContent = ownsStream;
-
-            if (_content == null)
-            {
-                _content = SparseStream.FromStream(stream, ownsStream);
-                _ownsContent = Ownership.Dispose;
-            }
-
-            _geometry = geometry ?? DetectGeometry(_content);
-        }
-
-        /// <summary>
-        /// Gets the geometry of the file.
-        /// </summary>
-        public override Geometry Geometry
-        {
-            get { return _geometry; }
-        }
-
-        /// <summary>
-        /// Gets a value indicating if the layer only stores meaningful sectors.
-        /// </summary>
-        public override bool IsSparse
-        {
-            get { return false; }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the file is a differencing disk.
-        /// </summary>
-        public override bool NeedsParent
-        {
-            get { return false; }
-        }
-
-        /// <summary>
-        /// Gets the type of disk represented by this object.
-        /// </summary>
-        public VirtualDiskClass DiskType
-        {
-            get { return DetectDiskType(Capacity); }
-        }
-
-        internal override long Capacity
-        {
-            get { return _content.Length; }
-        }
-
-        internal override FileLocator RelativeFileLocator
-        {
-            get { return null; }
-        }
-
-        internal SparseStream Content
-        {
-            get { return _content; }
-        }
-
-        /// <summary>
-        /// Initializes a stream as a raw disk image.
-        /// </summary>
-        /// <param name="stream">The stream to initialize.</param>
-        /// <param name="ownsStream">Indicates if the new instance controls the lifetime of the stream.</param>
-        /// <param name="capacity">The desired capacity of the new disk.</param>
-        /// <param name="geometry">The geometry of the new disk.</param>
-        /// <returns>An object that accesses the stream as a raw disk image.</returns>
-        public static DiskImageFile Initialize(Stream stream, Ownership ownsStream, long capacity, Geometry geometry)
-        {
-            stream.SetLength(Utilities.RoundUp(capacity, Sizes.Sector));
-
-            // Wipe any pre-existing master boot record / BPB
-            stream.Position = 0;
-            stream.Write(new byte[Sizes.Sector], 0, Sizes.Sector);
-            stream.Position = 0;
-
-            return new DiskImageFile(stream, ownsStream, geometry);
-        }
-
-        /// <summary>
-        /// Initializes a stream as an unformatted floppy disk.
-        /// </summary>
-        /// <param name="stream">The stream to initialize.</param>
-        /// <param name="ownsStream">Indicates if the new instance controls the lifetime of the stream.</param>
-        /// <param name="type">The type of floppy disk image to create.</param>
-        /// <returns>An object that accesses the stream as a disk.</returns>
-        public static DiskImageFile Initialize(Stream stream, Ownership ownsStream, FloppyDiskType type)
-        {
-            return Initialize(stream, ownsStream, FloppyCapacity(type), null);
-        }
-
-        /// <summary>
-        /// Gets the content of this layer.
-        /// </summary>
-        /// <param name="parent">The parent stream (if any).</param>
-        /// <param name="ownsParent">Controls ownership of the parent stream.</param>
-        /// <returns>The content as a stream.</returns>
-        public override SparseStream OpenContent(SparseStream parent, Ownership ownsParent)
-        {
-            if (ownsParent == Ownership.Dispose && parent != null)
-            {
-                parent.Dispose();
-            }
-
-            return SparseStream.FromStream(Content, Ownership.None);
-        }
-
-        /// <summary>
-        /// Gets the possible locations of the parent file (if any).
-        /// </summary>
-        /// <returns>Array of strings, empty if no parent.</returns>
-        public override string[] GetParentLocations()
-        {
-            return new string[0];
-        }
-
-        /// <summary>
-        /// Disposes of underlying resources.
-        /// </summary>
-        /// <param name="disposing">Set to <c>true</c> if called within Dispose(),
-        /// else <c>false</c>.</param>
-        protected override void Dispose(bool disposing)
-        {
-            try
-            {
-                if (disposing)
-                {
-                    if (_ownsContent == Ownership.Dispose && _content != null)
-                    {
-                        _content.Dispose();
-                    }
-
-                    _content = null;
-                }
-            }
-            finally
-            {
-                base.Dispose(disposing);
-            }
-        }
-
-        /// <summary>
-        /// Calculates the best guess geometry of a disk.
-        /// </summary>
-        /// <param name="disk">The disk to detect the geometry of.</param>
-        /// <returns>The geometry of the disk.</returns>
-        private static Geometry DetectGeometry(Stream disk)
-        {
-            long capacity = disk.Length;
-
-            // First, check for floppy disk capacities - these have well-defined geometries
-            if (capacity == Sizes.Sector * 1440)
-            {
-                return new Geometry(80, 2, 9);
-            }
-            else if (capacity == Sizes.Sector * 2880)
-            {
-                return new Geometry(80, 2, 18);
-            }
-            else if (capacity == Sizes.Sector * 5760)
-            {
-                return new Geometry(80, 2, 36);
-            }
-
-            // Failing that, try to detect the geometry from any partition table.
-            // Note: this call falls back to guessing the geometry from the capacity
-            return BiosPartitionTable.DetectGeometry(disk);
-        }
-
-        /// <summary>
-        /// Calculates the best guess disk type (i.e. floppy or hard disk).
-        /// </summary>
-        /// <param name="capacity">The capacity of the disk.</param>
-        /// <returns>The disk type.</returns>
-        private static VirtualDiskClass DetectDiskType(long capacity)
-        {
-            if (capacity == Sizes.Sector * 1440
-                || capacity == Sizes.Sector * 2880
-                || capacity == Sizes.Sector * 5760)
-            {
-                return VirtualDiskClass.FloppyDisk;
-            }
-            else
-            {
-                return VirtualDiskClass.HardDisk;
-            }
-        }
-
-        private static long FloppyCapacity(FloppyDiskType type)
-        {
-            switch (type)
-            {
-                case FloppyDiskType.DoubleDensity:
-                    return Sizes.Sector * 1440;
-                case FloppyDiskType.HighDensity:
-                    return Sizes.Sector * 2880;
-                case FloppyDiskType.Extended:
-                    return Sizes.Sector * 5760;
-                default:
-                    throw new ArgumentException("Invalid floppy disk type", "type");
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Registry/Bin.cs b/DiscUtils/Registry/Bin.cs
deleted file mode 100644
index 78564a5..0000000
--- a/DiscUtils/Registry/Bin.cs
+++ /dev/null
@@ -1,217 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Registry
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    /// <summary>
-    /// An internal structure within registry files, bins are the major unit of allocation in a registry hive.
-    /// </summary>
-    /// <remarks>Bins are divided into multiple cells, that contain actual registry data.</remarks>
-    internal sealed class Bin
-    {
-        private RegistryHive _hive;
-        private Stream _fileStream;
-        private long _streamPos;
-
-        private BinHeader _header;
-        private byte[] _buffer;
-
-        private List<Range<int, int>> _freeCells;
-
-        public Bin(RegistryHive hive, Stream stream)
-        {
-            _hive = hive;
-            _fileStream = stream;
-            _streamPos = stream.Position;
-
-            stream.Position = _streamPos;
-            byte[] buffer = Utilities.ReadFully(stream, 0x20);
-            _header = new BinHeader();
-            _header.ReadFrom(buffer, 0);
-
-            _fileStream.Position = _streamPos;
-            _buffer = Utilities.ReadFully(_fileStream, _header.BinSize);
-
-            // Gather list of all free cells.
-            _freeCells = new List<Range<int, int>>();
-            int pos = 0x20;
-            while (pos < _buffer.Length)
-            {
-                int size = Utilities.ToInt32LittleEndian(_buffer, pos);
-                if (size > 0)
-                {
-                    _freeCells.Add(new Range<int, int>(pos, size));
-                }
-
-                pos += Math.Abs(size);
-            }
-        }
-
-        public Cell TryGetCell(int index)
-        {
-            int size = Utilities.ToInt32LittleEndian(_buffer, index - _header.FileOffset);
-            if (size >= 0)
-            {
-                return null;
-            }
-
-            return Cell.Parse(_hive, index, _buffer, index + 4 - _header.FileOffset);
-        }
-
-        public void FreeCell(int index)
-        {
-            int freeIndex = index - _header.FileOffset;
-
-            int len = Utilities.ToInt32LittleEndian(_buffer, freeIndex);
-            if (len >= 0)
-            {
-                throw new ArgumentException("Attempt to free non-allocated cell");
-            }
-
-            len = Math.Abs(len);
-
-            // If there's a free cell before this one, combine
-            int i = 0;
-            while (i < _freeCells.Count && _freeCells[i].Offset < freeIndex)
-            {
-                if (_freeCells[i].Offset + _freeCells[i].Count == freeIndex)
-                {
-                    freeIndex = _freeCells[i].Offset;
-                    len += _freeCells[i].Count;
-                    _freeCells.RemoveAt(i);
-                }
-                else
-                {
-                    ++i;
-                }
-            }
-
-            // If there's a free cell after this one, combine
-            if (i < _freeCells.Count && _freeCells[i].Offset == freeIndex + len)
-            {
-                len += _freeCells[i].Count;
-                _freeCells.RemoveAt(i);
-            }
-
-            // Record the new free cell
-            _freeCells.Insert(i, new Range<int, int>(freeIndex, len));
-
-            // Free cells are indicated by length > 0
-            Utilities.WriteBytesLittleEndian(len, _buffer, freeIndex);
-
-            _fileStream.Position = _streamPos + freeIndex;
-            _fileStream.Write(_buffer, freeIndex, 4);
-        }
-
-        public bool UpdateCell(Cell cell)
-        {
-            int index = cell.Index - _header.FileOffset;
-            int allocSize = Math.Abs(Utilities.ToInt32LittleEndian(_buffer, index));
-
-            int newSize = cell.Size + 4;
-            if (newSize > allocSize)
-            {
-                return false;
-            }
-
-            cell.WriteTo(_buffer, index + 4);
-
-            _fileStream.Position = _streamPos + index;
-            _fileStream.Write(_buffer, index, newSize);
-
-            return true;
-        }
-
-        public byte[] ReadRawCellData(int cellIndex, int maxBytes)
-        {
-            int index = cellIndex - _header.FileOffset;
-            int len = Math.Abs(Utilities.ToInt32LittleEndian(_buffer, index));
-            byte[] result = new byte[Math.Min(len - 4, maxBytes)];
-            Array.Copy(_buffer, index + 4, result, 0, result.Length);
-            return result;
-        }
-
-        internal bool WriteRawCellData(int cellIndex, byte[] data, int offset, int count)
-        {
-            int index = cellIndex - _header.FileOffset;
-            int allocSize = Math.Abs(Utilities.ToInt32LittleEndian(_buffer, index));
-
-            int newSize = count + 4;
-            if (newSize > allocSize)
-            {
-                return false;
-            }
-
-            Array.Copy(data, offset, _buffer, index + 4, count);
-
-            _fileStream.Position = _streamPos + index;
-            _fileStream.Write(_buffer, index, newSize);
-
-            return true;
-        }
-
-        internal int AllocateCell(int size)
-        {
-            if (size < 8 || size % 8 != 0)
-            {
-                throw new ArgumentException("Invalid cell size");
-            }
-
-            // Very inefficient algorithm - will lead to fragmentation
-            for (int i = 0; i < _freeCells.Count; ++i)
-            {
-                int result = _freeCells[i].Offset + _header.FileOffset;
-                if (_freeCells[i].Count > size)
-                {
-                    // Record the newly allocated cell
-                    Utilities.WriteBytesLittleEndian(-size, _buffer, _freeCells[i].Offset);
-                    _fileStream.Position = _streamPos + _freeCells[i].Offset;
-                    _fileStream.Write(_buffer, _freeCells[i].Offset, 4);
-
-                    // Keep the remainder of the free buffer as unallocated
-                    _freeCells[i] = new Range<int, int>(_freeCells[i].Offset + size, _freeCells[i].Count - size);
-                    Utilities.WriteBytesLittleEndian(_freeCells[i].Count, _buffer, _freeCells[i].Offset);
-                    _fileStream.Position = _streamPos + _freeCells[i].Offset;
-                    _fileStream.Write(_buffer, _freeCells[i].Offset, 4);
-
-                    return result;
-                }
-                else if (_freeCells[i].Count == size)
-                {
-                    // Record the whole of the free buffer as a newly allocated cell
-                    Utilities.WriteBytesLittleEndian(-size, _buffer, _freeCells[i].Offset);
-                    _fileStream.Position = _streamPos + _freeCells[i].Offset;
-                    _fileStream.Write(_buffer, _freeCells[i].Offset, 4);
-
-                    _freeCells.RemoveAt(i);
-                    return result;
-                }
-            }
-
-            return -1;
-        }
-    }
-}
diff --git a/DiscUtils/Registry/BinHeader.cs b/DiscUtils/Registry/BinHeader.cs
deleted file mode 100644
index 331d3fa..0000000
--- a/DiscUtils/Registry/BinHeader.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Registry
-{
-    using System.IO;
-
-    internal sealed class BinHeader : IByteArraySerializable
-    {
-        public const int HeaderSize = 0x20;
-
-        public int FileOffset;
-        public int BinSize;
-
-        private const uint Signature = 0x6E696268;
-
-        public BinHeader()
-        {
-        }
-
-        public int Size
-        {
-            get { return HeaderSize; }
-        }
-
-        public int ReadFrom(byte[] buffer, int offset)
-        {
-            uint sig = Utilities.ToUInt32LittleEndian(buffer, offset + 0);
-            if (sig != Signature)
-            {
-                throw new IOException("Invalid signature for registry bin");
-            }
-
-            FileOffset = Utilities.ToInt32LittleEndian(buffer, offset + 0x04);
-            BinSize = Utilities.ToInt32LittleEndian(buffer, offset + 0x08);
-            long unknown = Utilities.ToInt64LittleEndian(buffer, offset + 0x0C);
-            long unknown1 = Utilities.ToInt64LittleEndian(buffer, offset + 0x14);
-            int unknown2 = Utilities.ToInt32LittleEndian(buffer, offset + 0x1C);
-            return HeaderSize;
-        }
-
-        public void WriteTo(byte[] buffer, int offset)
-        {
-            Utilities.WriteBytesLittleEndian(Signature, buffer, offset + 0x00);
-            Utilities.WriteBytesLittleEndian(FileOffset, buffer, offset + 0x04);
-            Utilities.WriteBytesLittleEndian(BinSize, buffer, offset + 0x08);
-        }
-    }
-}
diff --git a/DiscUtils/Registry/Cell.cs b/DiscUtils/Registry/Cell.cs
deleted file mode 100644
index 07e7f64..0000000
--- a/DiscUtils/Registry/Cell.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Registry
-{
-    /// <summary>
-    /// Base class for the different kinds of cell present in a hive.
-    /// </summary>
-    internal abstract class Cell : IByteArraySerializable
-    {
-        private int _index;
-
-        public Cell(int index)
-        {
-            _index = index;
-        }
-
-        public int Index
-        {
-            get { return _index; }
-            set { _index = value; }
-        }
-
-        public abstract int Size
-        {
-            get;
-        }
-
-        public abstract int ReadFrom(byte[] buffer, int offset);
-
-        public abstract void WriteTo(byte[] buffer, int offset);
-
-        internal static Cell Parse(RegistryHive hive, int index, byte[] buffer, int pos)
-        {
-            string type = Utilities.BytesToString(buffer, pos, 2);
-
-            Cell result = null;
-
-            switch (type)
-            {
-                case "nk":
-                    result = new KeyNodeCell(index);
-                    break;
-
-                case "sk":
-                    result = new SecurityCell(index);
-                    break;
-
-                case "vk":
-                    result = new ValueCell(index);
-                    break;
-
-                case "lh":
-                case "lf":
-                    result = new SubKeyHashedListCell(hive, index);
-                    break;
-
-                case "li":
-                case "ri":
-                    result = new SubKeyIndirectListCell(hive, index);
-                    break;
-
-                default:
-                    throw new RegistryCorruptException("Unknown cell type '" + type + "'");
-            }
-
-            result.ReadFrom(buffer, pos);
-            return result;
-        }
-    }
-}
diff --git a/DiscUtils/Registry/HiveHeader.cs b/DiscUtils/Registry/HiveHeader.cs
deleted file mode 100644
index 61012a8..0000000
--- a/DiscUtils/Registry/HiveHeader.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Registry
-{
-    using System;
-    using System.IO;
-    using System.Text;
-
-    internal sealed class HiveHeader : IByteArraySerializable
-    {
-        public const int HeaderSize = 512;
-
-        public int Sequence1;
-        public int Sequence2;
-        public DateTime Timestamp;
-        public int MajorVersion;
-        public int MinorVersion;
-        public int RootCell;
-        public int Length;
-        public uint Checksum;
-        public string Path;
-        public Guid Guid1;
-        public Guid Guid2;
-
-        private const uint Signature = 0x66676572;
-
-        public HiveHeader()
-        {
-            Sequence1 = 1;
-            Sequence2 = 1;
-            Timestamp = DateTime.UtcNow;
-            MajorVersion = 1;
-            MinorVersion = 3;
-            RootCell = -1;
-            Path = string.Empty;
-            Guid1 = Guid.NewGuid();
-            Guid2 = Guid.NewGuid();
-        }
-
-        public int Size
-        {
-            get { return HeaderSize; }
-        }
-
-        public int ReadFrom(byte[] buffer, int offset)
-        {
-            uint sig = Utilities.ToUInt32LittleEndian(buffer, offset + 0);
-            if (sig != Signature)
-            {
-                throw new IOException("Invalid signature for registry hive");
-            }
-
-            Sequence1 = Utilities.ToInt32LittleEndian(buffer, offset + 0x0004);
-            Sequence2 = Utilities.ToInt32LittleEndian(buffer, offset + 0x0008);
-
-            Timestamp = DateTime.FromFileTimeUtc(Utilities.ToInt64LittleEndian(buffer, offset + 0x000C));
-
-            MajorVersion = Utilities.ToInt32LittleEndian(buffer, 0x0014);
-            MinorVersion = Utilities.ToInt32LittleEndian(buffer, 0x0018);
-
-            int isLog = Utilities.ToInt32LittleEndian(buffer, 0x001C);
-
-            RootCell = Utilities.ToInt32LittleEndian(buffer, 0x0024);
-            Length = Utilities.ToInt32LittleEndian(buffer, 0x0028);
-
-            Path = Encoding.Unicode.GetString(buffer, 0x0030, 0x0040).Trim('\0');
-
-            Guid1 = Utilities.ToGuidLittleEndian(buffer, 0x0070);
-            Guid2 = Utilities.ToGuidLittleEndian(buffer, 0x0094);
-
-            Checksum = Utilities.ToUInt32LittleEndian(buffer, 0x01FC);
-
-            if (Sequence1 != Sequence2)
-            {
-                throw new NotImplementedException("Support for replaying registry log file");
-            }
-
-            if (Checksum != CalcChecksum(buffer, offset))
-            {
-                throw new IOException("Invalid checksum on registry file");
-            }
-
-            return HeaderSize;
-        }
-
-        public void WriteTo(byte[] buffer, int offset)
-        {
-            Utilities.WriteBytesLittleEndian(Signature, buffer, offset);
-            Utilities.WriteBytesLittleEndian(Sequence1, buffer, offset + 0x0004);
-            Utilities.WriteBytesLittleEndian(Sequence2, buffer, offset + 0x0008);
-            Utilities.WriteBytesLittleEndian(Timestamp.ToFileTimeUtc(), buffer, offset + 0x000C);
-            Utilities.WriteBytesLittleEndian(MajorVersion, buffer, offset + 0x0014);
-            Utilities.WriteBytesLittleEndian(MinorVersion, buffer, offset + 0x0018);
-
-            Utilities.WriteBytesLittleEndian((uint)1, buffer, offset + 0x0020); // Unknown - seems to be '1'
-
-            Utilities.WriteBytesLittleEndian(RootCell, buffer, offset + 0x0024);
-            Utilities.WriteBytesLittleEndian(Length, buffer, offset + 0x0028);
-
-            Encoding.Unicode.GetBytes(Path, 0, Path.Length, buffer, offset + 0x0030);
-            Utilities.WriteBytesLittleEndian((ushort)0, buffer, offset + 0x0030 + (Path.Length * 2));
-
-            Utilities.WriteBytesLittleEndian(Guid1, buffer, offset + 0x0070);
-            Utilities.WriteBytesLittleEndian(Guid2, buffer, offset + 0x0094);
-
-            Utilities.WriteBytesLittleEndian(CalcChecksum(buffer, offset), buffer, offset + 0x01FC);
-        }
-
-        private static uint CalcChecksum(byte[] buffer, int offset)
-        {
-            uint sum = 0;
-
-            for (int i = 0; i < 0x01FC; i += 4)
-            {
-                sum = sum ^ Utilities.ToUInt32LittleEndian(buffer, offset + i);
-            }
-
-            return sum;
-        }
-    }
-}
diff --git a/DiscUtils/Registry/KeyNodeCell.cs b/DiscUtils/Registry/KeyNodeCell.cs
deleted file mode 100644
index 99cf06c..0000000
--- a/DiscUtils/Registry/KeyNodeCell.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Registry
-{
-    using System;
-
-    internal sealed class KeyNodeCell : Cell
-    {
-        public RegistryKeyFlags Flags;
-        public DateTime Timestamp;
-        public int ParentIndex;
-        public int NumSubKeys;
-        public int SubKeysIndex;
-        public int NumValues;
-        public int ValueListIndex;
-        public int SecurityIndex;
-        public int ClassNameIndex;
-
-        /// <summary>
-        /// Number of bytes to represent largest subkey name in Unicode - no null terminator.
-        /// </summary>
-        public int MaxSubKeyNameBytes;
-
-        /// <summary>
-        /// Number of bytes to represent largest value name in Unicode - no null terminator.
-        /// </summary>
-        public int MaxValNameBytes;
-
-        /// <summary>
-        /// Number of bytes to represent largest value content (strings in Unicode, with null terminator - if stored).
-        /// </summary>
-        public int MaxValDataBytes;
-
-        public int IndexInParent;
-        public int ClassNameLength;
-        public string Name;
-
-        public KeyNodeCell(string name, int parentCellIndex)
-            : this(-1)
-        {
-            Flags = RegistryKeyFlags.Normal;
-            Timestamp = DateTime.UtcNow;
-            ParentIndex = parentCellIndex;
-            SubKeysIndex = -1;
-            ValueListIndex = -1;
-            SecurityIndex = -1;
-            ClassNameIndex = -1;
-            Name = name;
-        }
-
-        public KeyNodeCell(int index)
-            : base(index)
-        {
-        }
-
-        public override int Size
-        {
-            get { return 0x4C + Name.Length; }
-        }
-
-        public override int ReadFrom(byte[] buffer, int offset)
-        {
-            Flags = (RegistryKeyFlags)Utilities.ToUInt16LittleEndian(buffer, offset + 0x02);
-            Timestamp = DateTime.FromFileTimeUtc(Utilities.ToInt64LittleEndian(buffer, offset + 0x04));
-            ParentIndex = Utilities.ToInt32LittleEndian(buffer, offset + 0x10);
-            NumSubKeys = Utilities.ToInt32LittleEndian(buffer, offset + 0x14);
-            SubKeysIndex = Utilities.ToInt32LittleEndian(buffer, offset + 0x1C);
-            NumValues = Utilities.ToInt32LittleEndian(buffer, offset + 0x24);
-            ValueListIndex = Utilities.ToInt32LittleEndian(buffer, offset + 0x28);
-            SecurityIndex = Utilities.ToInt32LittleEndian(buffer, offset + 0x2C);
-            ClassNameIndex = Utilities.ToInt32LittleEndian(buffer, offset + 0x30);
-            MaxSubKeyNameBytes = Utilities.ToInt32LittleEndian(buffer, offset + 0x34);
-            MaxValNameBytes = Utilities.ToInt32LittleEndian(buffer, offset + 0x3C);
-            MaxValDataBytes = Utilities.ToInt32LittleEndian(buffer, offset + 0x40);
-            IndexInParent = Utilities.ToInt32LittleEndian(buffer, offset + 0x44);
-            int nameLength = Utilities.ToInt16LittleEndian(buffer, offset + 0x48);
-            ClassNameLength = Utilities.ToInt16LittleEndian(buffer, offset + 0x4A);
-            Name = Utilities.BytesToString(buffer, offset + 0x4C, nameLength);
-
-            return 0x4C + nameLength;
-        }
-
-        public override void WriteTo(byte[] buffer, int offset)
-        {
-            Utilities.StringToBytes("nk", buffer, offset, 2);
-            Utilities.WriteBytesLittleEndian((ushort)Flags, buffer, offset + 0x02);
-            Utilities.WriteBytesLittleEndian(Timestamp.ToFileTimeUtc(), buffer, offset + 0x04);
-            Utilities.WriteBytesLittleEndian(ParentIndex, buffer, offset + 0x10);
-            Utilities.WriteBytesLittleEndian(NumSubKeys, buffer, offset + 0x14);
-            Utilities.WriteBytesLittleEndian(SubKeysIndex, buffer, offset + 0x1C);
-            Utilities.WriteBytesLittleEndian(NumValues, buffer, offset + 0x24);
-            Utilities.WriteBytesLittleEndian(ValueListIndex, buffer, offset + 0x28);
-            Utilities.WriteBytesLittleEndian(SecurityIndex, buffer, offset + 0x2C);
-            Utilities.WriteBytesLittleEndian(ClassNameIndex, buffer, offset + 0x30);
-            Utilities.WriteBytesLittleEndian(IndexInParent, buffer, offset + 0x44);
-            Utilities.WriteBytesLittleEndian((ushort)Name.Length, buffer, offset + 0x48);
-            Utilities.WriteBytesLittleEndian(ClassNameLength, buffer, offset + 0x4A);
-            Utilities.StringToBytes(Name, buffer, offset + 0x4C, Name.Length);
-        }
-
-        public override string ToString()
-        {
-            return "Key:" + Name + "[" + Flags + "] <" + Timestamp + ">";
-        }
-    }
-}
diff --git a/DiscUtils/Registry/ListCell.cs b/DiscUtils/Registry/ListCell.cs
deleted file mode 100644
index e69c0c7..0000000
--- a/DiscUtils/Registry/ListCell.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Registry
-{
-    using System.Collections.Generic;
-
-    internal abstract class ListCell : Cell
-    {
-        public ListCell(int index)
-            : base(index)
-        {
-        }
-
-        /// <summary>
-        /// Gets the number of subkeys in this list.
-        /// </summary>
-        internal abstract int Count { get; }
-
-        /// <summary>
-        /// Searches for a key with a given name.
-        /// </summary>
-        /// <param name="name">The name to search for.</param>
-        /// <param name="cellIndex">The index of the cell, if found.</param>
-        /// <returns>The search result.</returns>
-        internal abstract int FindKey(string name, out int cellIndex);
-
-        /// <summary>
-        /// Enumerates all of the keys in the list.
-        /// </summary>
-        /// <param name="names">The list to populate.</param>
-        internal abstract void EnumerateKeys(List<string> names);
-
-        /// <summary>
-        /// Enumerates all of the keys in the list.
-        /// </summary>
-        /// <returns>Enumeration of key cells.</returns>
-        internal abstract IEnumerable<KeyNodeCell> EnumerateKeys();
-
-        /// <summary>
-        /// Adds a subkey to this list.
-        /// </summary>
-        /// <param name="name">The name of the subkey.</param>
-        /// <param name="cellIndex">The cell index of the subkey.</param>
-        /// <returns>The new cell index of the list, which may have changed.</returns>
-        internal abstract int LinkSubKey(string name, int cellIndex);
-
-        /// <summary>
-        /// Removes a subkey from this list.
-        /// </summary>
-        /// <param name="name">The name of the subkey.</param>
-        /// <returns>The new cell index of the list, which may have changed.</returns>
-        internal abstract int UnlinkSubKey(string name);
-    }
-}
diff --git a/DiscUtils/Registry/RegistryCorruptException.cs b/DiscUtils/Registry/RegistryCorruptException.cs
deleted file mode 100644
index d80dd39..0000000
--- a/DiscUtils/Registry/RegistryCorruptException.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Registry
-{
-    using System;
-    using System.Runtime.Serialization;
-
-    /// <summary>
-    /// Exception thrown when some corruption is found in the registry hive.
-    /// </summary>
-    [Serializable]
-    public class RegistryCorruptException : Exception
-    {
-        /// <summary>
-        /// Initializes a new instance of the RegistryCorruptException class.
-        /// </summary>
-        public RegistryCorruptException()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the RegistryCorruptException class.
-        /// </summary>
-        /// <param name="message">The exception message.</param>
-        public RegistryCorruptException(string message)
-            : base(message)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the RegistryCorruptException class.
-        /// </summary>
-        /// <param name="message">The exception message.</param>
-        /// <param name="innerException">The inner exception.</param>
-        public RegistryCorruptException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the RegistryCorruptException class.
-        /// </summary>
-        /// <param name="info">The serialization info.</param>
-        /// <param name="context">The streaming context.</param>
-        protected RegistryCorruptException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-    }
-}
diff --git a/DiscUtils/Registry/RegistryHive.cs b/DiscUtils/Registry/RegistryHive.cs
deleted file mode 100644
index d61b33b..0000000
--- a/DiscUtils/Registry/RegistryHive.cs
+++ /dev/null
@@ -1,404 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Registry
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Security.AccessControl;
-
-    /// <summary>
-    /// A registry hive.
-    /// </summary>
-    public sealed class RegistryHive : IDisposable
-    {
-        private const long BinStart = 4 * Sizes.OneKiB;
-
-        private Stream _fileStream;
-        private Ownership _ownsStream;
-        private HiveHeader _header;
-        private List<BinHeader> _bins;
-
-        /// <summary>
-        /// Initializes a new instance of the RegistryHive class.
-        /// </summary>
-        /// <param name="hive">The stream containing the registry hive.</param>
-        /// <remarks>
-        /// The created object does not assume ownership of the stream.
-        /// </remarks>
-        public RegistryHive(Stream hive)
-            : this(hive, Ownership.None)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the RegistryHive class.
-        /// </summary>
-        /// <param name="hive">The stream containing the registry hive.</param>
-        /// <param name="ownership">Whether the new object assumes object of the stream.</param>
-        public RegistryHive(Stream hive, Ownership ownership)
-        {
-            _fileStream = hive;
-            _fileStream.Position = 0;
-            _ownsStream = ownership;
-
-            byte[] buffer = Utilities.ReadFully(_fileStream, HiveHeader.HeaderSize);
-
-            _header = new HiveHeader();
-            _header.ReadFrom(buffer, 0);
-
-            _bins = new List<BinHeader>();
-            int pos = 0;
-            while (pos < _header.Length)
-            {
-                _fileStream.Position = BinStart + pos;
-                byte[] headerBuffer = Utilities.ReadFully(_fileStream, BinHeader.HeaderSize);
-                BinHeader header = new BinHeader();
-                header.ReadFrom(headerBuffer, 0);
-                _bins.Add(header);
-
-                pos += header.BinSize;
-            }
-        }
-
-        /// <summary>
-        /// Gets the root key in the registry hive.
-        /// </summary>
-        public RegistryKey Root
-        {
-            get { return new RegistryKey(this, GetCell<KeyNodeCell>(_header.RootCell)); }
-        }
-
-        /// <summary>
-        /// Creates a new (empty) registry hive.
-        /// </summary>
-        /// <param name="stream">The stream to contain the new hive.</param>
-        /// <returns>The new hive.</returns>
-        /// <remarks>
-        /// The returned object does not assume ownership of the stream.
-        /// </remarks>
-        public static RegistryHive Create(Stream stream)
-        {
-            return Create(stream, Ownership.None);
-        }
-
-        /// <summary>
-        /// Creates a new (empty) registry hive.
-        /// </summary>
-        /// <param name="stream">The stream to contain the new hive.</param>
-        /// <param name="ownership">Whether the returned object owns the stream.</param>
-        /// <returns>The new hive.</returns>
-        public static RegistryHive Create(Stream stream, Ownership ownership)
-        {
-            if (stream == null)
-            {
-                throw new ArgumentNullException("stream", "Attempt to create registry hive in null stream");
-            }
-
-            // Construct a file with minimal structure - hive header, plus one (empty) bin
-            BinHeader binHeader = new BinHeader();
-            binHeader.FileOffset = 0;
-            binHeader.BinSize = (int)(4 * Sizes.OneKiB);
-
-            HiveHeader hiveHeader = new HiveHeader();
-            hiveHeader.Length = binHeader.BinSize;
-
-            stream.Position = 0;
-
-            byte[] buffer = new byte[hiveHeader.Size];
-            hiveHeader.WriteTo(buffer, 0);
-            stream.Write(buffer, 0, buffer.Length);
-
-            buffer = new byte[binHeader.Size];
-            binHeader.WriteTo(buffer, 0);
-            stream.Position = BinStart;
-            stream.Write(buffer, 0, buffer.Length);
-
-            buffer = new byte[4];
-            Utilities.WriteBytesLittleEndian(binHeader.BinSize - binHeader.Size, buffer, 0);
-            stream.Write(buffer, 0, buffer.Length);
-
-            // Make sure the file is initialized out to the end of the firs bin
-            stream.Position = BinStart + binHeader.BinSize - 1;
-            stream.WriteByte(0);
-
-            // Temporary hive to perform construction of higher-level structures
-            RegistryHive newHive = new RegistryHive(stream);
-            KeyNodeCell rootCell = new KeyNodeCell("root", -1);
-            rootCell.Flags = RegistryKeyFlags.Normal | RegistryKeyFlags.Root;
-            newHive.UpdateCell(rootCell, true);
-
-            RegistrySecurity sd = new RegistrySecurity();
-            sd.SetSecurityDescriptorSddlForm("O:BAG:BAD:PAI(A;;KA;;;SY)(A;CI;KA;;;BA)", AccessControlSections.All);
-            SecurityCell secCell = new SecurityCell(sd);
-            newHive.UpdateCell(secCell, true);
-            secCell.NextIndex = secCell.Index;
-            secCell.PreviousIndex = secCell.Index;
-            newHive.UpdateCell(secCell, false);
-
-            rootCell.SecurityIndex = secCell.Index;
-            newHive.UpdateCell(rootCell, false);
-
-            // Ref the root cell from the hive header
-            hiveHeader.RootCell = rootCell.Index;
-            buffer = new byte[hiveHeader.Size];
-            hiveHeader.WriteTo(buffer, 0);
-            stream.Position = 0;
-            stream.Write(buffer, 0, buffer.Length);
-
-            // Finally, return the new hive
-            return new RegistryHive(stream, ownership);
-        }
-
-        /// <summary>
-        /// Creates a new (empty) registry hive.
-        /// </summary>
-        /// <param name="path">The file to create the new hive in.</param>
-        /// <returns>The new hive.</returns>
-        public static RegistryHive Create(string path)
-        {
-            return Create(new FileStream(path, FileMode.Create, FileAccess.ReadWrite), Ownership.Dispose);
-        }
-
-        /// <summary>
-        /// Disposes of this instance, freeing any underlying stream (if any).
-        /// </summary>
-        public void Dispose()
-        {
-            if (_fileStream != null && _ownsStream == Ownership.Dispose)
-            {
-                _fileStream.Dispose();
-                _fileStream = null;
-            }
-        }
-
-        internal K GetCell<K>(int index)
-            where K : Cell
-        {
-            Bin bin = GetBin(index);
-
-            if (bin != null)
-            {
-                return (K)bin.TryGetCell(index);
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        internal void FreeCell(int index)
-        {
-            Bin bin = GetBin(index);
-
-            if (bin != null)
-            {
-                bin.FreeCell(index);
-            }
-        }
-
-        internal int UpdateCell(Cell cell, bool canRelocate)
-        {
-            if (cell.Index == -1 && canRelocate)
-            {
-                cell.Index = AllocateRawCell(cell.Size);
-            }
-
-            Bin bin = GetBin(cell.Index);
-
-            if (bin != null)
-            {
-                if (bin.UpdateCell(cell))
-                {
-                    return cell.Index;
-                }
-                else if (canRelocate)
-                {
-                    int oldCell = cell.Index;
-                    cell.Index = AllocateRawCell(cell.Size);
-                    bin = GetBin(cell.Index);
-                    if (!bin.UpdateCell(cell))
-                    {
-                        cell.Index = oldCell;
-                        throw new RegistryCorruptException("Failed to migrate cell to new location");
-                    }
-
-                    FreeCell(oldCell);
-                    return cell.Index;
-                }
-                else
-                {
-                    throw new ArgumentException("Can't update cell, needs relocation but relocation disabled", "canRelocate");
-                }
-            }
-            else
-            {
-                throw new RegistryCorruptException("No bin found containing index: " + cell.Index);
-            }
-        }
-
-        internal byte[] RawCellData(int index, int maxBytes)
-        {
-            Bin bin = GetBin(index);
-
-            if (bin != null)
-            {
-                return bin.ReadRawCellData(index, maxBytes);
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        internal bool WriteRawCellData(int index, byte[] data, int offset, int count)
-        {
-            Bin bin = GetBin(index);
-
-            if (bin != null)
-            {
-                return bin.WriteRawCellData(index, data, offset, count);
-            }
-            else
-            {
-                throw new RegistryCorruptException("No bin found containing index: " + index);
-            }
-        }
-
-        internal int AllocateRawCell(int capacity)
-        {
-            int minSize = Utilities.RoundUp(capacity + 4, 8); // Allow for size header and ensure multiple of 8
-
-            // Incredibly inefficient algorithm...
-            foreach (var binHeader in _bins)
-            {
-                Bin bin = LoadBin(binHeader);
-                int cellIndex = bin.AllocateCell(minSize);
-
-                if (cellIndex >= 0)
-                {
-                    return cellIndex;
-                }
-            }
-
-            BinHeader newBinHeader = AllocateBin(minSize);
-            Bin newBin = LoadBin(newBinHeader);
-            return newBin.AllocateCell(minSize);
-        }
-
-        private BinHeader FindBin(int index)
-        {
-            int binsIdx = _bins.BinarySearch(null, new BinFinder(index));
-            if (binsIdx >= 0)
-            {
-                return _bins[binsIdx];
-            }
-
-            return null;
-        }
-
-        private Bin GetBin(int cellIndex)
-        {
-            BinHeader binHeader = FindBin(cellIndex);
-
-            if (binHeader != null)
-            {
-                return LoadBin(binHeader);
-            }
-
-            return null;
-        }
-
-        private Bin LoadBin(BinHeader binHeader)
-        {
-            _fileStream.Position = BinStart + binHeader.FileOffset;
-            return new Bin(this, _fileStream);
-        }
-
-        private BinHeader AllocateBin(int minSize)
-        {
-            BinHeader lastBin = _bins[_bins.Count - 1];
-
-            BinHeader newBinHeader = new BinHeader();
-            newBinHeader.FileOffset = lastBin.FileOffset + lastBin.BinSize;
-            newBinHeader.BinSize = Utilities.RoundUp(minSize + newBinHeader.Size, 4 * (int)Sizes.OneKiB);
-
-            byte[] buffer = new byte[newBinHeader.Size];
-            newBinHeader.WriteTo(buffer, 0);
-            _fileStream.Position = BinStart + newBinHeader.FileOffset;
-            _fileStream.Write(buffer, 0, buffer.Length);
-
-            byte[] cellHeader = new byte[4];
-            Utilities.WriteBytesLittleEndian(newBinHeader.BinSize - newBinHeader.Size, cellHeader, 0);
-            _fileStream.Write(cellHeader, 0, 4);
-
-            // Update hive with new length
-            _header.Length = newBinHeader.FileOffset + newBinHeader.BinSize;
-            _header.Timestamp = DateTime.UtcNow;
-            _header.Sequence1++;
-            _header.Sequence2++;
-            _fileStream.Position = 0;
-            byte[] hiveHeader = Utilities.ReadFully(_fileStream, _header.Size);
-            _header.WriteTo(hiveHeader, 0);
-            _fileStream.Position = 0;
-            _fileStream.Write(hiveHeader, 0, hiveHeader.Length);
-
-            // Make sure the file is initialized to desired position
-            _fileStream.Position = BinStart + _header.Length - 1;
-            _fileStream.WriteByte(0);
-
-            _bins.Add(newBinHeader);
-            return newBinHeader;
-        }
-
-        private class BinFinder : IComparer<BinHeader>
-        {
-            private int _index;
-
-            public BinFinder(int index)
-            {
-                _index = index;
-            }
-
-            #region IComparer<BinHeader> Members
-
-            public int Compare(BinHeader x, BinHeader y)
-            {
-                if (x.FileOffset + x.BinSize < _index)
-                {
-                    return -1;
-                }
-                else if (x.FileOffset > _index)
-                {
-                    return 1;
-                }
-                else
-                {
-                    return 0;
-                }
-            }
-
-            #endregion
-        }
-    }
-}
diff --git a/DiscUtils/Registry/RegistryKey.cs b/DiscUtils/Registry/RegistryKey.cs
deleted file mode 100644
index ef31e1d..0000000
--- a/DiscUtils/Registry/RegistryKey.cs
+++ /dev/null
@@ -1,853 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Registry
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Security.AccessControl;
-    using System.Text;
-
-    /// <summary>
-    /// A key within a registry hive.
-    /// </summary>
-    public sealed class RegistryKey
-    {
-        private RegistryHive _hive;
-        private KeyNodeCell _cell;
-
-        internal RegistryKey(RegistryHive hive, KeyNodeCell cell)
-        {
-            _hive = hive;
-            _cell = cell;
-        }
-
-        /// <summary>
-        /// Gets the name of this key.
-        /// </summary>
-        public string Name
-        {
-            get
-            {
-                RegistryKey parent = Parent;
-                if (parent != null && ((parent.Flags & RegistryKeyFlags.Root) == 0))
-                {
-                    return parent.Name + @"\" + _cell.Name;
-                }
-                else
-                {
-                    return _cell.Name;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the number of child keys.
-        /// </summary>
-        public int SubKeyCount
-        {
-            get { return _cell.NumSubKeys; }
-        }
-
-        /// <summary>
-        /// Gets the number of values in this key.
-        /// </summary>
-        public int ValueCount
-        {
-            get { return _cell.NumValues; }
-        }
-
-        /// <summary>
-        /// Gets the time the key was last modified.
-        /// </summary>
-        public DateTime Timestamp
-        {
-            get { return _cell.Timestamp; }
-        }
-
-        /// <summary>
-        /// Gets the parent key, or <c>null</c> if this is the root key.
-        /// </summary>
-        public RegistryKey Parent
-        {
-            get
-            {
-                if ((_cell.Flags & RegistryKeyFlags.Root) == 0)
-                {
-                    return new RegistryKey(_hive, _hive.GetCell<KeyNodeCell>(_cell.ParentIndex));
-                }
-                else
-                {
-                    return null;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the flags of this registry key.
-        /// </summary>
-        public RegistryKeyFlags Flags
-        {
-            get { return _cell.Flags; }
-        }
-
-        /// <summary>
-        /// Gets the class name of this registry key.
-        /// </summary>
-        /// <remarks>Class name is rarely used.</remarks>
-        public string ClassName
-        {
-            get
-            {
-                if (_cell.ClassNameIndex > 0)
-                {
-                    return Encoding.Unicode.GetString(_hive.RawCellData(_cell.ClassNameIndex, _cell.ClassNameLength));
-                }
-
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Gets an enumerator over all sub child keys.
-        /// </summary>
-        public IEnumerable<RegistryKey> SubKeys
-        {
-            get
-            {
-                if (_cell.NumSubKeys != 0)
-                {
-                    ListCell list = _hive.GetCell<ListCell>(_cell.SubKeysIndex);
-                    foreach (var key in list.EnumerateKeys())
-                    {
-                        yield return new RegistryKey(_hive, key);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets an enumerator over all values in this key.
-        /// </summary>
-        private IEnumerable<RegistryValue> Values
-        {
-            get
-            {
-                if (_cell.NumValues != 0)
-                {
-                    byte[] valueList = _hive.RawCellData(_cell.ValueListIndex, _cell.NumValues * 4);
-
-                    for (int i = 0; i < _cell.NumValues; ++i)
-                    {
-                        int valueIndex = Utilities.ToInt32LittleEndian(valueList, i * 4);
-                        yield return new RegistryValue(_hive, _hive.GetCell<ValueCell>(valueIndex));
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the Security Descriptor applied to the registry key.
-        /// </summary>
-        /// <returns>The security descriptor as a RegistrySecurity instance.</returns>
-        public RegistrySecurity GetAccessControl()
-        {
-            if (_cell.SecurityIndex > 0)
-            {
-                SecurityCell secCell = _hive.GetCell<SecurityCell>(_cell.SecurityIndex);
-                return secCell.SecurityDescriptor;
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Gets the names of all child sub keys.
-        /// </summary>
-        /// <returns>The names of the sub keys.</returns>
-        public string[] GetSubKeyNames()
-        {
-            List<string> names = new List<string>();
-
-            if (_cell.NumSubKeys != 0)
-            {
-                _hive.GetCell<ListCell>(_cell.SubKeysIndex).EnumerateKeys(names);
-            }
-
-            return names.ToArray();
-        }
-
-        /// <summary>
-        /// Gets a named value stored within this key.
-        /// </summary>
-        /// <param name="name">The name of the value to retrieve.</param>
-        /// <returns>The value as a .NET object.</returns>
-        /// <remarks>The mapping from registry type of .NET type is as follows:
-        /// <list type="table">
-        ///   <listheader>
-        ///     <term>Value Type</term>
-        ///     <term>.NET type</term>
-        ///   </listheader>
-        ///   <item>
-        ///     <description>String</description>
-        ///     <description>string</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>ExpandString</description>
-        ///     <description>string</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>Link</description>
-        ///     <description>string</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>DWord</description>
-        ///     <description>uint</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>DWordBigEndian</description>
-        ///     <description>uint</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>MultiString</description>
-        ///     <description>string[]</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>QWord</description>
-        ///     <description>ulong</description>
-        ///   </item>
-        /// </list>
-        /// </remarks>
-        public object GetValue(string name)
-        {
-            return GetValue(name, null, Microsoft.Win32.RegistryValueOptions.None);
-        }
-
-        /// <summary>
-        /// Gets a named value stored within this key.
-        /// </summary>
-        /// <param name="name">The name of the value to retrieve.</param>
-        /// <param name="defaultValue">The default value to return, if no existing value is stored.</param>
-        /// <returns>The value as a .NET object.</returns>
-        /// <remarks>The mapping from registry type of .NET type is as follows:
-        /// <list type="table">
-        ///   <listheader>
-        ///     <term>Value Type</term>
-        ///     <term>.NET type</term>
-        ///   </listheader>
-        ///   <item>
-        ///     <description>String</description>
-        ///     <description>string</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>ExpandString</description>
-        ///     <description>string</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>Link</description>
-        ///     <description>string</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>DWord</description>
-        ///     <description>uint</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>DWordBigEndian</description>
-        ///     <description>uint</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>MultiString</description>
-        ///     <description>string[]</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>QWord</description>
-        ///     <description>ulong</description>
-        ///   </item>
-        /// </list>
-        /// </remarks>
-        public object GetValue(string name, object defaultValue)
-        {
-            return GetValue(name, defaultValue, Microsoft.Win32.RegistryValueOptions.None);
-        }
-
-        /// <summary>
-        /// Gets a named value stored within this key.
-        /// </summary>
-        /// <param name="name">The name of the value to retrieve.</param>
-        /// <param name="defaultValue">The default value to return, if no existing value is stored.</param>
-        /// <param name="options">Flags controlling how the value is processed before it's returned.</param>
-        /// <returns>The value as a .NET object.</returns>
-        /// <remarks>The mapping from registry type of .NET type is as follows:
-        /// <list type="table">
-        ///   <listheader>
-        ///     <term>Value Type</term>
-        ///     <term>.NET type</term>
-        ///   </listheader>
-        ///   <item>
-        ///     <description>String</description>
-        ///     <description>string</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>ExpandString</description>
-        ///     <description>string</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>Link</description>
-        ///     <description>string</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>DWord</description>
-        ///     <description>uint</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>DWordBigEndian</description>
-        ///     <description>uint</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>MultiString</description>
-        ///     <description>string[]</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>QWord</description>
-        ///     <description>ulong</description>
-        ///   </item>
-        /// </list>
-        /// </remarks>
-        public object GetValue(string name, object defaultValue, Microsoft.Win32.RegistryValueOptions options)
-        {
-            RegistryValue regVal = GetRegistryValue(name);
-            if (regVal != null)
-            {
-                if (regVal.DataType == RegistryValueType.ExpandString && (options & Microsoft.Win32.RegistryValueOptions.DoNotExpandEnvironmentNames) == 0)
-                {
-                    return Environment.ExpandEnvironmentVariables((string)regVal.Value);
-                }
-                else
-                {
-                    return regVal.Value;
-                }
-            }
-
-            return defaultValue;
-        }
-
-        /// <summary>
-        /// Sets a named value stored within this key.
-        /// </summary>
-        /// <param name="name">The name of the value to store.</param>
-        /// <param name="value">The value to store.</param>
-        public void SetValue(string name, object value)
-        {
-            SetValue(name, value, RegistryValueType.None);
-        }
-
-        /// <summary>
-        /// Sets a named value stored within this key.
-        /// </summary>
-        /// <param name="name">The name of the value to store.</param>
-        /// <param name="value">The value to store.</param>
-        /// <param name="valueType">The registry type of the data.</param>
-        public void SetValue(string name, object value, RegistryValueType valueType)
-        {
-            RegistryValue valObj = GetRegistryValue(name);
-            if (valObj == null)
-            {
-                valObj = AddRegistryValue(name);
-            }
-
-            valObj.SetValue(value, valueType);
-        }
-
-        /// <summary>
-        /// Deletes a named value stored within this key.
-        /// </summary>
-        /// <param name="name">The name of the value to delete.</param>
-        public void DeleteValue(string name)
-        {
-            DeleteValue(name, true);
-        }
-
-        /// <summary>
-        /// Deletes a named value stored within this key.
-        /// </summary>
-        /// <param name="name">The name of the value to delete.</param>
-        /// <param name="throwOnMissingValue">Throws ArgumentException if <c>name</c> doesn't exist.</param>
-        public void DeleteValue(string name, bool throwOnMissingValue)
-        {
-            bool foundValue = false;
-
-            if (_cell.NumValues != 0)
-            {
-                byte[] valueList = _hive.RawCellData(_cell.ValueListIndex, _cell.NumValues * 4);
-
-                int i = 0;
-                while (i < _cell.NumValues)
-                {
-                    int valueIndex = Utilities.ToInt32LittleEndian(valueList, i * 4);
-                    ValueCell valueCell = _hive.GetCell<ValueCell>(valueIndex);
-                    if (string.Compare(valueCell.Name, name, StringComparison.OrdinalIgnoreCase) == 0)
-                    {
-                        foundValue = true;
-                        _hive.FreeCell(valueIndex);
-                        _cell.NumValues--;
-                        _hive.UpdateCell(_cell, false);
-                        break;
-                    }
-
-                    ++i;
-                }
-
-                // Move following value's to fill gap
-                if (i < _cell.NumValues)
-                {
-                    while (i < _cell.NumValues)
-                    {
-                        int valueIndex = Utilities.ToInt32LittleEndian(valueList, (i + 1) * 4);
-                        Utilities.WriteBytesLittleEndian(valueIndex, valueList, i * 4);
-
-                        ++i;
-                    }
-
-                    _hive.WriteRawCellData(_cell.ValueListIndex, valueList, 0, _cell.NumValues * 4);
-                }
-
-                // TODO: Update maxbytes for value name and value content if this was the largest value for either.
-                // Windows seems to repair this info, if not accurate, though.
-            }
-
-            if (throwOnMissingValue && !foundValue)
-            {
-                throw new ArgumentException("No such value: " + name, "name");
-            }
-        }
-
-        /// <summary>
-        /// Gets the type of a named value.
-        /// </summary>
-        /// <param name="name">The name of the value to inspect.</param>
-        /// <returns>The value's type.</returns>
-        public RegistryValueType GetValueType(string name)
-        {
-            RegistryValue regVal = GetRegistryValue(name);
-            if (regVal != null)
-            {
-                return regVal.DataType;
-            }
-
-            return RegistryValueType.None;
-        }
-
-        /// <summary>
-        /// Gets the names of all values in this key.
-        /// </summary>
-        /// <returns>An array of strings containing the value names.</returns>
-        public string[] GetValueNames()
-        {
-            List<string> names = new List<string>();
-            foreach (var value in Values)
-            {
-                names.Add(value.Name);
-            }
-
-            return names.ToArray();
-        }
-
-        /// <summary>
-        /// Creates or opens a subkey.
-        /// </summary>
-        /// <param name="subkey">The relative path the the subkey.</param>
-        /// <returns>The subkey.</returns>
-        public RegistryKey CreateSubKey(string subkey)
-        {
-            if (string.IsNullOrEmpty(subkey))
-            {
-                return this;
-            }
-
-            string[] split = subkey.Split(new char[] { '\\' }, 2);
-            int cellIndex = FindSubKeyCell(split[0]);
-
-            if (cellIndex < 0)
-            {
-                KeyNodeCell newKeyCell = new KeyNodeCell(split[0], _cell.Index);
-                newKeyCell.SecurityIndex = _cell.SecurityIndex;
-                ReferenceSecurityCell(newKeyCell.SecurityIndex);
-                _hive.UpdateCell(newKeyCell, true);
-
-                LinkSubKey(split[0], newKeyCell.Index);
-
-                if (split.Length == 1)
-                {
-                    return new RegistryKey(_hive, newKeyCell);
-                }
-                else
-                {
-                    return new RegistryKey(_hive, newKeyCell).CreateSubKey(split[1]);
-                }
-            }
-            else
-            {
-                KeyNodeCell cell = _hive.GetCell<KeyNodeCell>(cellIndex);
-                if (split.Length == 1)
-                {
-                    return new RegistryKey(_hive, cell);
-                }
-                else
-                {
-                    return new RegistryKey(_hive, cell).CreateSubKey(split[1]);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Opens a sub key.
-        /// </summary>
-        /// <param name="path">The relative path to the sub key.</param>
-        /// <returns>The sub key, or <c>null</c> if not found.</returns>
-        public RegistryKey OpenSubKey(string path)
-        {
-            if (string.IsNullOrEmpty(path))
-            {
-                return this;
-            }
-
-            string[] split = path.Split(new char[] { '\\' }, 2);
-            int cellIndex = FindSubKeyCell(split[0]);
-
-            if (cellIndex < 0)
-            {
-                return null;
-            }
-            else
-            {
-                KeyNodeCell cell = _hive.GetCell<KeyNodeCell>(cellIndex);
-                if (split.Length == 1)
-                {
-                    return new RegistryKey(_hive, cell);
-                }
-                else
-                {
-                    return new RegistryKey(_hive, cell).OpenSubKey(split[1]);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Deletes a subkey and any child subkeys recursively. The string subkey is not case-sensitive.
-        /// </summary>
-        /// <param name="subkey">The subkey to delete.</param>
-        public void DeleteSubKeyTree(string subkey)
-        {
-            RegistryKey subKeyObj = OpenSubKey(subkey);
-            if (subKeyObj == null)
-            {
-                return;
-            }
-
-            if ((subKeyObj.Flags & RegistryKeyFlags.Root) != 0)
-            {
-                throw new ArgumentException("Attempt to delete root key");
-            }
-
-            foreach (var child in subKeyObj.GetSubKeyNames())
-            {
-                subKeyObj.DeleteSubKeyTree(child);
-            }
-
-            DeleteSubKey(subkey);
-        }
-
-        /// <summary>
-        /// Deletes the specified subkey. The string subkey is not case-sensitive.
-        /// </summary>
-        /// <param name="subkey">The subkey to delete.</param>
-        public void DeleteSubKey(string subkey)
-        {
-            DeleteSubKey(subkey, true);
-        }
-
-        /// <summary>
-        /// Deletes the specified subkey. The string subkey is not case-sensitive.
-        /// </summary>
-        /// <param name="subkey">The subkey to delete.</param>
-        /// <param name="throwOnMissingSubKey"><c>true</c> to throw an argument exception if <c>subkey</c> doesn't exist.</param>
-        public void DeleteSubKey(string subkey, bool throwOnMissingSubKey)
-        {
-            if (string.IsNullOrEmpty(subkey))
-            {
-                throw new ArgumentException("Invalid SubKey", "subkey");
-            }
-
-            string[] split = subkey.Split(new char[] { '\\' }, 2);
-
-            int subkeyCellIndex = FindSubKeyCell(split[0]);
-            if (subkeyCellIndex < 0)
-            {
-                if (throwOnMissingSubKey)
-                {
-                    throw new ArgumentException("No such SubKey", "subkey");
-                }
-                else
-                {
-                    return;
-                }
-            }
-
-            KeyNodeCell subkeyCell = _hive.GetCell<KeyNodeCell>(subkeyCellIndex);
-
-            if (split.Length == 1)
-            {
-                if (subkeyCell.NumSubKeys != 0)
-                {
-                    throw new InvalidOperationException("The registry key has subkeys");
-                }
-
-                if (subkeyCell.ClassNameIndex != -1)
-                {
-                    _hive.FreeCell(subkeyCell.ClassNameIndex);
-                    subkeyCell.ClassNameIndex = -1;
-                    subkeyCell.ClassNameLength = 0;
-                }
-
-                if (subkeyCell.SecurityIndex != -1)
-                {
-                    DereferenceSecurityCell(subkeyCell.SecurityIndex);
-                    subkeyCell.SecurityIndex = -1;
-                }
-
-                if (subkeyCell.SubKeysIndex != -1)
-                {
-                    FreeSubKeys(subkeyCell);
-                }
-
-                if (subkeyCell.ValueListIndex != -1)
-                {
-                    FreeValues(subkeyCell);
-                }
-
-                UnlinkSubKey(subkey);
-                _hive.FreeCell(subkeyCellIndex);
-                _hive.UpdateCell(_cell, false);
-            }
-            else
-            {
-                new RegistryKey(_hive, subkeyCell).DeleteSubKey(split[1], throwOnMissingSubKey);
-            }
-        }
-
-        private RegistryValue GetRegistryValue(string name)
-        {
-            if (name != null && name.Length == 0)
-            {
-                name = null;
-            }
-
-            if (_cell.NumValues != 0)
-            {
-                byte[] valueList = _hive.RawCellData(_cell.ValueListIndex, _cell.NumValues * 4);
-
-                for (int i = 0; i < _cell.NumValues; ++i)
-                {
-                    int valueIndex = Utilities.ToInt32LittleEndian(valueList, i * 4);
-                    ValueCell cell = _hive.GetCell<ValueCell>(valueIndex);
-                    if (string.Compare(cell.Name, name, StringComparison.OrdinalIgnoreCase) == 0)
-                    {
-                        return new RegistryValue(_hive, cell);
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        private RegistryValue AddRegistryValue(string name)
-        {
-            byte[] valueList = _hive.RawCellData(_cell.ValueListIndex, _cell.NumValues * 4);
-            if (valueList == null)
-            {
-                valueList = new byte[0];
-            }
-
-            int insertIdx = 0;
-            while (insertIdx < _cell.NumValues)
-            {
-                int valueCellIndex = Utilities.ToInt32LittleEndian(valueList, insertIdx * 4);
-                ValueCell cell = _hive.GetCell<ValueCell>(valueCellIndex);
-                if (string.Compare(name, cell.Name, StringComparison.OrdinalIgnoreCase) < 0)
-                {
-                    break;
-                }
-
-                ++insertIdx;
-            }
-
-            // Allocate a new value cell (note _hive.UpdateCell does actual allocation).
-            ValueCell valueCell = new ValueCell(name);
-            _hive.UpdateCell(valueCell, true);
-
-            // Update the value list, re-allocating if necessary
-            byte[] newValueList = new byte[(_cell.NumValues * 4) + 4];
-            Array.Copy(valueList, 0, newValueList, 0, insertIdx * 4);
-            Utilities.WriteBytesLittleEndian(valueCell.Index, newValueList, insertIdx * 4);
-            Array.Copy(valueList, insertIdx * 4, newValueList, (insertIdx * 4) + 4, (_cell.NumValues - insertIdx) * 4);
-            if (_cell.ValueListIndex == -1 || !_hive.WriteRawCellData(_cell.ValueListIndex, newValueList, 0, newValueList.Length))
-            {
-                int newListCellIndex = _hive.AllocateRawCell(Utilities.RoundUp(newValueList.Length, 8));
-                _hive.WriteRawCellData(newListCellIndex, newValueList, 0, newValueList.Length);
-
-                if (_cell.ValueListIndex != -1)
-                {
-                    _hive.FreeCell(_cell.ValueListIndex);
-                }
-
-                _cell.ValueListIndex = newListCellIndex;
-            }
-
-            // Record the new value and save this cell
-            _cell.NumValues++;
-            _hive.UpdateCell(_cell, false);
-
-            // Finally, set the data in the value cell
-            return new RegistryValue(_hive, valueCell);
-        }
-
-        private int FindSubKeyCell(string name)
-        {
-            if (_cell.NumSubKeys != 0)
-            {
-                ListCell listCell = _hive.GetCell<ListCell>(_cell.SubKeysIndex);
-
-                int cellIndex;
-                if (listCell.FindKey(name, out cellIndex) == 0)
-                {
-                    return cellIndex;
-                }
-            }
-
-            return -1;
-        }
-
-        private void LinkSubKey(string name, int cellIndex)
-        {
-            if (_cell.SubKeysIndex == -1)
-            {
-                SubKeyHashedListCell newListCell = new SubKeyHashedListCell(_hive, "lf");
-                newListCell.Add(name, cellIndex);
-                _hive.UpdateCell(newListCell, true);
-                _cell.NumSubKeys = 1;
-                _cell.SubKeysIndex = newListCell.Index;
-            }
-            else
-            {
-                ListCell list = _hive.GetCell<ListCell>(_cell.SubKeysIndex);
-                _cell.SubKeysIndex = list.LinkSubKey(name, cellIndex);
-                _cell.NumSubKeys++;
-            }
-
-            _hive.UpdateCell(_cell, false);
-        }
-
-        private void UnlinkSubKey(string name)
-        {
-            if (_cell.SubKeysIndex == -1 || _cell.NumSubKeys == 0)
-            {
-                throw new InvalidOperationException("No subkey list");
-            }
-
-            ListCell list = _hive.GetCell<ListCell>(_cell.SubKeysIndex);
-            _cell.SubKeysIndex = list.UnlinkSubKey(name);
-            _cell.NumSubKeys--;
-        }
-
-        private void ReferenceSecurityCell(int cellIndex)
-        {
-            SecurityCell sc = _hive.GetCell<SecurityCell>(cellIndex);
-            sc.UsageCount++;
-            _hive.UpdateCell(sc, false);
-        }
-
-        private void DereferenceSecurityCell(int cellIndex)
-        {
-            SecurityCell sc = _hive.GetCell<SecurityCell>(cellIndex);
-            sc.UsageCount--;
-            if (sc.UsageCount == 0)
-            {
-                SecurityCell prev = _hive.GetCell<SecurityCell>(sc.PreviousIndex);
-                prev.NextIndex = sc.NextIndex;
-                _hive.UpdateCell(prev, false);
-
-                SecurityCell next = _hive.GetCell<SecurityCell>(sc.NextIndex);
-                next.PreviousIndex = sc.PreviousIndex;
-                _hive.UpdateCell(next, false);
-
-                _hive.FreeCell(cellIndex);
-            }
-            else
-            {
-                _hive.UpdateCell(sc, false);
-            }
-        }
-
-        private void FreeValues(KeyNodeCell cell)
-        {
-            if (cell.NumValues != 0 && cell.ValueListIndex != -1)
-            {
-                byte[] valueList = _hive.RawCellData(cell.ValueListIndex, cell.NumValues * 4);
-
-                for (int i = 0; i < cell.NumValues; ++i)
-                {
-                    int valueIndex = Utilities.ToInt32LittleEndian(valueList, i * 4);
-                    _hive.FreeCell(valueIndex);
-                }
-
-                _hive.FreeCell(cell.ValueListIndex);
-                cell.ValueListIndex = -1;
-                cell.NumValues = 0;
-                cell.MaxValDataBytes = 0;
-                cell.MaxValNameBytes = 0;
-            }
-        }
-
-        private void FreeSubKeys(KeyNodeCell subkeyCell)
-        {
-            if (subkeyCell.SubKeysIndex == -1)
-            {
-                throw new InvalidOperationException("No subkey list");
-            }
-
-            Cell list = _hive.GetCell<Cell>(subkeyCell.SubKeysIndex);
-
-            SubKeyIndirectListCell indirectList = list as SubKeyIndirectListCell;
-            if (indirectList != null)
-            {
-                ////foreach (int listIndex in indirectList.CellIndexes)
-                for (int i = 0; i < indirectList.CellIndexes.Count; ++i)
-                {
-                    int listIndex = indirectList.CellIndexes[i];
-                    _hive.FreeCell(listIndex);
-                }
-            }
-
-            _hive.FreeCell(list.Index);
-        }
-    }
-}
diff --git a/DiscUtils/Registry/RegistryKeyFlags.cs b/DiscUtils/Registry/RegistryKeyFlags.cs
deleted file mode 100644
index a17bc11..0000000
--- a/DiscUtils/Registry/RegistryKeyFlags.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Registry
-{
-    using System;
-
-    /// <summary>
-    /// The per-key flags present on registry keys.
-    /// </summary>
-    [Flags]
-    public enum RegistryKeyFlags : int
-    {
-        /// <summary>
-        /// Unknown purpose.
-        /// </summary>
-        Unknown0001 = 0x0001,
-
-        /// <summary>
-        /// Unknown purpose.
-        /// </summary>
-        Unknown0002 = 0x0002,
-
-        /// <summary>
-        /// The key is the root key in the registry hive.
-        /// </summary>
-        Root = 0x0004,
-
-        /// <summary>
-        /// Unknown purpose.
-        /// </summary>
-        Unknown0008 = 0x0008,
-
-        /// <summary>
-        /// The key is a link to another key.
-        /// </summary>
-        Link = 0x0010,
-
-        /// <summary>
-        /// This is a normal key.
-        /// </summary>
-        Normal = 0x0020,
-
-        /// <summary>
-        /// Unknown purpose.
-        /// </summary>
-        Unknown0040 = 0x0040,
-
-        /// <summary>
-        /// Unknown purpose.
-        /// </summary>
-        Unknown0080 = 0x0080,
-
-        /// <summary>
-        /// Unknown purpose.
-        /// </summary>
-        Unknown0100 = 0x0100,
-
-        /// <summary>
-        /// Unknown purpose.
-        /// </summary>
-        Unknown0200 = 0x0200,
-
-        /// <summary>
-        /// Unknown purpose.
-        /// </summary>
-        Unknown0400 = 0x0400,
-
-        /// <summary>
-        /// Unknown purpose.
-        /// </summary>
-        Unknown0800 = 0x0800,
-
-        /// <summary>
-        /// Unknown purpose.
-        /// </summary>
-        Unknown1000 = 0x1000,
-
-        /// <summary>
-        /// Unknown purpose.
-        /// </summary>
-        Unknown2000 = 0x2000,
-
-        /// <summary>
-        /// Unknown purpose.
-        /// </summary>
-        Unknown4000 = 0x4000,
-
-        /// <summary>
-        /// Unknown purpose.
-        /// </summary>
-        Unknown8000 = 0x8000
-    }
-}
diff --git a/DiscUtils/Registry/RegistryValue.cs b/DiscUtils/Registry/RegistryValue.cs
deleted file mode 100644
index 925b980..0000000
--- a/DiscUtils/Registry/RegistryValue.cs
+++ /dev/null
@@ -1,304 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Registry
-{
-    using System;
-    using System.Globalization;
-    using System.Text;
-
-    /// <summary>
-    /// A registry value.
-    /// </summary>
-    internal sealed class RegistryValue
-    {
-        private RegistryHive _hive;
-        private ValueCell _cell;
-
-        internal RegistryValue(RegistryHive hive, ValueCell cell)
-        {
-            _hive = hive;
-            _cell = cell;
-        }
-
-        /// <summary>
-        /// Gets the name of the value, or empty string if unnamed.
-        /// </summary>
-        public string Name
-        {
-            get { return _cell.Name ?? string.Empty; }
-        }
-
-        /// <summary>
-        /// Gets the type of the value.
-        /// </summary>
-        public RegistryValueType DataType
-        {
-            get { return _cell.DataType; }
-        }
-
-        /// <summary>
-        /// Gets the value data mapped to a .net object.
-        /// </summary>
-        /// <remarks>The mapping from registry type of .NET type is as follows:
-        /// <list type="table">
-        ///   <listheader>
-        ///     <term>Value Type</term>
-        ///     <term>.NET type</term>
-        ///   </listheader>
-        ///   <item>
-        ///     <description>String</description>
-        ///     <description>string</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>ExpandString</description>
-        ///     <description>string</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>Link</description>
-        ///     <description>string</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>DWord</description>
-        ///     <description>uint</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>DWordBigEndian</description>
-        ///     <description>uint</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>MultiString</description>
-        ///     <description>string[]</description>
-        ///   </item>
-        ///   <item>
-        ///     <description>QWord</description>
-        ///     <description>ulong</description>
-        ///   </item>
-        /// </list>
-        /// </remarks>
-        public object Value
-        {
-            get
-            {
-                return ConvertToObject(GetData(), DataType);
-            }
-        }
-
-        /// <summary>
-        /// The raw value data as a byte array.
-        /// </summary>
-        /// <returns>The value as a raw byte array.</returns>
-        public byte[] GetData()
-        {
-            if (_cell.DataLength < 0)
-            {
-                int len = _cell.DataLength & 0x7FFFFFFF;
-                byte[] buffer = new byte[4];
-                Utilities.WriteBytesLittleEndian(_cell.DataIndex, buffer, 0);
-
-                byte[] result = new byte[len];
-                Array.Copy(buffer, result, len);
-                return result;
-            }
-
-            return _hive.RawCellData(_cell.DataIndex, _cell.DataLength);
-        }
-
-        /// <summary>
-        /// Sets the value as raw bytes, with no validation that enough data is specified for the given value type.
-        /// </summary>
-        /// <param name="data">The data to store.</param>
-        /// <param name="offset">The offset within <c>data</c> of the first byte to store.</param>
-        /// <param name="count">The number of bytes to store.</param>
-        /// <param name="valueType">The type of the data.</param>
-        public void SetData(byte[] data, int offset, int count, RegistryValueType valueType)
-        {
-            // If we can place the data in the DataIndex field, do that to save space / allocation
-            if ((valueType == RegistryValueType.Dword || valueType == RegistryValueType.DwordBigEndian) && count <= 4)
-            {
-                if (_cell.DataLength >= 0)
-                {
-                    _hive.FreeCell(_cell.DataIndex);
-                }
-
-                _cell.DataLength = (int)((uint)count | 0x80000000);
-                _cell.DataIndex = Utilities.ToInt32LittleEndian(data, offset);
-                _cell.DataType = valueType;
-            }
-            else
-            {
-                if (_cell.DataIndex == -1 || _cell.DataLength < 0)
-                {
-                    _cell.DataIndex = _hive.AllocateRawCell(count);
-                }
-
-                if (!_hive.WriteRawCellData(_cell.DataIndex, data, offset, count))
-                {
-                    int newDataIndex = _hive.AllocateRawCell(count);
-                    _hive.WriteRawCellData(newDataIndex, data, offset, count);
-                    _hive.FreeCell(_cell.DataIndex);
-                    _cell.DataIndex = newDataIndex;
-                }
-
-                _cell.DataLength = count;
-                _cell.DataType = valueType;
-            }
-
-            _hive.UpdateCell(_cell, false);
-        }
-
-        /// <summary>
-        /// Sets the value stored.
-        /// </summary>
-        /// <param name="value">The value to store.</param>
-        /// <param name="valueType">The registry type of the data.</param>
-        public void SetValue(object value, RegistryValueType valueType)
-        {
-            if (valueType == RegistryValueType.None)
-            {
-                if (value is int)
-                {
-                    valueType = RegistryValueType.Dword;
-                }
-                else if (value is byte[])
-                {
-                    valueType = RegistryValueType.Binary;
-                }
-                else if (value is string[])
-                {
-                    valueType = RegistryValueType.MultiString;
-                }
-                else
-                {
-                    valueType = RegistryValueType.String;
-                }
-            }
-
-            byte[] data = ConvertToData(value, valueType);
-            SetData(data, 0, data.Length, valueType);
-        }
-
-        /// <summary>
-        /// Gets a string representation of the registry value.
-        /// </summary>
-        /// <returns>The registry value as a string.</returns>
-        public override string ToString()
-        {
-            return Name + ":" + DataType + ":" + DataAsString();
-        }
-
-        private static object ConvertToObject(byte[] data, RegistryValueType type)
-        {
-            switch (type)
-            {
-                case RegistryValueType.String:
-                case RegistryValueType.ExpandString:
-                case RegistryValueType.Link:
-                    return Encoding.Unicode.GetString(data).Trim('\0');
-
-                case RegistryValueType.Dword:
-                    return Utilities.ToInt32LittleEndian(data, 0);
-
-                case RegistryValueType.DwordBigEndian:
-                    return Utilities.ToInt32BigEndian(data, 0);
-
-                case RegistryValueType.MultiString:
-                    string multiString = Encoding.Unicode.GetString(data).Trim('\0');
-                    return multiString.Split('\0');
-
-                case RegistryValueType.QWord:
-                    return string.Empty + Utilities.ToUInt64LittleEndian(data, 0);
-
-                default:
-                    return data;
-            }
-        }
-
-        private static byte[] ConvertToData(object value, RegistryValueType valueType)
-        {
-            if (valueType == RegistryValueType.None)
-            {
-                throw new ArgumentException("Specific registry value type must be specified", "valueType");
-            }
-
-            byte[] data;
-            switch (valueType)
-            {
-                case RegistryValueType.String:
-                case RegistryValueType.ExpandString:
-                    string strValue = value.ToString();
-                    data = new byte[(strValue.Length * 2) + 2];
-                    Encoding.Unicode.GetBytes(strValue, 0, strValue.Length, data, 0);
-                    break;
-
-                case RegistryValueType.Dword:
-                    data = new byte[4];
-                    Utilities.WriteBytesLittleEndian((int)value, data, 0);
-                    break;
-
-                case RegistryValueType.DwordBigEndian:
-                    data = new byte[4];
-                    Utilities.WriteBytesBigEndian((int)value, data, 0);
-                    break;
-
-                case RegistryValueType.MultiString:
-                    string multiStrValue = string.Join("\0", (string[])value) + "\0";
-                    data = new byte[(multiStrValue.Length * 2) + 2];
-                    Encoding.Unicode.GetBytes(multiStrValue, 0, multiStrValue.Length, data, 0);
-                    break;
-
-                default:
-                    data = (byte[])value;
-                    break;
-            }
-
-            return data;
-        }
-
-        private string DataAsString()
-        {
-            switch (DataType)
-            {
-                case RegistryValueType.String:
-                case RegistryValueType.ExpandString:
-                case RegistryValueType.Link:
-                case RegistryValueType.Dword:
-                case RegistryValueType.DwordBigEndian:
-                case RegistryValueType.QWord:
-                    return ConvertToObject(GetData(), DataType).ToString();
-
-                case RegistryValueType.MultiString:
-                    return string.Join(",", (string[])ConvertToObject(GetData(), DataType));
-
-                default:
-                    byte[] data = GetData();
-                    string result = string.Empty;
-                    for (int i = 0; i < Math.Min(data.Length, 8); ++i)
-                    {
-                        result += string.Format(CultureInfo.InvariantCulture, "{0:X2} ", (int)data[i]);
-                    }
-
-                    return result + string.Format(CultureInfo.InvariantCulture, " ({0} bytes)", data.Length);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Registry/RegistryValueType.cs b/DiscUtils/Registry/RegistryValueType.cs
deleted file mode 100644
index d86cb44..0000000
--- a/DiscUtils/Registry/RegistryValueType.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Registry
-{
-    /// <summary>
-    /// The types of registry values.
-    /// </summary>
-    public enum RegistryValueType : int
-    {
-        /// <summary>
-        /// Unknown type.
-        /// </summary>
-        None = 0x00,
-
-        /// <summary>
-        /// A unicode string.
-        /// </summary>
-        String = 0x01,
-
-        /// <summary>
-        /// A string containing environment variables.
-        /// </summary>
-        ExpandString = 0x02,
-
-        /// <summary>
-        /// Binary data.
-        /// </summary>
-        Binary = 0x03,
-
-        /// <summary>
-        /// A 32-bit integer.
-        /// </summary>
-        Dword = 0x04,
-
-        /// <summary>
-        /// A 32-bit integer.
-        /// </summary>
-        DwordBigEndian = 0x05,
-
-        /// <summary>
-        /// A registry link.
-        /// </summary>
-        Link = 0x06,
-
-        /// <summary>
-        /// A multistring.
-        /// </summary>
-        MultiString = 0x07,
-
-        /// <summary>
-        /// An unknown binary format.
-        /// </summary>
-        ResourceList = 0x08,
-
-        /// <summary>
-        /// An unknown binary format.
-        /// </summary>
-        FullResourceDescriptor = 0x09,
-
-        /// <summary>
-        /// An unknown binary format.
-        /// </summary>
-        ResourceRequirementsList = 0x0A,
-
-        /// <summary>
-        /// A 64-bit integer.
-        /// </summary>
-        QWord = 0x0B,
-    }
-}
diff --git a/DiscUtils/Registry/SecurityCell.cs b/DiscUtils/Registry/SecurityCell.cs
deleted file mode 100644
index ee8e96c..0000000
--- a/DiscUtils/Registry/SecurityCell.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Registry
-{
-    using System;
-    using System.Security.AccessControl;
-
-    internal sealed class SecurityCell : Cell
-    {
-        private int _prevIndex;
-        private int _nextIndex;
-        private int _usageCount;
-        private RegistrySecurity _secDesc;
-
-        public SecurityCell(RegistrySecurity secDesc)
-            : this(-1)
-        {
-            _secDesc = secDesc;
-        }
-
-        public SecurityCell(int index)
-            : base(index)
-        {
-            _prevIndex = -1;
-            _nextIndex = -1;
-        }
-
-        public int PreviousIndex
-        {
-            get { return _prevIndex; }
-            set { _prevIndex = value; }
-        }
-
-        public int NextIndex
-        {
-            get { return _nextIndex; }
-            set { _nextIndex = value; }
-        }
-
-        public int UsageCount
-        {
-            get { return _usageCount; }
-            set { _usageCount = value; }
-        }
-
-        public RegistrySecurity SecurityDescriptor
-        {
-            get { return _secDesc; }
-        }
-
-        public override int Size
-        {
-            get
-            {
-                int sdLen = _secDesc.GetSecurityDescriptorBinaryForm().Length;
-                return 0x14 + sdLen;
-            }
-        }
-
-        public override int ReadFrom(byte[] buffer, int offset)
-        {
-            _prevIndex = Utilities.ToInt32LittleEndian(buffer, offset + 0x04);
-            _nextIndex = Utilities.ToInt32LittleEndian(buffer, offset + 0x08);
-            _usageCount = Utilities.ToInt32LittleEndian(buffer, offset + 0x0C);
-            int secDescSize = Utilities.ToInt32LittleEndian(buffer, offset + 0x10);
-
-            byte[] secDesc = new byte[secDescSize];
-            Array.Copy(buffer, offset + 0x14, secDesc, 0, secDescSize);
-            _secDesc = new RegistrySecurity();
-            _secDesc.SetSecurityDescriptorBinaryForm(secDesc);
-
-            return 0x14 + secDescSize;
-        }
-
-        public override void WriteTo(byte[] buffer, int offset)
-        {
-            byte[] sd = _secDesc.GetSecurityDescriptorBinaryForm();
-
-            Utilities.StringToBytes("sk", buffer, offset, 2);
-            Utilities.WriteBytesLittleEndian(_prevIndex, buffer, offset + 0x04);
-            Utilities.WriteBytesLittleEndian(_nextIndex, buffer, offset + 0x08);
-            Utilities.WriteBytesLittleEndian(_usageCount, buffer, offset + 0x0C);
-            Utilities.WriteBytesLittleEndian(sd.Length, buffer, offset + 0x10);
-            Array.Copy(sd, 0, buffer, offset + 0x14, sd.Length);
-        }
-
-        public override string ToString()
-        {
-            return "SecDesc:" + _secDesc.GetSecurityDescriptorSddlForm(AccessControlSections.All) + " (refCount:" + _usageCount + ")";
-        }
-    }
-}
diff --git a/DiscUtils/Registry/SubKeyHashedListCell.cs b/DiscUtils/Registry/SubKeyHashedListCell.cs
deleted file mode 100644
index 78ded1c..0000000
--- a/DiscUtils/Registry/SubKeyHashedListCell.cs
+++ /dev/null
@@ -1,320 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Registry
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-
-    internal sealed class SubKeyHashedListCell : ListCell
-    {
-        private string _hashType;
-        private short _numElements;
-        private List<int> _subKeyIndexes;
-        private List<uint> _nameHashes;
-        private RegistryHive _hive;
-
-        public SubKeyHashedListCell(RegistryHive hive, string hashType)
-            : base(-1)
-        {
-            _hive = hive;
-            _hashType = hashType;
-            _subKeyIndexes = new List<int>();
-            _nameHashes = new List<uint>();
-        }
-
-        public SubKeyHashedListCell(RegistryHive hive, int index)
-            : base(index)
-        {
-            _hive = hive;
-        }
-
-        public override int Size
-        {
-            get { return 0x4 + (_numElements * 0x8); }
-        }
-
-        internal override int Count
-        {
-            get { return _subKeyIndexes.Count; }
-        }
-
-        public override int ReadFrom(byte[] buffer, int offset)
-        {
-            _hashType = Utilities.BytesToString(buffer, offset, 2);
-            _numElements = Utilities.ToInt16LittleEndian(buffer, offset + 2);
-
-            _subKeyIndexes = new List<int>(_numElements);
-            _nameHashes = new List<uint>(_numElements);
-            for (int i = 0; i < _numElements; ++i)
-            {
-                _subKeyIndexes.Add(Utilities.ToInt32LittleEndian(buffer, offset + 0x4 + (i * 0x8)));
-                _nameHashes.Add(Utilities.ToUInt32LittleEndian(buffer, offset + 0x4 + (i * 0x8) + 0x4));
-            }
-
-            return 0x4 + (_numElements * 0x8);
-        }
-
-        public override void WriteTo(byte[] buffer, int offset)
-        {
-            Utilities.StringToBytes(_hashType, buffer, offset, 2);
-            Utilities.WriteBytesLittleEndian(_numElements, buffer, offset + 0x2);
-            for (int i = 0; i < _numElements; ++i)
-            {
-                Utilities.WriteBytesLittleEndian(_subKeyIndexes[i], buffer, offset + 0x4 + (i * 0x8));
-                Utilities.WriteBytesLittleEndian(_nameHashes[i], buffer, offset + 0x4 + (i * 0x8) + 0x4);
-            }
-        }
-
-        /// <summary>
-        /// Adds a new entry.
-        /// </summary>
-        /// <param name="name">The name of the subkey.</param>
-        /// <param name="cellIndex">The cell index of the subkey.</param>
-        /// <returns>The index of the new entry.</returns>
-        internal int Add(string name, int cellIndex)
-        {
-            for (int i = 0; i < _numElements; ++i)
-            {
-                KeyNodeCell cell = _hive.GetCell<KeyNodeCell>(_subKeyIndexes[i]);
-                if (string.Compare(cell.Name, name, StringComparison.OrdinalIgnoreCase) > 0)
-                {
-                    _subKeyIndexes.Insert(i, cellIndex);
-                    _nameHashes.Insert(i, CalcHash(name));
-                    _numElements++;
-                    return i;
-                }
-            }
-
-            _subKeyIndexes.Add(cellIndex);
-            _nameHashes.Add(CalcHash(name));
-            return _numElements++;
-        }
-
-        internal override int FindKey(string name, out int cellIndex)
-        {
-            // Check first and last, to early abort if the name is outside the range of this list
-            int result = FindKeyAt(name, 0, out cellIndex);
-            if (result <= 0)
-            {
-                return result;
-            }
-
-            result = FindKeyAt(name, _subKeyIndexes.Count - 1, out cellIndex);
-            if (result >= 0)
-            {
-                return result;
-            }
-
-            KeyFinder finder = new KeyFinder(_hive, name);
-            int idx = _subKeyIndexes.BinarySearch(-1, finder);
-            cellIndex = finder.CellIndex;
-            return (idx < 0) ? -1 : 0;
-        }
-
-        internal override void EnumerateKeys(List<string> names)
-        {
-            for (int i = 0; i < _subKeyIndexes.Count; ++i)
-            {
-                names.Add(_hive.GetCell<KeyNodeCell>(_subKeyIndexes[i]).Name);
-            }
-        }
-
-        internal override IEnumerable<KeyNodeCell> EnumerateKeys()
-        {
-            for (int i = 0; i < _subKeyIndexes.Count; ++i)
-            {
-                yield return _hive.GetCell<KeyNodeCell>(_subKeyIndexes[i]);
-            }
-        }
-
-        internal override int LinkSubKey(string name, int cellIndex)
-        {
-            Add(name, cellIndex);
-            return _hive.UpdateCell(this, true);
-        }
-
-        internal override int UnlinkSubKey(string name)
-        {
-            int index = IndexOf(name);
-            if (index >= 0)
-            {
-                RemoveAt(index);
-                return _hive.UpdateCell(this, true);
-            }
-
-            return Index;
-        }
-
-        /// <summary>
-        /// Finds a subkey cell, returning it's index in this list.
-        /// </summary>
-        /// <param name="name">The name of the key to find.</param>
-        /// <returns>The index of the found key, or <c>-1</c>.</returns>
-        internal int IndexOf(string name)
-        {
-            foreach (var index in Find(name, 0))
-            {
-                KeyNodeCell cell = _hive.GetCell<KeyNodeCell>(_subKeyIndexes[index]);
-                if (cell.Name.ToUpperInvariant() == name.ToUpperInvariant())
-                {
-                    return index;
-                }
-            }
-
-            return -1;
-        }
-
-        internal void RemoveAt(int index)
-        {
-            _nameHashes.RemoveAt(index);
-            _subKeyIndexes.RemoveAt(index);
-            _numElements--;
-        }
-
-        private uint CalcHash(string name)
-        {
-            uint hash = 0;
-            if (_hashType == "lh")
-            {
-                for (int i = 0; i < name.Length; ++i)
-                {
-                    hash *= 37;
-                    hash += char.ToUpper(name[i], CultureInfo.InvariantCulture);
-                }
-            }
-            else
-            {
-                string hashStr = name + "\0\0\0\0";
-                for (int i = 0; i < 4; ++i)
-                {
-                    hash |= (uint)((hashStr[i] & 0xFF) << (i * 8));
-                }
-            }
-
-            return hash;
-        }
-
-        private int FindKeyAt(string name, int listIndex, out int cellIndex)
-        {
-            Cell cell = _hive.GetCell<Cell>(_subKeyIndexes[listIndex]);
-            if (cell == null)
-            {
-                cellIndex = 0;
-                return -1;
-            }
-
-            ListCell listCell = cell as ListCell;
-            if (listCell != null)
-            {
-                return listCell.FindKey(name, out cellIndex);
-            }
-
-            cellIndex = _subKeyIndexes[listIndex];
-            return string.Compare(name, ((KeyNodeCell)cell).Name, StringComparison.OrdinalIgnoreCase);
-        }
-
-        private IEnumerable<int> Find(string name, int start)
-        {
-            if (_hashType == "lh")
-            {
-                return FindByHash(name, start);
-            }
-            else
-            {
-                return FindByPrefix(name, start);
-            }
-        }
-
-        private IEnumerable<int> FindByHash(string name, int start)
-        {
-            uint hash = CalcHash(name);
-
-            for (int i = start; i < _nameHashes.Count; ++i)
-            {
-                if (_nameHashes[i] == hash)
-                {
-                    yield return i;
-                }
-            }
-        }
-
-        private IEnumerable<int> FindByPrefix(string name, int start)
-        {
-            int compChars = Math.Min(name.Length, 4);
-            string compStr = name.Substring(0, compChars).ToUpperInvariant() + "\0\0\0\0";
-
-            for (int i = start; i < _nameHashes.Count; ++i)
-            {
-                bool match = true;
-                uint hash = _nameHashes[i];
-
-                for (int j = 0; j < 4; ++j)
-                {
-                    char ch = (char)((hash >> (j * 8)) & 0xFF);
-                    if (char.ToUpperInvariant(ch) != compStr[j])
-                    {
-                        match = false;
-                        break;
-                    }
-                }
-
-                if (match)
-                {
-                    yield return i;
-                }
-            }
-        }
-
-        private class KeyFinder : IComparer<int>
-        {
-            private RegistryHive _hive;
-            private string _searchName;
-
-            public KeyFinder(RegistryHive hive, string searchName)
-            {
-                _hive = hive;
-                _searchName = searchName;
-            }
-
-            public int CellIndex { get; set; }
-
-            #region IComparer<int> Members
-
-            public int Compare(int x, int y)
-            {
-                // TODO: Be more efficient at ruling out no-hopes by using the hash values
-                KeyNodeCell cell = _hive.GetCell<KeyNodeCell>(x);
-                int result = string.Compare(((KeyNodeCell)cell).Name, _searchName, StringComparison.OrdinalIgnoreCase);
-                if (result == 0)
-                {
-                    CellIndex = x;
-                }
-
-                return result;
-            }
-
-            #endregion
-        }
-    }
-}
diff --git a/DiscUtils/Registry/SubKeyIndirectListCell.cs b/DiscUtils/Registry/SubKeyIndirectListCell.cs
deleted file mode 100644
index 4581e95..0000000
--- a/DiscUtils/Registry/SubKeyIndirectListCell.cs
+++ /dev/null
@@ -1,310 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Registry
-{
-    using System;
-    using System.Collections.Generic;
-
-    internal sealed class SubKeyIndirectListCell : ListCell
-    {
-        private RegistryHive _hive;
-        private string _listType;
-        private List<int> _listIndexes;
-
-        public SubKeyIndirectListCell(RegistryHive hive, int index)
-            : base(index)
-        {
-            _hive = hive;
-        }
-
-        public string ListType
-        {
-            get { return _listType; }
-        }
-
-        public List<int> CellIndexes
-        {
-            get { return _listIndexes; }
-        }
-
-        public override int Size
-        {
-            get { return 4 + (_listIndexes.Count * 4); }
-        }
-
-        internal override int Count
-        {
-            get
-            {
-                int total = 0;
-                foreach (var cellIndex in _listIndexes)
-                {
-                    Cell cell = _hive.GetCell<Cell>(cellIndex);
-                    ListCell listCell = cell as ListCell;
-                    if (listCell != null)
-                    {
-                        total += listCell.Count;
-                    }
-                    else
-                    {
-                        total++;
-                    }
-                }
-
-                return total;
-            }
-        }
-
-        public override int ReadFrom(byte[] buffer, int offset)
-        {
-            _listType = Utilities.BytesToString(buffer, offset, 2);
-            int numElements = Utilities.ToInt16LittleEndian(buffer, offset + 2);
-            _listIndexes = new List<int>(numElements);
-
-            for (int i = 0; i < numElements; ++i)
-            {
-                _listIndexes.Add(Utilities.ToInt32LittleEndian(buffer, offset + 0x4 + (i * 0x4)));
-            }
-
-            return 4 + (_listIndexes.Count * 4);
-        }
-
-        public override void WriteTo(byte[] buffer, int offset)
-        {
-            Utilities.StringToBytes(_listType, buffer, offset, 2);
-            Utilities.WriteBytesLittleEndian((ushort)_listIndexes.Count, buffer, offset + 2);
-            for (int i = 0; i < _listIndexes.Count; ++i)
-            {
-                Utilities.WriteBytesLittleEndian(_listIndexes[i], buffer, offset + 4 + (i * 4));
-            }
-        }
-
-        internal override int FindKey(string name, out int cellIndex)
-        {
-            if (_listIndexes.Count <= 0)
-            {
-                cellIndex = 0;
-                return -1;
-            }
-
-            // Check first and last, to early abort if the name is outside the range of this list
-            int result = DoFindKey(name, 0, out cellIndex);
-            if (result <= 0)
-            {
-                return result;
-            }
-
-            result = DoFindKey(name, _listIndexes.Count - 1, out cellIndex);
-            if (result >= 0)
-            {
-                return result;
-            }
-
-            KeyFinder finder = new KeyFinder(_hive, name);
-            int idx = _listIndexes.BinarySearch(-1, finder);
-            cellIndex = finder.CellIndex;
-            return (idx < 0) ? -1 : 0;
-        }
-
-        internal override void EnumerateKeys(List<string> names)
-        {
-            for (int i = 0; i < _listIndexes.Count; ++i)
-            {
-                Cell cell = _hive.GetCell<Cell>(_listIndexes[i]);
-                ListCell listCell = cell as ListCell;
-                if (listCell != null)
-                {
-                    listCell.EnumerateKeys(names);
-                }
-                else
-                {
-                    names.Add(((KeyNodeCell)cell).Name);
-                }
-            }
-        }
-
-        internal override IEnumerable<KeyNodeCell> EnumerateKeys()
-        {
-            for (int i = 0; i < _listIndexes.Count; ++i)
-            {
-                Cell cell = _hive.GetCell<Cell>(_listIndexes[i]);
-                ListCell listCell = cell as ListCell;
-                if (listCell != null)
-                {
-                    foreach (var keyNodeCell in listCell.EnumerateKeys())
-                    {
-                        yield return keyNodeCell;
-                    }
-                }
-                else
-                {
-                    yield return (KeyNodeCell)cell;
-                }
-            }
-        }
-
-        internal override int LinkSubKey(string name, int cellIndex)
-        {
-            // Look for the first sublist that has a subkey name greater than name
-            if (ListType == "ri")
-            {
-                if (_listIndexes.Count == 0)
-                {
-                    throw new NotImplementedException("Empty indirect list");
-                }
-
-                for (int i = 0; i < _listIndexes.Count - 1; ++i)
-                {
-                    int tempIndex;
-                    ListCell cell = _hive.GetCell<ListCell>(_listIndexes[i]);
-                    if (cell.FindKey(name, out tempIndex) <= 0)
-                    {
-                        _listIndexes[i] = cell.LinkSubKey(name, cellIndex);
-                        return _hive.UpdateCell(this, false);
-                    }
-                }
-
-                ListCell lastCell = _hive.GetCell<ListCell>(_listIndexes[_listIndexes.Count - 1]);
-                _listIndexes[_listIndexes.Count - 1] = lastCell.LinkSubKey(name, cellIndex);
-                return _hive.UpdateCell(this, false);
-            }
-            else
-            {
-                for (int i = 0; i < _listIndexes.Count; ++i)
-                {
-                    KeyNodeCell cell = _hive.GetCell<KeyNodeCell>(_listIndexes[i]);
-                    if (string.Compare(name, cell.Name, StringComparison.OrdinalIgnoreCase) < 0)
-                    {
-                        _listIndexes.Insert(i, cellIndex);
-                        return _hive.UpdateCell(this, true);
-                    }
-                }
-
-                _listIndexes.Add(cellIndex);
-                return _hive.UpdateCell(this, true);
-            }
-        }
-
-        internal override int UnlinkSubKey(string name)
-        {
-            if (ListType == "ri")
-            {
-                if (_listIndexes.Count == 0)
-                {
-                    throw new NotImplementedException("Empty indirect list");
-                }
-
-                for (int i = 0; i < _listIndexes.Count; ++i)
-                {
-                    int tempIndex;
-                    ListCell cell = _hive.GetCell<ListCell>(_listIndexes[i]);
-                    if (cell.FindKey(name, out tempIndex) <= 0)
-                    {
-                        _listIndexes[i] = cell.UnlinkSubKey(name);
-                        if (cell.Count == 0)
-                        {
-                            _hive.FreeCell(_listIndexes[i]);
-                            _listIndexes.RemoveAt(i);
-                        }
-
-                        return _hive.UpdateCell(this, false);
-                    }
-                }
-            }
-            else
-            {
-                for (int i = 0; i < _listIndexes.Count; ++i)
-                {
-                    KeyNodeCell cell = _hive.GetCell<KeyNodeCell>(_listIndexes[i]);
-                    if (string.Compare(name, cell.Name, StringComparison.OrdinalIgnoreCase) == 0)
-                    {
-                        _listIndexes.RemoveAt(i);
-                        return _hive.UpdateCell(this, true);
-                    }
-                }
-            }
-
-            return Index;
-        }
-
-        private int DoFindKey(string name, int listIndex, out int cellIndex)
-        {
-            Cell cell = _hive.GetCell<Cell>(_listIndexes[listIndex]);
-            ListCell listCell = cell as ListCell;
-            if (listCell != null)
-            {
-                return listCell.FindKey(name, out cellIndex);
-            }
-
-            cellIndex = _listIndexes[listIndex];
-            return string.Compare(name, ((KeyNodeCell)cell).Name, StringComparison.OrdinalIgnoreCase);
-        }
-
-        private class KeyFinder : IComparer<int>
-        {
-            private RegistryHive _hive;
-            private string _searchName;
-
-            public KeyFinder(RegistryHive hive, string searchName)
-            {
-                _hive = hive;
-                _searchName = searchName;
-            }
-
-            public int CellIndex { get; set; }
-
-            #region IComparer<int> Members
-
-            public int Compare(int x, int y)
-            {
-                Cell cell = _hive.GetCell<Cell>(x);
-                ListCell listCell = cell as ListCell;
-
-                int result;
-                if (listCell != null)
-                {
-                    int cellIndex;
-                    result = listCell.FindKey(_searchName, out cellIndex);
-                    if (result == 0)
-                    {
-                        CellIndex = cellIndex;
-                    }
-
-                    return -result;
-                }
-                else
-                {
-                    result = string.Compare(((KeyNodeCell)cell).Name, _searchName, StringComparison.OrdinalIgnoreCase);
-                    if (result == 0)
-                    {
-                        CellIndex = x;
-                    }
-                }
-
-                return result;
-            }
-
-            #endregion
-        }
-    }
-}
diff --git a/DiscUtils/Registry/ValueCell.cs b/DiscUtils/Registry/ValueCell.cs
deleted file mode 100644
index 0a59927..0000000
--- a/DiscUtils/Registry/ValueCell.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Registry
-{
-    internal sealed class ValueCell : Cell
-    {
-        private int _dataLength;
-        private int _dataIndex;
-        private RegistryValueType _type;
-        private ValueFlags _flags;
-        private string _name;
-
-        public ValueCell(string name)
-            : this(-1)
-        {
-            _name = name;
-        }
-
-        public ValueCell(int index)
-            : base(index)
-        {
-            _dataIndex = -1;
-        }
-
-        public int DataLength
-        {
-            get { return _dataLength; }
-            set { _dataLength = value; }
-        }
-
-        public int DataIndex
-        {
-            get { return _dataIndex; }
-            set { _dataIndex = value; }
-        }
-
-        public RegistryValueType DataType
-        {
-            get { return _type; }
-            set { _type = value; }
-        }
-
-        public string Name
-        {
-            get { return _name; }
-        }
-
-        public override int Size
-        {
-            get { return 0x14 + (string.IsNullOrEmpty(_name) ? 0 : _name.Length); }
-        }
-
-        public override int ReadFrom(byte[] buffer, int offset)
-        {
-            int nameLen = Utilities.ToUInt16LittleEndian(buffer, offset + 0x02);
-            _dataLength = Utilities.ToInt32LittleEndian(buffer, offset + 0x04);
-            _dataIndex = Utilities.ToInt32LittleEndian(buffer, offset + 0x08);
-            _type = (RegistryValueType)Utilities.ToInt32LittleEndian(buffer, offset + 0x0C);
-            _flags = (ValueFlags)Utilities.ToUInt16LittleEndian(buffer, offset + 0x10);
-
-            if ((_flags & ValueFlags.Named) != 0)
-            {
-                _name = Utilities.BytesToString(buffer, offset + 0x14, nameLen).Trim('\0');
-            }
-
-            return 0x14 + nameLen;
-        }
-
-        public override void WriteTo(byte[] buffer, int offset)
-        {
-            int nameLen;
-
-            if (string.IsNullOrEmpty(_name))
-            {
-                _flags &= ~ValueFlags.Named;
-                nameLen = 0;
-            }
-            else
-            {
-                _flags |= ValueFlags.Named;
-                nameLen = _name.Length;
-            }
-
-            Utilities.StringToBytes("vk", buffer, offset, 2);
-            Utilities.WriteBytesLittleEndian(nameLen, buffer, offset + 0x02);
-            Utilities.WriteBytesLittleEndian(_dataLength, buffer, offset + 0x04);
-            Utilities.WriteBytesLittleEndian(_dataIndex, buffer, offset + 0x08);
-            Utilities.WriteBytesLittleEndian((int)_type, buffer, offset + 0x0C);
-            Utilities.WriteBytesLittleEndian((ushort)_flags, buffer, offset + 0x10);
-            if (nameLen != 0)
-            {
-                Utilities.StringToBytes(_name, buffer, offset + 0x14, nameLen);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Registry/ValueFlags.cs b/DiscUtils/Registry/ValueFlags.cs
deleted file mode 100644
index c910d35..0000000
--- a/DiscUtils/Registry/ValueFlags.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Registry
-{
-    using System;
-
-    [Flags]
-    internal enum ValueFlags : ushort
-    {
-        Named = 0x0001,
-        Unknown0002 = 0x0002,
-        Unknown0004 = 0x0004,
-        Unknown0008 = 0x0008,
-        Unknown0010 = 0x0010,
-        Unknown0020 = 0x0020,
-        Unknown0040 = 0x0040,
-        Unknown0080 = 0x0080,
-        Unknown0100 = 0x0100,
-        Unknown0200 = 0x0200,
-        Unknown0400 = 0x0400,
-        Unknown0800 = 0x0800,
-        Unknown1000 = 0x1000,
-        Unknown2000 = 0x2000,
-        Unknown4000 = 0x4000,
-        Unknown8000 = 0x8000
-    }
-}
diff --git a/DiscUtils/ReparsePoint.cs b/DiscUtils/ReparsePoint.cs
deleted file mode 100644
index 7998b45..0000000
--- a/DiscUtils/ReparsePoint.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    /// <summary>
-    /// Represents a Reparse Point, which can be associated with a file or directory.
-    /// </summary>
-    public sealed class ReparsePoint
-    {
-        private int _tag;
-        private byte[] _content;
-
-        /// <summary>
-        /// Initializes a new instance of the ReparsePoint class.
-        /// </summary>
-        /// <param name="tag">The defined reparse point tag.</param>
-        /// <param name="content">The reparse point's content.</param>
-        public ReparsePoint(int tag, byte[] content)
-        {
-            _tag = tag;
-            _content = content;
-        }
-
-        /// <summary>
-        /// Gets or sets the defined reparse point tag.
-        /// </summary>
-        public int Tag
-        {
-            get { return _tag; }
-            set { _tag = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the reparse point's content.
-        /// </summary>
-        public byte[] Content
-        {
-            get { return _content; }
-            set { _content = value; }
-        }
-    }
-}
diff --git a/DiscUtils/Sizes.cs b/DiscUtils/Sizes.cs
deleted file mode 100644
index d640b8b..0000000
--- a/DiscUtils/Sizes.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    internal static class Sizes
-    {
-        public const long OneKiB = 1024;
-        public const long OneMiB = 1024 * OneKiB;
-        public const long OneGiB = 1024 * OneMiB;
-
-        public const int Sector = 512;
-    }
-}
diff --git a/DiscUtils/SnapshotStream.cs b/DiscUtils/SnapshotStream.cs
deleted file mode 100644
index 934909e..0000000
--- a/DiscUtils/SnapshotStream.cs
+++ /dev/null
@@ -1,423 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    /// <summary>
-    /// A wrapper stream that enables you to take a snapshot, pushing changes into a side buffer.
-    /// </summary>
-    /// <remarks>Once a snapshot is taken, you can discard subsequent changes or merge them back
-    /// into the wrapped stream.</remarks>
-    public sealed class SnapshotStream : SparseStream
-    {
-        private Stream _baseStream;
-
-        private Ownership _baseStreamOwnership;
-
-        /// <summary>
-        /// Captures changes to the base stream (when enabled).
-        /// </summary>
-        private SparseMemoryStream _diffStream;
-
-        /// <summary>
-        /// Records which byte ranges in diffStream hold changes.
-        /// </summary>
-        /// <remarks>Can't use _diffStream's own tracking because that's based on it's
-        /// internal block size, not on the _actual_ bytes stored.</remarks>
-        private List<StreamExtent> _diffExtents;
-
-        /// <summary>
-        /// The saved stream position (if the diffStream is active).
-        /// </summary>
-        private long _savedPosition;
-
-        /// <summary>
-        /// Indicates that no writes should be permitted.
-        /// </summary>
-        private bool _frozen;
-
-        private long _position;
-
-        /// <summary>
-        /// Initializes a new instance of the SnapshotStream class.
-        /// </summary>
-        /// <param name="baseStream">The stream to wrap.</param>
-        /// <param name="owns">Indicates if this stream should control the lifetime of baseStream.</param>
-        public SnapshotStream(Stream baseStream, Ownership owns)
-        {
-            _baseStream = baseStream;
-            _baseStreamOwnership = owns;
-            _diffExtents = new List<StreamExtent>();
-        }
-
-        /// <summary>
-        /// Gets an indication as to whether the stream can be read.
-        /// </summary>
-        public override bool CanRead
-        {
-            get { return _baseStream.CanRead; }
-        }
-
-        /// <summary>
-        /// Gets an indication as to whether the stream position can be changed.
-        /// </summary>
-        public override bool CanSeek
-        {
-            get { return _baseStream.CanSeek; }
-        }
-
-        /// <summary>
-        /// Gets an indication as to whether the stream can be written to.
-        /// </summary>
-        /// <remarks>This property is orthogonal to Freezing/Thawing, it's
-        /// perfectly possible for a stream to be frozen and this method
-        /// return <c>true</c>.</remarks>
-        public override bool CanWrite
-        {
-            get { return (_diffStream != null) ? true : _baseStream.CanWrite; }
-        }
-
-        /// <summary>
-        /// Gets the length of the stream.
-        /// </summary>
-        public override long Length
-        {
-            get
-            {
-                if (_diffStream != null)
-                {
-                    return _diffStream.Length;
-                }
-                else
-                {
-                    return _baseStream.Length;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets and sets the current stream position.
-        /// </summary>
-        public override long Position
-        {
-            get
-            {
-                return _position;
-            }
-
-            set
-            {
-                _position = value;
-            }
-        }
-
-        /// <summary>
-        /// Returns an enumeration over the parts of the stream that contain real data.
-        /// </summary>
-        public override IEnumerable<StreamExtent> Extents
-        {
-            get
-            {
-                SparseStream sparseBase = _baseStream as SparseStream;
-                if (sparseBase == null)
-                {
-                    return new StreamExtent[] { new StreamExtent(0, Length) };
-                }
-                else
-                {
-                    return StreamExtent.Union(sparseBase.Extents, _diffExtents);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Prevents any write operations to the stream.
-        /// </summary>
-        /// <remarks>Useful to prevent changes whilst inspecting the stream.</remarks>
-        public void Freeze()
-        {
-            _frozen = true;
-        }
-
-        /// <summary>
-        /// Re-permits write operations to the stream.
-        /// </summary>
-        public void Thaw()
-        {
-            _frozen = false;
-        }
-
-        /// <summary>
-        /// Takes a snapshot of the current stream contents.
-        /// </summary>
-        public void Snapshot()
-        {
-            if (_diffStream != null)
-            {
-                throw new InvalidOperationException("Already have a snapshot");
-            }
-
-            _savedPosition = _position;
-
-            _diffExtents = new List<StreamExtent>();
-            _diffStream = new SparseMemoryStream();
-            _diffStream.SetLength(_baseStream.Length);
-        }
-
-        /// <summary>
-        /// Reverts to a previous snapshot, discarding any changes made to the stream.
-        /// </summary>
-        public void RevertToSnapshot()
-        {
-            if (_diffStream == null)
-            {
-                throw new InvalidOperationException("No snapshot");
-            }
-
-            _diffStream = null;
-            _diffExtents = null;
-
-            _position = _savedPosition;
-        }
-
-        /// <summary>
-        /// Discards the snapshot any changes made after the snapshot was taken are kept.
-        /// </summary>
-        public void ForgetSnapshot()
-        {
-            if (_diffStream == null)
-            {
-                throw new InvalidOperationException("No snapshot");
-            }
-
-            byte[] buffer = new byte[8192];
-
-            foreach (var extent in _diffExtents)
-            {
-                _diffStream.Position = extent.Start;
-                _baseStream.Position = extent.Start;
-
-                int totalRead = 0;
-                while (totalRead < extent.Length)
-                {
-                    int toRead = (int)Math.Min(extent.Length - totalRead, buffer.Length);
-
-                    int read = _diffStream.Read(buffer, 0, toRead);
-                    _baseStream.Write(buffer, 0, read);
-
-                    totalRead += read;
-                }
-            }
-
-            _diffStream = null;
-            _diffExtents = null;
-        }
-
-        /// <summary>
-        /// Flushes the stream.
-        /// </summary>
-        public override void Flush()
-        {
-            CheckFrozen();
-
-            _baseStream.Flush();
-        }
-
-        /// <summary>
-        /// Reads data from the stream.
-        /// </summary>
-        /// <param name="buffer">The buffer to fill.</param>
-        /// <param name="offset">The buffer offset to start from.</param>
-        /// <param name="count">The number of bytes to read.</param>
-        /// <returns>The number of bytes read.</returns>
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            int numRead;
-
-            if (_diffStream == null)
-            {
-                _baseStream.Position = _position;
-                numRead = _baseStream.Read(buffer, offset, count);
-            }
-            else
-            {
-                if (_position > _diffStream.Length)
-                {
-                    throw new IOException("Attempt to read beyond end of file");
-                }
-
-                int toRead = (int)Math.Min(count, _diffStream.Length - _position);
-
-                // If the read is within the base stream's range, then touch it first to get the
-                // (potentially) stale data.
-                if (_position < _baseStream.Length)
-                {
-                    int baseToRead = (int)Math.Min(toRead, _baseStream.Length - _position);
-                    _baseStream.Position = _position;
-
-                    int totalBaseRead = 0;
-                    while (totalBaseRead < baseToRead)
-                    {
-                        totalBaseRead += _baseStream.Read(buffer, offset + totalBaseRead, baseToRead - totalBaseRead);
-                    }
-                }
-
-                // Now overlay any data from the overlay stream (if any)
-                IEnumerable<StreamExtent> overlayExtents = StreamExtent.Intersect(_diffExtents, new StreamExtent(_position, toRead));
-                foreach (var extent in overlayExtents)
-                {
-                    _diffStream.Position = extent.Start;
-                    int overlayNumRead = 0;
-                    while (overlayNumRead < extent.Length)
-                    {
-                        overlayNumRead += _diffStream.Read(
-                            buffer,
-                            (int)(offset + (extent.Start - _position) + overlayNumRead),
-                            (int)(extent.Length - overlayNumRead));
-                    }
-                }
-
-                numRead = toRead;
-            }
-
-            _position += numRead;
-
-            return numRead;
-        }
-
-        /// <summary>
-        /// Moves the stream position.
-        /// </summary>
-        /// <param name="offset">The origin-relative location.</param>
-        /// <param name="origin">The base location.</param>
-        /// <returns>The new absolute stream position.</returns>
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            CheckFrozen();
-
-            long effectiveOffset = offset;
-            if (origin == SeekOrigin.Current)
-            {
-                effectiveOffset += _position;
-            }
-            else if (origin == SeekOrigin.End)
-            {
-                effectiveOffset += Length;
-            }
-
-            if (effectiveOffset < 0)
-            {
-                throw new IOException("Attempt to move before beginning of disk");
-            }
-            else
-            {
-                _position = effectiveOffset;
-                return _position;
-            }
-        }
-
-        /// <summary>
-        /// Sets the length of the stream.
-        /// </summary>
-        /// <param name="value">The new length.</param>
-        public override void SetLength(long value)
-        {
-            CheckFrozen();
-
-            if (_diffStream != null)
-            {
-                _diffStream.SetLength(value);
-            }
-            else
-            {
-                _baseStream.SetLength(value);
-            }
-        }
-
-        /// <summary>
-        /// Writes data to the stream at the current location.
-        /// </summary>
-        /// <param name="buffer">The data to write.</param>
-        /// <param name="offset">The first byte to write from buffer.</param>
-        /// <param name="count">The number of bytes to write.</param>
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            CheckFrozen();
-
-            if (_diffStream != null)
-            {
-                _diffStream.Position = _position;
-                _diffStream.Write(buffer, offset, count);
-
-                // Beware of Linq's delayed model - force execution now by placing into a list.
-                // Without this, large execution chains can build up (v. slow) and potential for stack overflow.
-                _diffExtents = new List<StreamExtent>(StreamExtent.Union(_diffExtents, new StreamExtent(_position, count)));
-
-                _position += count;
-            }
-            else
-            {
-                _baseStream.Position = _position;
-                _baseStream.Write(buffer, offset, count);
-                _position += count;
-            }
-        }
-
-        /// <summary>
-        /// Disposes of this instance.
-        /// </summary>
-        /// <param name="disposing"><c>true</c> if called from Dispose(), else <c>false</c>.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                if (_baseStreamOwnership == Ownership.Dispose && _baseStream != null)
-                {
-                    _baseStream.Dispose();
-                }
-
-                _baseStream = null;
-
-                if (_diffStream != null)
-                {
-                    _diffStream.Dispose();
-                }
-
-                _diffStream = null;
-            }
-
-            base.Dispose(disposing);
-        }
-
-        private void CheckFrozen()
-        {
-            if (_frozen)
-            {
-                throw new InvalidOperationException("The stream is frozen");
-            }
-        }
-    }
-}
diff --git a/DiscUtils/SparseMemoryBuffer.cs b/DiscUtils/SparseMemoryBuffer.cs
deleted file mode 100644
index e4f6c9a..0000000
--- a/DiscUtils/SparseMemoryBuffer.cs
+++ /dev/null
@@ -1,228 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// A sparse in-memory buffer.
-    /// </summary>
-    /// <remarks>This class is useful for storing large sparse buffers in memory, unused
-    /// chunks of the buffer are not stored (assumed to be zero).</remarks>
-    public sealed class SparseMemoryBuffer : Buffer
-    {
-        private Dictionary<int, byte[]> _buffers;
-        private int _chunkSize;
-
-        private long _capacity;
-
-        /// <summary>
-        /// Initializes a new instance of the SparseMemoryBuffer class.
-        /// </summary>
-        /// <param name="chunkSize">The size of each allocation chunk.</param>
-        public SparseMemoryBuffer(int chunkSize)
-        {
-            _chunkSize = chunkSize;
-            _buffers = new Dictionary<int, byte[]>();
-        }
-
-        /// <summary>
-        /// Indicates this stream can be read (always <c>true</c>).
-        /// </summary>
-        public override bool CanRead
-        {
-            get { return true; }
-        }
-
-        /// <summary>
-        /// Indicates this stream can be written (always <c>true</c>).
-        /// </summary>
-        public override bool CanWrite
-        {
-            get { return true; }
-        }
-
-        /// <summary>
-        /// Gets the current capacity of the sparse buffer (number of logical bytes stored).
-        /// </summary>
-        public override long Capacity
-        {
-            get { return _capacity; }
-        }
-
-        /// <summary>
-        /// Gets the size of each allocation chunk.
-        /// </summary>
-        public int ChunkSize
-        {
-            get { return _chunkSize; }
-        }
-
-        /// <summary>
-        /// Gets the (sorted) list of allocated chunks, as chunk indexes.
-        /// </summary>
-        /// <returns>An enumeration of chunk indexes.</returns>
-        /// <remarks>This method returns chunks as an index rather than absolute stream position.
-        /// For example, if ChunkSize is 16KB, and the first 32KB of the buffer is actually stored,
-        /// this method will return 0 and 1.  This indicates the first and second chunks are stored.</remarks>
-        public IEnumerable<int> AllocatedChunks
-        {
-            get
-            {
-                List<int> keys = new List<int>(_buffers.Keys);
-                keys.Sort();
-                return keys;
-            }
-        }
-
-        /// <summary>
-        /// Accesses this memory buffer as an infinite byte array.
-        /// </summary>
-        /// <param name="pos">The buffer position to read.</param>
-        /// <returns>The byte stored at this position (or Zero if not explicitly stored).</returns>
-        public byte this[long pos]
-        {
-            get
-            {
-                byte[] buffer = new byte[1];
-                if (Read(pos, buffer, 0, 1) != 0)
-                {
-                    return buffer[0];
-                }
-                else
-                {
-                    return 0;
-                }
-            }
-
-            set
-            {
-                byte[] buffer = new byte[1];
-                buffer[0] = value;
-                Write(pos, buffer, 0, 1);
-            }
-        }
-
-        /// <summary>
-        /// Reads a section of the sparse buffer into a byte array.
-        /// </summary>
-        /// <param name="pos">The offset within the sparse buffer to start reading.</param>
-        /// <param name="buffer">The destination byte array.</param>
-        /// <param name="offset">The start offset within the destination buffer.</param>
-        /// <param name="count">The number of bytes to read.</param>
-        /// <returns>The actual number of bytes read.</returns>
-        public override int Read(long pos, byte[] buffer, int offset, int count)
-        {
-            int totalRead = 0;
-
-            while (totalRead < count && pos < _capacity)
-            {
-                int chunk = (int)(pos / _chunkSize);
-                int chunkOffset = (int)(pos % _chunkSize);
-                int numToRead = (int)Math.Min(Math.Min(_chunkSize - chunkOffset, _capacity - pos), count - totalRead);
-
-                byte[] chunkBuffer;
-                if (!_buffers.TryGetValue(chunk, out chunkBuffer))
-                {
-                    Array.Clear(buffer, offset + totalRead, numToRead);
-                }
-                else
-                {
-                    Array.Copy(chunkBuffer, chunkOffset, buffer, offset + totalRead, numToRead);
-                }
-
-                totalRead += numToRead;
-                pos += numToRead;
-            }
-
-            return totalRead;
-        }
-
-        /// <summary>
-        /// Writes a byte array into the sparse buffer.
-        /// </summary>
-        /// <param name="pos">The start offset within the sparse buffer.</param>
-        /// <param name="buffer">The source byte array.</param>
-        /// <param name="offset">The start offset within the source byte array.</param>
-        /// <param name="count">The number of bytes to write.</param>
-        public override void Write(long pos, byte[] buffer, int offset, int count)
-        {
-            int totalWritten = 0;
-
-            while (totalWritten < count)
-            {
-                int chunk = (int)(pos / _chunkSize);
-                int chunkOffset = (int)(pos % _chunkSize);
-                int numToWrite = (int)Math.Min(_chunkSize - chunkOffset, count - totalWritten);
-
-                byte[] chunkBuffer;
-                if (!_buffers.TryGetValue(chunk, out chunkBuffer))
-                {
-                    chunkBuffer = new byte[_chunkSize];
-                    _buffers[chunk] = chunkBuffer;
-                }
-
-                Array.Copy(buffer, offset + totalWritten, chunkBuffer, chunkOffset, numToWrite);
-
-                totalWritten += numToWrite;
-                pos += numToWrite;
-            }
-
-            _capacity = Math.Max(_capacity, pos);
-        }
-
-        /// <summary>
-        /// Sets the capacity of the sparse buffer, truncating if appropriate.
-        /// </summary>
-        /// <param name="value">The desired capacity of the buffer.</param>
-        /// <remarks>This method does not allocate any chunks, it merely records the logical
-        /// capacity of the sparse buffer.  Writes beyond the specified capacity will increase
-        /// the capacity.</remarks>
-        public override void SetCapacity(long value)
-        {
-            _capacity = value;
-        }
-
-        /// <summary>
-        /// Gets the parts of a buffer that are stored, within a specified range.
-        /// </summary>
-        /// <param name="start">The offset of the first byte of interest.</param>
-        /// <param name="count">The number of bytes of interest.</param>
-        /// <returns>An enumeration of stream extents, indicating stored bytes.</returns>
-        public override IEnumerable<StreamExtent> GetExtentsInRange(long start, long count)
-        {
-            long end = start + count;
-            foreach (var chunk in AllocatedChunks)
-            {
-                long chunkStart = chunk * (long)_chunkSize;
-                long chunkEnd = chunkStart + _chunkSize;
-                if (chunkEnd > start && chunkStart < end)
-                {
-                    long extentStart = Math.Max(start, chunkStart);
-                    yield return new StreamExtent(extentStart, Math.Min(chunkEnd, end) - extentStart);
-                }
-            }
-        }
-    }
-}
diff --git a/DiscUtils/SparseMemoryStream.cs b/DiscUtils/SparseMemoryStream.cs
deleted file mode 100644
index 37dc5d4..0000000
--- a/DiscUtils/SparseMemoryStream.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System.IO;
-
-    /// <summary>
-    /// Provides a sparse equivalent to MemoryStream.
-    /// </summary>
-    public sealed class SparseMemoryStream : BufferStream
-    {
-        /// <summary>
-        /// Initializes a new instance of the SparseMemoryStream class.
-        /// </summary>
-        /// <remarks>The created instance permits read and write access.</remarks>
-        public SparseMemoryStream()
-            : base(new SparseMemoryBuffer(16 * 1024), FileAccess.ReadWrite)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the SparseMemoryStream class.
-        /// </summary>
-        /// <param name="buffer">The buffer to use.</param>
-        /// <param name="access">The access permitted to clients.</param>
-        public SparseMemoryStream(SparseMemoryBuffer buffer, FileAccess access)
-            : base(buffer, access)
-        {
-        }
-    }
-}
diff --git a/DiscUtils/SparseStream.cs b/DiscUtils/SparseStream.cs
deleted file mode 100644
index 8b314ad..0000000
--- a/DiscUtils/SparseStream.cs
+++ /dev/null
@@ -1,349 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal delegate SparseStream SparseStreamOpenDelegate();
-
-    /// <summary>
-    /// Represents a sparse stream.
-    /// </summary>
-    /// <remarks>A sparse stream is a logically contiguous stream where some parts of the stream
-    /// aren't stored.  The unstored parts are implicitly zero-byte ranges.</remarks>
-    public abstract class SparseStream : Stream
-    {
-        /// <summary>
-        /// Gets the parts of the stream that are stored.
-        /// </summary>
-        /// <remarks>This may be an empty enumeration if all bytes are zero.</remarks>
-        public abstract IEnumerable<StreamExtent> Extents
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Converts any stream into a sparse stream.
-        /// </summary>
-        /// <param name="stream">The stream to convert.</param>
-        /// <param name="takeOwnership"><c>true</c> to have the new stream dispose the wrapped
-        /// stream when it is disposed.</param>
-        /// <returns>A sparse stream.</returns>
-        /// <remarks>The returned stream has the entire wrapped stream as a
-        /// single extent.</remarks>
-        public static SparseStream FromStream(Stream stream, Ownership takeOwnership)
-        {
-            return new SparseWrapperStream(stream, takeOwnership, null);
-        }
-
-        /// <summary>
-        /// Converts any stream into a sparse stream.
-        /// </summary>
-        /// <param name="stream">The stream to convert.</param>
-        /// <param name="takeOwnership"><c>true</c> to have the new stream dispose the wrapped
-        /// stream when it is disposed.</param>
-        /// <param name="extents">The set of extents actually stored in <c>stream</c>.</param>
-        /// <returns>A sparse stream.</returns>
-        /// <remarks>The returned stream has the entire wrapped stream as a
-        /// single extent.</remarks>
-        public static SparseStream FromStream(Stream stream, Ownership takeOwnership, IEnumerable<StreamExtent> extents)
-        {
-            return new SparseWrapperStream(stream, takeOwnership, extents);
-        }
-
-        /// <summary>
-        /// Efficiently pumps data from a sparse stream to another stream.
-        /// </summary>
-        /// <param name="inStream">The sparse stream to pump from.</param>
-        /// <param name="outStream">The stream to pump to.</param>
-        /// <remarks><paramref name="outStream"/> must support seeking.</remarks>
-        public static void Pump(Stream inStream, Stream outStream)
-        {
-            Pump(inStream, outStream, Sizes.Sector);
-        }
-
-        /// <summary>
-        /// Efficiently pumps data from a sparse stream to another stream.
-        /// </summary>
-        /// <param name="inStream">The stream to pump from.</param>
-        /// <param name="outStream">The stream to pump to.</param>
-        /// <param name="chunkSize">The smallest sequence of zero bytes that will be skipped when writing to <paramref name="outStream"/>.</param>
-        /// <remarks><paramref name="outStream"/> must support seeking.</remarks>
-        public static void Pump(Stream inStream, Stream outStream, int chunkSize)
-        {
-            StreamPump pump = new StreamPump(inStream, outStream, chunkSize);
-            pump.Run();
-        }
-
-        /// <summary>
-        /// Wraps a sparse stream in a read-only wrapper, preventing modification.
-        /// </summary>
-        /// <param name="toWrap">The stream to make read-only.</param>
-        /// <param name="ownership">Whether to transfer responsibility for calling Dispose on <c>toWrap</c>.</param>
-        /// <returns>The read-only stream.</returns>
-        public static SparseStream ReadOnly(SparseStream toWrap, Ownership ownership)
-        {
-            return new SparseReadOnlyWrapperStream(toWrap, ownership);
-        }
-
-        /// <summary>
-        /// Clears bytes from the stream.
-        /// </summary>
-        /// <param name="count">The number of bytes (from the current position) to clear.</param>
-        /// <remarks>
-        /// <para>Logically equivalent to writing <c>count</c> null/zero bytes to the stream, some
-        /// implementations determine that some (or all) of the range indicated is not actually
-        /// stored.  There is no direct, automatic, correspondence to clearing bytes and them
-        /// not being represented as an 'extent' - for example, the implementation of the underlying
-        /// stream may not permit fine-grained extent storage.</para>
-        /// <para>It is always safe to call this method to 'zero-out' a section of a stream, regardless of
-        /// the underlying stream implementation.</para>
-        /// </remarks>
-        public virtual void Clear(int count)
-        {
-            Write(new byte[count], 0, count);
-        }
-
-        /// <summary>
-        /// Gets the parts of a stream that are stored, within a specified range.
-        /// </summary>
-        /// <param name="start">The offset of the first byte of interest.</param>
-        /// <param name="count">The number of bytes of interest.</param>
-        /// <returns>An enumeration of stream extents, indicating stored bytes.</returns>
-        public virtual IEnumerable<StreamExtent> GetExtentsInRange(long start, long count)
-        {
-            return StreamExtent.Intersect(Extents, new StreamExtent[] { new StreamExtent(start, count) });
-        }
-
-        private class SparseReadOnlyWrapperStream : SparseStream
-        {
-            private SparseStream _wrapped;
-            private Ownership _ownsWrapped;
-
-            public SparseReadOnlyWrapperStream(SparseStream wrapped, Ownership ownsWrapped)
-            {
-                _wrapped = wrapped;
-                _ownsWrapped = ownsWrapped;
-            }
-
-            public override bool CanRead
-            {
-                get { return _wrapped.CanRead; }
-            }
-
-            public override bool CanSeek
-            {
-                get { return _wrapped.CanSeek; }
-            }
-
-            public override bool CanWrite
-            {
-                get { return false; }
-            }
-
-            public override long Length
-            {
-                get { return _wrapped.Length; }
-            }
-
-            public override long Position
-            {
-                get
-                {
-                    return _wrapped.Position;
-                }
-
-                set
-                {
-                    _wrapped.Position = value;
-                }
-            }
-
-            public override IEnumerable<StreamExtent> Extents
-            {
-                get { return _wrapped.Extents; }
-            }
-
-            public override void Flush()
-            {
-            }
-
-            public override int Read(byte[] buffer, int offset, int count)
-            {
-                return _wrapped.Read(buffer, offset, count);
-            }
-
-            public override long Seek(long offset, SeekOrigin origin)
-            {
-                return _wrapped.Seek(offset, origin);
-            }
-
-            public override void SetLength(long value)
-            {
-                throw new InvalidOperationException("Attempt to change length of read-only stream");
-            }
-
-            public override void Write(byte[] buffer, int offset, int count)
-            {
-                throw new InvalidOperationException("Attempt to write to read-only stream");
-            }
-
-            protected override void Dispose(bool disposing)
-            {
-                try
-                {
-                    if (disposing && _ownsWrapped == Ownership.Dispose && _wrapped != null)
-                    {
-                        _wrapped.Dispose();
-                        _wrapped = null;
-                    }
-                }
-                finally
-                {
-                    base.Dispose(disposing);
-                }
-            }
-        }
-
-        private class SparseWrapperStream : SparseStream
-        {
-            private Stream _wrapped;
-            private Ownership _ownsWrapped;
-            private List<StreamExtent> _extents;
-
-            public SparseWrapperStream(Stream wrapped, Ownership ownsWrapped, IEnumerable<StreamExtent> extents)
-            {
-                _wrapped = wrapped;
-                _ownsWrapped = ownsWrapped;
-                if (extents != null)
-                {
-                    _extents = new List<StreamExtent>(extents);
-                }
-            }
-
-            public override bool CanRead
-            {
-                get { return _wrapped.CanRead; }
-            }
-
-            public override bool CanSeek
-            {
-                get { return _wrapped.CanSeek; }
-            }
-
-            public override bool CanWrite
-            {
-                get { return _wrapped.CanWrite; }
-            }
-
-            public override long Length
-            {
-                get { return _wrapped.Length; }
-            }
-
-            public override long Position
-            {
-                get
-                {
-                    return _wrapped.Position;
-                }
-
-                set
-                {
-                    _wrapped.Position = value;
-                }
-            }
-
-            public override IEnumerable<StreamExtent> Extents
-            {
-                get
-                {
-                    if (_extents != null)
-                    {
-                        return _extents;
-                    }
-                    else
-                    {
-                        SparseStream wrappedAsSparse = _wrapped as SparseStream;
-                        if (wrappedAsSparse != null)
-                        {
-                            return wrappedAsSparse.Extents;
-                        }
-                        else
-                        {
-                            return new StreamExtent[] { new StreamExtent(0, _wrapped.Length) };
-                        }
-                    }
-                }
-            }
-
-            public override void Flush()
-            {
-                _wrapped.Flush();
-            }
-
-            public override int Read(byte[] buffer, int offset, int count)
-            {
-                return _wrapped.Read(buffer, offset, count);
-            }
-
-            public override long Seek(long offset, SeekOrigin origin)
-            {
-                return _wrapped.Seek(offset, origin);
-            }
-
-            public override void SetLength(long value)
-            {
-                _wrapped.SetLength(value);
-            }
-
-            public override void Write(byte[] buffer, int offset, int count)
-            {
-                if (_extents != null)
-                {
-                    throw new InvalidOperationException("Attempt to write to stream with explicit extents");
-                }
-
-                _wrapped.Write(buffer, offset, count);
-            }
-
-            protected override void Dispose(bool disposing)
-            {
-                try
-                {
-                    if (disposing && _ownsWrapped == Ownership.Dispose && _wrapped != null)
-                    {
-                        _wrapped.Dispose();
-                        _wrapped = null;
-                    }
-                }
-                finally
-                {
-                    base.Dispose(disposing);
-                }
-            }
-        }
-    }
-}
diff --git a/DiscUtils/StreamBuilder.cs b/DiscUtils/StreamBuilder.cs
deleted file mode 100644
index c485868..0000000
--- a/DiscUtils/StreamBuilder.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System.Collections.Generic;
-    using System.IO;
-
-    /// <summary>
-    /// Base class for objects that can dynamically construct a stream.
-    /// </summary>
-    public abstract class StreamBuilder
-    {
-        /// <summary>
-        /// Builds a new stream.
-        /// </summary>
-        /// <returns>The stream created by the StreamBuilder instance.</returns>
-        public virtual SparseStream Build()
-        {
-            long totalLength;
-            List<BuilderExtent> extents = FixExtents(out totalLength);
-            return new BuiltStream(totalLength, extents);
-        }
-
-        /// <summary>
-        /// Writes the stream contents to an existing stream.
-        /// </summary>
-        /// <param name="output">The stream to write to.</param>
-        public void Build(Stream output)
-        {
-            using (Stream src = Build())
-            {
-                byte[] buffer = new byte[64 * 1024];
-                int numRead = src.Read(buffer, 0, buffer.Length);
-                while (numRead != 0)
-                {
-                    output.Write(buffer, 0, numRead);
-                    numRead = src.Read(buffer, 0, buffer.Length);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Writes the stream contents to a file.
-        /// </summary>
-        /// <param name="outputFile">The file to write to.</param>
-        public void Build(string outputFile)
-        {
-            using (FileStream destStream = new FileStream(outputFile, FileMode.Create, FileAccess.Write))
-            {
-                Build(destStream);
-            }
-        }
-
-        internal abstract List<BuilderExtent> FixExtents(out long totalLength);
-    }
-}
diff --git a/DiscUtils/StreamExtent.cs b/DiscUtils/StreamExtent.cs
deleted file mode 100644
index daf15e3..0000000
--- a/DiscUtils/StreamExtent.cs
+++ /dev/null
@@ -1,512 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// Represents a range of bytes in a stream.
-    /// </summary>
-    /// <remarks>This is normally used to represent regions of a SparseStream that
-    /// are actually stored in the underlying storage medium (rather than implied
-    /// zero bytes).  Extents are stored as a zero-based byte offset (from the
-    /// beginning of the stream), and a byte length.</remarks>
-    public sealed class StreamExtent : IEquatable<StreamExtent>, IComparable<StreamExtent>
-    {
-        private long _start;
-        private long _length;
-
-        /// <summary>
-        /// Initializes a new instance of the StreamExtent class.
-        /// </summary>
-        /// <param name="start">The start of the extent.</param>
-        /// <param name="length">The length of the extent.</param>
-        public StreamExtent(long start, long length)
-        {
-            _start = start;
-            _length = length;
-        }
-
-        /// <summary>
-        /// Gets the start of the extent (in bytes).
-        /// </summary>
-        public long Start
-        {
-            get { return _start; }
-        }
-
-        /// <summary>
-        /// Gets the start of the extent (in bytes).
-        /// </summary>
-        public long Length
-        {
-            get { return _length; }
-        }
-
-        /// <summary>
-        /// Calculates the union of a list of extents with another extent.
-        /// </summary>
-        /// <param name="extents">The list of extents.</param>
-        /// <param name="other">The other extent.</param>
-        /// <returns>The union of the extents.</returns>
-        public static IEnumerable<StreamExtent> Union(IEnumerable<StreamExtent> extents, StreamExtent other)
-        {
-            List<StreamExtent> otherList = new List<StreamExtent>();
-            otherList.Add(other);
-            return Union(extents, otherList);
-        }
-
-        /// <summary>
-        /// Calculates the union of the extents of multiple streams.
-        /// </summary>
-        /// <param name="streams">The stream extents.</param>
-        /// <returns>The union of the extents from multiple streams.</returns>
-        /// <remarks>A typical use of this method is to calculate the combined set of
-        /// stored extents from a number of overlayed sparse streams.</remarks>
-        public static IEnumerable<StreamExtent> Union(params IEnumerable<StreamExtent>[] streams)
-        {
-            long extentStart = long.MaxValue;
-            long extentEnd = 0;
-
-            // Initialize enumerations and find first stored byte position
-            IEnumerator<StreamExtent>[] enums = new IEnumerator<StreamExtent>[streams.Length];
-            bool[] streamsValid = new bool[streams.Length];
-            int validStreamsRemaining = 0;
-            for (int i = 0; i < streams.Length; ++i)
-            {
-                enums[i] = streams[i].GetEnumerator();
-                streamsValid[i] = enums[i].MoveNext();
-                if (streamsValid[i])
-                {
-                    ++validStreamsRemaining;
-                    if (enums[i].Current.Start < extentStart)
-                    {
-                        extentStart = enums[i].Current.Start;
-                        extentEnd = enums[i].Current.Start + enums[i].Current.Length;
-                    }
-                }
-            }
-
-            while (validStreamsRemaining > 0)
-            {
-                // Find the end of this extent
-                bool foundIntersection;
-                do
-                {
-                    foundIntersection = false;
-                    validStreamsRemaining = 0;
-                    for (int i = 0; i < streams.Length; ++i)
-                    {
-                        while (streamsValid[i] && enums[i].Current.Start + enums[i].Current.Length <= extentEnd)
-                        {
-                            streamsValid[i] = enums[i].MoveNext();
-                        }
-
-                        if (streamsValid[i])
-                        {
-                            ++validStreamsRemaining;
-                        }
-
-                        if (streamsValid[i] && enums[i].Current.Start <= extentEnd)
-                        {
-                            extentEnd = enums[i].Current.Start + enums[i].Current.Length;
-                            foundIntersection = true;
-                            streamsValid[i] = enums[i].MoveNext();
-                        }
-                    }
-                }
-                while (foundIntersection && validStreamsRemaining > 0);
-
-                // Return the discovered extent
-                yield return new StreamExtent(extentStart, extentEnd - extentStart);
-
-                // Find the next extent start point
-                extentStart = long.MaxValue;
-                validStreamsRemaining = 0;
-                for (int i = 0; i < streams.Length; ++i)
-                {
-                    if (streamsValid[i])
-                    {
-                        ++validStreamsRemaining;
-                        if (enums[i].Current.Start < extentStart)
-                        {
-                            extentStart = enums[i].Current.Start;
-                            extentEnd = enums[i].Current.Start + enums[i].Current.Length;
-                        }
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Calculates the intersection of the extents of a stream with another extent.
-        /// </summary>
-        /// <param name="extents">The stream extents.</param>
-        /// <param name="other">The extent to intersect.</param>
-        /// <returns>The intersection of the extents.</returns>
-        public static IEnumerable<StreamExtent> Intersect(IEnumerable<StreamExtent> extents, StreamExtent other)
-        {
-            List<StreamExtent> otherList = new List<StreamExtent>(1);
-            otherList.Add(other);
-            return Intersect(extents, otherList);
-        }
-
-        /// <summary>
-        /// Calculates the intersection of the extents of multiple streams.
-        /// </summary>
-        /// <param name="streams">The stream extents.</param>
-        /// <returns>The intersection of the extents from multiple streams.</returns>
-        /// <remarks>A typical use of this method is to calculate the extents in a
-        /// region of a stream..</remarks>
-        public static IEnumerable<StreamExtent> Intersect(params IEnumerable<StreamExtent>[] streams)
-        {
-            long extentStart = long.MinValue;
-            long extentEnd = long.MaxValue;
-
-            IEnumerator<StreamExtent>[] enums = new IEnumerator<StreamExtent>[streams.Length];
-            for (int i = 0; i < streams.Length; ++i)
-            {
-                enums[i] = streams[i].GetEnumerator();
-                if (!enums[i].MoveNext())
-                {
-                    // Gone past end of one stream (in practice was empty), so no intersections
-                    yield break;
-                }
-            }
-
-            int overlapsFound = 0;
-            while (true)
-            {
-                // We keep cycling round the streams, until we get streams.Length continuous overlaps
-                for (int i = 0; i < streams.Length; ++i)
-                {
-                    // Move stream on past all extents that are earlier than our candidate start point
-                    while (enums[i].Current.Length == 0
-                        || enums[i].Current.Start + enums[i].Current.Length <= extentStart)
-                    {
-                        if (!enums[i].MoveNext())
-                        {
-                            // Gone past end of this stream, no more intersections possible
-                            yield break;
-                        }
-                    }
-
-                    // If this stream has an extent that spans over the candidate start point
-                    if (enums[i].Current.Start <= extentStart)
-                    {
-                        extentEnd = Math.Min(extentEnd, enums[i].Current.Start + enums[i].Current.Length);
-                        overlapsFound++;
-                    }
-                    else
-                    {
-                        extentStart = enums[i].Current.Start;
-                        extentEnd = extentStart + enums[i].Current.Length;
-                        overlapsFound = 1;
-                    }
-
-                    // We've just done a complete loop of all streams, they overlapped this start position
-                    // and we've cut the extent's end down to the shortest run.
-                    if (overlapsFound == streams.Length)
-                    {
-                        yield return new StreamExtent(extentStart, extentEnd - extentStart);
-                        extentStart = extentEnd;
-                        extentEnd = long.MaxValue;
-                        overlapsFound = 0;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Calculates the subtraction of the extents of a stream by another extent.
-        /// </summary>
-        /// <param name="extents">The stream extents.</param>
-        /// <param name="other">The extent to subtract.</param>
-        /// <returns>The subtraction of <c>other</c> from <c>extents</c>.</returns>
-        public static IEnumerable<StreamExtent> Subtract(IEnumerable<StreamExtent> extents, StreamExtent other)
-        {
-            return Subtract(extents, new StreamExtent[] { other });
-        }
-
-        /// <summary>
-        /// Calculates the subtraction of the extents of a stream by another stream.
-        /// </summary>
-        /// <param name="a">The stream extents to subtract from.</param>
-        /// <param name="b">The stream extents to subtract.</param>
-        /// <returns>The subtraction of the extents of b from a.</returns>
-        public static IEnumerable<StreamExtent> Subtract(IEnumerable<StreamExtent> a, IEnumerable<StreamExtent> b)
-        {
-            return Intersect(a, Invert(b));
-        }
-
-        /// <summary>
-        /// Calculates the inverse of the extents of a stream.
-        /// </summary>
-        /// <param name="extents">The stream extents to inverse.</param>
-        /// <returns>The inverted extents.</returns>
-        /// <remarks>
-        /// This method assumes a logical stream addressable from <c>0</c> to <c>long.MaxValue</c>, and is undefined
-        /// should any stream extent start at less than 0.  To constrain the extents to a specific range, use the
-        /// <c>Intersect</c> method.
-        /// </remarks>
-        public static IEnumerable<StreamExtent> Invert(IEnumerable<StreamExtent> extents)
-        {
-            StreamExtent last = new StreamExtent(0, 0);
-            foreach (StreamExtent extent in extents)
-            {
-                // Skip over any 'noise'
-                if (extent.Length == 0)
-                {
-                    continue;
-                }
-
-                long lastEnd = last.Start + last.Length;
-                if (lastEnd < extent.Start)
-                {
-                    yield return new StreamExtent(lastEnd, extent.Start - lastEnd);
-                }
-
-                last = extent;
-            }
-
-            long finalEnd = last.Start + last.Length;
-            if (finalEnd < long.MaxValue)
-            {
-                yield return new StreamExtent(finalEnd, long.MaxValue - finalEnd);
-            }
-        }
-
-        /// <summary>
-        /// Offsets the extents of a stream.
-        /// </summary>
-        /// <param name="stream">The stream extents.</param>
-        /// <param name="delta">The amount to offset the extents by.</param>
-        /// <returns>The stream extents, offset by delta.</returns>
-        public static IEnumerable<StreamExtent> Offset(IEnumerable<StreamExtent> stream, long delta)
-        {
-            foreach (StreamExtent extent in stream)
-            {
-                yield return new StreamExtent(extent.Start + delta, extent.Length);
-            }
-        }
-
-        /// <summary>
-        /// Returns the number of blocks containing stream data.
-        /// </summary>
-        /// <param name="stream">The stream extents.</param>
-        /// <param name="blockSize">The size of each block.</param>
-        /// <returns>The number of blocks containing stream data.</returns>
-        /// <remarks>This method logically divides the stream into blocks of a specified
-        /// size, then indicates how many of those blocks contain actual stream data.</remarks>
-        public static long BlockCount(IEnumerable<StreamExtent> stream, long blockSize)
-        {
-            long totalBlocks = 0;
-            long lastBlock = -1;
-
-            foreach (var extent in stream)
-            {
-                if (extent.Length > 0)
-                {
-                    long extentStartBlock = extent.Start / blockSize;
-                    long extentNextBlock = Utilities.Ceil(extent.Start + extent.Length, blockSize);
-
-                    long extentNumBlocks = extentNextBlock - extentStartBlock;
-                    if (extentStartBlock == lastBlock)
-                    {
-                        extentNumBlocks--;
-                    }
-
-                    lastBlock = extentNextBlock - 1;
-
-                    totalBlocks += extentNumBlocks;
-                }
-            }
-
-            return totalBlocks;
-        }
-
-        /// <summary>
-        /// Returns all of the blocks containing stream data.
-        /// </summary>
-        /// <param name="stream">The stream extents.</param>
-        /// <param name="blockSize">The size of each block.</param>
-        /// <returns>Ranges of blocks, as block indexes.</returns>
-        /// <remarks>This method logically divides the stream into blocks of a specified
-        /// size, then indicates ranges of blocks that contain stream data.</remarks>
-        public static IEnumerable<Range<long, long>> Blocks(IEnumerable<StreamExtent> stream, long blockSize)
-        {
-            long? rangeStart = null;
-            long rangeLength = 0;
-
-            foreach (var extent in stream)
-            {
-                if (extent.Length > 0)
-                {
-                    long extentStartBlock = extent.Start / blockSize;
-                    long extentNextBlock = Utilities.Ceil(extent.Start + extent.Length, blockSize);
-
-                    if (rangeStart != null && extentStartBlock > rangeStart + rangeLength)
-                    {
-                        // This extent is non-contiguous (in terms of blocks), so write out the last range and start new
-                        yield return new Range<long, long>((long)rangeStart, rangeLength);
-                        rangeStart = extentStartBlock;
-                    }
-                    else if (rangeStart == null)
-                    {
-                        // First extent, so start first range
-                        rangeStart = extentStartBlock;
-                    }
-
-                    // Set the length of the current range, based on the end of this extent
-                    rangeLength = extentNextBlock - (long)rangeStart;
-                }
-            }
-
-            // Final range (if any ranges at all) hasn't been returned yet, so do that now
-            if (rangeStart != null)
-            {
-                yield return new Range<long, long>((long)rangeStart, rangeLength);
-            }
-        }
-
-        /// <summary>
-        /// The equality operator.
-        /// </summary>
-        /// <param name="a">The first extent to compare.</param>
-        /// <param name="b">The second extent to compare.</param>
-        /// <returns>Whether the two extents are equal.</returns>
-        public static bool operator ==(StreamExtent a, StreamExtent b)
-        {
-            if (Object.ReferenceEquals(a, null))
-            {
-                return Object.ReferenceEquals(b, null);
-            }
-            else
-            {
-                return a.Equals(b);
-            }
-        }
-
-        /// <summary>
-        /// The inequality operator.
-        /// </summary>
-        /// <param name="a">The first extent to compare.</param>
-        /// <param name="b">The second extent to compare.</param>
-        /// <returns>Whether the two extents are different.</returns>
-        public static bool operator !=(StreamExtent a, StreamExtent b)
-        {
-            return !(a == b);
-        }
-
-        /// <summary>
-        /// The less-than operator.
-        /// </summary>
-        /// <param name="a">The first extent to compare.</param>
-        /// <param name="b">The second extent to compare.</param>
-        /// <returns>Whether a is less than b.</returns>
-        public static bool operator <(StreamExtent a, StreamExtent b)
-        {
-            return a.CompareTo(b) < 0;
-        }
-
-        /// <summary>
-        /// The greater-than operator.
-        /// </summary>
-        /// <param name="a">The first extent to compare.</param>
-        /// <param name="b">The second extent to compare.</param>
-        /// <returns>Whether a is greater than b.</returns>
-        public static bool operator >(StreamExtent a, StreamExtent b)
-        {
-            return a.CompareTo(b) > 0;
-        }
-
-        /// <summary>
-        /// Indicates if this StreamExtent is equal to another.
-        /// </summary>
-        /// <param name="other">The extent to compare.</param>
-        /// <returns><c>true</c> if the extents are equal, else <c>false</c>.</returns>
-        public bool Equals(StreamExtent other)
-        {
-            if (other == null)
-            {
-                return false;
-            }
-            else
-            {
-                return _start == other._start && _length == other._length;
-            }
-        }
-
-        /// <summary>
-        /// Returns a string representation of the extent as [start:+length].
-        /// </summary>
-        /// <returns>The string representation.</returns>
-        public override string ToString()
-        {
-            return "[" + _start + ":+" + _length + "]";
-        }
-
-        /// <summary>
-        /// Indicates if this stream extent is equal to another object.
-        /// </summary>
-        /// <param name="obj">The object to test.</param>
-        /// <returns><c>true</c> if <c>obj</c> is equivalent, else <c>false</c>.</returns>
-        public override bool Equals(object obj)
-        {
-            return Equals(obj as StreamExtent);
-        }
-
-        /// <summary>
-        /// Gets a hash code for this extent.
-        /// </summary>
-        /// <returns>The extent's hash code.</returns>
-        public override int GetHashCode()
-        {
-            return _start.GetHashCode() ^ _length.GetHashCode();
-        }
-
-        /// <summary>
-        /// Compares this stream extent to another.
-        /// </summary>
-        /// <param name="other">The extent to compare.</param>
-        /// <returns>Value greater than zero if this extent starts after
-        /// <c>other</c>, zero if they start at the same position, else
-        /// a value less than zero.</returns>
-        public int CompareTo(StreamExtent other)
-        {
-            if (_start > other._start)
-            {
-                return 1;
-            }
-            else if (_start == other._start)
-            {
-                return 0;
-            }
-            else
-            {
-                return -1;
-            }
-        }
-    }
-}
diff --git a/DiscUtils/StreamPump.cs b/DiscUtils/StreamPump.cs
deleted file mode 100644
index 03424a9..0000000
--- a/DiscUtils/StreamPump.cs
+++ /dev/null
@@ -1,270 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Utility class for pumping the contents of one stream into another.
-    /// </summary>
-    /// <remarks>
-    /// This class is aware of sparse streams, and will avoid copying data that is not
-    /// valid in the source stream.  This functionality should normally only be used
-    /// when the destination stream is known not to contain any existing data.
-    /// </remarks>
-    public sealed class StreamPump
-    {
-        /// <summary>
-        /// Initializes a new instance of the StreamPump class.
-        /// </summary>
-        public StreamPump()
-        {
-            SparseChunkSize = 512;
-            BufferSize = (int)(512 * Sizes.OneKiB);
-            SparseCopy = true;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the StreamPump class.
-        /// </summary>
-        /// <param name="inStream">The stream to read from.</param>
-        /// <param name="outStream">The stream to write to.</param>
-        /// <param name="sparseChunkSize">The size of each sparse chunk.</param>
-        public StreamPump(Stream inStream, Stream outStream, int sparseChunkSize)
-        {
-            InputStream = inStream;
-            OutputStream = outStream;
-            SparseChunkSize = sparseChunkSize;
-            BufferSize = (int)(512 * Sizes.OneKiB);
-            SparseCopy = true;
-        }
-
-        /// <summary>
-        /// Event raised periodically through the pump operation.
-        /// </summary>
-        /// <remarks>
-        /// This event is signalled synchronously, so to avoid slowing the pumping activity
-        /// implementations should return quickly.
-        /// </remarks>
-        public event EventHandler<PumpProgressEventArgs> ProgressEvent;
-
-        /// <summary>
-        /// Gets or sets the stream that will be read from.
-        /// </summary>
-        public Stream InputStream { get; set; }
-
-        /// <summary>
-        /// Gets or sets the stream that will be written to.
-        /// </summary>
-        public Stream OutputStream { get; set; }
-
-        /// <summary>
-        /// Gets or sets, for sparse transfers, the size of each chunk.
-        /// </summary>
-        /// <remarks>
-        /// A chunk is transfered if any byte in the chunk is valid, otherwise it is not.
-        /// This value should normally be set to reflect the underlying storage granularity
-        /// of <c>OutputStream</c>.
-        /// </remarks>
-        public int SparseChunkSize { get; set; }
-
-        /// <summary>
-        /// Gets or sets the amount of data to read at a time from <c>InputStream</c>.
-        /// </summary>
-        public int BufferSize { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to enable the sparse copy behaviour (default true).
-        /// </summary>
-        public bool SparseCopy { get; set; }
-
-        /// <summary>
-        /// Gets the number of bytes read from <c>InputStream</c>.
-        /// </summary>
-        public long BytesRead { get; private set; }
-
-        /// <summary>
-        /// Gets the number of bytes written to <c>OutputStream</c>.
-        /// </summary>
-        public long BytesWritten { get; private set; }
-
-        /// <summary>
-        /// Performs the pump activity, blocking until complete.
-        /// </summary>
-        public void Run()
-        {
-            if (InputStream == null)
-            {
-                throw new InvalidOperationException("Input stream is null");
-            }
-
-            if (OutputStream == null)
-            {
-                throw new InvalidOperationException("Output stream is null");
-            }
-
-            if (!OutputStream.CanSeek)
-            {
-                throw new InvalidOperationException("Output stream does not support seek operations");
-            }
-
-            if (SparseChunkSize <= 1)
-            {
-                throw new InvalidOperationException("Chunk size is invalid");
-            }
-
-            if (SparseCopy)
-            {
-                RunSparse();
-            }
-            else
-            {
-                RunNonSparse();
-            }
-        }
-
-        private static bool IsAllZeros(byte[] buffer, int offset, int count)
-        {
-            for (int j = 0; j < count; j++)
-            {
-                if (buffer[offset + j] != 0)
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private void RunNonSparse()
-        {
-            byte[] copyBuffer = new byte[BufferSize];
-
-            InputStream.Position = 0;
-            OutputStream.Position = 0;
-
-            int numRead = InputStream.Read(copyBuffer, 0, copyBuffer.Length);
-            while (numRead > 0)
-            {
-                BytesRead += numRead;
-
-                OutputStream.Write(copyBuffer, 0, numRead);
-                BytesWritten += numRead;
-
-                RaiseProgressEvent();
-
-                numRead = InputStream.Read(copyBuffer, 0, copyBuffer.Length);
-            }
-        }
-
-        private void RunSparse()
-        {
-            SparseStream inStream = InputStream as SparseStream;
-            if (inStream == null)
-            {
-                inStream = SparseStream.FromStream(InputStream, Ownership.None);
-            }
-
-            if (BufferSize > SparseChunkSize && (BufferSize % SparseChunkSize) != 0)
-            {
-                throw new InvalidOperationException("Buffer size is not a multiple of the sparse chunk size");
-            }
-
-            byte[] copyBuffer = new byte[Math.Max(BufferSize, SparseChunkSize)];
-
-            BytesRead = 0;
-            BytesWritten = 0;
-
-            foreach (var extent in inStream.Extents)
-            {
-                inStream.Position = extent.Start;
-
-                long extentOffset = 0;
-                while (extentOffset < extent.Length)
-                {
-                    int toRead = (int)Math.Min(copyBuffer.Length, extent.Length - extentOffset);
-                    int numRead = Utilities.ReadFully(inStream, copyBuffer, 0, toRead);
-                    BytesRead += numRead;
-
-                    int copyBufferOffset = 0;
-                    for (int i = 0; i < numRead; i += SparseChunkSize)
-                    {
-                        if (IsAllZeros(copyBuffer, i, Math.Min(SparseChunkSize, numRead - i)))
-                        {
-                            if (copyBufferOffset < i)
-                            {
-                                OutputStream.Position = extent.Start + extentOffset + copyBufferOffset;
-                                OutputStream.Write(copyBuffer, copyBufferOffset, i - copyBufferOffset);
-                                BytesWritten += i - copyBufferOffset;
-                            }
-
-                            copyBufferOffset = i + SparseChunkSize;
-                        }
-                    }
-
-                    if (copyBufferOffset < numRead)
-                    {
-                        OutputStream.Position = extent.Start + extentOffset + copyBufferOffset;
-                        OutputStream.Write(copyBuffer, copyBufferOffset, numRead - copyBufferOffset);
-                        BytesWritten += numRead - copyBufferOffset;
-                    }
-
-                    extentOffset += numRead;
-
-                    RaiseProgressEvent();
-                }
-            }
-
-            // Ensure the output stream is at least as long as the input stream.  This uses
-            // read/write, rather than SetLength, to avoid failing on streams that can't be
-            // explicitly resized.  Side-effect of this, is that if outStream is an NTFS
-            // file stream, then actual clusters will be allocated out to at least the
-            // length of the input stream.
-            if (OutputStream.Length < inStream.Length)
-            {
-                inStream.Position = inStream.Length - 1;
-                int b = inStream.ReadByte();
-                if (b >= 0)
-                {
-                    OutputStream.Position = inStream.Length - 1;
-                    OutputStream.WriteByte((byte)b);
-                }
-            }
-        }
-
-        private void RaiseProgressEvent()
-        {
-            // Raise the event by using the () operator.
-            if (ProgressEvent != null)
-            {
-                PumpProgressEventArgs args = new PumpProgressEventArgs();
-                args.BytesRead = BytesRead;
-                args.BytesWritten = BytesWritten;
-                args.SourcePosition = InputStream.Position;
-                args.DestinationPosition = OutputStream.Position;
-                ProgressEvent(this, args);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/StripedStream.cs b/DiscUtils/StripedStream.cs
deleted file mode 100644
index 32aa0a7..0000000
--- a/DiscUtils/StripedStream.cs
+++ /dev/null
@@ -1,229 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal class StripedStream : SparseStream
-    {
-        private List<SparseStream> _wrapped;
-        private long _stripeSize;
-        private Ownership _ownsWrapped;
-        private bool _canRead;
-        private bool _canWrite;
-        private long _length;
-
-        private long _position;
-
-        public StripedStream(long stripeSize, Ownership ownsWrapped, params SparseStream[] wrapped)
-        {
-            _wrapped = new List<SparseStream>(wrapped);
-            _stripeSize = stripeSize;
-            _ownsWrapped = ownsWrapped;
-
-            _canRead = _wrapped[0].CanRead;
-            _canWrite = _wrapped[0].CanWrite;
-            long subStreamLength = _wrapped[0].Length;
-
-            foreach (var stream in _wrapped)
-            {
-                if (stream.CanRead != _canRead || stream.CanWrite != _canWrite)
-                {
-                    throw new ArgumentException("All striped streams must have the same read/write permissions", "wrapped");
-                }
-
-                if (stream.Length != subStreamLength)
-                {
-                    throw new ArgumentException("All striped streams must have the same length", "wrapped");
-                }
-            }
-
-            _length = subStreamLength * wrapped.Length;
-        }
-
-        public override bool CanRead
-        {
-            get { return _canRead; }
-        }
-
-        public override bool CanSeek
-        {
-            get { return true; }
-        }
-
-        public override bool CanWrite
-        {
-            get { return _canWrite; }
-        }
-
-        public override long Length
-        {
-            get { return _length; }
-        }
-
-        public override long Position
-        {
-            get
-            {
-                return _position;
-            }
-
-            set
-            {
-                _position = value;
-            }
-        }
-
-        public override IEnumerable<StreamExtent> Extents
-        {
-            get
-            {
-                // Temporary, indicate there are no 'unstored' extents.
-                // Consider combining extent information from all wrapped streams in future.
-                yield return new StreamExtent(0, _length);
-            }
-        }
-
-        public override void Flush()
-        {
-            foreach (var stream in _wrapped)
-            {
-                stream.Flush();
-            }
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            if (!CanRead)
-            {
-                throw new InvalidOperationException("Attempt to read to non-readable stream");
-            }
-
-            int maxToRead = (int)Math.Min(_length - _position, count);
-
-            int totalRead = 0;
-            while (totalRead < maxToRead)
-            {
-                long stripe = _position / _stripeSize;
-                long stripeOffset = _position % _stripeSize;
-                int stripeToRead = (int)Math.Min(maxToRead - totalRead, _stripeSize - stripeOffset);
-
-                int streamIdx = (int)(stripe % _wrapped.Count);
-                long streamStripe = stripe / _wrapped.Count;
-
-                Stream targetStream = _wrapped[streamIdx];
-                targetStream.Position = (streamStripe * _stripeSize) + stripeOffset;
-
-                int numRead = targetStream.Read(buffer, offset + totalRead, stripeToRead);
-                _position += numRead;
-                totalRead += numRead;
-            }
-
-            return totalRead;
-        }
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            long effectiveOffset = offset;
-            if (origin == SeekOrigin.Current)
-            {
-                effectiveOffset += _position;
-            }
-            else if (origin == SeekOrigin.End)
-            {
-                effectiveOffset += _length;
-            }
-
-            if (effectiveOffset < 0)
-            {
-                throw new IOException("Attempt to move before beginning of stream");
-            }
-            else
-            {
-                _position = effectiveOffset;
-                return _position;
-            }
-        }
-
-        public override void SetLength(long value)
-        {
-            if (value != _length)
-            {
-                throw new InvalidOperationException("Changing the stream length is not permitted for striped streams");
-            }
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            if (!CanWrite)
-            {
-                throw new InvalidOperationException("Attempt to write to read-only stream");
-            }
-
-            if (_position + count > _length)
-            {
-                throw new IOException("Attempt to write beyond end of stream");
-            }
-
-            int totalWritten = 0;
-            while (totalWritten < count)
-            {
-                long stripe = _position / _stripeSize;
-                long stripeOffset = _position % _stripeSize;
-                int stripeToWrite = (int)Math.Min(count - totalWritten, _stripeSize - stripeOffset);
-
-                int streamIdx = (int)(stripe % _wrapped.Count);
-                long streamStripe = stripe / _wrapped.Count;
-
-                Stream targetStream = _wrapped[streamIdx];
-                targetStream.Position = (streamStripe * _stripeSize) + stripeOffset;
-                targetStream.Write(buffer, offset + totalWritten, stripeToWrite);
-
-                _position += stripeToWrite;
-                totalWritten += stripeToWrite;
-            }
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            try
-            {
-                if (disposing && _ownsWrapped == Ownership.Dispose && _wrapped != null)
-                {
-                    foreach (var stream in _wrapped)
-                    {
-                        stream.Dispose();
-                    }
-
-                    _wrapped = null;
-                }
-            }
-            finally
-            {
-                base.Dispose(disposing);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/SubBuffer.cs b/DiscUtils/SubBuffer.cs
deleted file mode 100644
index 1a0230e..0000000
--- a/DiscUtils/SubBuffer.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// Class representing a portion of an existing buffer.
-    /// </summary>
-    internal class SubBuffer : Buffer
-    {
-        private long _first;
-        private long _length;
-
-        private IBuffer _parent;
-
-        /// <summary>
-        /// Initializes a new instance of the SubBuffer class.
-        /// </summary>
-        /// <param name="parent">The parent buffer.</param>
-        /// <param name="first">The first byte in <paramref name="parent"/> represented by this sub-buffer.</param>
-        /// <param name="length">The number of bytes of <paramref name="parent"/> represented by this sub-buffer.</param>
-        public SubBuffer(IBuffer parent, long first, long length)
-        {
-            _parent = parent;
-            _first = first;
-            _length = length;
-
-            if (_first + _length > _parent.Capacity)
-            {
-                throw new ArgumentException("Substream extends beyond end of parent stream");
-            }
-        }
-
-        /// <summary>
-        /// Can this buffer be read.
-        /// </summary>
-        public override bool CanRead
-        {
-            get { return _parent.CanRead; }
-        }
-
-        /// <summary>
-        /// Can this buffer be modified.
-        /// </summary>
-        public override bool CanWrite
-        {
-            get { return _parent.CanWrite; }
-        }
-
-        /// <summary>
-        /// Gets the current capacity of the buffer, in bytes.
-        /// </summary>
-        public override long Capacity
-        {
-            get { return _length; }
-        }
-
-        /// <summary>
-        /// Gets the parts of the buffer that are stored.
-        /// </summary>
-        /// <remarks>This may be an empty enumeration if all bytes are zero.</remarks>
-        public override IEnumerable<StreamExtent> Extents
-        {
-            get
-            {
-                return OffsetExtents(_parent.GetExtentsInRange(_first, _length));
-            }
-        }
-
-        /// <summary>
-        /// Flushes all data to the underlying storage.
-        /// </summary>
-        public override void Flush()
-        {
-            _parent.Flush();
-        }
-
-        /// <summary>
-        /// Reads from the buffer into a byte array.
-        /// </summary>
-        /// <param name="pos">The offset within the buffer to start reading.</param>
-        /// <param name="buffer">The destination byte array.</param>
-        /// <param name="offset">The start offset within the destination buffer.</param>
-        /// <param name="count">The number of bytes to read.</param>
-        /// <returns>The actual number of bytes read.</returns>
-        public override int Read(long pos, byte[] buffer, int offset, int count)
-        {
-            if (count < 0)
-            {
-                throw new ArgumentOutOfRangeException("count", "Attempt to read negative bytes");
-            }
-
-            if (pos >= _length)
-            {
-                return 0;
-            }
-
-            return _parent.Read(pos + _first, buffer, offset, (int)Math.Min(count, Math.Min(_length - pos, int.MaxValue)));
-        }
-
-        /// <summary>
-        /// Writes a byte array into the buffer.
-        /// </summary>
-        /// <param name="pos">The start offset within the buffer.</param>
-        /// <param name="buffer">The source byte array.</param>
-        /// <param name="offset">The start offset within the source byte array.</param>
-        /// <param name="count">The number of bytes to write.</param>
-        public override void Write(long pos, byte[] buffer, int offset, int count)
-        {
-            if (count < 0)
-            {
-                throw new ArgumentOutOfRangeException("count", "Attempt to write negative bytes");
-            }
-
-            if (pos + count > _length)
-            {
-                throw new ArgumentOutOfRangeException("count", "Attempt to write beyond end of substream");
-            }
-
-            _parent.Write(pos + _first, buffer, offset, count);
-        }
-
-        /// <summary>
-        /// Sets the capacity of the buffer, truncating if appropriate.
-        /// </summary>
-        /// <param name="value">The desired capacity of the buffer.</param>
-        public override void SetCapacity(long value)
-        {
-            throw new NotSupportedException("Attempt to change length of a subbuffer");
-        }
-
-        /// <summary>
-        /// Gets the parts of a buffer that are stored, within a specified range.
-        /// </summary>
-        /// <param name="start">The offset of the first byte of interest.</param>
-        /// <param name="count">The number of bytes of interest.</param>
-        /// <returns>An enumeration of stream extents, indicating stored bytes.</returns>
-        public override IEnumerable<StreamExtent> GetExtentsInRange(long start, long count)
-        {
-            long absStart = _first + start;
-            long absEnd = Math.Min(absStart + count, _first + _length);
-            return OffsetExtents(_parent.GetExtentsInRange(absStart, absEnd - absStart));
-        }
-
-        private IEnumerable<StreamExtent> OffsetExtents(IEnumerable<StreamExtent> src)
-        {
-            foreach (StreamExtent e in src)
-            {
-                yield return new StreamExtent(e.Start - _first, e.Length);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/SubStream.cs b/DiscUtils/SubStream.cs
deleted file mode 100644
index 0d3d399..0000000
--- a/DiscUtils/SubStream.cs
+++ /dev/null
@@ -1,217 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal class SubStream : MappedStream
-    {
-        private long _position;
-        private long _first;
-        private long _length;
-
-        private Stream _parent;
-        private Ownership _ownsParent;
-
-        public SubStream(Stream parent, long first, long length)
-        {
-            _parent = parent;
-            _first = first;
-            _length = length;
-            _ownsParent = Ownership.None;
-
-            if (_first + _length > _parent.Length)
-            {
-                throw new ArgumentException("Substream extends beyond end of parent stream");
-            }
-        }
-
-        public SubStream(Stream parent, Ownership ownsParent, long first, long length)
-        {
-            _parent = parent;
-            _ownsParent = ownsParent;
-            _first = first;
-            _length = length;
-
-            if (_first + _length > _parent.Length)
-            {
-                throw new ArgumentException("Substream extends beyond end of parent stream");
-            }
-        }
-
-        public override bool CanRead
-        {
-            get { return _parent.CanRead; }
-        }
-
-        public override bool CanSeek
-        {
-            get { return _parent.CanSeek; }
-        }
-
-        public override bool CanWrite
-        {
-            get { return _parent.CanWrite; }
-        }
-
-        public override long Length
-        {
-            get { return _length; }
-        }
-
-        public override long Position
-        {
-            get
-            {
-                return _position;
-            }
-
-            set
-            {
-                if (value <= _length)
-                {
-                    _position = value;
-                }
-                else
-                {
-                    throw new ArgumentOutOfRangeException("value", "Attempt to move beyond end of stream");
-                }
-            }
-        }
-
-        public override IEnumerable<StreamExtent> Extents
-        {
-            get
-            {
-                SparseStream parentAsSparse = _parent as SparseStream;
-                if (parentAsSparse != null)
-                {
-                    return OffsetExtents(parentAsSparse.GetExtentsInRange(_first, _length));
-                }
-                else
-                {
-                    return new StreamExtent[] { new StreamExtent(0, _length) };
-                }
-            }
-        }
-
-        public override IEnumerable<StreamExtent> MapContent(long start, long length)
-        {
-            return new StreamExtent[] { new StreamExtent(start + _first, length) };
-        }
-
-        public override void Flush()
-        {
-            _parent.Flush();
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            if (count < 0)
-            {
-                throw new ArgumentOutOfRangeException("count", "Attempt to read negative bytes");
-            }
-
-            if (_position > _length)
-            {
-                return 0;
-            }
-
-            _parent.Position = _first + _position;
-            int numRead = _parent.Read(buffer, offset, (int)Math.Min(count, Math.Min(_length - _position, int.MaxValue)));
-            _position += numRead;
-            return numRead;
-        }
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            long absNewPos = offset;
-            if (origin == SeekOrigin.Current)
-            {
-                absNewPos += _position;
-            }
-            else if (origin == SeekOrigin.End)
-            {
-                absNewPos += _length;
-            }
-
-            if (absNewPos < 0)
-            {
-                throw new ArgumentOutOfRangeException("offset", "Attempt to move before start of stream");
-            }
-
-            _position = absNewPos;
-            return _position;
-        }
-
-        public override void SetLength(long value)
-        {
-            throw new NotSupportedException("Attempt to change length of a substream");
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            if (count < 0)
-            {
-                throw new ArgumentOutOfRangeException("count", "Attempt to write negative bytes");
-            }
-
-            if (_position + count > _length)
-            {
-                throw new ArgumentOutOfRangeException("count", "Attempt to write beyond end of substream");
-            }
-
-            _parent.Position = _first + _position;
-            _parent.Write(buffer, offset, count);
-            _position += count;
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            try
-            {
-                if (disposing)
-                {
-                    if (_ownsParent == Ownership.Dispose)
-                    {
-                        _parent.Dispose();
-                    }
-                }
-            }
-            finally
-            {
-                base.Dispose(disposing);
-            }
-        }
-
-        private IEnumerable<StreamExtent> OffsetExtents(IEnumerable<StreamExtent> src)
-        {
-            foreach (StreamExtent e in src)
-            {
-                yield return new StreamExtent(e.Start - _first, e.Length);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Tuple.cs b/DiscUtils/Tuple.cs
deleted file mode 100644
index 7ed0420..0000000
--- a/DiscUtils/Tuple.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    internal abstract class Tuple
-    {
-        public abstract object this[int i]
-        {
-            get;
-        }
-
-        protected static bool Equals<V>(V a, V b)
-        {
-            if (a == null && b == null)
-            {
-                return true;
-            }
-            else if (a == null)
-            {
-                return false;
-            }
-            else
-            {
-                return a.Equals(b);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Tuple_2.cs b/DiscUtils/Tuple_2.cs
deleted file mode 100644
index 4d58e6c..0000000
--- a/DiscUtils/Tuple_2.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-
-    internal class Tuple<A, B> : Tuple
-    {
-        private A _a;
-        private B _b;
-
-        public Tuple(A a, B b)
-        {
-            _a = a;
-            _b = b;
-        }
-
-        public A First
-        {
-            get { return _a; }
-        }
-
-        public B Second
-        {
-            get { return _b; }
-        }
-
-        public override object this[int i]
-        {
-            get
-            {
-                switch (i)
-                {
-                    case 0: return _a;
-                    case 1: return _b;
-                    default: throw new ArgumentOutOfRangeException("i", i, "Invalid index");
-                }
-            }
-        }
-
-        public override bool Equals(object obj)
-        {
-            Tuple<A, B> asType = obj as Tuple<A, B>;
-            if (asType == null)
-            {
-                return false;
-            }
-
-            return Equals(_a, asType._a) && Equals(_b, asType._b);
-        }
-
-        public override int GetHashCode()
-        {
-            return ((_a == null) ? 0x14AB32BC : _a.GetHashCode()) ^ ((_b == null) ? 0x65BC32DE : _b.GetHashCode());
-        }
-    }
-}
diff --git a/DiscUtils/Tuple_3.cs b/DiscUtils/Tuple_3.cs
deleted file mode 100644
index 05db4aa..0000000
--- a/DiscUtils/Tuple_3.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-
-    internal class Tuple<A, B, C> : Tuple
-    {
-        private A _a;
-        private B _b;
-        private C _c;
-
-        public Tuple(A a, B b, C c)
-        {
-            _a = a;
-            _b = b;
-            _c = c;
-        }
-
-        public A First
-        {
-            get { return _a; }
-        }
-
-        public B Second
-        {
-            get { return _b; }
-        }
-
-        public C Third
-        {
-            get { return _c; }
-        }
-
-        public override object this[int i]
-        {
-            get
-            {
-                switch (i)
-                {
-                    case 0: return _a;
-                    case 1: return _b;
-                    case 2: return _c;
-                    default: throw new ArgumentOutOfRangeException("i", i, "Invalid index");
-                }
-            }
-        }
-
-        public override bool Equals(object obj)
-        {
-            Tuple<A, B, C> asType = obj as Tuple<A, B, C>;
-            if (asType == null)
-            {
-                return false;
-            }
-
-            return Equals(_a, asType._a) && Equals(_b, asType._b) && Equals(_c, asType._c);
-        }
-
-        public override int GetHashCode()
-        {
-            return ((_a == null) ? 0x14AB32BC : _a.GetHashCode())
-                ^ ((_b == null) ? 0x65BC32DE : _b.GetHashCode())
-                ^ ((_c == null) ? 0x2D4C25CF : _b.GetHashCode());
-        }
-    }
-}
diff --git a/DiscUtils/UnixFileType.cs b/DiscUtils/UnixFileType.cs
deleted file mode 100644
index 05d0f98..0000000
--- a/DiscUtils/UnixFileType.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    /// <summary>
-    /// Standard Unix-style file type.
-    /// </summary>
-    public enum UnixFileType
-    {
-        /// <summary>
-        /// No type specified.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// A FIFO / Named Pipe.
-        /// </summary>
-        Fifo = 0x1,
-
-        /// <summary>
-        /// A character device.
-        /// </summary>
-        Character = 0x2,
-
-        /// <summary>
-        /// A normal directory.
-        /// </summary>
-        Directory = 0x4,
-
-        /// <summary>
-        /// A block device.
-        /// </summary>
-        Block = 0x6,
-
-        /// <summary>
-        /// A regular file.
-        /// </summary>
-        Regular = 0x8,
-
-        /// <summary>
-        /// A soft link.
-        /// </summary>
-        Link = 0xA,
-
-        /// <summary>
-        /// A unix socket.
-        /// </summary>
-        Socket = 0xC
-    }
-}
diff --git a/DiscUtils/Utilities.cs b/DiscUtils/Utilities.cs
deleted file mode 100644
index 945bd27..0000000
--- a/DiscUtils/Utilities.cs
+++ /dev/null
@@ -1,1106 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Text;
-    using System.Text.RegularExpressions;
-
-    internal delegate TResult Func<T, TResult>(T arg);
-
-    internal static class Utilities
-    {
-        /// <summary>
-        /// The number of bytes in a standard disk sector (512).
-        /// </summary>
-        internal const int SectorSize = Sizes.Sector;
-
-        /// <summary>
-        /// The Epoch common to most (all?) Unix systems.
-        /// </summary>
-        internal static readonly DateTime UnixEpoch = new DateTime(1970, 1, 1);
-
-        /// <summary>
-        /// Round up a value to a multiple of a unit size.
-        /// </summary>
-        /// <param name="value">The value to round up.</param>
-        /// <param name="unit">The unit (the returned value will be a multiple of this number).</param>
-        /// <returns>The rounded-up value.</returns>
-        public static long RoundUp(long value, long unit)
-        {
-            return ((value + (unit - 1)) / unit) * unit;
-        }
-
-        /// <summary>
-        /// Round up a value to a multiple of a unit size.
-        /// </summary>
-        /// <param name="value">The value to round up.</param>
-        /// <param name="unit">The unit (the returned value will be a multiple of this number).</param>
-        /// <returns>The rounded-up value.</returns>
-        public static int RoundUp(int value, int unit)
-        {
-            return ((value + (unit - 1)) / unit) * unit;
-        }
-
-        /// <summary>
-        /// Round down a value to a multiple of a unit size.
-        /// </summary>
-        /// <param name="value">The value to round down.</param>
-        /// <param name="unit">The unit (the returned value will be a multiple of this number).</param>
-        /// <returns>The rounded-down value.</returns>
-        public static long RoundDown(long value, long unit)
-        {
-            return (value / unit) * unit;
-        }
-
-        /// <summary>
-        /// Calculates the CEIL function.
-        /// </summary>
-        /// <param name="numerator">The value to divide.</param>
-        /// <param name="denominator">The value to divide by.</param>
-        /// <returns>The value of CEIL(numerator/denominator).</returns>
-        public static int Ceil(int numerator, int denominator)
-        {
-            return (numerator + (denominator - 1)) / denominator;
-        }
-
-        /// <summary>
-        /// Calculates the CEIL function.
-        /// </summary>
-        /// <param name="numerator">The value to divide.</param>
-        /// <param name="denominator">The value to divide by.</param>
-        /// <returns>The value of CEIL(numerator/denominator).</returns>
-        public static uint Ceil(uint numerator, uint denominator)
-        {
-            return (numerator + (denominator - 1)) / denominator;
-        }
-
-        /// <summary>
-        /// Calculates the CEIL function.
-        /// </summary>
-        /// <param name="numerator">The value to divide.</param>
-        /// <param name="denominator">The value to divide by.</param>
-        /// <returns>The value of CEIL(numerator/denominator).</returns>
-        public static long Ceil(long numerator, long denominator)
-        {
-            return (numerator + (denominator - 1)) / denominator;
-        }
-
-        /// <summary>
-        /// Converts between two arrays.
-        /// </summary>
-        /// <typeparam name="T">The type of the elements of the source array.</typeparam>
-        /// <typeparam name="U">The type of the elements of the destination array.</typeparam>
-        /// <param name="source">The source array.</param>
-        /// <param name="func">The function to map from source type to destination type.</param>
-        /// <returns>The resultant array.</returns>
-        public static U[] Map<T, U>(ICollection<T> source, Func<T, U> func)
-        {
-            U[] result = new U[source.Count];
-            int i = 0;
-
-            foreach (T sVal in source)
-            {
-                result[i++] = func(sVal);
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Converts between two arrays.
-        /// </summary>
-        /// <typeparam name="T">The type of the elements of the source array.</typeparam>
-        /// <typeparam name="U">The type of the elements of the destination array.</typeparam>
-        /// <param name="source">The source array.</param>
-        /// <param name="func">The function to map from source type to destination type.</param>
-        /// <returns>The resultant array.</returns>
-        public static U[] Map<T, U>(IEnumerable<T> source, Func<T, U> func)
-        {
-            List<U> result = new List<U>();
-
-            foreach (T sVal in source)
-            {
-                result.Add(func(sVal));
-            }
-
-            return result.ToArray();
-        }
-
-        /// <summary>
-        /// Filters a collection into a new collection.
-        /// </summary>
-        /// <typeparam name="C">The type of the new collection.</typeparam>
-        /// <typeparam name="T">The type of the collection entries.</typeparam>
-        /// <param name="source">The collection to filter.</param>
-        /// <param name="predicate">The predicate to select which entries are carried over.</param>
-        /// <returns>The new collection, containing all entries where the predicate returns <c>true</c>.</returns>
-        public static C Filter<C, T>(ICollection<T> source, Func<T, bool> predicate) where C : ICollection<T>, new()
-        {
-            C result = new C();
-            foreach (T val in source)
-            {
-                if (predicate(val))
-                {
-                    result.Add(val);
-                }
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Indicates if two ranges overlap.
-        /// </summary>
-        /// <typeparam name="T">The type of the ordinals.</typeparam>
-        /// <param name="xFirst">The lowest ordinal of the first range (inclusive).</param>
-        /// <param name="xLast">The highest ordinal of the first range (exclusive).</param>
-        /// <param name="yFirst">The lowest ordinal of the second range (inclusive).</param>
-        /// <param name="yLast">The highest ordinal of the second range (exclusive).</param>
-        /// <returns><c>true</c> if the ranges overlap, else <c>false</c>.</returns>
-        public static bool RangesOverlap<T>(T xFirst, T xLast, T yFirst, T yLast) where T : IComparable<T>
-        {
-            return !((xLast.CompareTo(yFirst) <= 0) || (xFirst.CompareTo(yLast) >= 0));
-        }
-
-        /// <summary>
-        /// Validates standard buffer, offset, count parameters to a method.
-        /// </summary>
-        /// <param name="buffer">The byte array to read from / write to.</param>
-        /// <param name="offset">The starting offset in <c>buffer</c>.</param>
-        /// <param name="count">The number of bytes to read / write.</param>
-        public static void AssertBufferParameters(byte[] buffer, int offset, int count)
-        {
-            if (buffer == null)
-            {
-                throw new ArgumentNullException("buffer");
-            }
-
-            if (offset < 0)
-            {
-                throw new ArgumentOutOfRangeException("offset", offset, "Offset is negative");
-            }
-
-            if (count < 0)
-            {
-                throw new ArgumentOutOfRangeException("count", count, "Count is negative");
-            }
-
-            if (buffer.Length < offset + count)
-            {
-                throw new ArgumentException("buffer is too small", "buffer");
-            }
-        }
-
-        #region Bit Twiddling
-        public static bool IsAllZeros(byte[] buffer, int offset, int count)
-        {
-            int end = offset + count;
-            for (int i = offset; i < end; ++i)
-            {
-                if (buffer[i] != 0)
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        public static bool IsPowerOfTwo(uint val)
-        {
-            if (val == 0)
-            {
-                return false;
-            }
-
-            while ((val & 1) != 1)
-            {
-                val >>= 1;
-            }
-
-            return val == 1;
-        }
-
-        public static bool IsPowerOfTwo(long val)
-        {
-            if (val == 0)
-            {
-                return false;
-            }
-
-            while ((val & 1) != 1)
-            {
-                val >>= 1;
-            }
-
-            return val == 1;
-        }
-
-        public static int Log2(uint val)
-        {
-            if (val == 0)
-            {
-                throw new ArgumentException("Cannot calculate log of Zero", "val");
-            }
-
-            int result = 0;
-            while ((val & 1) != 1)
-            {
-                val >>= 1;
-                ++result;
-            }
-
-            if (val == 1)
-            {
-                return result;
-            }
-            else
-            {
-                throw new ArgumentException("Input is not a power of Two", "val");
-            }
-        }
-
-        public static int Log2(int val)
-        {
-            if (val == 0)
-            {
-                throw new ArgumentException("Cannot calculate log of Zero", "val");
-            }
-
-            int result = 0;
-            while ((val & 1) != 1)
-            {
-                val >>= 1;
-                ++result;
-            }
-
-            if (val == 1)
-            {
-                return result;
-            }
-            else
-            {
-                throw new ArgumentException("Input is not a power of Two", "val");
-            }
-        }
-
-        public static bool AreEqual(byte[] a, byte[] b)
-        {
-            if (a.Length != b.Length)
-            {
-                return false;
-            }
-
-            for (int i = 0; i < a.Length; ++i)
-            {
-                if (a[i] != b[i])
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        public static ushort BitSwap(ushort value)
-        {
-            return (ushort)(((value & 0x00FF) << 8) | ((value & 0xFF00) >> 8));
-        }
-
-        public static uint BitSwap(uint value)
-        {
-            return ((value & 0xFF) << 24) | ((value & 0xFF00) << 8) | ((value & 0x00FF0000) >> 8) | ((value & 0xFF000000) >> 24);
-        }
-
-        public static ulong BitSwap(ulong value)
-        {
-            return (((ulong)BitSwap((uint)(value & 0xFFFFFFFF))) << 32) | BitSwap((uint)(value >> 32));
-        }
-
-        public static short BitSwap(short value)
-        {
-            return (short)BitSwap((ushort)value);
-        }
-
-        public static int BitSwap(int value)
-        {
-            return (int)BitSwap((uint)value);
-        }
-
-        public static long BitSwap(long value)
-        {
-            return (long)BitSwap((ulong)value);
-        }
-
-        public static void WriteBytesLittleEndian(ushort val, byte[] buffer, int offset)
-        {
-            buffer[offset] = (byte)(val & 0xFF);
-            buffer[offset + 1] = (byte)((val >> 8) & 0xFF);
-        }
-
-        public static void WriteBytesLittleEndian(uint val, byte[] buffer, int offset)
-        {
-            buffer[offset] = (byte)(val & 0xFF);
-            buffer[offset + 1] = (byte)((val >> 8) & 0xFF);
-            buffer[offset + 2] = (byte)((val >> 16) & 0xFF);
-            buffer[offset + 3] = (byte)((val >> 24) & 0xFF);
-        }
-
-        public static void WriteBytesLittleEndian(ulong val, byte[] buffer, int offset)
-        {
-            buffer[offset] = (byte)(val & 0xFF);
-            buffer[offset + 1] = (byte)((val >> 8) & 0xFF);
-            buffer[offset + 2] = (byte)((val >> 16) & 0xFF);
-            buffer[offset + 3] = (byte)((val >> 24) & 0xFF);
-            buffer[offset + 4] = (byte)((val >> 32) & 0xFF);
-            buffer[offset + 5] = (byte)((val >> 40) & 0xFF);
-            buffer[offset + 6] = (byte)((val >> 48) & 0xFF);
-            buffer[offset + 7] = (byte)((val >> 56) & 0xFF);
-        }
-
-        public static void WriteBytesLittleEndian(short val, byte[] buffer, int offset)
-        {
-            WriteBytesLittleEndian((ushort)val, buffer, offset);
-        }
-
-        public static void WriteBytesLittleEndian(int val, byte[] buffer, int offset)
-        {
-            WriteBytesLittleEndian((uint)val, buffer, offset);
-        }
-
-        public static void WriteBytesLittleEndian(long val, byte[] buffer, int offset)
-        {
-            WriteBytesLittleEndian((ulong)val, buffer, offset);
-        }
-
-        public static void WriteBytesLittleEndian(Guid val, byte[] buffer, int offset)
-        {
-            byte[] le = val.ToByteArray();
-            Array.Copy(le, 0, buffer, offset, 16);
-        }
-
-        public static void WriteBytesBigEndian(ushort val, byte[] buffer, int offset)
-        {
-            buffer[offset] = (byte)(val >> 8);
-            buffer[offset + 1] = (byte)(val & 0xFF);
-        }
-
-        public static void WriteBytesBigEndian(uint val, byte[] buffer, int offset)
-        {
-            buffer[offset] = (byte)((val >> 24) & 0xFF);
-            buffer[offset + 1] = (byte)((val >> 16) & 0xFF);
-            buffer[offset + 2] = (byte)((val >> 8) & 0xFF);
-            buffer[offset + 3] = (byte)(val & 0xFF);
-        }
-
-        public static void WriteBytesBigEndian(ulong val, byte[] buffer, int offset)
-        {
-            buffer[offset] = (byte)((val >> 56) & 0xFF);
-            buffer[offset + 1] = (byte)((val >> 48) & 0xFF);
-            buffer[offset + 2] = (byte)((val >> 40) & 0xFF);
-            buffer[offset + 3] = (byte)((val >> 32) & 0xFF);
-            buffer[offset + 4] = (byte)((val >> 24) & 0xFF);
-            buffer[offset + 5] = (byte)((val >> 16) & 0xFF);
-            buffer[offset + 6] = (byte)((val >> 8) & 0xFF);
-            buffer[offset + 7] = (byte)(val & 0xFF);
-        }
-
-        public static void WriteBytesBigEndian(short val, byte[] buffer, int offset)
-        {
-            WriteBytesBigEndian((ushort)val, buffer, offset);
-        }
-
-        public static void WriteBytesBigEndian(int val, byte[] buffer, int offset)
-        {
-            WriteBytesBigEndian((uint)val, buffer, offset);
-        }
-
-        public static void WriteBytesBigEndian(long val, byte[] buffer, int offset)
-        {
-            WriteBytesBigEndian((ulong)val, buffer, offset);
-        }
-
-        public static void WriteBytesBigEndian(Guid val, byte[] buffer, int offset)
-        {
-            byte[] le = val.ToByteArray();
-            WriteBytesBigEndian(ToUInt32LittleEndian(le, 0), buffer, offset + 0);
-            WriteBytesBigEndian(ToUInt16LittleEndian(le, 4), buffer, offset + 4);
-            WriteBytesBigEndian(ToUInt16LittleEndian(le, 6), buffer, offset + 6);
-            Array.Copy(le, 8, buffer, offset + 8, 8);
-        }
-
-        public static ushort ToUInt16LittleEndian(byte[] buffer, int offset)
-        {
-            return (ushort)(((buffer[offset + 1] << 8) & 0xFF00) | ((buffer[offset + 0] << 0) & 0x00FF));
-        }
-
-        public static uint ToUInt32LittleEndian(byte[] buffer, int offset)
-        {
-            return (uint)(((buffer[offset + 3] << 24) & 0xFF000000U) | ((buffer[offset + 2] << 16) & 0x00FF0000U)
-                | ((buffer[offset + 1] << 8) & 0x0000FF00U) | ((buffer[offset + 0] << 0) & 0x000000FFU));
-        }
-
-        public static ulong ToUInt64LittleEndian(byte[] buffer, int offset)
-        {
-            return (((ulong)ToUInt32LittleEndian(buffer, offset + 4)) << 32) | ToUInt32LittleEndian(buffer, offset + 0);
-        }
-
-        public static short ToInt16LittleEndian(byte[] buffer, int offset)
-        {
-            return (short)ToUInt16LittleEndian(buffer, offset);
-        }
-
-        public static int ToInt32LittleEndian(byte[] buffer, int offset)
-        {
-            return (int)ToUInt32LittleEndian(buffer, offset);
-        }
-
-        public static long ToInt64LittleEndian(byte[] buffer, int offset)
-        {
-            return (long)ToUInt64LittleEndian(buffer, offset);
-        }
-
-        public static ushort ToUInt16BigEndian(byte[] buffer, int offset)
-        {
-            return (ushort)(((buffer[offset] << 8) & 0xFF00) | ((buffer[offset + 1] << 0) & 0x00FF));
-        }
-
-        public static uint ToUInt32BigEndian(byte[] buffer, int offset)
-        {
-            uint val = (uint)(((buffer[offset + 0] << 24) & 0xFF000000U) | ((buffer[offset + 1] << 16) & 0x00FF0000U)
-                | ((buffer[offset + 2] << 8) & 0x0000FF00U) | ((buffer[offset + 3] << 0) & 0x000000FFU));
-            return val;
-        }
-
-        public static ulong ToUInt64BigEndian(byte[] buffer, int offset)
-        {
-            return (((ulong)ToUInt32BigEndian(buffer, offset + 0)) << 32) | ToUInt32BigEndian(buffer, offset + 4);
-        }
-
-        public static short ToInt16BigEndian(byte[] buffer, int offset)
-        {
-            return (short)ToUInt16BigEndian(buffer, offset);
-        }
-
-        public static int ToInt32BigEndian(byte[] buffer, int offset)
-        {
-            return (int)ToUInt32BigEndian(buffer, offset);
-        }
-
-        public static long ToInt64BigEndian(byte[] buffer, int offset)
-        {
-            return (long)ToUInt64BigEndian(buffer, offset);
-        }
-
-        public static Guid ToGuidLittleEndian(byte[] buffer, int offset)
-        {
-            byte[] temp = new byte[16];
-            Array.Copy(buffer, offset, temp, 0, 16);
-            return new Guid(temp);
-        }
-
-        public static Guid ToGuidBigEndian(byte[] buffer, int offset)
-        {
-            return new Guid(
-                ToUInt32BigEndian(buffer, offset + 0),
-                ToUInt16BigEndian(buffer, offset + 4),
-                ToUInt16BigEndian(buffer, offset + 6),
-                buffer[offset + 8],
-                buffer[offset + 9],
-                buffer[offset + 10],
-                buffer[offset + 11],
-                buffer[offset + 12],
-                buffer[offset + 13],
-                buffer[offset + 14],
-                buffer[offset + 15]);
-        }
-
-        public static byte[] ToByteArray(byte[] buffer, int offset, int length)
-        {
-            byte[] result = new byte[length];
-            Array.Copy(buffer, offset, result, 0, length);
-            return result;
-        }
-
-        public static T ToStruct<T>(byte[] buffer, int offset)
-            where T : IByteArraySerializable, new()
-        {
-            T result = new T();
-            result.ReadFrom(buffer, offset);
-            return result;
-        }
-
-        /// <summary>
-        /// Primitive conversion from Unicode to ASCII that preserves special characters.
-        /// </summary>
-        /// <param name="value">The string to convert.</param>
-        /// <param name="dest">The buffer to fill.</param>
-        /// <param name="offset">The start of the string in the buffer.</param>
-        /// <param name="count">The number of characters to convert.</param>
-        /// <remarks>The built-in ASCIIEncoding converts characters of codepoint > 127 to ?,
-        /// this preserves those code points by removing the top 16 bits of each character.</remarks>
-        public static void StringToBytes(string value, byte[] dest, int offset, int count)
-        {
-            char[] chars = value.ToCharArray();
-
-            int i = 0;
-            while (i < chars.Length)
-            {
-                dest[i + offset] = (byte)chars[i];
-                ++i;
-            }
-
-            while (i < count)
-            {
-                dest[i + offset] = 0;
-                ++i;
-            }
-        }
-
-        /// <summary>
-        /// Primitive conversion from ASCII to Unicode that preserves special characters.
-        /// </summary>
-        /// <param name="data">The data to convert.</param>
-        /// <param name="offset">The first byte to convert.</param>
-        /// <param name="count">The number of bytes to convert.</param>
-        /// <returns>The string.</returns>
-        /// <remarks>The built-in ASCIIEncoding converts characters of codepoint > 127 to ?,
-        /// this preserves those code points.</remarks>
-        public static string BytesToString(byte[] data, int offset, int count)
-        {
-            char[] result = new char[count];
-
-            for (int i = 0; i < count; ++i)
-            {
-                result[i] = (char)data[i + offset];
-            }
-
-            return new string(result);
-        }
-
-        /// <summary>
-        /// Primitive conversion from ASCII to Unicode that stops at a null-terminator.
-        /// </summary>
-        /// <param name="data">The data to convert.</param>
-        /// <param name="offset">The first byte to convert.</param>
-        /// <param name="count">The number of bytes to convert.</param>
-        /// <returns>The string.</returns>
-        /// <remarks>The built-in ASCIIEncoding converts characters of codepoint > 127 to ?,
-        /// this preserves those code points.</remarks>
-        public static string BytesToZString(byte[] data, int offset, int count)
-        {
-            char[] result = new char[count];
-
-            for (int i = 0; i < count; ++i)
-            {
-                byte ch = data[i + offset];
-                if (ch == 0)
-                {
-                    return new string(result, 0, i);
-                }
-
-                result[i] = (char)ch;
-            }
-
-            return new string(result);
-        }
-
-        #endregion
-
-        #region Path Manipulation
-        /// <summary>
-        /// Extracts the directory part of a path.
-        /// </summary>
-        /// <param name="path">The path to process.</param>
-        /// <returns>The directory part.</returns>
-        public static string GetDirectoryFromPath(string path)
-        {
-            string trimmed = path.TrimEnd('\\');
-
-            int index = trimmed.LastIndexOf('\\');
-            if (index < 0)
-            {
-                return string.Empty; // No directory, just a file name
-            }
-
-            return trimmed.Substring(0, index);
-        }
-
-        /// <summary>
-        /// Extracts the file part of a path.
-        /// </summary>
-        /// <param name="path">The path to process.</param>
-        /// <returns>The file part of the path.</returns>
-        public static string GetFileFromPath(string path)
-        {
-            string trimmed = path.Trim('\\');
-
-            int index = trimmed.LastIndexOf('\\');
-            if (index < 0)
-            {
-                return trimmed; // No directory, just a file name
-            }
-
-            return trimmed.Substring(index + 1);
-        }
-
-        /// <summary>
-        /// Combines two paths.
-        /// </summary>
-        /// <param name="a">The first part of the path.</param>
-        /// <param name="b">The second part of the path.</param>
-        /// <returns>The combined path.</returns>
-        public static string CombinePaths(string a, string b)
-        {
-            if (string.IsNullOrEmpty(a) || (b.Length > 0 && b[0] == '\\'))
-            {
-                return b;
-            }
-            else if (string.IsNullOrEmpty(b))
-            {
-                return a;
-            }
-            else
-            {
-                return a.TrimEnd('\\') + '\\' + b.TrimStart('\\');
-            }
-        }
-
-        /// <summary>
-        /// Resolves a relative path into an absolute one.
-        /// </summary>
-        /// <param name="basePath">The base path to resolve from.</param>
-        /// <param name="relativePath">The relative path.</param>
-        /// <returns>The absolute path, so far as it can be resolved.  If the
-        /// <paramref name="relativePath"/> contains more '..' characters than the
-        /// base path contains levels of directory, the resultant string will be relative.
-        /// For example: (TEMP\Foo.txt, ..\..\Bar.txt) gives (..\Bar.txt).</returns>
-        public static string ResolveRelativePath(string basePath, string relativePath)
-        {
-            List<string> pathElements = new List<string>(basePath.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries));
-            if (!basePath.EndsWith(@"\", StringComparison.Ordinal) && pathElements.Count > 0)
-            {
-                pathElements.RemoveAt(pathElements.Count - 1);
-            }
-
-            pathElements.AddRange(relativePath.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries));
-
-            int pos = 1;
-            while (pos < pathElements.Count)
-            {
-                if (pathElements[pos] == ".")
-                {
-                    pathElements.RemoveAt(pos);
-                }
-                else if (pathElements[pos] == ".." && pos > 0 && pathElements[pos - 1][0] != '.')
-                {
-                    pathElements.RemoveAt(pos);
-                    pathElements.RemoveAt(pos - 1);
-                    pos--;
-                }
-                else
-                {
-                    pos++;
-                }
-            }
-
-            string merged = string.Join(@"\", pathElements.ToArray());
-            if (relativePath.EndsWith(@"\", StringComparison.Ordinal))
-            {
-                merged += @"\";
-            }
-
-            if (basePath.StartsWith(@"\\", StringComparison.Ordinal))
-            {
-                merged = @"\\" + merged;
-            }
-            else if (basePath.StartsWith(@"\", StringComparison.Ordinal))
-            {
-                merged = @"\" + merged;
-            }
-
-            return merged;
-        }
-
-        public static string ResolvePath(string basePath, string path)
-        {
-            if (!path.StartsWith("\\", StringComparison.OrdinalIgnoreCase))
-            {
-                return ResolveRelativePath(basePath, path);
-            }
-            else
-            {
-                return path;
-            }
-        }
-
-        public static string MakeRelativePath(string path, string basePath)
-        {
-            List<string> pathElements = new List<string>(path.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries));
-            List<string> basePathElements = new List<string>(basePath.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries));
-
-            if (!basePath.EndsWith("\\", StringComparison.Ordinal) && basePathElements.Count > 0)
-            {
-                basePathElements.RemoveAt(basePathElements.Count - 1);
-            }
-
-            // Find first part of paths that don't match
-            int i = 0;
-            while (i < Math.Min(pathElements.Count - 1, basePathElements.Count))
-            {
-                if (pathElements[i].ToUpperInvariant() != basePathElements[i].ToUpperInvariant())
-                {
-                    break;
-                }
-
-                ++i;
-            }
-
-            // For each remaining part of the base path, insert '..'
-            StringBuilder result = new StringBuilder();
-            if (i == basePathElements.Count)
-            {
-                result.Append(@".\");
-            }
-            else if (i < basePathElements.Count)
-            {
-                for (int j = 0; j < basePathElements.Count - i; ++j)
-                {
-                    result.Append(@"..\");
-                }
-            }
-
-            // For each remaining part of the path, add the path element
-            for (int j = i; j < pathElements.Count - 1; ++j)
-            {
-                result.Append(pathElements[j]);
-                result.Append(@"\");
-            }
-
-            result.Append(pathElements[pathElements.Count - 1]);
-
-            // If the target was a directory, put the terminator back
-            if (path.EndsWith(@"\", StringComparison.Ordinal))
-            {
-                result.Append(@"\");
-            }
-
-            return result.ToString();
-        }
-        #endregion
-
-        #region Stream Manipulation
-        /// <summary>
-        /// Read bytes until buffer filled or EOF.
-        /// </summary>
-        /// <param name="stream">The stream to read.</param>
-        /// <param name="buffer">The buffer to populate.</param>
-        /// <param name="offset">Offset in the buffer to start.</param>
-        /// <param name="length">The number of bytes to read.</param>
-        /// <returns>The number of bytes actually read.</returns>
-        public static int ReadFully(Stream stream, byte[] buffer, int offset, int length)
-        {
-            int totalRead = 0;
-            int numRead = stream.Read(buffer, offset, length);
-            while (numRead > 0)
-            {
-                totalRead += numRead;
-                if (totalRead == length)
-                {
-                    break;
-                }
-
-                numRead = stream.Read(buffer, offset + totalRead, length - totalRead);
-            }
-
-            return totalRead;
-        }
-
-        /// <summary>
-        /// Read bytes until buffer filled or throw IOException.
-        /// </summary>
-        /// <param name="stream">The stream to read.</param>
-        /// <param name="count">The number of bytes to read.</param>
-        /// <returns>The data read from the stream.</returns>
-        public static byte[] ReadFully(Stream stream, int count)
-        {
-            byte[] buffer = new byte[count];
-            if (ReadFully(stream, buffer, 0, count) == count)
-            {
-                return buffer;
-            }
-            else
-            {
-                throw new IOException("Unable to complete read of " + count + " bytes");
-            }
-        }
-
-        /// <summary>
-        /// Read bytes until buffer filled or EOF.
-        /// </summary>
-        /// <param name="buffer">The stream to read.</param>
-        /// <param name="pos">The position in buffer to read from.</param>
-        /// <param name="data">The buffer to populate.</param>
-        /// <param name="offset">Offset in the buffer to start.</param>
-        /// <param name="length">The number of bytes to read.</param>
-        /// <returns>The number of bytes actually read.</returns>
-        public static int ReadFully(IBuffer buffer, long pos, byte[] data, int offset, int length)
-        {
-            int totalRead = 0;
-            int numRead = buffer.Read(pos, data, offset, length);
-            while (numRead > 0)
-            {
-                totalRead += numRead;
-                if (totalRead == length)
-                {
-                    break;
-                }
-
-                numRead = buffer.Read(pos, data, offset + totalRead, length - totalRead);
-            }
-
-            return totalRead;
-        }
-
-        /// <summary>
-        /// Read bytes until buffer filled or throw IOException.
-        /// </summary>
-        /// <param name="buffer">The buffer to read.</param>
-        /// <param name="pos">The position in buffer to read from.</param>
-        /// <param name="count">The number of bytes to read.</param>
-        /// <returns>The data read from the stream.</returns>
-        public static byte[] ReadFully(IBuffer buffer, long pos, int count)
-        {
-            byte[] result = new byte[count];
-            if (ReadFully(buffer, pos, result, 0, count) == count)
-            {
-                return result;
-            }
-            else
-            {
-                throw new IOException("Unable to complete read of " + count + " bytes");
-            }
-        }
-
-        /// <summary>
-        /// Read bytes until buffer filled or throw IOException.
-        /// </summary>
-        /// <param name="buffer">The buffer to read.</param>
-        /// <returns>The data read from the stream.</returns>
-        public static byte[] ReadAll(IBuffer buffer)
-        {
-            return ReadFully(buffer, 0, (int)buffer.Capacity);
-        }
-
-        /// <summary>
-        /// Reads a disk sector (512 bytes).
-        /// </summary>
-        /// <param name="stream">The stream to read.</param>
-        /// <returns>The sector data as a byte array.</returns>
-        public static byte[] ReadSector(Stream stream)
-        {
-            return ReadFully(stream, SectorSize);
-        }
-
-        /// <summary>
-        /// Reads a structure from a stream.
-        /// </summary>
-        /// <typeparam name="T">The type of the structure.</typeparam>
-        /// <param name="stream">The stream to read.</param>
-        /// <returns>The structure.</returns>
-        public static T ReadStruct<T>(Stream stream)
-            where T : IByteArraySerializable, new()
-        {
-            T result = new T();
-            byte[] buffer = Utilities.ReadFully(stream, result.Size);
-            result.ReadFrom(buffer, 0);
-            return result;
-        }
-
-        /// <summary>
-        /// Reads a structure from a stream.
-        /// </summary>
-        /// <typeparam name="T">The type of the structure.</typeparam>
-        /// <param name="stream">The stream to read.</param>
-        /// <param name="length">The number of bytes to read.</param>
-        /// <returns>The structure.</returns>
-        public static T ReadStruct<T>(Stream stream, int length)
-            where T : IByteArraySerializable, new()
-        {
-            T result = new T();
-            byte[] buffer = Utilities.ReadFully(stream, length);
-            result.ReadFrom(buffer, 0);
-            return result;
-        }
-
-        /// <summary>
-        /// Writes a structure to a stream.
-        /// </summary>
-        /// <typeparam name="T">The type of the structure.</typeparam>
-        /// <param name="stream">The stream to write to.</param>
-        /// <param name="obj">The structure to write.</param>
-        public static void WriteStruct<T>(Stream stream, T obj)
-            where T : IByteArraySerializable
-        {
-            byte[] buffer = new byte[obj.Size];
-            obj.WriteTo(buffer, 0);
-            stream.Write(buffer, 0, buffer.Length);
-        }
-
-        /// <summary>
-        /// Copies the contents of one stream to another.
-        /// </summary>
-        /// <param name="source">The stream to copy from.</param>
-        /// <param name="dest">The destination stream.</param>
-        /// <remarks>Copying starts at the current stream positions.</remarks>
-        public static void PumpStreams(Stream source, Stream dest)
-        {
-            byte[] buffer = new byte[64 * 1024];
-
-            int numRead = source.Read(buffer, 0, buffer.Length);
-            while (numRead != 0)
-            {
-                dest.Write(buffer, 0, numRead);
-                numRead = source.Read(buffer, 0, buffer.Length);
-            }
-        }
-
-        #endregion
-
-        #region Filesystem Support
-
-        /// <summary>
-        /// Indicates if a file name matches the 8.3 pattern.
-        /// </summary>
-        /// <param name="name">The name to test.</param>
-        /// <returns><c>true</c> if the name is 8.3, otherwise <c>false</c>.</returns>
-        public static bool Is8Dot3(string name)
-        {
-            if (name.Length > 12)
-            {
-                return false;
-            }
-
-            string[] split = name.Split(new char[] { '.' });
-
-            if (split.Length > 2 || split.Length < 1)
-            {
-                return false;
-            }
-
-            if (split[0].Length > 8)
-            {
-                return false;
-            }
-
-            foreach (char ch in split[0])
-            {
-                if (!Is8Dot3Char(ch))
-                {
-                    return false;
-                }
-            }
-
-            if (split.Length > 1)
-            {
-                if (split[1].Length > 3)
-                {
-                    return false;
-                }
-
-                foreach (char ch in split[1])
-                {
-                    if (!Is8Dot3Char(ch))
-                    {
-                        return false;
-                    }
-                }
-            }
-
-            return true;
-        }
-
-        public static bool Is8Dot3Char(char ch)
-        {
-            return (ch >= 'A' && ch <= 'Z') || (ch >= '0' && ch <= '9') || "_^$~!#%£-{}()@'`&".IndexOf(ch) != -1;
-        }
-
-        /// <summary>
-        /// Converts a 'standard' wildcard file/path specification into a regular expression.
-        /// </summary>
-        /// <param name="pattern">The wildcard pattern to convert.</param>
-        /// <returns>The resultant regular expression.</returns>
-        /// <remarks>
-        /// The wildcard * (star) matches zero or more characters (including '.'), and ?
-        /// (question mark) matches precisely one character (except '.').
-        /// </remarks>
-        public static Regex ConvertWildcardsToRegEx(string pattern)
-        {
-            if (!pattern.Contains("."))
-            {
-                pattern += ".";
-            }
-
-            string query = "^" + Regex.Escape(pattern).Replace(@"\*", ".*").Replace(@"\?", "[^.]") + "$";
-            return new Regex(query, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
-        }
-
-        public static DateTime DateTimeFromUnix(uint fileTime)
-        {
-            long ticks = fileTime * (long)10 * 1000 * 1000;
-            return new DateTime(ticks + UnixEpoch.Ticks);
-        }
-
-        public static uint DateTimeToUnix(DateTime time)
-        {
-            return (uint)((time.Ticks - UnixEpoch.Ticks) / (10 * 1000 * 1000));
-        }
-
-        public static FileAttributes FileAttributesFromUnixFileType(UnixFileType fileType)
-        {
-            switch (fileType)
-            {
-                case UnixFileType.Fifo:
-                    return FileAttributes.Device | FileAttributes.System;
-                case UnixFileType.Character:
-                    return FileAttributes.Device | FileAttributes.System;
-                case UnixFileType.Directory:
-                    return FileAttributes.Directory;
-                case UnixFileType.Block:
-                    return FileAttributes.Device | FileAttributes.System;
-                case UnixFileType.Regular:
-                    return FileAttributes.Normal;
-                case UnixFileType.Link:
-                    return FileAttributes.ReparsePoint;
-                case UnixFileType.Socket:
-                    return FileAttributes.Device | FileAttributes.System;
-                default:
-                    return (FileAttributes)0;
-            }
-        }
-        #endregion
-    }
-}
diff --git a/DiscUtils/Vfs/IVfsDirectory.cs b/DiscUtils/Vfs/IVfsDirectory.cs
deleted file mode 100644
index 901766d..0000000
--- a/DiscUtils/Vfs/IVfsDirectory.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Vfs
-{
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// Interface implemented by classes representing a directory.
-    /// </summary>
-    /// <typeparam name="TDirEntry">Concrete type representing directory entries.</typeparam>
-    /// <typeparam name="TFile">Concrete type representing files.</typeparam>
-    public interface IVfsDirectory<TDirEntry, TFile> : IVfsFile
-        where TDirEntry : VfsDirEntry
-        where TFile : IVfsFile
-    {
-        /// <summary>
-        /// Gets all of the directory entries.
-        /// </summary>
-        ICollection<TDirEntry> AllEntries { get; }
-
-        /// <summary>
-        /// Gets a self-reference, if available.
-        /// </summary>
-        TDirEntry Self
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets a specific directory entry, by name.
-        /// </summary>
-        /// <param name="name">The name of the directory entry.</param>
-        /// <returns>The directory entry, or <c>null</c> if not found.</returns>
-        TDirEntry GetEntryByName(string name);
-
-        /// <summary>
-        /// Creates a new file.
-        /// </summary>
-        /// <param name="name">The name of the file (relative to this directory).</param>
-        /// <returns>The newly created file.</returns>
-        TDirEntry CreateNewFile(string name);
-    }
-}
diff --git a/DiscUtils/Vfs/IVfsFile.cs b/DiscUtils/Vfs/IVfsFile.cs
deleted file mode 100644
index 89f5abf..0000000
--- a/DiscUtils/Vfs/IVfsFile.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Vfs
-{
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Interface implemented by a class representing a file.
-    /// </summary>
-    /// <remarks>
-    /// File system implementations should have a class that implements this
-    /// interface.  If the file system implementation is read-only, it is
-    /// acceptable to throw <c>NotImplementedException</c> from setters.
-    /// </remarks>
-    public interface IVfsFile
-    {
-        /// <summary>
-        /// Gets or sets the last access time in UTC.
-        /// </summary>
-        DateTime LastAccessTimeUtc { get; set; }
-
-        /// <summary>
-        /// Gets or sets the last write time in UTC.
-        /// </summary>
-        DateTime LastWriteTimeUtc { get; set; }
-
-        /// <summary>
-        /// Gets or sets the last creation time in UTC.
-        /// </summary>
-        DateTime CreationTimeUtc { get; set; }
-
-        /// <summary>
-        /// Gets or sets the file's attributes.
-        /// </summary>
-        FileAttributes FileAttributes { get; set; }
-
-        /// <summary>
-        /// Gets the length of the file.
-        /// </summary>
-        long FileLength { get; }
-
-        /// <summary>
-        /// Gets a buffer to access the file's contents.
-        /// </summary>
-        IBuffer FileContent { get; }
-    }
-
-    /// <summary>
-    /// Interface implemented by classes representing files, in file systems that support multi-stream files.
-    /// </summary>
-    public interface IVfsFileWithStreams : IVfsFile
-    {
-        /// <summary>
-        /// Creates a new stream.
-        /// </summary>
-        /// <param name="name">The name of the stream.</param>
-        /// <returns>An object representing the stream.</returns>
-        SparseStream CreateStream(string name);
-
-        /// <summary>
-        /// Opens an existing stream.
-        /// </summary>
-        /// <param name="name">The name of the stream.</param>
-        /// <returns>An object representing the stream.</returns>
-        /// <remarks>The implementation must not implicitly create the stream if it doesn't already
-        /// exist.</remarks>
-        SparseStream OpenExistingStream(string name);
-    }
-}
diff --git a/DiscUtils/Vfs/IVfsSymlink.cs b/DiscUtils/Vfs/IVfsSymlink.cs
deleted file mode 100644
index 2fe23b8..0000000
--- a/DiscUtils/Vfs/IVfsSymlink.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Vfs
-{
-    /// <summary>
-    /// Interface implemented by classes representing a directory.
-    /// </summary>
-    /// <typeparam name="TDirEntry">Concrete type representing directory entries.</typeparam>
-    /// <typeparam name="TFile">Concrete type representing files.</typeparam>
-    public interface IVfsSymlink<TDirEntry, TFile> : IVfsFile
-        where TDirEntry : VfsDirEntry
-        where TFile : IVfsFile
-    {
-        /// <summary>
-        /// Gets the target path for this symlink.
-        /// </summary>
-        string TargetPath { get; }
-    }
-}
diff --git a/DiscUtils/Vfs/VfsContext.cs b/DiscUtils/Vfs/VfsContext.cs
deleted file mode 100644
index 22476c2..0000000
--- a/DiscUtils/Vfs/VfsContext.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Vfs
-{
-    /// <summary>
-    /// Base class for a context object that holds global state for file system implementations.
-    /// </summary>
-    public abstract class VfsContext
-    {
-    }
-}
diff --git a/DiscUtils/Vfs/VfsDirEntry.cs b/DiscUtils/Vfs/VfsDirEntry.cs
deleted file mode 100644
index 3ae4d52..0000000
--- a/DiscUtils/Vfs/VfsDirEntry.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Vfs
-{
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Base class for directory entries in a file system.
-    /// </summary>
-    /// <remarks>
-    /// File system implementations should have a class that derives from
-    /// this abstract class.  If the file system implementation is read-only,
-    /// it is acceptable to throw <c>NotImplementedException</c> from methods
-    /// that attempt to modify the file system.
-    /// </remarks>
-    public abstract class VfsDirEntry
-    {
-        /// <summary>
-        /// Gets a value indicating whether this directory entry represents a directory (rather than a file).
-        /// </summary>
-        public abstract bool IsDirectory { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether this directory entry represents a symlink (rather than a file or directory).
-        /// </summary>
-        public abstract bool IsSymlink { get; }
-
-        /// <summary>
-        /// Gets the name of this directory entry.
-        /// </summary>
-        public abstract string FileName { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether this directory entry contains time information.
-        /// </summary>
-        /// <remarks>
-        /// <para>Typically either always returns <c>true</c> or <c>false</c>.</para>
-        /// </remarks>
-        public abstract bool HasVfsTimeInfo { get; }
-
-        /// <summary>
-        /// Gets the last access time of the file or directory.
-        /// </summary>
-        /// <remarks>
-        /// May throw <c>NotSupportedException</c> if <c>HasVfsTimeInfo</c> is <c>false</c>.
-        /// </remarks>
-        public abstract DateTime LastAccessTimeUtc { get; }
-
-        /// <summary>
-        /// Gets the last write time of the file or directory.
-        /// </summary>
-        /// <remarks>
-        /// May throw <c>NotSupportedException</c> if <c>HasVfsTimeInfo</c> is <c>false</c>.
-        /// </remarks>
-        public abstract DateTime LastWriteTimeUtc { get; }
-
-        /// <summary>
-        /// Gets the creation time of the file or directory.
-        /// </summary>
-        /// <remarks>
-        /// May throw <c>NotSupportedException</c> if <c>HasVfsTimeInfo</c> is <c>false</c>.
-        /// </remarks>
-        public abstract DateTime CreationTimeUtc { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether this directory entry contains file attribute information.
-        /// </summary>
-        /// <remarks>
-        /// <para>Typically either always returns <c>true</c> or <c>false</c>.</para>
-        /// </remarks>
-        public abstract bool HasVfsFileAttributes { get; }
-
-        /// <summary>
-        /// Gets the file attributes from the directory entry.
-        /// </summary>
-        /// <remarks>
-        /// May throw <c>NotSupportedException</c> if <c>HasVfsFileAttributes</c> is <c>false</c>.
-        /// </remarks>
-        public abstract FileAttributes FileAttributes { get; }
-
-        /// <summary>
-        /// Gets a unique id for the file or directory represented by this directory entry.
-        /// </summary>
-        public abstract long UniqueCacheId { get; }
-
-        /// <summary>
-        /// Gets a version of FileName that can be used in wildcard matches.
-        /// </summary>
-        /// <remarks>
-        /// The returned name, must have an extension separator '.', and not have any optional version
-        /// information found in some files.  The returned name is matched against a wildcard patterns
-        /// such as "*.*".
-        /// </remarks>
-        public virtual string SearchName
-        {
-            get
-            {
-                string fileName = FileName;
-                if (fileName.IndexOf('.') == -1)
-                {
-                    return fileName + ".";
-                }
-                else
-                {
-                    return fileName;
-                }
-            }
-        }
-    }
-}
diff --git a/DiscUtils/Vfs/VfsFileSystem.cs b/DiscUtils/Vfs/VfsFileSystem.cs
deleted file mode 100644
index f81c605..0000000
--- a/DiscUtils/Vfs/VfsFileSystem.cs
+++ /dev/null
@@ -1,772 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Vfs
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using System.Text.RegularExpressions;
-
-    /// <summary>
-    /// Base class for VFS file systems.
-    /// </summary>
-    /// <typeparam name="TDirEntry">The concrete type representing directory entries.</typeparam>
-    /// <typeparam name="TFile">The concrete type representing files.</typeparam>
-    /// <typeparam name="TDirectory">The concrete type representing directories.</typeparam>
-    /// <typeparam name="TContext">The concrete type holding global state.</typeparam>
-    public abstract class VfsFileSystem<TDirEntry, TFile, TDirectory, TContext> : DiscFileSystem
-        where TDirEntry : VfsDirEntry
-        where TFile : IVfsFile
-        where TDirectory : class, IVfsDirectory<TDirEntry, TFile>, TFile
-        where TContext : VfsContext
-    {
-        private TContext _context;
-        private TDirectory _rootDir;
-        private ObjectCache<long, TFile> _fileCache;
-
-        /// <summary>
-        /// Initializes a new instance of the VfsFileSystem class.
-        /// </summary>
-        /// <param name="defaultOptions">The default file system options.</param>
-        protected VfsFileSystem(DiscFileSystemOptions defaultOptions)
-            : base(defaultOptions)
-        {
-            _fileCache = new ObjectCache<long, TFile>();
-        }
-
-        /// <summary>
-        /// Delegate for processing directory entries.
-        /// </summary>
-        /// <param name="path">Full path to the directory entry.</param>
-        /// <param name="dirEntry">The directory entry itself.</param>
-        protected delegate void DirEntryHandler(string path, TDirEntry dirEntry);
-
-        /// <summary>
-        /// Gets the volume label.
-        /// </summary>
-        public override abstract string VolumeLabel
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets or sets the global shared state.
-        /// </summary>
-        protected TContext Context
-        {
-            get { return _context; }
-            set { _context = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the object representing the root directory.
-        /// </summary>
-        protected TDirectory RootDirectory
-        {
-            get { return _rootDir; }
-            set { _rootDir = value; }
-        }
-
-        /// <summary>
-        /// Copies a file - not supported on read-only file systems.
-        /// </summary>
-        /// <param name="sourceFile">The source file.</param>
-        /// <param name="destinationFile">The destination file.</param>
-        /// <param name="overwrite">Whether to permit over-writing of an existing file.</param>
-        public override void CopyFile(string sourceFile, string destinationFile, bool overwrite)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// Creates a directory - not supported on read-only file systems.
-        /// </summary>
-        /// <param name="path">The path of the new directory.</param>
-        public override void CreateDirectory(string path)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// Deletes a directory - not supported on read-only file systems.
-        /// </summary>
-        /// <param name="path">The path of the directory to delete.</param>
-        public override void DeleteDirectory(string path)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// Deletes a file - not supported on read-only file systems.
-        /// </summary>
-        /// <param name="path">The path of the file to delete.</param>
-        public override void DeleteFile(string path)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// Indicates if a directory exists.
-        /// </summary>
-        /// <param name="path">The path to test.</param>
-        /// <returns>true if the directory exists.</returns>
-        public override bool DirectoryExists(string path)
-        {
-            if (IsRoot(path))
-            {
-                return true;
-            }
-
-            TDirEntry dirEntry = GetDirectoryEntry(path);
-
-            if (dirEntry != null)
-            {
-                return dirEntry.IsDirectory;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Indicates if a file exists.
-        /// </summary>
-        /// <param name="path">The path to test.</param>
-        /// <returns>true if the file exists.</returns>
-        public override bool FileExists(string path)
-        {
-            TDirEntry dirEntry = GetDirectoryEntry(path);
-
-            if (dirEntry != null)
-            {
-                return !dirEntry.IsDirectory;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Gets the names of subdirectories in a specified directory matching a specified
-        /// search pattern, using a value to determine whether to search subdirectories.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <param name="searchOption">Indicates whether to search subdirectories.</param>
-        /// <returns>Array of directories matching the search pattern.</returns>
-        public override string[] GetDirectories(string path, string searchPattern, SearchOption searchOption)
-        {
-            Regex re = Utilities.ConvertWildcardsToRegEx(searchPattern);
-
-            List<string> dirs = new List<string>();
-            DoSearch(dirs, path, re, searchOption == SearchOption.AllDirectories, true, false);
-            return dirs.ToArray();
-        }
-
-        /// <summary>
-        /// Gets the names of files in a specified directory matching a specified
-        /// search pattern, using a value to determine whether to search subdirectories.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <param name="searchOption">Indicates whether to search subdirectories.</param>
-        /// <returns>Array of files matching the search pattern.</returns>
-        public override string[] GetFiles(string path, string searchPattern, SearchOption searchOption)
-        {
-            Regex re = Utilities.ConvertWildcardsToRegEx(searchPattern);
-
-            List<string> results = new List<string>();
-            DoSearch(results, path, re, searchOption == SearchOption.AllDirectories, false, true);
-            return results.ToArray();
-        }
-
-        /// <summary>
-        /// Gets the names of all files and subdirectories in a specified directory.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <returns>Array of files and subdirectories matching the search pattern.</returns>
-        public override string[] GetFileSystemEntries(string path)
-        {
-            string fullPath = path;
-            if (!fullPath.StartsWith(@"\", StringComparison.OrdinalIgnoreCase))
-            {
-                fullPath = @"\" + fullPath;
-            }
-
-            TDirectory parentDir = GetDirectory(fullPath);
-            return Utilities.Map<TDirEntry, string>(parentDir.AllEntries, (m) => Utilities.CombinePaths(fullPath, FormatFileName(m.FileName)));
-        }
-
-        /// <summary>
-        /// Gets the names of files and subdirectories in a specified directory matching a specified
-        /// search pattern.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <returns>Array of files and subdirectories matching the search pattern.</returns>
-        public override string[] GetFileSystemEntries(string path, string searchPattern)
-        {
-            Regex re = Utilities.ConvertWildcardsToRegEx(searchPattern);
-
-            TDirectory parentDir = GetDirectory(path);
-
-            List<string> result = new List<string>();
-            foreach (TDirEntry dirEntry in parentDir.AllEntries)
-            {
-                if (re.IsMatch(dirEntry.SearchName))
-                {
-                    result.Add(Utilities.CombinePaths(path, dirEntry.FileName));
-                }
-            }
-
-            return result.ToArray();
-        }
-
-        /// <summary>
-        /// Moves a directory.
-        /// </summary>
-        /// <param name="sourceDirectoryName">The directory to move.</param>
-        /// <param name="destinationDirectoryName">The target directory name.</param>
-        public override void MoveDirectory(string sourceDirectoryName, string destinationDirectoryName)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// Moves a file.
-        /// </summary>
-        /// <param name="sourceName">The file to move.</param>
-        /// <param name="destinationName">The target file name.</param>
-        /// <param name="overwrite">Overwrite any existing file.</param>
-        public override void MoveFile(string sourceName, string destinationName, bool overwrite)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// Opens the specified file.
-        /// </summary>
-        /// <param name="path">The full path of the file to open.</param>
-        /// <param name="mode">The file mode for the created stream.</param>
-        /// <param name="access">The access permissions for the created stream.</param>
-        /// <returns>The new stream.</returns>
-        public override SparseStream OpenFile(string path, FileMode mode, FileAccess access)
-        {
-            if (!CanWrite)
-            {
-                if (mode != FileMode.Open)
-                {
-                    throw new NotSupportedException("Only existing files can be opened");
-                }
-
-                if (access != FileAccess.Read)
-                {
-                    throw new NotSupportedException("Files cannot be opened for write");
-                }
-            }
-
-            string fileName = Utilities.GetFileFromPath(path);
-            string attributeName = null;
-
-            int streamSepPos = fileName.IndexOf(':');
-            if (streamSepPos >= 0)
-            {
-                attributeName = fileName.Substring(streamSepPos + 1);
-            }
-
-            string dirName;
-            try
-            {
-                dirName = Utilities.GetDirectoryFromPath(path);
-            }
-            catch (ArgumentException)
-            {
-                throw new IOException("Invalid path: " + path);
-            }
-
-            string entryPath = Utilities.CombinePaths(dirName, fileName);
-            TDirEntry entry = GetDirectoryEntry(entryPath);
-            if (entry == null)
-            {
-                if (mode == FileMode.Open)
-                {
-                    throw new FileNotFoundException("No such file", path);
-                }
-                else
-                {
-                    TDirectory parentDir = GetDirectory(Utilities.GetDirectoryFromPath(path));
-                    entry = parentDir.CreateNewFile(Utilities.GetFileFromPath(path));
-                }
-            }
-            else if (mode == FileMode.CreateNew)
-            {
-                throw new IOException("File already exists");
-            }
-
-            if (entry.IsSymlink)
-            {
-                entry = ResolveSymlink(entry, entryPath);
-            }
-
-            if (entry.IsDirectory)
-            {
-                throw new IOException("Attempt to open directory as a file");
-            }
-            else
-            {
-                TFile file = GetFile(entry);
-
-                SparseStream stream = null;
-                if (string.IsNullOrEmpty(attributeName))
-                {
-                    stream = new BufferStream(file.FileContent, access);
-                }
-                else
-                {
-                    IVfsFileWithStreams fileStreams = file as IVfsFileWithStreams;
-                    if (fileStreams != null)
-                    {
-                        stream = fileStreams.OpenExistingStream(attributeName);
-                        if (stream == null)
-                        {
-                            if (mode == FileMode.Create || mode == FileMode.OpenOrCreate)
-                            {
-                                stream = fileStreams.CreateStream(attributeName);
-                            }
-                            else
-                            {
-                                throw new FileNotFoundException("No such attribute on file", path);
-                            }
-                        }
-                    }
-                    else
-                    {
-                        throw new NotSupportedException("Attempt to open a file stream on a file system that doesn't support them");
-                    }
-                }
-
-                if (mode == FileMode.Create || mode == FileMode.Truncate)
-                {
-                    stream.SetLength(0);
-                }
-
-                return stream;
-            }
-        }
-
-        /// <summary>
-        /// Gets the attributes of a file or directory.
-        /// </summary>
-        /// <param name="path">The file or directory to inspect.</param>
-        /// <returns>The attributes of the file or directory.</returns>
-        public override FileAttributes GetAttributes(string path)
-        {
-            if (IsRoot(path))
-            {
-                return _rootDir.FileAttributes;
-            }
-
-            TDirEntry dirEntry = GetDirectoryEntry(path);
-            if (dirEntry == null)
-            {
-                throw new FileNotFoundException("File not found", path);
-            }
-
-            if (dirEntry.HasVfsFileAttributes)
-            {
-                return dirEntry.FileAttributes;
-            }
-            else
-            {
-                return GetFile(dirEntry).FileAttributes;
-            }
-        }
-
-        /// <summary>
-        /// Sets the attributes of a file or directory.
-        /// </summary>
-        /// <param name="path">The file or directory to change.</param>
-        /// <param name="newValue">The new attributes of the file or directory.</param>
-        public override void SetAttributes(string path, FileAttributes newValue)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// Gets the creation time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The creation time.</returns>
-        public override DateTime GetCreationTimeUtc(string path)
-        {
-            if (IsRoot(path))
-            {
-                return _rootDir.CreationTimeUtc;
-            }
-
-            TDirEntry dirEntry = GetDirectoryEntry(path);
-            if (dirEntry == null)
-            {
-                throw new FileNotFoundException("No such file or directory", path);
-            }
-
-            if (dirEntry.HasVfsTimeInfo)
-            {
-                return dirEntry.CreationTimeUtc;
-            }
-            else
-            {
-                return GetFile(dirEntry).CreationTimeUtc;
-            }
-        }
-
-        /// <summary>
-        /// Sets the creation time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public override void SetCreationTimeUtc(string path, DateTime newTime)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// Gets the last access time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The last access time.</returns>
-        public override DateTime GetLastAccessTimeUtc(string path)
-        {
-            if (IsRoot(path))
-            {
-                return _rootDir.LastAccessTimeUtc;
-            }
-
-            TDirEntry dirEntry = GetDirectoryEntry(path);
-            if (dirEntry == null)
-            {
-                throw new FileNotFoundException("No such file or directory", path);
-            }
-
-            if (dirEntry.HasVfsTimeInfo)
-            {
-                return dirEntry.LastAccessTimeUtc;
-            }
-            else
-            {
-                return GetFile(dirEntry).LastAccessTimeUtc;
-            }
-        }
-
-        /// <summary>
-        /// Sets the last access time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public override void SetLastAccessTimeUtc(string path, DateTime newTime)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// Gets the last modification time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The last write time.</returns>
-        public override DateTime GetLastWriteTimeUtc(string path)
-        {
-            if (IsRoot(path))
-            {
-                return _rootDir.LastWriteTimeUtc;
-            }
-
-            TDirEntry dirEntry = GetDirectoryEntry(path);
-            if (dirEntry == null)
-            {
-                throw new FileNotFoundException("No such file or directory", path);
-            }
-
-            if (dirEntry.HasVfsTimeInfo)
-            {
-                return dirEntry.LastWriteTimeUtc;
-            }
-            else
-            {
-                return GetFile(dirEntry).LastWriteTimeUtc;
-            }
-        }
-
-        /// <summary>
-        /// Sets the last modification time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public override void SetLastWriteTimeUtc(string path, DateTime newTime)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// Gets the length of a file.
-        /// </summary>
-        /// <param name="path">The path to the file.</param>
-        /// <returns>The length in bytes.</returns>
-        public override long GetFileLength(string path)
-        {
-            TFile file = GetFile(path);
-            if (file == null || (file.FileAttributes & FileAttributes.Directory) != 0)
-            {
-                throw new FileNotFoundException("No such file", path);
-            }
-
-            return file.FileLength;
-        }
-
-        internal TFile GetFile(TDirEntry dirEntry)
-        {
-            long cacheKey = dirEntry.UniqueCacheId;
-
-            TFile file = _fileCache[cacheKey];
-            if (file == null)
-            {
-                file = ConvertDirEntryToFile(dirEntry);
-                _fileCache[cacheKey] = file;
-            }
-
-            return file;
-        }
-
-        internal TDirectory GetDirectory(string path)
-        {
-            if (IsRoot(path))
-            {
-                return _rootDir;
-            }
-
-            TDirEntry dirEntry = GetDirectoryEntry(path);
-
-            if (dirEntry.IsSymlink)
-            {
-                dirEntry = ResolveSymlink(dirEntry, path);
-            }
-
-            if (dirEntry == null || !dirEntry.IsDirectory)
-            {
-                throw new DirectoryNotFoundException("No such directory: " + path);
-            }
-
-            return (TDirectory)GetFile(dirEntry);
-        }
-
-        internal TDirEntry GetDirectoryEntry(string path)
-        {
-            return GetDirectoryEntry(_rootDir, path);
-        }
-
-        /// <summary>
-        /// Gets all directory entries in the specified directory and sub-directories.
-        /// </summary>
-        /// <param name="path">The path to inspect.</param>
-        /// <param name="handler">Delegate invoked for each directory entry.</param>
-        protected void ForAllDirEntries(string path, DirEntryHandler handler)
-        {
-            TDirectory dir = null;
-            TDirEntry self = GetDirectoryEntry(path);
-
-            if (self != null)
-            {
-                handler(path, self);
-                if (self.IsDirectory)
-                {
-                    dir = GetFile(self) as TDirectory;
-                }
-            }
-            else
-            {
-                dir = GetFile(path) as TDirectory;
-            }
-
-            if (dir != null)
-            {
-                foreach (var subentry in dir.AllEntries)
-                {
-                    ForAllDirEntries(Utilities.CombinePaths(path, subentry.FileName), handler);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the file object for a given path.
-        /// </summary>
-        /// <param name="path">The path to query.</param>
-        /// <returns>The file object corresponding to the path.</returns>
-        protected TFile GetFile(string path)
-        {
-            if (IsRoot(path))
-            {
-                return _rootDir;
-            }
-            else if (path == null)
-            {
-                return default(TFile);
-            }
-
-            TDirEntry dirEntry = GetDirectoryEntry(path);
-            if (dirEntry == null)
-            {
-                throw new FileNotFoundException("No such file or directory", path);
-            }
-
-            return GetFile(dirEntry);
-        }
-
-        /// <summary>
-        /// Converts a directory entry to an object representing a file.
-        /// </summary>
-        /// <param name="dirEntry">The directory entry to convert.</param>
-        /// <returns>The corresponding file object.</returns>
-        protected abstract TFile ConvertDirEntryToFile(TDirEntry dirEntry);
-
-        /// <summary>
-        /// Converts an internal directory entry name into an external one.
-        /// </summary>
-        /// <param name="name">The name to convert.</param>
-        /// <returns>The external name.</returns>
-        /// <remarks>
-        /// This method is called on a single path element (i.e. name contains no path
-        /// separators).
-        /// </remarks>
-        protected virtual string FormatFileName(string name)
-        {
-            return name;
-        }
-
-        private static bool IsRoot(string path)
-        {
-            return string.IsNullOrEmpty(path) || path == @"\";
-        }
-
-        private TDirEntry GetDirectoryEntry(TDirectory dir, string path)
-        {
-            string[] pathElements = path.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries);
-            return GetDirectoryEntry(dir, pathElements, 0);
-        }
-
-        private TDirEntry GetDirectoryEntry(TDirectory dir, string[] pathEntries, int pathOffset)
-        {
-            TDirEntry entry;
-
-            if (pathEntries.Length == 0)
-            {
-                return dir.Self;
-            }
-            else
-            {
-                entry = dir.GetEntryByName(pathEntries[pathOffset]);
-                if (entry != null)
-                {
-                    if (pathOffset == pathEntries.Length - 1)
-                    {
-                        return entry;
-                    }
-                    else if (entry.IsDirectory)
-                    {
-                        return GetDirectoryEntry((TDirectory)ConvertDirEntryToFile(entry), pathEntries, pathOffset + 1);
-                    }
-                    else
-                    {
-                        throw new IOException(string.Format(CultureInfo.InvariantCulture, "{0} is a file, not a directory", pathEntries[pathOffset]));
-                    }
-                }
-                else
-                {
-                    return null;
-                }
-            }
-        }
-
-        private void DoSearch(List<string> results, string path, Regex regex, bool subFolders, bool dirs, bool files)
-        {
-            TDirectory parentDir = GetDirectory(path);
-            if (parentDir == null)
-            {
-                throw new DirectoryNotFoundException(string.Format(CultureInfo.InvariantCulture, "The directory '{0}' was not found", path));
-            }
-
-            string resultPrefixPath = path;
-            if (IsRoot(path))
-            {
-                resultPrefixPath = @"\";
-            }
-
-            foreach (TDirEntry de in parentDir.AllEntries)
-            {
-                bool isDir = de.IsDirectory;
-
-                if ((isDir && dirs) || (!isDir && files))
-                {
-                    if (regex.IsMatch(de.SearchName))
-                    {
-                        results.Add(Utilities.CombinePaths(resultPrefixPath, FormatFileName(de.FileName)));
-                    }
-                }
-
-                if (subFolders && isDir)
-                {
-                    DoSearch(results, Utilities.CombinePaths(resultPrefixPath, FormatFileName(de.FileName)), regex, subFolders, dirs, files);
-                }
-            }
-        }
-
-        private TDirEntry ResolveSymlink(TDirEntry entry, string path)
-        {
-            TDirEntry currentEntry = entry;
-            string currentPath = path;
-
-            int resolvesLeft = 20;
-            while (currentEntry.IsSymlink && resolvesLeft > 0)
-            {
-                IVfsSymlink<TDirEntry, TFile> symlink = GetFile(currentEntry) as IVfsSymlink<TDirEntry, TFile>;
-                if (symlink == null)
-                {
-                    throw new FileNotFoundException("Unable to resolve symlink", path);
-                }
-
-                currentPath = Utilities.ResolvePath(currentPath.TrimEnd('\\'), symlink.TargetPath);
-                currentEntry = GetDirectoryEntry(currentPath);
-                if (currentEntry == null)
-                {
-                    throw new FileNotFoundException("Unable to resolve symlink", path);
-                }
-
-                --resolvesLeft;
-            }
-
-            if (currentEntry.IsSymlink)
-            {
-                throw new FileNotFoundException("Unable to resolve symlink - too many links", path);
-            }
-
-            return currentEntry;
-        }
-    }
-}
diff --git a/DiscUtils/Vfs/VfsFileSystemFacade.cs b/DiscUtils/Vfs/VfsFileSystemFacade.cs
deleted file mode 100644
index 95b028d..0000000
--- a/DiscUtils/Vfs/VfsFileSystemFacade.cs
+++ /dev/null
@@ -1,541 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Vfs
-{
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Base class for the public facade on a file system.
-    /// </summary>
-    /// <remarks>
-    /// The derived class can extend the functionality available from a file system
-    /// beyond that defined by DiscFileSystem.
-    /// </remarks>
-    public abstract class VfsFileSystemFacade : DiscFileSystem
-    {
-        private DiscFileSystem _wrapped;
-
-        /// <summary>
-        /// Initializes a new instance of the VfsFileSystemFacade class.
-        /// </summary>
-        /// <param name="toWrap">The actual file system instance.</param>
-        protected VfsFileSystemFacade(DiscFileSystem toWrap)
-        {
-            _wrapped = toWrap;
-        }
-
-        /// <summary>
-        /// Gets the file system options, which can be modified.
-        /// </summary>
-        public override DiscFileSystemOptions Options
-        {
-            get { return _wrapped.Options; }
-        }
-
-        /// <summary>
-        /// Gets a friendly name for the file system.
-        /// </summary>
-        public override string FriendlyName
-        {
-            get { return _wrapped.FriendlyName; }
-        }
-
-        /// <summary>
-        /// Indicates whether the file system is read-only or read-write.
-        /// </summary>
-        /// <returns>true if the file system is read-write.</returns>
-        public override bool CanWrite
-        {
-            get { return _wrapped.CanWrite; }
-        }
-
-        /// <summary>
-        /// Gets the root directory of the file system.
-        /// </summary>
-        public override DiscDirectoryInfo Root
-        {
-            get { return new DiscDirectoryInfo(this, string.Empty); }
-        }
-
-        /// <summary>
-        /// Gets the volume label.
-        /// </summary>
-        public override string VolumeLabel
-        {
-            get { return _wrapped.VolumeLabel; }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the file system is thread-safe.
-        /// </summary>
-        public override bool IsThreadSafe
-        {
-            get { return _wrapped.IsThreadSafe; }
-        }
-
-        /// <summary>
-        /// Copies an existing file to a new file.
-        /// </summary>
-        /// <param name="sourceFile">The source file.</param>
-        /// <param name="destinationFile">The destination file.</param>
-        public override void CopyFile(string sourceFile, string destinationFile)
-        {
-            _wrapped.CopyFile(sourceFile, destinationFile);
-        }
-
-        /// <summary>
-        /// Copies an existing file to a new file.
-        /// </summary>
-        /// <param name="sourceFile">The source file.</param>
-        /// <param name="destinationFile">The destination file.</param>
-        /// <param name="overwrite">Overwrite any existing file.</param>
-        public override void CopyFile(string sourceFile, string destinationFile, bool overwrite)
-        {
-            _wrapped.CopyFile(sourceFile, destinationFile, overwrite);
-        }
-
-        /// <summary>
-        /// Creates a directory.
-        /// </summary>
-        /// <param name="path">The path of the new directory.</param>
-        public override void CreateDirectory(string path)
-        {
-            _wrapped.CreateDirectory(path);
-        }
-
-        /// <summary>
-        /// Deletes a directory.
-        /// </summary>
-        /// <param name="path">The path of the directory to delete.</param>
-        public override void DeleteDirectory(string path)
-        {
-            _wrapped.DeleteDirectory(path);
-        }
-
-        /// <summary>
-        /// Deletes a directory, optionally with all descendants.
-        /// </summary>
-        /// <param name="path">The path of the directory to delete.</param>
-        /// <param name="recursive">Determines if the all descendants should be deleted.</param>
-        public override void DeleteDirectory(string path, bool recursive)
-        {
-            _wrapped.DeleteDirectory(path, recursive);
-        }
-
-        /// <summary>
-        /// Deletes a file.
-        /// </summary>
-        /// <param name="path">The path of the file to delete.</param>
-        public override void DeleteFile(string path)
-        {
-            _wrapped.DeleteFile(path);
-        }
-
-        /// <summary>
-        /// Indicates if a directory exists.
-        /// </summary>
-        /// <param name="path">The path to test.</param>
-        /// <returns>true if the directory exists.</returns>
-        public override bool DirectoryExists(string path)
-        {
-            return _wrapped.DirectoryExists(path);
-        }
-
-        /// <summary>
-        /// Indicates if a file exists.
-        /// </summary>
-        /// <param name="path">The path to test.</param>
-        /// <returns>true if the file exists.</returns>
-        public override bool FileExists(string path)
-        {
-            return _wrapped.FileExists(path);
-        }
-
-        /// <summary>
-        /// Indicates if a file or directory exists.
-        /// </summary>
-        /// <param name="path">The path to test.</param>
-        /// <returns>true if the file or directory exists.</returns>
-        public override bool Exists(string path)
-        {
-            return _wrapped.Exists(path);
-        }
-
-        /// <summary>
-        /// Gets the names of subdirectories in a specified directory.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <returns>Array of directories.</returns>
-        public override string[] GetDirectories(string path)
-        {
-            return _wrapped.GetDirectories(path);
-        }
-
-        /// <summary>
-        /// Gets the names of subdirectories in a specified directory matching a specified
-        /// search pattern.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <returns>Array of directories matching the search pattern.</returns>
-        public override string[] GetDirectories(string path, string searchPattern)
-        {
-            return _wrapped.GetDirectories(path, searchPattern);
-        }
-
-        /// <summary>
-        /// Gets the names of subdirectories in a specified directory matching a specified
-        /// search pattern, using a value to determine whether to search subdirectories.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <param name="searchOption">Indicates whether to search subdirectories.</param>
-        /// <returns>Array of directories matching the search pattern.</returns>
-        public override string[] GetDirectories(string path, string searchPattern, SearchOption searchOption)
-        {
-            return _wrapped.GetDirectories(path, searchPattern, searchOption);
-        }
-
-        /// <summary>
-        /// Gets the names of files in a specified directory.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <returns>Array of files.</returns>
-        public override string[] GetFiles(string path)
-        {
-            return _wrapped.GetFiles(path);
-        }
-
-        /// <summary>
-        /// Gets the names of files in a specified directory.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <returns>Array of files matching the search pattern.</returns>
-        public override string[] GetFiles(string path, string searchPattern)
-        {
-            return _wrapped.GetFiles(path, searchPattern);
-        }
-
-        /// <summary>
-        /// Gets the names of files in a specified directory matching a specified
-        /// search pattern, using a value to determine whether to search subdirectories.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <param name="searchOption">Indicates whether to search subdirectories.</param>
-        /// <returns>Array of files matching the search pattern.</returns>
-        public override string[] GetFiles(string path, string searchPattern, SearchOption searchOption)
-        {
-            return _wrapped.GetFiles(path, searchPattern, searchOption);
-        }
-
-        /// <summary>
-        /// Gets the names of all files and subdirectories in a specified directory.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <returns>Array of files and subdirectories matching the search pattern.</returns>
-        public override string[] GetFileSystemEntries(string path)
-        {
-            return _wrapped.GetFileSystemEntries(path);
-        }
-
-        /// <summary>
-        /// Gets the names of files and subdirectories in a specified directory matching a specified
-        /// search pattern.
-        /// </summary>
-        /// <param name="path">The path to search.</param>
-        /// <param name="searchPattern">The search string to match against.</param>
-        /// <returns>Array of files and subdirectories matching the search pattern.</returns>
-        public override string[] GetFileSystemEntries(string path, string searchPattern)
-        {
-            return _wrapped.GetFileSystemEntries(path, searchPattern);
-        }
-
-        /// <summary>
-        /// Moves a directory.
-        /// </summary>
-        /// <param name="sourceDirectoryName">The directory to move.</param>
-        /// <param name="destinationDirectoryName">The target directory name.</param>
-        public override void MoveDirectory(string sourceDirectoryName, string destinationDirectoryName)
-        {
-            _wrapped.MoveDirectory(sourceDirectoryName, destinationDirectoryName);
-        }
-
-        /// <summary>
-        /// Moves a file.
-        /// </summary>
-        /// <param name="sourceName">The file to move.</param>
-        /// <param name="destinationName">The target file name.</param>
-        public override void MoveFile(string sourceName, string destinationName)
-        {
-            _wrapped.MoveFile(sourceName, destinationName);
-        }
-
-        /// <summary>
-        /// Moves a file, allowing an existing file to be overwritten.
-        /// </summary>
-        /// <param name="sourceName">The file to move.</param>
-        /// <param name="destinationName">The target file name.</param>
-        /// <param name="overwrite">Whether to permit a destination file to be overwritten.</param>
-        public override void MoveFile(string sourceName, string destinationName, bool overwrite)
-        {
-            _wrapped.MoveFile(sourceName, destinationName, overwrite);
-        }
-
-        /// <summary>
-        /// Opens the specified file.
-        /// </summary>
-        /// <param name="path">The full path of the file to open.</param>
-        /// <param name="mode">The file mode for the created stream.</param>
-        /// <returns>The new stream.</returns>
-        public override SparseStream OpenFile(string path, FileMode mode)
-        {
-            return _wrapped.OpenFile(path, mode);
-        }
-
-        /// <summary>
-        /// Opens the specified file.
-        /// </summary>
-        /// <param name="path">The full path of the file to open.</param>
-        /// <param name="mode">The file mode for the created stream.</param>
-        /// <param name="access">The access permissions for the created stream.</param>
-        /// <returns>The new stream.</returns>
-        public override SparseStream OpenFile(string path, FileMode mode, FileAccess access)
-        {
-            return _wrapped.OpenFile(path, mode, access);
-        }
-
-        /// <summary>
-        /// Gets the attributes of a file or directory.
-        /// </summary>
-        /// <param name="path">The file or directory to inspect.</param>
-        /// <returns>The attributes of the file or directory.</returns>
-        public override FileAttributes GetAttributes(string path)
-        {
-            return _wrapped.GetAttributes(path);
-        }
-
-        /// <summary>
-        /// Sets the attributes of a file or directory.
-        /// </summary>
-        /// <param name="path">The file or directory to change.</param>
-        /// <param name="newValue">The new attributes of the file or directory.</param>
-        public override void SetAttributes(string path, FileAttributes newValue)
-        {
-            _wrapped.SetAttributes(path, newValue);
-        }
-
-        /// <summary>
-        /// Gets the creation time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The creation time.</returns>
-        public override DateTime GetCreationTime(string path)
-        {
-            return _wrapped.GetCreationTime(path);
-        }
-
-        /// <summary>
-        /// Sets the creation time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public override void SetCreationTime(string path, DateTime newTime)
-        {
-            _wrapped.SetCreationTime(path, newTime);
-        }
-
-        /// <summary>
-        /// Gets the creation time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The creation time.</returns>
-        public override DateTime GetCreationTimeUtc(string path)
-        {
-            return _wrapped.GetCreationTimeUtc(path);
-        }
-
-        /// <summary>
-        /// Sets the creation time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public override void SetCreationTimeUtc(string path, DateTime newTime)
-        {
-            _wrapped.SetCreationTimeUtc(path, newTime);
-        }
-
-        /// <summary>
-        /// Gets the last access time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The last access time.</returns>
-        public override DateTime GetLastAccessTime(string path)
-        {
-            return _wrapped.GetLastAccessTime(path);
-        }
-
-        /// <summary>
-        /// Sets the last access time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public override void SetLastAccessTime(string path, DateTime newTime)
-        {
-            _wrapped.SetLastAccessTime(path, newTime);
-        }
-
-        /// <summary>
-        /// Gets the last access time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The last access time.</returns>
-        public override DateTime GetLastAccessTimeUtc(string path)
-        {
-            return _wrapped.GetLastAccessTimeUtc(path);
-        }
-
-        /// <summary>
-        /// Sets the last access time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public override void SetLastAccessTimeUtc(string path, DateTime newTime)
-        {
-            _wrapped.SetLastAccessTimeUtc(path, newTime);
-        }
-
-        /// <summary>
-        /// Gets the last modification time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The last write time.</returns>
-        public override DateTime GetLastWriteTime(string path)
-        {
-            return _wrapped.GetLastWriteTime(path);
-        }
-
-        /// <summary>
-        /// Sets the last modification time (in local time) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public override void SetLastWriteTime(string path, DateTime newTime)
-        {
-            _wrapped.SetLastWriteTime(path, newTime);
-        }
-
-        /// <summary>
-        /// Gets the last modification time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <returns>The last write time.</returns>
-        public override DateTime GetLastWriteTimeUtc(string path)
-        {
-            return _wrapped.GetLastWriteTimeUtc(path);
-        }
-
-        /// <summary>
-        /// Sets the last modification time (in UTC) of a file or directory.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public override void SetLastWriteTimeUtc(string path, DateTime newTime)
-        {
-            _wrapped.SetLastWriteTimeUtc(path, newTime);
-        }
-
-        /// <summary>
-        /// Gets the length of a file.
-        /// </summary>
-        /// <param name="path">The path to the file.</param>
-        /// <returns>The length in bytes.</returns>
-        public override long GetFileLength(string path)
-        {
-            return _wrapped.GetFileLength(path);
-        }
-
-        /// <summary>
-        /// Gets an object representing a possible file.
-        /// </summary>
-        /// <param name="path">The file path.</param>
-        /// <returns>The representing object.</returns>
-        /// <remarks>The file does not need to exist.</remarks>
-        public override DiscFileInfo GetFileInfo(string path)
-        {
-            return new DiscFileInfo(this, path);
-        }
-
-        /// <summary>
-        /// Gets an object representing a possible directory.
-        /// </summary>
-        /// <param name="path">The directory path.</param>
-        /// <returns>The representing object.</returns>
-        /// <remarks>The directory does not need to exist.</remarks>
-        public override DiscDirectoryInfo GetDirectoryInfo(string path)
-        {
-            return new DiscDirectoryInfo(this, path);
-        }
-
-        /// <summary>
-        /// Gets an object representing a possible file system object (file or directory).
-        /// </summary>
-        /// <param name="path">The file system path.</param>
-        /// <returns>The representing object.</returns>
-        /// <remarks>The file system object does not need to exist.</remarks>
-        public override DiscFileSystemInfo GetFileSystemInfo(string path)
-        {
-            return new DiscFileSystemInfo(this, path);
-        }
-
-        /// <summary>
-        /// Provides access to the actual file system implementation.
-        /// </summary>
-        /// <typeparam name="TDirEntry">The concrete type representing directory entries.</typeparam>
-        /// <typeparam name="TFile">The concrete type representing files.</typeparam>
-        /// <typeparam name="TDirectory">The concrete type representing directories.</typeparam>
-        /// <typeparam name="TContext">The concrete type holding global state.</typeparam>
-        /// <returns>The actual file system instance.</returns>
-        protected VfsFileSystem<TDirEntry, TFile, TDirectory, TContext> GetRealFileSystem<TDirEntry, TFile, TDirectory, TContext>()
-            where TDirEntry : VfsDirEntry
-            where TFile : IVfsFile
-            where TDirectory : class, IVfsDirectory<TDirEntry, TFile>, TFile
-            where TContext : VfsContext
-        {
-            return (VfsFileSystem<TDirEntry, TFile, TDirectory, TContext>)_wrapped;
-        }
-
-        /// <summary>
-        /// Provides access to the actual file system implementation.
-        /// </summary>
-        /// <typeparam name="T">The concrete type of the actual file system.</typeparam>
-        /// <returns>The actual file system instance.</returns>
-        protected T GetRealFileSystem<T>()
-            where T : DiscFileSystem
-        {
-            return (T)_wrapped;
-        }
-    }
-}
diff --git a/DiscUtils/Vfs/VfsFileSystemFactory.cs b/DiscUtils/Vfs/VfsFileSystemFactory.cs
deleted file mode 100644
index dfb07d2..0000000
--- a/DiscUtils/Vfs/VfsFileSystemFactory.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Vfs
-{
-    using System.IO;
-
-    /// <summary>
-    /// Base class for logic to detect file systems.
-    /// </summary>
-    public abstract class VfsFileSystemFactory
-    {
-        /// <summary>
-        /// Detects if a stream contains any known file systems.
-        /// </summary>
-        /// <param name="stream">The stream to inspect.</param>
-        /// <returns>A list of file systems (may be empty).</returns>
-        public DiscUtils.FileSystemInfo[] Detect(Stream stream)
-        {
-            return Detect(stream, null);
-        }
-
-        /// <summary>
-        /// Detects if a volume contains any known file systems.
-        /// </summary>
-        /// <param name="volume">The volume to inspect.</param>
-        /// <returns>A list of file systems (may be empty).</returns>
-        public DiscUtils.FileSystemInfo[] Detect(VolumeInfo volume)
-        {
-            using (Stream stream = volume.Open())
-            {
-                return Detect(stream, volume);
-            }
-        }
-
-        /// <summary>
-        /// The logic for detecting file systems.
-        /// </summary>
-        /// <param name="stream">The stream to inspect.</param>
-        /// <param name="volumeInfo">Optionally, information about the volume.</param>
-        /// <returns>A list of file systems detected (may be empty).</returns>
-        public abstract DiscUtils.FileSystemInfo[] Detect(Stream stream, VolumeInfo volumeInfo);
-    }
-}
diff --git a/DiscUtils/Vfs/VfsFileSystemFactoryAttribute.cs b/DiscUtils/Vfs/VfsFileSystemFactoryAttribute.cs
deleted file mode 100644
index 76313a8..0000000
--- a/DiscUtils/Vfs/VfsFileSystemFactoryAttribute.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Vfs
-{
-    using System;
-
-    /// <summary>
-    /// Attribute identifying file system factory classes.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
-    public sealed class VfsFileSystemFactoryAttribute : Attribute
-    {
-    }
-}
diff --git a/DiscUtils/Vfs/VfsFileSystemInfo.cs b/DiscUtils/Vfs/VfsFileSystemInfo.cs
deleted file mode 100644
index cf23d57..0000000
--- a/DiscUtils/Vfs/VfsFileSystemInfo.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Vfs
-{
-    using System.IO;
-
-    /// <summary>
-    /// Delegate for instantiating a file system.
-    /// </summary>
-    /// <param name="stream">The stream containing the file system.</param>
-    /// <param name="volumeInfo">Optional, information about the volume the file system is on.</param>
-    /// <param name="parameters">Parameters for the file system.</param>
-    /// <returns>A file system implementation.</returns>
-    public delegate DiscFileSystem VfsFileSystemOpener(Stream stream, VolumeInfo volumeInfo, FileSystemParameters parameters);
-
-    /// <summary>
-    /// Class holding information about a file system.
-    /// </summary>
-    public sealed class VfsFileSystemInfo : DiscUtils.FileSystemInfo
-    {
-        private string _name;
-        private string _description;
-        private VfsFileSystemOpener _openDelegate;
-
-        /// <summary>
-        /// Initializes a new instance of the VfsFileSystemInfo class.
-        /// </summary>
-        /// <param name="name">The name of the file system.</param>
-        /// <param name="description">A one-line description of the file system.</param>
-        /// <param name="openDelegate">A delegate that can open streams as the indicated file system.</param>
-        public VfsFileSystemInfo(string name, string description, VfsFileSystemOpener openDelegate)
-        {
-            _name = name;
-            _description = description;
-            _openDelegate = openDelegate;
-        }
-
-        /// <summary>
-        /// Gets the name of the file system.
-        /// </summary>
-        public override string Name
-        {
-            get { return _name; }
-        }
-
-        /// <summary>
-        /// Gets a one-line description of the file system.
-        /// </summary>
-        public override string Description
-        {
-            get { return _description; }
-        }
-
-        /// <summary>
-        /// Opens a volume using the file system.
-        /// </summary>
-        /// <param name="volume">The volume to access.</param>
-        /// <param name="parameters">Parameters for the file system.</param>
-        /// <returns>A file system instance.</returns>
-        public override DiscFileSystem Open(VolumeInfo volume, FileSystemParameters parameters)
-        {
-            return _openDelegate(volume.Open(), volume, parameters);
-        }
-
-        /// <summary>
-        /// Opens a stream using the file system.
-        /// </summary>
-        /// <param name="stream">The stream to access.</param>
-        /// <param name="parameters">Parameters for the file system.</param>
-        /// <returns>A file system instance.</returns>
-        public override DiscFileSystem Open(Stream stream, FileSystemParameters parameters)
-        {
-            return _openDelegate(stream, null, parameters);
-        }
-    }
-}
diff --git a/DiscUtils/Vfs/VfsReadOnlyFileSystem.cs b/DiscUtils/Vfs/VfsReadOnlyFileSystem.cs
deleted file mode 100644
index 69ff03a..0000000
--- a/DiscUtils/Vfs/VfsReadOnlyFileSystem.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils.Vfs
-{
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Base class for read-only file system implementations.
-    /// </summary>
-    /// <typeparam name="TDirEntry">The concrete type representing directory entries.</typeparam>
-    /// <typeparam name="TFile">The concrete type representing files.</typeparam>
-    /// <typeparam name="TDirectory">The concrete type representing directories.</typeparam>
-    /// <typeparam name="TContext">The concrete type holding global state.</typeparam>
-    public abstract class VfsReadOnlyFileSystem<TDirEntry, TFile, TDirectory, TContext> : VfsFileSystem<TDirEntry, TFile, TDirectory, TContext>
-        where TDirEntry : VfsDirEntry
-        where TFile : IVfsFile
-        where TDirectory : class, IVfsDirectory<TDirEntry, TFile>, TFile
-        where TContext : VfsContext
-    {
-        /// <summary>
-        /// Initializes a new instance of the VfsReadOnlyFileSystem class.
-        /// </summary>
-        /// <param name="defaultOptions">The default file system options.</param>
-        protected VfsReadOnlyFileSystem(DiscFileSystemOptions defaultOptions)
-            : base(defaultOptions)
-        {
-        }
-
-        /// <summary>
-        /// Indicates whether the file system is read-only or read-write.
-        /// </summary>
-        /// <returns>Always false.</returns>
-        public override bool CanWrite
-        {
-            get { return false; }
-        }
-
-        /// <summary>
-        /// Copies a file - not supported on read-only file systems.
-        /// </summary>
-        /// <param name="sourceFile">The source file.</param>
-        /// <param name="destinationFile">The destination file.</param>
-        /// <param name="overwrite">Whether to permit over-writing of an existing file.</param>
-        public override void CopyFile(string sourceFile, string destinationFile, bool overwrite)
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <summary>
-        /// Creates a directory - not supported on read-only file systems.
-        /// </summary>
-        /// <param name="path">The path of the new directory.</param>
-        public override void CreateDirectory(string path)
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <summary>
-        /// Deletes a directory - not supported on read-only file systems.
-        /// </summary>
-        /// <param name="path">The path of the directory to delete.</param>
-        public override void DeleteDirectory(string path)
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <summary>
-        /// Deletes a file - not supported on read-only file systems.
-        /// </summary>
-        /// <param name="path">The path of the file to delete.</param>
-        public override void DeleteFile(string path)
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <summary>
-        /// Moves a directory - not supported on read-only file systems.
-        /// </summary>
-        /// <param name="sourceDirectoryName">The directory to move.</param>
-        /// <param name="destinationDirectoryName">The target directory name.</param>
-        public override void MoveDirectory(string sourceDirectoryName, string destinationDirectoryName)
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <summary>
-        /// Moves a file - not supported on read-only file systems.
-        /// </summary>
-        /// <param name="sourceName">The file to move.</param>
-        /// <param name="destinationName">The target file name.</param>
-        /// <param name="overwrite">Whether to allow an existing file to be overwritten.</param>
-        public override void MoveFile(string sourceName, string destinationName, bool overwrite)
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <summary>
-        /// Opens the specified file.
-        /// </summary>
-        /// <param name="path">The full path of the file to open.</param>
-        /// <param name="mode">The file mode for the created stream.</param>
-        /// <returns>The new stream.</returns>
-        public override SparseStream OpenFile(string path, FileMode mode)
-        {
-            return OpenFile(path, mode, FileAccess.Read);
-        }
-
-        /// <summary>
-        /// Sets the attributes of a file or directory - not supported on read-only file systems.
-        /// </summary>
-        /// <param name="path">The file or directory to change.</param>
-        /// <param name="newValue">The new attributes of the file or directory.</param>
-        public override void SetAttributes(string path, FileAttributes newValue)
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <summary>
-        /// Sets the creation time (in UTC) of a file or directory - not supported on read-only file systems.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public override void SetCreationTimeUtc(string path, DateTime newTime)
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <summary>
-        /// Sets the last access time (in UTC) of a file or directory - not supported on read-only file systems.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public override void SetLastAccessTimeUtc(string path, DateTime newTime)
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <summary>
-        /// Sets the last modification time (in UTC) of a file or directory - not supported on read-only file systems.
-        /// </summary>
-        /// <param name="path">The path of the file or directory.</param>
-        /// <param name="newTime">The new time to set.</param>
-        public override void SetLastWriteTimeUtc(string path, DateTime newTime)
-        {
-            throw new NotSupportedException();
-        }
-    }
-}
diff --git a/DiscUtils/VirtualDisk.cs b/DiscUtils/VirtualDisk.cs
deleted file mode 100644
index 26228a0..0000000
--- a/DiscUtils/VirtualDisk.cs
+++ /dev/null
@@ -1,736 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using DiscUtils.Partitions;
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-
-    /// <summary>
-    /// Base class representing virtual hard disks.
-    /// </summary>
-    public abstract class VirtualDisk : MarshalByRefObject, IDisposable
-    {
-        private static Dictionary<string, VirtualDiskFactory> s_extensionMap;
-        private static Dictionary<string, VirtualDiskFactory> s_typeMap;
-        private static Dictionary<string, Type> s_diskTransports;
-
-        private VirtualDiskTransport _transport;
-
-        /// <summary>
-        /// Finalizes an instance of the VirtualDisk class.
-        /// </summary>
-        ~VirtualDisk()
-        {
-            Dispose(false);
-        }
-
-        /// <summary>
-        /// Gets the set of disk formats supported as an array of file extensions.
-        /// </summary>
-        public static ICollection<string> SupportedDiskFormats
-        {
-            get { return ExtensionMap.Keys; }
-        }
-
-        /// <summary>
-        /// Gets the set of disk types supported, as an array of identifiers.
-        /// </summary>
-        public static ICollection<string> SupportedDiskTypes
-        {
-            get { return TypeMap.Keys; }
-        }
-
-        /// <summary>
-        /// Gets the geometry of the disk.
-        /// </summary>
-        public abstract Geometry Geometry
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets the geometry of the disk as it is anticipated a hypervisor BIOS will represent it.
-        /// </summary>
-        public virtual Geometry BiosGeometry
-        {
-            get { return Geometry.MakeBiosSafe(Geometry, Capacity); }
-        }
-
-        /// <summary>
-        /// Gets the type of disk represented by this object.
-        /// </summary>
-        public abstract VirtualDiskClass DiskClass
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets the capacity of the disk (in bytes).
-        /// </summary>
-        public abstract long Capacity
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets the size of the disk's logical blocks (aka sector size), in bytes.
-        /// </summary>
-        public virtual int BlockSize
-        {
-            get { return Sizes.Sector; }
-        }
-
-        /// <summary>
-        /// Gets the logical sector size of the disk, in bytes.
-        /// </summary>
-        /// <remarks>This is an alias for the <c>BlockSize</c> property.</remarks>
-        public int SectorSize
-        {
-            get { return BlockSize; }
-        }
-
-        /// <summary>
-        /// Gets the content of the disk as a stream.
-        /// </summary>
-        /// <remarks>Note the returned stream is not guaranteed to be at any particular position.  The actual position
-        /// will depend on the last partition table/file system activity, since all access to the disk contents pass
-        /// through a single stream instance.  Set the stream position before accessing the stream.</remarks>
-        public abstract SparseStream Content
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets the layers that make up the disk.
-        /// </summary>
-        public abstract IEnumerable<VirtualDiskLayer> Layers
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets or sets the Windows disk signature of the disk, which uniquely identifies the disk.
-        /// </summary>
-        public virtual int Signature
-        {
-            get
-            {
-                return Utilities.ToInt32LittleEndian(GetMasterBootRecord(), 0x01B8);
-            }
-
-            set
-            {
-                byte[] mbr = GetMasterBootRecord();
-                Utilities.WriteBytesLittleEndian(value, mbr, 0x01B8);
-                SetMasterBootRecord(mbr);
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the disk appears to have a valid partition table.
-        /// </summary>
-        /// <remarks>There is no reliable way to determine whether a disk has a valid partition
-        /// table.  The 'guess' consists of checking for basic indicators and looking for obviously
-        /// invalid data, such as overlapping partitions.</remarks>
-        public virtual bool IsPartitioned
-        {
-            get { return PartitionTable.IsPartitioned(Content); }
-        }
-
-        /// <summary>
-        /// Gets the object that interprets the partition structure.
-        /// </summary>
-        /// <remarks>It is theoretically possible for a disk to contain two independent partition structures - a
-        /// BIOS/GPT one and an Apple one, for example.  This method will return in order of preference,
-        /// a GUID partition table, a BIOS partition table, then in undefined preference one of any other partition
-        /// tables found.  See PartitionTable.GetPartitionTables to gain access to all the discovered partition
-        /// tables on a disk.</remarks>
-        public virtual PartitionTable Partitions
-        {
-            get
-            {
-                IList<PartitionTable> tables = PartitionTable.GetPartitionTables(this);
-                if (tables == null || tables.Count == 0)
-                {
-                    return null;
-                }
-                else if (tables.Count == 1)
-                {
-                    return tables[0];
-                }
-                else
-                {
-                    PartitionTable best = null;
-                    int bestScore = -1;
-                    for (int i = 0; i < tables.Count; ++i)
-                    {
-                        int newScore = 0;
-                        if (tables[i] is GuidPartitionTable)
-                        {
-                            newScore = 2;
-                        }
-                        else if (tables[i] is BiosPartitionTable)
-                        {
-                            newScore = 1;
-                        }
-
-                        if (newScore > bestScore)
-                        {
-                            bestScore = newScore;
-                            best = tables[i];
-                        }
-                    }
-
-                    return best;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the parameters of the disk.
-        /// </summary>
-        /// <remarks>Most of the parameters are also available individually, such as DiskType and Capacity.</remarks>
-        public virtual VirtualDiskParameters Parameters
-        {
-            get
-            {
-                return new VirtualDiskParameters()
-                {
-                    DiskType = DiskClass,
-                    Capacity = Capacity,
-                    Geometry = Geometry,
-                    BiosGeometry = BiosGeometry,
-                    AdapterType = GenericDiskAdapterType.Ide
-                };
-            }
-        }
-
-        /// <summary>
-        /// Gets information about the type of disk.
-        /// </summary>
-        /// <remarks>This property provides access to meta-data about the disk format, for example whether the
-        /// BIOS geometry is preserved in the disk file.</remarks>
-        public abstract VirtualDiskTypeInfo DiskTypeInfo
-        {
-            get;
-        }
-
-        private static Dictionary<string, VirtualDiskFactory> ExtensionMap
-        {
-            get
-            {
-                if (s_extensionMap == null)
-                {
-                    InitializeMaps();
-                }
-
-                return s_extensionMap;
-            }
-        }
-
-        private static Dictionary<string, VirtualDiskFactory> TypeMap
-        {
-            get
-            {
-                if (s_typeMap == null)
-                {
-                    InitializeMaps();
-                }
-
-                return s_typeMap;
-            }
-        }
-
-        private static Dictionary<string, Type> DiskTransports
-        {
-            get
-            {
-                if (s_diskTransports == null)
-                {
-                    Dictionary<string, Type> transports = new Dictionary<string, Type>();
-
-                    foreach (var type in typeof(VirtualDisk).Assembly.GetTypes())
-                    {
-                        foreach (VirtualDiskTransportAttribute attr in Attribute.GetCustomAttributes(type, typeof(VirtualDiskTransportAttribute), false))
-                        {
-                            transports.Add(attr.Scheme.ToUpperInvariant(), type);
-                        }
-                    }
-
-                    s_diskTransports = transports;
-                }
-
-                return s_diskTransports;
-            }
-        }
-
-        /// <summary>
-        /// Gets the set of supported variants of a type of virtual disk.
-        /// </summary>
-        /// <param name="type">A type, as returned by <see cref="SupportedDiskTypes"/>.</param>
-        /// <returns>A collection of identifiers, or empty if there is no variant concept for this type of disk.</returns>
-        public static ICollection<string> GetSupportedDiskVariants(string type)
-        {
-            return TypeMap[type].Variants;
-        }
-
-        /// <summary>
-        /// Gets information about disk type.
-        /// </summary>
-        /// <param name="type">The disk type, as returned by <see cref="SupportedDiskTypes"/>.</param>
-        /// <param name="variant">The variant of the disk type.</param>
-        /// <returns>Information about the disk type.</returns>
-        public static VirtualDiskTypeInfo GetDiskType(string type, string variant)
-        {
-            return TypeMap[type].GetDiskTypeInformation(variant);
-        }
-
-        /// <summary>
-        /// Create a new virtual disk, possibly within an existing disk.
-        /// </summary>
-        /// <param name="fileSystem">The file system to create the disk on.</param>
-        /// <param name="type">The type of disk to create (see <see cref="SupportedDiskTypes"/>).</param>
-        /// <param name="variant">The variant of the type to create (see <see cref="GetSupportedDiskVariants"/>).</param>
-        /// <param name="path">The path (or URI) for the disk to create.</param>
-        /// <param name="capacity">The capacity of the new disk.</param>
-        /// <param name="geometry">The geometry of the new disk (or null).</param>
-        /// <param name="parameters">Untyped parameters controlling the creation process (TBD).</param>
-        /// <returns>The newly created disk.</returns>
-        public static VirtualDisk CreateDisk(DiscFileSystem fileSystem, string type, string variant, string path, long capacity, Geometry geometry, Dictionary<string, string> parameters)
-        {
-            VirtualDiskFactory factory = TypeMap[type];
-
-            VirtualDiskParameters diskParams = new VirtualDiskParameters()
-            {
-                AdapterType = GenericDiskAdapterType.Scsi,
-                Capacity = capacity,
-                Geometry = geometry,
-            };
-
-            if (parameters != null)
-            {
-                foreach (var key in parameters.Keys)
-                {
-                    diskParams.ExtendedParameters[key] = parameters[key];
-                }
-            }
-
-            return factory.CreateDisk(new DiscFileLocator(fileSystem, Utilities.GetDirectoryFromPath(path)), variant.ToLowerInvariant(), Utilities.GetFileFromPath(path), diskParams);
-        }
-
-        /// <summary>
-        /// Create a new virtual disk.
-        /// </summary>
-        /// <param name="type">The type of disk to create (see <see cref="SupportedDiskTypes"/>).</param>
-        /// <param name="variant">The variant of the type to create (see <see cref="GetSupportedDiskVariants"/>).</param>
-        /// <param name="path">The path (or URI) for the disk to create.</param>
-        /// <param name="capacity">The capacity of the new disk.</param>
-        /// <param name="geometry">The geometry of the new disk (or null).</param>
-        /// <param name="parameters">Untyped parameters controlling the creation process (TBD).</param>
-        /// <returns>The newly created disk.</returns>
-        public static VirtualDisk CreateDisk(string type, string variant, string path, long capacity, Geometry geometry, Dictionary<string, string> parameters)
-        {
-            return CreateDisk(type, variant, path, capacity, geometry, null, null, parameters);
-        }
-
-        /// <summary>
-        /// Create a new virtual disk.
-        /// </summary>
-        /// <param name="type">The type of disk to create (see <see cref="SupportedDiskTypes"/>).</param>
-        /// <param name="variant">The variant of the type to create (see <see cref="GetSupportedDiskVariants"/>).</param>
-        /// <param name="path">The path (or URI) for the disk to create.</param>
-        /// <param name="capacity">The capacity of the new disk.</param>
-        /// <param name="geometry">The geometry of the new disk (or null).</param>
-        /// <param name="user">The user identity to use when accessing the <c>path</c> (or null).</param>
-        /// <param name="password">The password to use when accessing the <c>path</c> (or null).</param>
-        /// <param name="parameters">Untyped parameters controlling the creation process (TBD).</param>
-        /// <returns>The newly created disk.</returns>
-        public static VirtualDisk CreateDisk(string type, string variant, string path, long capacity, Geometry geometry, string user, string password, Dictionary<string, string> parameters)
-        {
-            VirtualDiskParameters diskParams = new VirtualDiskParameters()
-            {
-                AdapterType = GenericDiskAdapterType.Scsi,
-                Capacity = capacity,
-                Geometry = geometry,
-            };
-
-            if (parameters != null)
-            {
-                foreach (var key in parameters.Keys)
-                {
-                    diskParams.ExtendedParameters[key] = parameters[key];
-                }
-            }
-
-            return CreateDisk(type, variant, path, diskParams, user, password);
-        }
-
-        /// <summary>
-        /// Create a new virtual disk.
-        /// </summary>
-        /// <param name="type">The type of disk to create (see <see cref="SupportedDiskTypes"/>).</param>
-        /// <param name="variant">The variant of the type to create (see <see cref="GetSupportedDiskVariants"/>).</param>
-        /// <param name="path">The path (or URI) for the disk to create.</param>
-        /// <param name="diskParameters">Parameters controlling the capacity, geometry, etc of the new disk.</param>
-        /// <param name="user">The user identity to use when accessing the <c>path</c> (or null).</param>
-        /// <param name="password">The password to use when accessing the <c>path</c> (or null).</param>
-        /// <returns>The newly created disk.</returns>
-        public static VirtualDisk CreateDisk(string type, string variant, string path, VirtualDiskParameters diskParameters, string user, string password)
-        {
-            Uri uri = PathToUri(path);
-            VirtualDisk result = null;
-
-            Type transportType;
-            if (!DiskTransports.TryGetValue(uri.Scheme.ToUpperInvariant(), out transportType))
-            {
-                throw new FileNotFoundException(string.Format(CultureInfo.InvariantCulture, "Unable to parse path '{0}'", path), path);
-            }
-
-            VirtualDiskTransport transport = (VirtualDiskTransport)Activator.CreateInstance(transportType);
-
-            try
-            {
-                transport.Connect(uri, user, password);
-
-                if (transport.IsRawDisk)
-                {
-                    result = transport.OpenDisk(FileAccess.ReadWrite);
-                }
-                else
-                {
-                    VirtualDiskFactory factory = TypeMap[type];
-
-                    result = factory.CreateDisk(transport.GetFileLocator(), variant.ToLowerInvariant(), Utilities.GetFileFromPath(path), diskParameters);
-                }
-
-                if (result != null)
-                {
-                    result._transport = transport;
-                    transport = null;
-                }
-
-                return result;
-            }
-            finally
-            {
-                if (transport != null)
-                {
-                    transport.Dispose();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Opens an existing virtual disk.
-        /// </summary>
-        /// <param name="path">The path of the virtual disk to open, can be a URI.</param>
-        /// <param name="access">The desired access to the disk.</param>
-        /// <returns>The Virtual Disk, or <c>null</c> if an unknown disk format.</returns>
-        public static VirtualDisk OpenDisk(string path, FileAccess access)
-        {
-            return OpenDisk(path, null, access, null, null);
-        }
-
-        /// <summary>
-        /// Opens an existing virtual disk.
-        /// </summary>
-        /// <param name="path">The path of the virtual disk to open, can be a URI.</param>
-        /// <param name="access">The desired access to the disk.</param>
-        /// <param name="user">The user name to use for authentication (if necessary).</param>
-        /// <param name="password">The password to use for authentication (if necessary).</param>
-        /// <returns>The Virtual Disk, or <c>null</c> if an unknown disk format.</returns>
-        public static VirtualDisk OpenDisk(string path, FileAccess access, string user, string password)
-        {
-            return OpenDisk(path, null, access, user, password);
-        }
-
-        /// <summary>
-        /// Opens an existing virtual disk.
-        /// </summary>
-        /// <param name="path">The path of the virtual disk to open, can be a URI.</param>
-        /// <param name="forceType">Force the detected disk type (<c>null</c> to detect).</param>
-        /// <param name="access">The desired access to the disk.</param>
-        /// <param name="user">The user name to use for authentication (if necessary).</param>
-        /// <param name="password">The password to use for authentication (if necessary).</param>
-        /// <returns>The Virtual Disk, or <c>null</c> if an unknown disk format.</returns>
-        /// <remarks>
-        /// The detected disk type can be forced by specifying a known disk type: 
-        /// RAW, VHD, VMDK, etc.
-        /// </remarks>
-        public static VirtualDisk OpenDisk(string path, string forceType, FileAccess access, string user, string password)
-        {
-            Uri uri = PathToUri(path);
-            VirtualDisk result = null;
-
-            Type transportType;
-            if (!DiskTransports.TryGetValue(uri.Scheme.ToUpperInvariant(), out transportType))
-            {
-                throw new FileNotFoundException(string.Format(CultureInfo.InvariantCulture, "Unable to parse path '{0}'", path), path);
-            }
-
-            VirtualDiskTransport transport = (VirtualDiskTransport)Activator.CreateInstance(transportType);
-
-            try
-            {
-                transport.Connect(uri, user, password);
-
-                if (transport.IsRawDisk)
-                {
-                    result = transport.OpenDisk(access);
-                }
-                else
-                {
-                    bool foundFactory;
-                    VirtualDiskFactory factory;
-
-                    if (!string.IsNullOrEmpty(forceType))
-                    {
-                        foundFactory = TypeMap.TryGetValue(forceType, out factory);
-                    }
-                    else
-                    {
-                        string extension = Path.GetExtension(uri.AbsolutePath).ToUpperInvariant();
-                        if (extension.StartsWith(".", StringComparison.Ordinal))
-                        {
-                            extension = extension.Substring(1);
-                        }
-
-                        foundFactory = ExtensionMap.TryGetValue(extension, out factory);
-                    }
-
-                    if (foundFactory)
-                    {
-                        result = factory.OpenDisk(transport.GetFileLocator(), transport.GetFileName(), access);
-                    }
-                }
-
-                if (result != null)
-                {
-                    result._transport = transport;
-                    transport = null;
-                }
-
-                return result;
-            }
-            finally
-            {
-                if (transport != null)
-                {
-                    transport.Dispose();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Opens an existing virtual disk, possibly from within an existing disk.
-        /// </summary>
-        /// <param name="fs">The file system to open the disk on.</param>
-        /// <param name="path">The path of the virtual disk to open.</param>
-        /// <param name="access">The desired access to the disk.</param>
-        /// <returns>The Virtual Disk, or <c>null</c> if an unknown disk format.</returns>
-        public static VirtualDisk OpenDisk(DiscFileSystem fs, string path, FileAccess access)
-        {
-            if (fs == null)
-            {
-                return OpenDisk(path, access);
-            }
-
-            string extension = Path.GetExtension(path).ToUpperInvariant();
-            if (extension.StartsWith(".", StringComparison.Ordinal))
-            {
-                extension = extension.Substring(1);
-            }
-
-            VirtualDiskFactory factory;
-            if (ExtensionMap.TryGetValue(extension, out factory))
-            {
-                return factory.OpenDisk(fs, path, access);
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Disposes of this instance, freeing underlying resources.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Reads the first sector of the disk, known as the Master Boot Record.
-        /// </summary>
-        /// <returns>The MBR as a byte array.</returns>
-        public virtual byte[] GetMasterBootRecord()
-        {
-            byte[] sector = new byte[Sizes.Sector];
-
-            long oldPos = Content.Position;
-            Content.Position = 0;
-            Utilities.ReadFully(Content, sector, 0, Sizes.Sector);
-            Content.Position = oldPos;
-
-            return sector;
-        }
-
-        /// <summary>
-        /// Overwrites the first sector of the disk, known as the Master Boot Record.
-        /// </summary>
-        /// <param name="data">The master boot record, must be 512 bytes in length.</param>
-        public virtual void SetMasterBootRecord(byte[] data)
-        {
-            if (data == null)
-            {
-                throw new ArgumentNullException("data");
-            }
-            else if (data.Length != Sizes.Sector)
-            {
-                throw new ArgumentException("The Master Boot Record must be exactly 512 bytes in length", "data");
-            }
-
-            long oldPos = Content.Position;
-            Content.Position = 0;
-            Content.Write(data, 0, Sizes.Sector);
-            Content.Position = oldPos;
-        }
-
-        /// <summary>
-        /// Create a new differencing disk, possibly within an existing disk.
-        /// </summary>
-        /// <param name="fileSystem">The file system to create the disk on.</param>
-        /// <param name="path">The path (or URI) for the disk to create.</param>
-        /// <returns>The newly created disk.</returns>
-        public abstract VirtualDisk CreateDifferencingDisk(DiscFileSystem fileSystem, string path);
-
-        /// <summary>
-        /// Create a new differencing disk.
-        /// </summary>
-        /// <param name="path">The path (or URI) for the disk to create.</param>
-        /// <returns>The newly created disk.</returns>
-        public abstract VirtualDisk CreateDifferencingDisk(string path);
-
-        internal static VirtualDiskLayer OpenDiskLayer(FileLocator locator, string path, FileAccess access)
-        {
-            string extension = Path.GetExtension(path).ToUpperInvariant();
-            if (extension.StartsWith(".", StringComparison.Ordinal))
-            {
-                extension = extension.Substring(1);
-            }
-
-            VirtualDiskFactory factory;
-            if (ExtensionMap.TryGetValue(extension, out factory))
-            {
-                return factory.OpenDiskLayer(locator, path, access);
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Disposes of underlying resources.
-        /// </summary>
-        /// <param name="disposing"><c>true</c> if running inside Dispose(), indicating
-        /// graceful cleanup of all managed objects should be performed, or <c>false</c>
-        /// if running inside destructor.</param>
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                if (_transport != null)
-                {
-                    _transport.Dispose();
-                }
-
-                _transport = null;
-            }
-        }
-
-        private static Uri PathToUri(string path)
-        {
-            if (string.IsNullOrEmpty(path))
-            {
-                throw new ArgumentException("Path must not be null or empty", "path");
-            }
-
-            if (path.Contains("://"))
-            {
-                return new Uri(path);
-            }
-
-            if (!Path.IsPathRooted(path))
-            {
-                path = Path.GetFullPath(path);
-            }
-
-            // Built-in Uri class does cope well with query params on file Uris, so do some
-            // parsing ourselves...
-            if (path.Length >= 1 && path[0] == '\\')
-            {
-                UriBuilder builder = new UriBuilder("file:" + path.Replace('\\', '/'));
-                return builder.Uri;
-            }
-            else if (path.StartsWith("//", StringComparison.OrdinalIgnoreCase))
-            {
-                UriBuilder builder = new UriBuilder("file:" + path);
-                return builder.Uri;
-            }
-            else if (path.Length >= 2 && path[1] == ':')
-            {
-                UriBuilder builder = new UriBuilder("file:///" + path.Replace('\\', '/'));
-                return builder.Uri;
-            }
-            else
-            {
-                return new Uri(path);
-            }
-        }
-
-        private static void InitializeMaps()
-        {
-            Dictionary<string, VirtualDiskFactory> typeMap = new Dictionary<string, VirtualDiskFactory>();
-            Dictionary<string, VirtualDiskFactory> extensionMap = new Dictionary<string, VirtualDiskFactory>();
-
-            foreach (var type in typeof(VirtualDisk).Assembly.GetTypes())
-            {
-                VirtualDiskFactoryAttribute attr = (VirtualDiskFactoryAttribute)Attribute.GetCustomAttribute(type, typeof(VirtualDiskFactoryAttribute), false);
-                if (attr != null)
-                {
-                    VirtualDiskFactory factory = (VirtualDiskFactory)Activator.CreateInstance(type);
-                    typeMap.Add(attr.Type, factory);
-                    foreach (var extension in attr.FileExtensions)
-                    {
-                        extensionMap.Add(extension.ToUpperInvariant(), factory);
-                    }
-                }
-            }
-
-            s_typeMap = typeMap;
-            s_extensionMap = extensionMap;
-        }
-    }
-}
diff --git a/DiscUtils/VirtualDiskClass.cs b/DiscUtils/VirtualDiskClass.cs
deleted file mode 100644
index 81c6188..0000000
--- a/DiscUtils/VirtualDiskClass.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    /// <summary>
-    /// Enumeration of different classes of disk.
-    /// </summary>
-    public enum VirtualDiskClass
-    {
-        /// <summary>
-        /// Unknown (or unspecified) type.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// Hard disk.
-        /// </summary>
-        HardDisk = 1,
-
-        /// <summary>
-        /// Optical disk, such as CD or DVD.
-        /// </summary>
-        OpticalDisk = 2,
-
-        /// <summary>
-        /// Floppy disk.
-        /// </summary>
-        FloppyDisk = 3,
-    }
-}
diff --git a/DiscUtils/VirtualDiskExtent.cs b/DiscUtils/VirtualDiskExtent.cs
deleted file mode 100644
index 816a2a1..0000000
--- a/DiscUtils/VirtualDiskExtent.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-
-    /// <summary>
-    /// Base class represented a stored extent of a virtual disk.
-    /// </summary>
-    /// <remarks>
-    /// Some file formats can divide a logical disk layer into multiple extents, stored in
-    /// different files.  This class represents those extents.  Normally, all virtual disks
-    /// have at least one extent.
-    /// </remarks>
-    public abstract class VirtualDiskExtent : IDisposable
-    {
-        /// <summary>
-        /// Gets a value indicating whether the extent only stores meaningful sectors.
-        /// </summary>
-        public abstract bool IsSparse
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets the capacity of the extent (in bytes).
-        /// </summary>
-        public abstract long Capacity
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets the size of the extent (in bytes) on underlying storage.
-        /// </summary>
-        public abstract long StoredSize
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets the content of this extent.
-        /// </summary>
-        /// <param name="parent">The parent stream (if any).</param>
-        /// <param name="ownsParent">Controls ownership of the parent stream.</param>
-        /// <returns>The content as a stream.</returns>
-        public abstract MappedStream OpenContent(SparseStream parent, Ownership ownsParent);
-
-        /// <summary>
-        /// Disposes of this instance, freeing underlying resources.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Disposes of underlying resources.
-        /// </summary>
-        /// <param name="disposing"><c>true</c> if running inside Dispose(), indicating
-        /// graceful cleanup of all managed objects should be performed, or <c>false</c>
-        /// if running inside destructor.</param>
-        protected virtual void Dispose(bool disposing)
-        {
-        }
-    }
-}
diff --git a/DiscUtils/VirtualDiskFactory.cs b/DiscUtils/VirtualDiskFactory.cs
deleted file mode 100644
index 5db867e..0000000
--- a/DiscUtils/VirtualDiskFactory.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System.Collections.Generic;
-    using System.IO;
-
-    internal abstract class VirtualDiskFactory
-    {
-        public abstract string[] Variants { get; }
-
-        public abstract VirtualDiskTypeInfo GetDiskTypeInformation(string variant);
-
-        public abstract DiskImageBuilder GetImageBuilder(string variant);
-
-        public abstract VirtualDisk CreateDisk(FileLocator locator, string variant, string path, VirtualDiskParameters diskParameters);
-
-        public abstract VirtualDisk OpenDisk(string path, FileAccess access);
-
-        public abstract VirtualDisk OpenDisk(FileLocator locator, string path, FileAccess access);
-
-        public virtual VirtualDisk OpenDisk(FileLocator locator, string path, string extraInfo, Dictionary<string, string> parameters, FileAccess access)
-        {
-            return OpenDisk(locator, path, access);
-        }
-
-        public VirtualDisk OpenDisk(DiscFileSystem fileSystem, string path, FileAccess access)
-        {
-            return OpenDisk(new DiscFileLocator(fileSystem, @"\"), path, access);
-        }
-
-        public abstract VirtualDiskLayer OpenDiskLayer(FileLocator locator, string path, FileAccess access);
-    }
-}
diff --git a/DiscUtils/VirtualDiskFactoryAttribute.cs b/DiscUtils/VirtualDiskFactoryAttribute.cs
deleted file mode 100644
index c404685..0000000
--- a/DiscUtils/VirtualDiskFactoryAttribute.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
-    internal sealed class VirtualDiskFactoryAttribute : Attribute
-    {
-        private string _type;
-        private string[] _fileExtensions;
-
-        public VirtualDiskFactoryAttribute(string type, string fileExtensions)
-        {
-            _type = type;
-            _fileExtensions = fileExtensions.Replace(".", string.Empty).Split(',');
-        }
-
-        public string Type
-        {
-            get { return _type; }
-        }
-
-        public string[] FileExtensions
-        {
-            get { return _fileExtensions; }
-        }
-    }
-}
diff --git a/DiscUtils/VirtualDiskLayer.cs b/DiscUtils/VirtualDiskLayer.cs
deleted file mode 100644
index e627279..0000000
--- a/DiscUtils/VirtualDiskLayer.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// Represents the base layer, or a differencing layer of a VirtualDisk.
-    /// </summary>
-    /// <remarks>
-    /// <para>VirtualDisks are composed of one or more layers - a base layer
-    /// which represents the entire disk (even if not all bytes are actually stored),
-    /// and a number of differencing layers that store the disk sectors that are
-    /// logically different to the base layer.</para>
-    /// <para>Disk Layers may not store all sectors.  Any sectors that are not stored
-    /// are logically zero's (for base layers), or holes through to the layer underneath
-    /// (all other layers).</para>
-    /// </remarks>
-    public abstract class VirtualDiskLayer : IDisposable
-    {
-        /// <summary>
-        /// Finalizes an instance of the VirtualDiskLayer class.
-        /// </summary>
-        ~VirtualDiskLayer()
-        {
-            Dispose(false);
-        }
-
-        /// <summary>
-        /// Gets the geometry of the virtual disk layer.
-        /// </summary>
-        public abstract Geometry Geometry
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets and sets the logical extents that make up this layer.
-        /// </summary>
-        public virtual IList<VirtualDiskExtent> Extents
-        {
-            get { return new List<VirtualDiskExtent>(); }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the layer only stores meaningful sectors.
-        /// </summary>
-        public abstract bool IsSparse
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this is a differential disk.
-        /// </summary>
-        public abstract bool NeedsParent
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets the full path to this disk layer, or empty string.
-        /// </summary>
-        public virtual string FullPath
-        {
-            get { return string.Empty; }
-        }
-
-        /// <summary>
-        /// Gets the capacity of the disk (in bytes).
-        /// </summary>
-        internal abstract long Capacity
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets a <c>FileLocator</c> that can resolve relative paths, or <c>null</c>.
-        /// </summary>
-        /// <remarks>
-        /// Typically used to locate parent disks.
-        /// </remarks>
-        internal abstract FileLocator RelativeFileLocator
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets the content of this layer.
-        /// </summary>
-        /// <param name="parent">The parent stream (if any).</param>
-        /// <param name="ownsParent">Controls ownership of the parent stream.</param>
-        /// <returns>The content as a stream.</returns>
-        public abstract SparseStream OpenContent(SparseStream parent, Ownership ownsParent);
-
-        /// <summary>
-        /// Gets the possible locations of the parent file (if any).
-        /// </summary>
-        /// <returns>Array of strings, empty if no parent.</returns>
-        public abstract string[] GetParentLocations();
-
-        /// <summary>
-        /// Disposes of this instance, freeing underlying resources.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Disposes of underlying resources.
-        /// </summary>
-        /// <param name="disposing"><c>true</c> if running inside Dispose(), indicating
-        /// graceful cleanup of all managed objects should be performed, or <c>false</c>
-        /// if running inside destructor.</param>
-        protected virtual void Dispose(bool disposing)
-        {
-        }
-    }
-}
diff --git a/DiscUtils/VirtualDiskParameters.cs b/DiscUtils/VirtualDiskParameters.cs
deleted file mode 100644
index 8385f29..0000000
--- a/DiscUtils/VirtualDiskParameters.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// Common parameters for virtual disks.
-    /// </summary>
-    /// <remarks>Not all attributes make sense for all kinds of disks, so some
-    /// may be null.  Modifying instances of this class does not modify the
-    /// disk itself.</remarks>
-    public sealed class VirtualDiskParameters
-    {
-        private Dictionary<string, string> _extendedParameters = new Dictionary<string, string>();
-
-        /// <summary>
-        /// Gets or sets the type of disk (optical, hard disk, etc).
-        /// </summary>
-        public VirtualDiskClass DiskType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the disk capacity.
-        /// </summary>
-        public long Capacity { get; set; }
-
-        /// <summary>
-        /// Gets or sets the physical (aka IDE) geometry of the disk.
-        /// </summary>
-        public Geometry Geometry { get; set; }
-
-        /// <summary>
-        /// Gets or sets the logical (aka BIOS) geometry of the disk.
-        /// </summary>
-        public Geometry BiosGeometry { get; set; }
-
-        /// <summary>
-        /// Gets or sets the type of disk adapter.
-        /// </summary>
-        public GenericDiskAdapterType AdapterType { get; set; }
-
-        /// <summary>
-        /// Gets a dictionary of extended parameters, that varies by disk type.
-        /// </summary>
-        public Dictionary<string, string> ExtendedParameters
-        {
-            get { return _extendedParameters; }
-        }
-    }
-}
diff --git a/DiscUtils/VirtualDiskTransport.cs b/DiscUtils/VirtualDiskTransport.cs
deleted file mode 100644
index 90e33e9..0000000
--- a/DiscUtils/VirtualDiskTransport.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.IO;
-
-    internal abstract class VirtualDiskTransport : IDisposable
-    {
-        public abstract bool IsRawDisk { get; }
-
-        public abstract void Connect(Uri uri, string username, string password);
-
-        public abstract VirtualDisk OpenDisk(FileAccess access);
-
-        public abstract FileLocator GetFileLocator();
-
-        public abstract string GetFileName();
-
-        public abstract string GetExtraInfo();
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-        }
-    }
-}
diff --git a/DiscUtils/VirtualDiskTransportAttribute.cs b/DiscUtils/VirtualDiskTransportAttribute.cs
deleted file mode 100644
index e86e2f5..0000000
--- a/DiscUtils/VirtualDiskTransportAttribute.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
-    internal sealed class VirtualDiskTransportAttribute : Attribute
-    {
-        private string _scheme;
-
-        public VirtualDiskTransportAttribute(string scheme)
-        {
-            _scheme = scheme;
-        }
-
-        public string Scheme
-        {
-            get { return _scheme; }
-        }
-    }
-}
diff --git a/DiscUtils/VirtualDiskTypeInfo.cs b/DiscUtils/VirtualDiskTypeInfo.cs
deleted file mode 100644
index 62d6248..0000000
--- a/DiscUtils/VirtualDiskTypeInfo.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    /// <summary>
-    /// Delegate for calculating a disk geometry from a capacity.
-    /// </summary>
-    /// <param name="capacity">The disk capacity to convert.</param>
-    /// <returns>The appropriate geometry for the disk.</returns>
-    public delegate Geometry GeometryCalculation(long capacity);
-
-    /// <summary>
-    /// Information about a type of virtual disk.
-    /// </summary>
-    public sealed class VirtualDiskTypeInfo
-    {
-        /// <summary>
-        /// Gets or sets the name of the virtual disk type.
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the variant of the virtual disk type.
-        /// </summary>
-        public string Variant { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this disk type can represent hard disks.
-        /// </summary>
-        public bool CanBeHardDisk { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this disk type requires a specific geometry for any given disk capacity.
-        /// </summary>
-        public bool DeterministicGeometry { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this disk type persists the BIOS geometry.
-        /// </summary>
-        public bool PreservesBiosGeometry { get; set; }
-
-        /// <summary>
-        /// Gets or sets the algorithm for determining the geometry for a given disk capacity.
-        /// </summary>
-        public GeometryCalculation CalcGeometry { get; set; }
-    }
-}
diff --git a/DiscUtils/VolumeInfo.cs b/DiscUtils/VolumeInfo.cs
deleted file mode 100644
index 68cb714..0000000
--- a/DiscUtils/VolumeInfo.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-
-    /// <summary>
-    /// Base class that holds information about a disk volume.
-    /// </summary>
-    public abstract class VolumeInfo : MarshalByRefObject
-    {
-        internal VolumeInfo()
-        {
-        }
-
-        /// <summary>
-        /// Gets the one-byte BIOS type for this volume, which indicates the content.
-        /// </summary>
-        public abstract byte BiosType { get; }
-
-        /// <summary>
-        /// Gets the size of the volume, in bytes.
-        /// </summary>
-        public abstract long Length { get; }
-
-        /// <summary>
-        /// Gets the stable volume identity.
-        /// </summary>
-        /// <remarks>The stability of the identity depends the disk structure.
-        /// In some cases the identity may include a simple index, when no other information
-        /// is available.  Best practice is to add disks to the Volume Manager in a stable 
-        /// order, if the stability of this identity is paramount.</remarks>
-        public abstract string Identity { get; }
-
-        /// <summary>
-        /// Gets the disk geometry of the underlying storage medium, if any (may be null).
-        /// </summary>
-        public abstract Geometry PhysicalGeometry { get; }
-
-        /// <summary>
-        /// Gets the disk geometry of the underlying storage medium (as used in BIOS calls), may be null.
-        /// </summary>
-        public abstract Geometry BiosGeometry { get; }
-
-        /// <summary>
-        /// Gets the offset of this volume in the underlying storage medium, if any (may be Zero).
-        /// </summary>
-        public abstract long PhysicalStartSector { get; }
-
-        /// <summary>
-        /// Opens the volume, providing access to it's contents.
-        /// </summary>
-        /// <returns>Stream that can access the volume's contents.</returns>
-        public abstract SparseStream Open();
-    }
-}
diff --git a/DiscUtils/VolumeManager.cs b/DiscUtils/VolumeManager.cs
deleted file mode 100644
index 8904bd2..0000000
--- a/DiscUtils/VolumeManager.cs
+++ /dev/null
@@ -1,321 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using DiscUtils.Partitions;
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-
-    /// <summary>
-    /// VolumeManager interprets partitions and other on-disk structures (possibly combining multiple disks).
-    /// </summary>
-    /// <remarks>
-    /// <para>Although file systems commonly are placed directly within partitions on a disk, in some
-    /// cases a logical volume manager / logical disk manager may be used, to combine disk regions in multiple
-    /// ways for data redundancy or other purposes.</para>
-    /// </remarks>
-    public sealed class VolumeManager : MarshalByRefObject
-    {
-        private static List<LogicalVolumeFactory> s_logicalVolumeFactories;
-        private List<VirtualDisk> _disks;
-        private bool _needScan;
-
-        private Dictionary<string, PhysicalVolumeInfo> _physicalVolumes;
-        private Dictionary<string, LogicalVolumeInfo> _logicalVolumes;
-
-        /// <summary>
-        /// Initializes a new instance of the VolumeManager class.
-        /// </summary>
-        public VolumeManager()
-        {
-            _disks = new List<VirtualDisk>();
-            _physicalVolumes = new Dictionary<string, PhysicalVolumeInfo>();
-            _logicalVolumes = new Dictionary<string, LogicalVolumeInfo>();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the VolumeManager class.
-        /// </summary>
-        /// <param name="initialDisk">The initial disk to add.</param>
-        public VolumeManager(VirtualDisk initialDisk)
-            : this()
-        {
-            AddDisk(initialDisk);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the VolumeManager class.
-        /// </summary>
-        /// <param name="initialDiskContent">Content of the initial disk to add.</param>
-        public VolumeManager(Stream initialDiskContent)
-            : this()
-        {
-            AddDisk(initialDiskContent);
-        }
-
-        private static List<LogicalVolumeFactory> LogicalVolumeFactories
-        {
-            get
-            {
-                if (s_logicalVolumeFactories == null)
-                {
-                    List<LogicalVolumeFactory> factories = new List<LogicalVolumeFactory>();
-
-                    foreach (var type in typeof(VolumeManager).Assembly.GetTypes())
-                    {
-                        foreach (LogicalVolumeFactoryAttribute attr in Attribute.GetCustomAttributes(type, typeof(LogicalVolumeFactoryAttribute), false))
-                        {
-                            factories.Add((LogicalVolumeFactory)Activator.CreateInstance(type));
-                        }
-                    }
-
-                    s_logicalVolumeFactories = factories;
-                }
-
-                return s_logicalVolumeFactories;
-            }
-        }
-
-        /// <summary>
-        /// Gets the physical volumes held on a disk.
-        /// </summary>
-        /// <param name="diskContent">The contents of the disk to inspect.</param>
-        /// <returns>An array of volumes.</returns>
-        /// <remarks>
-        /// <para>By preference, use the form of this method that takes a disk parameter.</para>
-        /// <para>If the disk isn't partitioned, this method returns the entire disk contents
-        /// as a single volume.</para>
-        /// </remarks>
-        public static PhysicalVolumeInfo[] GetPhysicalVolumes(Stream diskContent)
-        {
-            return GetPhysicalVolumes(new Raw.Disk(diskContent, Ownership.None));
-        }
-
-        /// <summary>
-        /// Gets the physical volumes held on a disk.
-        /// </summary>
-        /// <param name="disk">The disk to inspect.</param>
-        /// <returns>An array of volumes.</returns>
-        /// <remarks>If the disk isn't partitioned, this method returns the entire disk contents
-        /// as a single volume.</remarks>
-        public static PhysicalVolumeInfo[] GetPhysicalVolumes(VirtualDisk disk)
-        {
-            return new VolumeManager(disk).GetPhysicalVolumes();
-        }
-
-        /// <summary>
-        /// Adds a disk to the volume manager.
-        /// </summary>
-        /// <param name="disk">The disk to add.</param>
-        /// <returns>The GUID the volume manager will use to identify the disk.</returns>
-        public string AddDisk(VirtualDisk disk)
-        {
-            _needScan = true;
-            int ordinal = _disks.Count;
-            _disks.Add(disk);
-            return GetDiskId(ordinal);
-        }
-
-        /// <summary>
-        /// Adds a disk to the volume manager.
-        /// </summary>
-        /// <param name="content">The contents of the disk to add.</param>
-        /// <returns>The GUID the volume manager will use to identify the disk.</returns>
-        public string AddDisk(Stream content)
-        {
-            return AddDisk(new Raw.Disk(content, Ownership.None));
-        }
-
-        /// <summary>
-        /// Gets the physical volumes from all disks added to this volume manager.
-        /// </summary>
-        /// <returns>An array of physical volumes.</returns>
-        public PhysicalVolumeInfo[] GetPhysicalVolumes()
-        {
-            if (_needScan)
-            {
-                Scan();
-            }
-
-            return new List<PhysicalVolumeInfo>(_physicalVolumes.Values).ToArray();
-        }
-
-        /// <summary>
-        /// Gets the logical volumes from all disks added to this volume manager.
-        /// </summary>
-        /// <returns>An array of logical volumes.</returns>
-        public LogicalVolumeInfo[] GetLogicalVolumes()
-        {
-            if (_needScan)
-            {
-                Scan();
-            }
-
-            return new List<LogicalVolumeInfo>(_logicalVolumes.Values).ToArray();
-        }
-
-        /// <summary>
-        /// Gets a particular volume, based on it's identity.
-        /// </summary>
-        /// <param name="identity">The volume's identity.</param>
-        /// <returns>The volume information for the volume, or returns <c>null</c>.</returns>
-        public VolumeInfo GetVolume(string identity)
-        {
-            if (_needScan)
-            {
-                Scan();
-            }
-
-            PhysicalVolumeInfo pvi;
-            if (_physicalVolumes.TryGetValue(identity, out pvi))
-            {
-                return pvi;
-            }
-
-            LogicalVolumeInfo lvi;
-            if (_logicalVolumes.TryGetValue(identity, out lvi))
-            {
-                return lvi;
-            }
-
-            return null;
-        }
-
-        private static void MapPhysicalVolumes(IEnumerable<PhysicalVolumeInfo> physicalVols, Dictionary<string, LogicalVolumeInfo> result)
-        {
-            foreach (var physicalVol in physicalVols)
-            {
-                LogicalVolumeInfo lvi = new LogicalVolumeInfo(
-                    physicalVol.PartitionIdentity,
-                    physicalVol,
-                    physicalVol.Open,
-                    physicalVol.Length,
-                    physicalVol.BiosType,
-                    LogicalVolumeStatus.Healthy);
-
-                result.Add(lvi.Identity, lvi);
-            }
-        }
-
-        /// <summary>
-        /// Scans all of the disks for their physical and logical volumes.
-        /// </summary>
-        private void Scan()
-        {
-            Dictionary<string, PhysicalVolumeInfo> newPhysicalVolumes = ScanForPhysicalVolumes();
-            Dictionary<string, LogicalVolumeInfo> newLogicalVolumes = ScanForLogicalVolumes(newPhysicalVolumes.Values);
-
-            _physicalVolumes = newPhysicalVolumes;
-            _logicalVolumes = newLogicalVolumes;
-
-            _needScan = false;
-        }
-
-        private Dictionary<string, LogicalVolumeInfo> ScanForLogicalVolumes(IEnumerable<PhysicalVolumeInfo> physicalVols)
-        {
-            List<PhysicalVolumeInfo> unhandledPhysical = new List<PhysicalVolumeInfo>();
-            Dictionary<string, LogicalVolumeInfo> result = new Dictionary<string, LogicalVolumeInfo>();
-
-            foreach (PhysicalVolumeInfo pvi in physicalVols)
-            {
-                bool handled = false;
-                foreach (var volFactory in LogicalVolumeFactories)
-                {
-                    if (volFactory.HandlesPhysicalVolume(pvi))
-                    {
-                        handled = true;
-                        break;
-                    }
-                }
-
-                if (!handled)
-                {
-                    unhandledPhysical.Add(pvi);
-                }
-            }
-
-            MapPhysicalVolumes(unhandledPhysical, result);
-
-            foreach (var volFactory in LogicalVolumeFactories)
-            {
-                volFactory.MapDisks(_disks, result);
-            }
-
-            return result;
-        }
-
-        private Dictionary<string, PhysicalVolumeInfo> ScanForPhysicalVolumes()
-        {
-            Dictionary<string, PhysicalVolumeInfo> result = new Dictionary<string, PhysicalVolumeInfo>();
-
-            // First scan physical volumes
-            for (int i = 0; i < _disks.Count; ++i)
-            {
-                VirtualDisk disk = _disks[i];
-                string diskId = GetDiskId(i);
-
-                if (PartitionTable.IsPartitioned(disk.Content))
-                {
-                    foreach (var table in PartitionTable.GetPartitionTables(disk))
-                    {
-                        foreach (var part in table.Partitions)
-                        {
-                            PhysicalVolumeInfo pvi = new PhysicalVolumeInfo(diskId, disk, part);
-                            result.Add(pvi.Identity, pvi);
-                        }
-                    }
-                }
-                else
-                {
-                    PhysicalVolumeInfo pvi = new PhysicalVolumeInfo(diskId, disk);
-                    result.Add(pvi.Identity, pvi);
-                }
-            }
-
-            return result;
-        }
-
-        private string GetDiskId(int ordinal)
-        {
-            VirtualDisk disk = _disks[ordinal];
-            if (disk.IsPartitioned)
-            {
-                Guid guid = disk.Partitions.DiskGuid;
-                if (guid != Guid.Empty)
-                {
-                    return "DG" + guid.ToString("B");
-                }
-            }
-
-            int sig = disk.Signature;
-            if (sig != 0)
-            {
-                return "DS" + sig.ToString("X8", CultureInfo.InvariantCulture);
-            }
-
-            return "DO" + ordinal;
-        }
-    }
-}
diff --git a/DiscUtils/WindowsFileInformation.cs b/DiscUtils/WindowsFileInformation.cs
deleted file mode 100644
index 5219d70..0000000
--- a/DiscUtils/WindowsFileInformation.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Common information for Windows files.
-    /// </summary>
-    public class WindowsFileInformation
-    {
-        /// <summary>
-        /// Gets or sets the creation time of the file.
-        /// </summary>
-        public DateTime CreationTime { get; set; }
-
-        /// <summary>
-        /// Gets or sets the last access time of the file.
-        /// </summary>
-        public DateTime LastAccessTime { get; set; }
-
-        /// <summary>
-        /// Gets or sets the modification time of the file.
-        /// </summary>
-        public DateTime LastWriteTime { get; set; }
-
-        /// <summary>
-        /// Gets or sets the last time the file was changed.
-        /// </summary>
-        public DateTime ChangeTime { get; set; }
-
-        /// <summary>
-        /// Gets or sets the file attributes.
-        /// </summary>
-        public FileAttributes FileAttributes { get; set; }
-    }
-}
diff --git a/DiscUtils/WrappingMappedStream.cs b/DiscUtils/WrappingMappedStream.cs
deleted file mode 100644
index bb5b9bd..0000000
--- a/DiscUtils/WrappingMappedStream.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-//
-// Copyright (c) 2008-2012, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System.Collections.Generic;
-    using System.IO;
-
-    /// <summary>
-    /// Base class for streams that wrap another stream.
-    /// </summary>
-    /// <typeparam name="T">The type of stream to wrap.</typeparam>
-    /// <remarks>
-    /// Provides the default implementation of methods &amp; properties, so
-    /// wrapping streams need only override the methods they need to intercept.
-    /// </remarks>
-    internal class WrappingMappedStream<T> : MappedStream
-        where T : Stream
-    {
-        private T _wrapped;
-        private Ownership _ownership;
-        private List<StreamExtent> _extents;
-
-        public WrappingMappedStream(T toWrap, Ownership ownership, IEnumerable<StreamExtent> extents)
-        {
-            _wrapped = toWrap;
-            _ownership = ownership;
-            if (extents != null)
-            {
-                _extents = new List<StreamExtent>(extents);
-            }
-        }
-
-        public override IEnumerable<StreamExtent> Extents
-        {
-            get
-            {
-                if (_extents != null)
-                {
-                    return _extents;
-                }
-                else
-                {
-                    SparseStream sparse = _wrapped as SparseStream;
-                    if (sparse != null)
-                    {
-                        return sparse.Extents;
-                    }
-                    else
-                    {
-                        return new StreamExtent[] { new StreamExtent(0, _wrapped.Length) };
-                    }
-                }
-            }
-        }
-
-        public override bool CanRead
-        {
-            get { return _wrapped.CanRead; }
-        }
-
-        public override bool CanSeek
-        {
-            get { return _wrapped.CanSeek; }
-        }
-
-        public override bool CanWrite
-        {
-            get { return _wrapped.CanWrite; }
-        }
-
-        public override long Length
-        {
-            get { return _wrapped.Length; }
-        }
-
-        public override long Position
-        {
-            get { return _wrapped.Position; }
-            set { _wrapped.Position = value; }
-        }
-
-        protected T WrappedStream
-        {
-            get { return _wrapped; }
-        }
-
-        public override IEnumerable<StreamExtent> MapContent(long start, long length)
-        {
-            MappedStream mapped = _wrapped as MappedStream;
-            if (mapped != null)
-            {
-                return mapped.MapContent(start, length);
-            }
-            else
-            {
-                return new StreamExtent[] { new StreamExtent(start, length) };
-            }
-        }
-
-        public override void Flush()
-        {
-            _wrapped.Flush();
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            return _wrapped.Read(buffer, offset, count);
-        }
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            return _wrapped.Seek(offset, origin);
-        }
-
-        public override void SetLength(long value)
-        {
-            _wrapped.SetLength(value);
-        }
-
-        public override void Clear(int count)
-        {
-            SparseStream sparse = _wrapped as SparseStream;
-            if (sparse != null)
-            {
-                sparse.Clear(count);
-            }
-            else
-            {
-                base.Clear(count);
-            }
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            _wrapped.Write(buffer, offset, count);
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            try
-            {
-                if (disposing)
-                {
-                    if (_wrapped != null && _ownership == Ownership.Dispose)
-                    {
-                        _wrapped.Dispose();
-                    }
-
-                    _wrapped = null;
-                }
-            }
-            finally
-            {
-                base.Dispose(disposing);
-            }
-        }
-    }
-}
diff --git a/DiscUtils/ZeroStream.cs b/DiscUtils/ZeroStream.cs
deleted file mode 100644
index cd6250f..0000000
--- a/DiscUtils/ZeroStream.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-//
-// Copyright (c) 2008-2011, Kenneth Bell
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-namespace DiscUtils
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    /// <summary>
-    /// A stream that returns Zero's.
-    /// </summary>
-    internal class ZeroStream : MappedStream
-    {
-        private long _length;
-        private long _position;
-        private bool _atEof;
-
-        public ZeroStream(long length)
-        {
-            _length = length;
-        }
-
-        public override bool CanRead
-        {
-            get { return true; }
-        }
-
-        public override bool CanSeek
-        {
-            get { return true; }
-        }
-
-        public override bool CanWrite
-        {
-            get { return false; }
-        }
-
-        public override long Length
-        {
-            get { return _length; }
-        }
-
-        public override long Position
-        {
-            get
-            {
-                return _position;
-            }
-
-            set
-            {
-                _position = value;
-                _atEof = false;
-            }
-        }
-
-        public override IEnumerable<StreamExtent> Extents
-        {
-            // The stream is entirely sparse
-            get { return new List<StreamExtent>(0); }
-        }
-
-        public override IEnumerable<StreamExtent> MapContent(long start, long length)
-        {
-            return new StreamExtent[0];
-        }
-
-        public override void Flush()
-        {
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            if (_position > _length)
-            {
-                _atEof = true;
-                throw new IOException("Attempt to read beyond end of stream");
-            }
-
-            if (_position == _length)
-            {
-                if (_atEof)
-                {
-                    throw new IOException("Attempt to read beyond end of stream");
-                }
-                else
-                {
-                    _atEof = true;
-                    return 0;
-                }
-            }
-
-            int numToClear = (int)Math.Min(count, _length - _position);
-            Array.Clear(buffer, offset, numToClear);
-            _position += numToClear;
-
-            return numToClear;
-        }
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            long effectiveOffset = offset;
-            if (origin == SeekOrigin.Current)
-            {
-                effectiveOffset += _position;
-            }
-            else if (origin == SeekOrigin.End)
-            {
-                effectiveOffset += _length;
-            }
-
-            _atEof = false;
-
-            if (effectiveOffset < 0)
-            {
-                throw new IOException("Attempt to move before beginning of stream");
-            }
-            else
-            {
-                _position = effectiveOffset;
-                return _position;
-            }
-        }
-
-        public override void SetLength(long value)
-        {
-            throw new NotSupportedException();
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            throw new NotSupportedException();
-        }
-    }
-}
diff --git a/FilePickerControl.xaml.cs b/FilePickerControl.xaml.cs
index bc48aed..0156d93 100644
--- a/FilePickerControl.xaml.cs
+++ b/FilePickerControl.xaml.cs
@@ -48,17 +48,19 @@ namespace WPinternals
     /// </summary>
     public partial class FilePickerBase : System.Windows.Controls.UserControl, INotifyPropertyChanged
     {
-        private SynchronizationContext UIContext;
+        private readonly SynchronizationContext UIContext;
 
         public event PropertyChangedEventHandler PropertyChanged = delegate { };
-        public event PathChangedEventHandler PathChanged = delegate { };
+        public event EventHandler<PathChangedEventArgs> PathChanged = delegate { };
 
         protected void OnPropertyChanged(string propertyName)
         {
             if (this.PropertyChanged != null)
             {
                 if (SynchronizationContext.Current == UIContext)
+                {
                     PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+                }
                 else
                 {
                     UIContext.Post((s) => PropertyChanged(this, new PropertyChangedEventArgs(propertyName)), null);
@@ -160,7 +162,7 @@ namespace WPinternals
                 100 / 96
             );
 #else
-            FormattedText formatted = new FormattedText(
+            FormattedText formatted = new(
                 "TEST",
                 CultureInfo.CurrentCulture,
                 FlowDirection.LeftToRight,
@@ -179,7 +181,9 @@ namespace WPinternals
         private void Resize()
         {
             if (!IsLoaded)
+            {
                 return;
+            }
 
             CaptionTextBlock.Text = Caption;
 #if NETCORE
@@ -193,7 +197,7 @@ namespace WPinternals
                 100 / 96
                 );
 #else
-            FormattedText formatted = new FormattedText(
+            FormattedText formatted = new(
                 CaptionTextBlock.Text,
                 CultureInfo.CurrentCulture,
                 FlowDirection.LeftToRight,
@@ -205,19 +209,29 @@ namespace WPinternals
 #endif
             double CaptionWidth = formatted.Width;
             if (CaptionWidth > 0)
+            {
                 CaptionWidth += 10;
+            }
 
             bool SelectVisible = (Path == null);
             bool ChangeVisible = (Path != null);
-            bool ClearVisible = ((Path != null) && (AllowNull));
+            bool ClearVisible = ((Path != null) && AllowNull);
 
             double NewWidth = ActualWidth - CaptionWidth;
             if (SelectVisible)
+            {
                 NewWidth -= SelectLink.ActualWidth;
+            }
+
             if (ChangeVisible)
+            {
                 NewWidth -= (ChangeLink.ActualWidth + 10);
+            }
+
             if (ClearVisible)
+            {
                 NewWidth -= (ClearLink.ActualWidth + 10);
+            }
 
             SetText(NewWidth);
 
@@ -245,11 +259,13 @@ namespace WPinternals
                         );
 #endif
             if (NewWidth < 0)
+            {
                 PathTextBlock.Width = 0;
-            else if (formatted.Width > NewWidth)
-                PathTextBlock.Width = NewWidth;
+            }
             else
-                PathTextBlock.Width = formatted.Width;
+            {
+                PathTextBlock.Width = formatted.Width > NewWidth ? NewWidth : formatted.Width;
+            }
 
             PathTextBlock.Margin = new Thickness(CaptionWidth, 0, 0, 0);
             double Pos = PathTextBlock.Width + CaptionWidth;
@@ -261,7 +277,9 @@ namespace WPinternals
                 Pos += SelectLink.ActualWidth;
             }
             else
+            {
                 SelectLink.Visibility = Visibility.Collapsed;
+            }
 
             if (ChangeVisible)
             {
@@ -270,7 +288,9 @@ namespace WPinternals
                 Pos += ChangeLink.ActualWidth + 10;
             }
             else
+            {
                 ChangeLink.Visibility = Visibility.Collapsed;
+            }
 
             if (ClearVisible)
             {
@@ -279,7 +299,9 @@ namespace WPinternals
                 Pos += ClearLink.ActualWidth + 10;
             }
             else
+            {
                 ClearLink.Visibility = Visibility.Collapsed;
+            }
         }
 
         private void SetText(double MaxWidth)
@@ -336,7 +358,9 @@ namespace WPinternals
                         changedWidth = true;
 
                         if (directory.Length > 0)
-                            directory = directory.Substring(0, directory.Length - 1);
+                        {
+                            directory = directory[0..^1];
+                        }
 
                         if (directory.Length == 0)
                         {
@@ -387,22 +411,21 @@ namespace WPinternals
         public FilePicker()
             : base()
         {
-            if (SelectionText == "")
+            if (SelectionText?.Length == 0)
+            {
                 SelectionText = "Select file...";
+            }
         }
 
         protected override void Select()
         {
-            Nullable<bool> result;
+            bool? result;
 
             if (SaveDialog)
             {
-                Microsoft.Win32.SaveFileDialog savedlg = new Microsoft.Win32.SaveFileDialog();
+                Microsoft.Win32.SaveFileDialog savedlg = new();
 
-                if (Path != null)
-                    savedlg.FileName = Path;
-                else
-                    savedlg.FileName = DefaultFileName;
+                savedlg.FileName = Path ?? DefaultFileName;
 
                 // Show open file dialog box
                 result = savedlg.ShowDialog();
@@ -417,12 +440,9 @@ namespace WPinternals
             else
             {
                 // Select file
-                Microsoft.Win32.OpenFileDialog dlg = new Microsoft.Win32.OpenFileDialog();
+                Microsoft.Win32.OpenFileDialog dlg = new();
 
-                if (Path != null)
-                    dlg.FileName = Path;
-                else
-                    dlg.FileName = DefaultFileName;
+                dlg.FileName = Path ?? DefaultFileName;
 
                 // Show open file dialog box
                 result = dlg.ShowDialog();
@@ -472,24 +492,30 @@ namespace WPinternals
         public FolderPicker()
             : base()
         {
-            if (SelectionText == "")
+            if (SelectionText?.Length == 0)
+            {
                 SelectionText = "Select folder...";
+            }
         }
 
         protected override void Select()
         {
             // Select folder
 
-            FolderSelectDialog dlg = new FolderSelectDialog();
+            FolderSelectDialog dlg = new();
             if (Path != null)
+            {
                 dlg.InitialDirectory = Path;
+            }
 
             if (dlg.ShowDialog())
+            {
                 Path = dlg.FileName;
+            }
         }
     }
 
-    static class Extensions
+    internal static class Extensions
     {
         public static string FormatWith(this string s, params object[] args)
         {
diff --git a/FolderSelectDialog.cs b/FolderSelectDialog.cs
index ab4fa87..0d0369e 100644
--- a/FolderSelectDialog.cs
+++ b/FolderSelectDialog.cs
@@ -14,20 +14,21 @@ namespace WPinternals
     public class FolderSelectDialog
     {
         // Wrapped dialog
-        System.Windows.Forms.OpenFileDialog ofd = null;
+        private readonly OpenFileDialog ofd = null;
 
         /// <summary>
         /// Default constructor
         /// </summary>
         public FolderSelectDialog()
         {
-            ofd = new System.Windows.Forms.OpenFileDialog();
-
-            ofd.Filter = "Folders|\n";
-            ofd.AddExtension = false;
-            ofd.CheckFileExists = false;
-            ofd.DereferenceLinks = true;
-            ofd.Multiselect = false;
+            ofd = new OpenFileDialog
+            {
+                Filter = "Folders|\n",
+                AddExtension = false,
+                CheckFileExists = false,
+                DereferenceLinks = true,
+                Multiselect = false
+            };
         }
 
         #region Properties
@@ -38,7 +39,7 @@ namespace WPinternals
         public string InitialDirectory
         {
             get { return ofd.InitialDirectory; }
-            set { ofd.InitialDirectory = value == null || value.Length == 0 ? Environment.CurrentDirectory : value; }
+            set { ofd.InitialDirectory = string.IsNullOrEmpty(value) ? Environment.CurrentDirectory : value; }
         }
 
         /// <summary>
@@ -47,7 +48,7 @@ namespace WPinternals
         public string Title
         {
             get { return ofd.Title; }
-            set { ofd.Title = value == null ? "Select a folder" : value; }
+            set { ofd.Title = value ?? "Select a folder"; }
         }
 
         /// <summary>
@@ -78,11 +79,17 @@ namespace WPinternals
         /// <returns>True if the user presses OK else false</returns>
         public bool ShowDialog(IntPtr hWndOwner)
         {
-            var fbd = new FolderBrowserDialog();
-            fbd.Description = this.Title;
-            fbd.SelectedPath = this.InitialDirectory;
-            fbd.ShowNewFolderButton = false;
-            if (fbd.ShowDialog(new WindowWrapper(hWndOwner)) != DialogResult.OK) return false;
+            var fbd = new FolderBrowserDialog
+            {
+                Description = this.Title,
+                SelectedPath = this.InitialDirectory,
+                ShowNewFolderButton = false
+            };
+            if (fbd.ShowDialog(new WindowWrapper(hWndOwner)) != DialogResult.OK)
+            {
+                return false;
+            }
+
             ofd.FileName = fbd.SelectedPath;
 
             return true;
@@ -94,7 +101,7 @@ namespace WPinternals
     /// <summary>
     /// Creates IWin32Window around an IntPtr
     /// </summary>
-    public class WindowWrapper : System.Windows.Forms.IWin32Window
+    public class WindowWrapper : IWin32Window
     {
         /// <summary>
         /// Constructor
@@ -102,17 +109,12 @@ namespace WPinternals
         /// <param name="handle">Handle to wrap</param>
         public WindowWrapper(IntPtr handle)
         {
-            _hwnd = handle;
+            Handle = handle;
         }
 
         /// <summary>
         /// Original ptr
         /// </summary>
-        public IntPtr Handle
-        {
-            get { return _hwnd; }
-        }
-
-        private IntPtr _hwnd;
+        public IntPtr Handle { get; }
     }
 }
diff --git a/HelperClasses.cs b/HelperClasses.cs
index c082015..493aa77 100644
--- a/HelperClasses.cs
+++ b/HelperClasses.cs
@@ -93,32 +93,52 @@ namespace WPinternals
 
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            value = value == null
+            return value == null
                 ? OnNull ?? Default(targetType)
                 : (string.Equals(value.ToString(), false.ToString(), StringComparison.CurrentCultureIgnoreCase)
                     ? OnFalse
                     : OnTrue);
-            return value;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if (value == OnNull) return Default(targetType);
-            if (value == OnFalse) return false;
-            if (value == OnTrue) return true;
-            if (value == null) return null;
+            if (value == OnNull)
+            {
+                return Default(targetType);
+            }
+
+            if (value == OnFalse)
+            {
+                return false;
+            }
+
+            if (value == OnTrue)
+            {
+                return true;
+            }
+
+            if (value == null)
+            {
+                return null;
+            }
 
             if (OnNull != null &&
                 string.Equals(value.ToString(), OnNull.ToString(), StringComparison.CurrentCultureIgnoreCase))
+            {
                 return Default(targetType);
+            }
 
             if (OnFalse != null &&
                 string.Equals(value.ToString(), OnFalse.ToString(), StringComparison.CurrentCultureIgnoreCase))
+            {
                 return false;
+            }
 
             if (OnTrue != null &&
                 string.Equals(value.ToString(), OnTrue.ToString(), StringComparison.CurrentCultureIgnoreCase))
+            {
                 return true;
+            }
 
             return null;
         }
@@ -143,20 +163,24 @@ namespace WPinternals
 
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if (value is byte[])
+            if (value is byte[] bytes)
             {
-                byte[] bytes = (byte[])value;
-                StringBuilder s = new StringBuilder(1000);
+                StringBuilder s = new(1000);
                 for (int i = bytes.GetLowerBound(0); i <= bytes.GetUpperBound(0); i++)
                 {
                     if (i != bytes.GetLowerBound(0))
+                    {
                         s.Append(Separator);
+                    }
+
                     s.Append(bytes[i].ToString("X2"));
                 }
                 return s.ToString();
             }
             else
+            {
                 return "";
+            }
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
@@ -175,9 +199,13 @@ namespace WPinternals
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             if (value == null)
+            {
                 return "Collapsed";
+            }
             else
+            {
                 return "Visible";
+            }
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
@@ -196,9 +224,13 @@ namespace WPinternals
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             if (value == null)
+            {
                 return "Visible";
+            }
             else
+            {
                 return "Collapsed";
+            }
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
@@ -238,10 +270,7 @@ namespace WPinternals
           "IsVisible", typeof(Boolean), typeof(CollapsibleRun), new PropertyMetadata(true, IsVisibleChanged));
         public static void IsVisibleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            if ((bool)e.NewValue)
-                ((CollapsibleRun)d).Text = ((CollapsibleRun)d).CollapsibleText;
-            else
-                ((CollapsibleRun)d).Text = String.Empty;
+            ((CollapsibleRun)d).Text = (bool)e.NewValue ? ((CollapsibleRun)d).CollapsibleText : String.Empty;
         }
     }
 
@@ -257,12 +286,14 @@ namespace WPinternals
             base.OnInitialized(e);
 
             foreach (Block Block in Blocks)
+            {
                 CollapsibleBlocks.Add(Block);
+            }
 
             Blocks.Clear();
         }
 
-        public List<Block> CollapsibleBlocks { get; private set; }
+        public List<Block> CollapsibleBlocks { get; }
 
         public Boolean IsCollapsed
         {
@@ -281,7 +312,9 @@ namespace WPinternals
                     if (!value)
                     {
                         foreach (Block Block in CollapsibleBlocks)
+                        {
                             Blocks.Add(Block);
+                        }
                     }
                 }
             }
@@ -301,12 +334,12 @@ namespace WPinternals
             int inlinesCount = this.Inlines.Count;
             for (int i = 0; i < inlinesCount; i++)
             {
-                System.Windows.Documents.Inline inline = this.Inlines.ElementAt(i);
-                if (inline is System.Windows.Documents.Run)
+                Inline inline = this.Inlines.ElementAt(i);
+                if (inline is Run)
                 {
-                    if ((inline as System.Windows.Documents.Run).Text == Convert.ToChar(32).ToString()) //ACSII 32 is the white space
+                    if ((inline as Run)?.Text == Convert.ToChar(32).ToString()) //ACSII 32 is the white space
                     {
-                        (inline as System.Windows.Documents.Run).Text = string.Empty;
+                        (inline as Run).Text = string.Empty;
                     }
                 }
             }
@@ -332,19 +365,27 @@ namespace WPinternals
         {
             byte[] Bytes;
             if (Value is short)
+            {
                 Bytes = BitConverter.GetBytes((short)Value);
+            }
             else if (Value is ushort)
+            {
                 Bytes = BitConverter.GetBytes((ushort)Value);
+            }
             else if (Value is int)
+            {
                 Bytes = BitConverter.GetBytes((int)Value);
-            else if (Value is uint)
-                Bytes = BitConverter.GetBytes((uint)Value);
+            }
             else
-                throw new NotSupportedException();
+            {
+                Bytes = Value is uint ? BitConverter.GetBytes((uint)Value) : throw new NotSupportedException();
+            }
 
             byte[] Result = new byte[Bytes.Length];
             for (int i = 0; i < Bytes.Length; i++)
+            {
                 Result[i] = Bytes[Bytes.Length - 1 - i];
+            }
 
             return Result;
         }
@@ -354,7 +395,9 @@ namespace WPinternals
             byte[] Result;
             byte[] BigEndianBytes = GetBytes(Value);
             if (BigEndianBytes.Length == Width)
+            {
                 return BigEndianBytes;
+            }
             else if (BigEndianBytes.Length > Width)
             {
                 Result = new byte[Width];
@@ -373,7 +416,10 @@ namespace WPinternals
         {
             byte[] Bytes = new byte[2];
             for (int i = 0; i < 2; i++)
+            {
                 Bytes[i] = Buffer[Offset + 1 - i];
+            }
+
             return BitConverter.ToUInt16(Bytes, 0);
         }
 
@@ -381,7 +427,10 @@ namespace WPinternals
         {
             byte[] Bytes = new byte[2];
             for (int i = 0; i < 2; i++)
+            {
                 Bytes[i] = Buffer[Offset + 1 - i];
+            }
+
             return BitConverter.ToInt16(Bytes, 0);
         }
 
@@ -389,7 +438,10 @@ namespace WPinternals
         {
             byte[] Bytes = new byte[4];
             for (int i = 0; i < 4; i++)
+            {
                 Bytes[i] = Buffer[Offset + 3 - i];
+            }
+
             return BitConverter.ToUInt32(Bytes, 0);
         }
 
@@ -397,7 +449,10 @@ namespace WPinternals
         {
             byte[] Bytes = new byte[4];
             for (int i = 0; i < 4; i++)
+            {
                 Bytes[i] = Buffer[Offset + 3 - i];
+            }
+
             return BitConverter.ToInt32(Bytes, 0);
         }
     }
@@ -420,8 +475,10 @@ namespace WPinternals
         private void Initialize()
         {
             _gifDecoder = new GifBitmapDecoder(new Uri("pack://application:,,," + this.GifSource), BitmapCreateOptions.PreservePixelFormat, BitmapCacheOption.Default);
-            _animation = new Int32Animation(0, _gifDecoder.Frames.Count - 1, new Duration(new TimeSpan(0, 0, 0, _gifDecoder.Frames.Count / 10, (int)((_gifDecoder.Frames.Count / 10.0 - _gifDecoder.Frames.Count / 10) * 1000))));
-            _animation.RepeatBehavior = RepeatBehavior.Forever;
+            _animation = new Int32Animation(0, _gifDecoder.Frames.Count - 1, new Duration(new TimeSpan(0, 0, 0, _gifDecoder.Frames.Count / 10, (int)(((_gifDecoder.Frames.Count / 10.0) - (_gifDecoder.Frames.Count / 10)) * 1000))))
+            {
+                RepeatBehavior = RepeatBehavior.Forever
+            };
             this.Source = _gifDecoder.Frames[0];
 
             _isInitialized = true;
@@ -448,7 +505,7 @@ namespace WPinternals
         public static readonly DependencyProperty FrameIndexProperty =
             DependencyProperty.Register("FrameIndex", typeof(int), typeof(GifImage), new UIPropertyMetadata(0, new PropertyChangedCallback(ChangingFrameIndex)));
 
-        static void ChangingFrameIndex(DependencyObject obj, DependencyPropertyChangedEventArgs ev)
+        private static void ChangingFrameIndex(DependencyObject obj, DependencyPropertyChangedEventArgs ev)
         {
             var gifImage = obj as GifImage;
             gifImage.Source = gifImage._gifDecoder.Frames[(int)ev.NewValue];
@@ -466,7 +523,9 @@ namespace WPinternals
         private static void AutoStartPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
         {
             if ((bool)e.NewValue)
-                (sender as GifImage).StartAnimation();
+            {
+                (sender as GifImage)?.StartAnimation();
+            }
         }
 
         public string GifSource
@@ -480,13 +539,15 @@ namespace WPinternals
 
         private static void GifSourcePropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
         {
-            (sender as GifImage).Initialize();
+            (sender as GifImage)?.Initialize();
         }
 
         public void StartAnimation()
         {
             if (!_isInitialized)
+            {
                 this.Initialize();
+            }
 
             BeginAnimation(FrameIndexProperty, _animation);
         }
@@ -506,8 +567,8 @@ namespace WPinternals
 
     internal static class LogFile
     {
-        private static StreamWriter w = null;
-        private static object lockobject = new object();
+        private static readonly StreamWriter w = null;
+        private static readonly object lockobject = new();
 #if PREVIEW
         private static string LogAction = null;
         private static StringBuilder LogBuilder;
@@ -518,7 +579,10 @@ namespace WPinternals
             try
             {
                 if (!Directory.Exists(Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals")))
+                {
                     Directory.CreateDirectory(Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals"));
+                }
+
                 w = File.AppendText(Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\WPInternals.log"));
             }
             catch { }
@@ -526,7 +590,10 @@ namespace WPinternals
 
         public static void Log(string logMessage, LogType Type = LogType.FileOnly)
         {
-            if (w == null) return;
+            if (w == null)
+            {
+                return;
+            }
 
             lock (lockobject)
             {
@@ -544,7 +611,9 @@ namespace WPinternals
                 }
 
                 if ((CommandLine.IsConsoleVisible) && ((Type == LogType.ConsoleOnly) || (Type == LogType.FileAndConsole)))
+                {
                     Console.WriteLine(logMessage);
+                }
             }
         }
 
@@ -557,10 +626,14 @@ namespace WPinternals
                 Log(Indent + "Error: " + RemoveBadChars(CurrentEx.Message).Replace("of type '.' ", "") + (AdditionalInfo == null ? "" : " - " + AdditionalInfo), Type);
                 AdditionalInfo = null;
                 if (CurrentEx is WPinternalsException)
+                {
                     Log(Indent + ((WPinternalsException)CurrentEx).SubMessage, Type);
+                }
 #if DEBUG
                 if (CurrentEx.StackTrace != null)
+                {
                     Log(Indent + CurrentEx.StackTrace, LogType.FileOnly);
+                }
 #endif
                 Indent += "    ";
                 CurrentEx = CurrentEx.InnerException;
@@ -667,11 +740,14 @@ namespace WPinternals
     {
         public static string ConvertHexToString(byte[] Bytes, string Separator)
         {
-            StringBuilder s = new StringBuilder(1000);
+            StringBuilder s = new(1000);
             for (int i = Bytes.GetLowerBound(0); i <= Bytes.GetUpperBound(0); i++)
             {
                 if (i != Bytes.GetLowerBound(0))
+                {
                     s.Append(Separator);
+                }
+
                 s.Append(Bytes[i].ToString("X2"));
             }
             return s.ToString();
@@ -680,7 +756,9 @@ namespace WPinternals
         public static byte[] ConvertStringToHex(string HexString)
         {
             if (HexString.Length % 2 == 1)
+            {
                 throw new Exception("The binary key cannot have an odd number of digits");
+            }
 
             byte[] arr = new byte[HexString.Length >> 1];
 
@@ -694,7 +772,7 @@ namespace WPinternals
 
         public static int GetHexVal(char hex)
         {
-            int val = (int)hex;
+            int val = hex;
             //For uppercase A-F letters:
             //return val - (val < 58 ? 48 : 55);
             //For lowercase a-f letters:
@@ -702,7 +780,6 @@ namespace WPinternals
             //Or the two combined, but a bit slower:
             return val - (val < 58 ? 48 : (val < 97 ? 55 : 87));
         }
-
     }
 
     // This class was found online.
@@ -751,7 +828,7 @@ namespace WPinternals
             var oldContext = SynchronizationContext.Current;
             var synch = new ExclusiveSynchronizationContext();
             SynchronizationContext.SetSynchronizationContext(synch);
-            T ret = default(T);
+            T ret = default;
             synch.Post(async _ =>
             {
                 try
@@ -777,9 +854,9 @@ namespace WPinternals
         {
             private bool done;
             public Exception InnerException { get; set; }
-            readonly AutoResetEvent workItemsWaiting = new AutoResetEvent(false);
-            readonly Queue<Tuple<SendOrPostCallback, object>> items =
-                new Queue<Tuple<SendOrPostCallback, object>>();
+            private readonly AutoResetEvent workItemsWaiting = new(false);
+            private readonly Queue<Tuple<SendOrPostCallback, object>> items =
+                new();
 
             public override void Send(SendOrPostCallback d, object state)
             {
@@ -840,11 +917,7 @@ namespace WPinternals
     {
         public static void AddWeakReferenceHandler(ref List<WeakReference> handlers, EventHandler handler, int defaultListSize)
         {
-            if (handlers == null)
-            {
-                handlers = (defaultListSize > 0) ? new List<WeakReference>(defaultListSize) : new List<WeakReference>();
-            }
-            handlers.Add(new WeakReference(handler));
+            (handlers ??= (defaultListSize > 0) ? new List<WeakReference>(defaultListSize) : new List<WeakReference>()).Add(new WeakReference(handler));
         }
 
         private static void CallHandler(object sender, EventHandler eventHandler)
@@ -852,7 +925,7 @@ namespace WPinternals
             DispatcherProxy proxy = DispatcherProxy.CreateDispatcher();
             if (eventHandler != null)
             {
-                if ((proxy != null) && !proxy.CheckAccess())
+                if (proxy?.CheckAccess() == false)
                 {
                     proxy.BeginInvoke(new Action<object, EventHandler>(WeakEventHandlerManager.CallHandler), new object[] { sender, eventHandler });
                 }
@@ -882,8 +955,7 @@ namespace WPinternals
             for (int i = handlers.Count - 1; i >= 0; i--)
             {
                 WeakReference reference = handlers[i];
-                EventHandler target = reference.Target as EventHandler;
-                if (target == null)
+                if (reference.Target is not EventHandler target)
                 {
                     handlers.RemoveAt(i);
                 }
@@ -903,8 +975,7 @@ namespace WPinternals
                 for (int i = handlers.Count - 1; i >= 0; i--)
                 {
                     WeakReference reference = handlers[i];
-                    EventHandler target = reference.Target as EventHandler;
-                    if ((target == null) || (target == handler))
+                    if ((reference.Target is not EventHandler target) || (target == handler))
                     {
                         handlers.RemoveAt(i);
                     }
@@ -914,7 +985,7 @@ namespace WPinternals
 
         private class DispatcherProxy
         {
-            private Dispatcher innerDispatcher;
+            private readonly Dispatcher innerDispatcher;
 
             private DispatcherProxy(Dispatcher dispatcher)
             {
@@ -931,13 +1002,13 @@ namespace WPinternals
                 return this.innerDispatcher.CheckAccess();
             }
 
-            public static WeakEventHandlerManager.DispatcherProxy CreateDispatcher()
+            public static DispatcherProxy CreateDispatcher()
             {
                 if (Application.Current == null)
                 {
                     return null;
                 }
-                return new WeakEventHandlerManager.DispatcherProxy(Application.Current.Dispatcher);
+                return new DispatcherProxy(Application.Current.Dispatcher);
             }
         }
     }
@@ -985,7 +1056,7 @@ namespace WPinternals
         {
             if ((executeMethod == null) || (canExecuteMethod == null))
             {
-                throw new ArgumentNullException("executeMethod", "Delegate Command Delegates Cannot Be Null");
+                throw new ArgumentNullException(nameof(executeMethod), "Delegate Command Delegates Cannot Be Null");
             }
             this.executeMethod = executeMethod;
             this.canExecuteMethod = canExecuteMethod;
@@ -1012,11 +1083,7 @@ namespace WPinternals
 
         protected virtual void OnIsActiveChanged()
         {
-            EventHandler isActiveChanged = this.IsActiveChanged;
-            if (isActiveChanged != null)
-            {
-                isActiveChanged(this, EventArgs.Empty);
-            }
+            this.IsActiveChanged?.Invoke(this, EventArgs.Empty);
         }
 
         public void RaiseCanExecuteChanged()
@@ -1084,10 +1151,10 @@ namespace WPinternals
 
     internal class ProgressUpdater
     {
-        private DateTime InitTime;
+        private readonly DateTime InitTime;
         private DateTime LastUpdateTime;
-        private UInt64 MaxValue;
-        private Action<int, TimeSpan?> ProgressUpdateCallback;
+        private readonly UInt64 MaxValue;
+        private readonly Action<int, TimeSpan?> ProgressUpdateCallback;
         internal int ProgressPercentage;
 
         internal ProgressUpdater(UInt64 MaxValue, Action<int, TimeSpan?> ProgressUpdateCallback)
@@ -1120,13 +1187,17 @@ namespace WPinternals
                 if (((DateTime.Now - LastUpdateTime) > TimeSpan.FromSeconds(0.5)) || (ProgressPercentage == 100))
                 {
 #if DEBUG
-                    Console.WriteLine("Init time: " + InitTime.ToShortTimeString() + " / Now: " + DateTime.Now.ToString() + " / NewValue: " + NewValue.ToString() + " / MaxValue: " + MaxValue.ToString() + " ->> Percentage: " + ProgressPercentage.ToString() + " / Remaining: " + TimeSpan.FromTicks((long)((DateTime.Now - InitTime).Ticks / ((double)NewValue / MaxValue) * ((double)1 - ((double)NewValue / MaxValue)))).ToString());
+                    Console.WriteLine("Init time: " + InitTime.ToShortTimeString() + " / Now: " + DateTime.Now.ToString() + " / NewValue: " + NewValue.ToString() + " / MaxValue: " + MaxValue.ToString() + " ->> Percentage: " + ProgressPercentage.ToString() + " / Remaining: " + TimeSpan.FromTicks((long)((DateTime.Now - InitTime).Ticks / ((double)NewValue / MaxValue) * (1 - ((double)NewValue / MaxValue)))).ToString());
 #endif
 
                     if (((DateTime.Now - InitTime) < TimeSpan.FromSeconds(30)) && (ProgressPercentage < 15))
+                    {
                         ProgressUpdateCallback(ProgressPercentage, null);
+                    }
                     else
-                        ProgressUpdateCallback(ProgressPercentage, TimeSpan.FromTicks((long)((DateTime.Now - InitTime).Ticks / ((double)NewValue / MaxValue) * ((double)1 - ((double)NewValue / MaxValue)))));
+                    {
+                        ProgressUpdateCallback(ProgressPercentage, TimeSpan.FromTicks((long)((DateTime.Now - InitTime).Ticks / ((double)NewValue / MaxValue) * (1 - ((double)NewValue / MaxValue)))));
+                    }
 
                     LastUpdateTime = DateTime.Now;
                 }
@@ -1148,9 +1219,13 @@ namespace WPinternals
             InputStream.Read(GZipHeader, 0, 3);
             InputStream.Position = P;
             if (StructuralComparisons.StructuralEqualityComparer.Equals(GZipHeader, new byte[] { 0x1F, 0x8B, 0x08 }))
+            {
                 return new GZipStream(InputStream, CompressionMode.Decompress, false);
+            }
             else
+            {
                 return InputStream;
+            }
         }
 
         internal static bool IsCompressedStream(Stream InputStream)
@@ -1195,7 +1270,10 @@ namespace WPinternals
         public ReadSeekableStream(Stream underlyingStream, int seekBackBufferSize)
         {
             if (!underlyingStream.CanRead)
+            {
                 throw new Exception("Provided stream " + underlyingStream + " is not readable");
+            }
+
             _underlyingStream = underlyingStream;
             _seekBackBuffer = new byte[seekBackBufferSize];
         }
@@ -1227,7 +1305,10 @@ namespace WPinternals
                     var bufferBytesToMove = Math.Min(_seekBackBufferCount - 1, copyToBufferOffset);
 
                     if (bufferBytesToMove > 0)
+                    {
                         Buffer.BlockCopy(_seekBackBuffer, _seekBackBufferCount - bufferBytesToMove, _seekBackBuffer, 0, bufferBytesToMove);
+                    }
+
                     Buffer.BlockCopy(buffer, offset, _seekBackBuffer, copyToBufferOffset, copyToBufferCount);
                     _seekBackBufferCount = Math.Min(_seekBackBuffer.Length, _seekBackBufferCount + copyToBufferCount);
                     _seekBackBufferIndex = _seekBackBufferCount;
@@ -1239,18 +1320,26 @@ namespace WPinternals
         public override long Seek(long offset, SeekOrigin origin)
         {
             if (origin == SeekOrigin.End)
+            {
                 return SeekFromEnd((int)Math.Max(0, -offset));
+            }
 
             var relativeOffset = origin == SeekOrigin.Current
                 ? offset
                 : offset - Position;
 
             if (relativeOffset == 0)
+            {
                 return Position;
+            }
             else if (relativeOffset > 0)
+            {
                 return SeekForward(relativeOffset);
+            }
             else
+            {
                 return SeekBackwards(-relativeOffset);
+            }
         }
 
         private long SeekForward(long origOffset)
@@ -1270,7 +1359,10 @@ namespace WPinternals
                 {
                     var maxRead = seekBackBufferLength - _seekBackBufferCount;
                     if (offset < maxRead)
+                    {
                         maxRead = (int)offset;
+                    }
+
                     var bytesRead = _underlyingStream.Read(_seekBackBuffer, _seekBackBufferCount, maxRead);
                     _underlyingPosition += bytesRead;
                     _seekBackBufferCount += bytesRead;
@@ -1278,7 +1370,10 @@ namespace WPinternals
                     if (bytesRead < maxRead)
                     {
                         if (_seekBackBufferCount < offset)
+                        {
                             throw new NotSupportedException("Reached end of stream seeking forward " + origOffset + " bytes");
+                        }
+
                         return Position;
                     }
                     offset -= bytesRead;
@@ -1307,11 +1402,16 @@ namespace WPinternals
                         else
                         {
                             if (bytesRead > 0)
+                            {
                                 Buffer.BlockCopy(_seekBackBuffer, 0, _seekBackBuffer, bytesReadDiff, bytesRead);
+                            }
+
                             Buffer.BlockCopy(tempBuffer, bytesRead, _seekBackBuffer, 0, bytesReadDiff);
                         }
                         if (offset > 0)
+                        {
                             throw new NotSupportedException("Reached end of stream seeking forward " + origOffset + " bytes");
+                        }
                     }
                     fillTempBuffer = !fillTempBuffer;
                 }
@@ -1323,7 +1423,10 @@ namespace WPinternals
         {
             var intOffset = (int)offset;
             if (offset > int.MaxValue || intOffset > _seekBackBufferIndex)
+            {
                 throw new NotSupportedException("Cannot currently seek backwards more than " + _seekBackBufferIndex + " bytes");
+            }
+
             _seekBackBufferIndex -= intOffset;
             return Position;
         }
@@ -1333,7 +1436,9 @@ namespace WPinternals
             var intOffset = (int)offset;
             var seekBackBufferLength = _seekBackBuffer.Length;
             if (offset > int.MaxValue || intOffset > seekBackBufferLength)
+            {
                 throw new NotSupportedException("Cannot seek backwards from end more than " + seekBackBufferLength + " bytes");
+            }
 
             // first completely fill seekBackBuffer to remove special cases from while loop below
             if (_seekBackBufferCount < seekBackBufferLength)
@@ -1346,7 +1451,10 @@ namespace WPinternals
                 if (bytesRead < maxRead)
                 {
                     if (_seekBackBufferCount < intOffset)
+                    {
                         throw new NotSupportedException("Could not seek backwards from end " + intOffset + " bytes");
+                    }
+
                     return Position;
                 }
             }
@@ -1376,7 +1484,10 @@ namespace WPinternals
                     else
                     {
                         if (bytesRead > 0)
+                        {
                             Buffer.BlockCopy(_seekBackBuffer, 0, _seekBackBuffer, bytesReadDiff, bytesRead);
+                        }
+
                         Buffer.BlockCopy(tempBuffer, bytesRead, _seekBackBuffer, 0, bytesReadDiff);
                     }
                     _seekBackBufferIndex -= intOffset;
@@ -1407,15 +1518,14 @@ namespace WPinternals
                 _underlyingStream.Dispose();
             }
         }
-
     }
 
     // For reading a compressed stream or normal stream
     internal class DecompressedStream : Stream
     {
-        private Stream UnderlyingStream;
-        private bool IsSourceCompressed;
-        private UInt64 DecompressedLength;
+        private readonly Stream UnderlyingStream;
+        private readonly bool IsSourceCompressed;
+        private readonly UInt64 DecompressedLength;
         private Int64 ReadPosition = 0;
 
         // For reading a compressed stream
@@ -1438,7 +1548,9 @@ namespace WPinternals
                 byte[] FormatVersionBytes = new byte[4];
                 UnderlyingStream.Read(FormatVersionBytes, 0, 4);
                 if (BitConverter.ToUInt32(FormatVersionBytes, 0) > 1) // Max supported format version = 1
+                {
                     throw new InvalidDataException();
+                }
 
                 byte[] HeaderSizeBytes = new byte[4];
                 UnderlyingStream.Read(HeaderSizeBytes, 0, 4);
@@ -1451,7 +1563,9 @@ namespace WPinternals
                     DecompressedLength = BitConverter.ToUInt64(DecompressedLengthBytes, 0);
                 }
                 else
+                {
                     throw new InvalidDataException();
+                }
 
                 UInt32 HeaderBytesRemaining = (UInt32)(HeaderSize - Signature.Length - 0x10);
                 if (HeaderBytesRemaining > 0)
@@ -1463,7 +1577,9 @@ namespace WPinternals
                 UnderlyingStream = new GZipStream(UnderlyingStream, CompressionMode.Decompress, false);
             }
             else
+            {
                 UnderlyingStream.Position = 0;
+            }
         }
 
         public override bool CanRead { get { return true; } }
@@ -1487,9 +1603,13 @@ namespace WPinternals
             get
             {
                 if (IsSourceCompressed)
+                {
                     return (long)DecompressedLength;
+                }
                 else
+                {
                     return UnderlyingStream.Length;
+                }
             }
         }
         public override void SetLength(long value) { throw new NotSupportedException(); }
@@ -1508,9 +1628,9 @@ namespace WPinternals
     // For writing a compressed stream
     internal class CompressedStream : Stream
     {
-        private UInt32 HeaderSize;
+        private readonly UInt32 HeaderSize;
         private UInt64 WritePosition;
-        private GZipStream UnderlyingStream;
+        private readonly GZipStream UnderlyingStream;
 
         internal CompressedStream(Stream OutputStream, UInt64 TotalDecompressedStreamLength)
         {
@@ -1561,8 +1681,8 @@ namespace WPinternals
     {
         private Stream UnderlyingStream;
         private Int64 ReadPosition = 0;
-        private Func<Stream> StreamInitializer;
-        private Int64 UnderlyingStreamLength;
+        private readonly Func<Stream> StreamInitializer;
+        private readonly Int64 UnderlyingStreamLength;
 
         // For reading a compressed stream
         internal SeekableStream(Func<Stream> StreamInitializer, Int64? Length = null)
@@ -1570,7 +1690,9 @@ namespace WPinternals
             this.StreamInitializer = StreamInitializer;
             UnderlyingStream = StreamInitializer();
             if (Length != null)
+            {
                 UnderlyingStreamLength = (Int64)Length;
+            }
             else
             {
                 try
@@ -1615,7 +1737,10 @@ namespace WPinternals
                         break;
                 }
                 if ((NewPosition < 0) || (NewPosition > UnderlyingStreamLength))
+                {
                     throw new ArgumentOutOfRangeException();
+                }
+
                 if (NewPosition < ReadPosition)
                 {
                     UnderlyingStream.Close();
@@ -1628,7 +1753,10 @@ namespace WPinternals
                 {
                     Remaining = (UInt64)(NewPosition - ReadPosition);
                     if (Remaining > (UInt64)Buffer.Length)
+                    {
                         Remaining = (UInt64)Buffer.Length;
+                    }
+
                     UnderlyingStream.Read(Buffer, 0, (int)Remaining);
                     ReadPosition += (long)Remaining;
                 }
@@ -1670,27 +1798,27 @@ namespace WPinternals
 
     internal enum ResourceType
     {
-        RT_ACCELERATOR = 9, //Accelerator table.
-        RT_ANICURSOR = 21, //Animated cursor.
-        RT_ANIICON = 22, //Animated icon.
-        RT_BITMAP = 2, //Bitmap resource.
-        RT_CURSOR = 1, //Hardware-dependent cursor resource.
-        RT_DIALOG = 5, //Dialog box.
-        RT_DLGINCLUDE = 17, //Allows
-        RT_FONT = 8, //Font resource.
-        RT_FONTDIR = 7, //Font directory resource.
-        RT_GROUP_CURSOR = ((RT_CURSOR) + 11), //Hardware-independent cursor resource.
-        RT_GROUP_ICON = ((RT_ICON) + 11), //Hardware-independent icon resource.
-        RT_HTML = 23, //HTML resource.
-        RT_ICON = 3, //Hardware-dependent icon resource.
-        RT_MANIFEST = 24, //Side-by-Side Assembly Manifest.
-        RT_MENU = 4, //Menu resource.
-        RT_MESSAGETABLE = 11, //Message-table entry.
-        RT_PLUGPLAY = 19, //Plug and Play resource.
-        RT_RCDATA = 10, //Application-defined resource (raw data).
-        RT_STRING = 6, //String-table entry.
-        RT_VERSION = 16, //Version resource.
-        RT_VXD = 20, //
+        RT_CURSOR = 1,
+        RT_BITMAP = 2,
+        RT_ICON = 3,
+        RT_MENU = 4,
+        RT_DIALOG = 5,
+        RT_STRING = 6,
+        RT_FONTDIR = 7,
+        RT_FONT = 8,
+        RT_ACCELERATOR = 9,
+        RT_RCDATA = 10,
+        RT_MESSAGETABLE = 11,
+        RT_GROUP_CURSOR = (RT_CURSOR + 11),
+        RT_GROUP_ICON = (RT_ICON + 11),
+        RT_VERSION = 16,
+        RT_DLGINCLUDE = 17,
+        RT_PLUGPLAY = 19,
+        RT_VXD = 20,
+        RT_ANICURSOR = 21,
+        RT_ANIICON = 22,
+        RT_HTML = 23,
+        RT_MANIFEST = 24,
         RT_DLGINIT = 240,
         RT_TOOLBAR = 241
     };
@@ -1712,7 +1840,10 @@ namespace WPinternals
                 string SectionName = ByteOperations.ReadAsciiString(PEfile, (UInt32)(SectionTablePointer + (i * 0x28)), 8);
                 int e = SectionName.IndexOf('\0');
                 if (e >= 0)
+                {
                     SectionName = SectionName.Substring(0, e);
+                }
+
                 if (SectionName == ".rsrc")
                 {
                     ResourceSectionEntryPointer = (UInt32)(SectionTablePointer + (i * 0x28));
@@ -1720,7 +1851,10 @@ namespace WPinternals
                 }
             }
             if (ResourceSectionEntryPointer == null)
+            {
                 throw new WPinternalsException("Resource-section not found");
+            }
+
             UInt32 ResourceRawSize = ByteOperations.ReadUInt32(PEfile, (UInt32)ResourceSectionEntryPointer + 0x10);
             UInt32 ResourceRawPointer = ByteOperations.ReadUInt32(PEfile, (UInt32)ResourceSectionEntryPointer + 0x14);
             UInt32 ResourceVirtualPointer = ByteOperations.ReadUInt32(PEfile, (UInt32)ResourceSectionEntryPointer + 0x0C);
@@ -1738,7 +1872,9 @@ namespace WPinternals
                     {
                         // Check high bit
                         if (((NextPointer & 0x80000000) == 0) != (i == (Index.Length - 1)))
+                        {
                             throw new WPinternalsException("Bad resource path");
+                        }
 
                         p = ResourceRawPointer + (NextPointer & 0x7fffffff);
                         break;
@@ -1762,7 +1898,7 @@ namespace WPinternals
             // RT_VERSION format:
             // https://msdn.microsoft.com/en-us/library/windows/desktop/ms647001(v=vs.85).aspx
             // https://msdn.microsoft.com/en-us/library/windows/desktop/ms646997(v=vs.85).aspx
-            UInt32 FixedFileInfoPointer = 0x28;
+            const UInt32 FixedFileInfoPointer = 0x28;
             UInt16 Major = ByteOperations.ReadUInt16(version, FixedFileInfoPointer + 0x0A);
             UInt16 Minor = ByteOperations.ReadUInt16(version, FixedFileInfoPointer + 0x08);
             UInt16 Build = ByteOperations.ReadUInt16(version, FixedFileInfoPointer + 0x0E);
@@ -1778,7 +1914,7 @@ namespace WPinternals
             // RT_VERSION format:
             // https://msdn.microsoft.com/en-us/library/windows/desktop/ms647001(v=vs.85).aspx
             // https://msdn.microsoft.com/en-us/library/windows/desktop/ms646997(v=vs.85).aspx
-            UInt32 FixedFileInfoPointer = 0x28;
+            const UInt32 FixedFileInfoPointer = 0x28;
             UInt16 Major = ByteOperations.ReadUInt16(version, FixedFileInfoPointer + 0x12);
             UInt16 Minor = ByteOperations.ReadUInt16(version, FixedFileInfoPointer + 0x10);
             UInt16 Build = ByteOperations.ReadUInt16(version, FixedFileInfoPointer + 0x16);
@@ -1838,10 +1974,10 @@ namespace WPinternals
 
     internal class AsyncAutoResetEvent
     {
-        readonly LinkedList<TaskCompletionSource<bool>> waiters =
-            new LinkedList<TaskCompletionSource<bool>>();
+        private readonly LinkedList<TaskCompletionSource<bool>> waiters =
+            new();
 
-        bool isSignaled;
+        private bool isSignaled;
 
         public AsyncAutoResetEvent(bool signaled)
         {
@@ -1913,10 +2049,7 @@ namespace WPinternals
                 }
             }
 
-            if (toRelease != null)
-            {
-                toRelease.SetResult(true);
-            }
+            toRelease?.SetResult(true);
         }
     }
 
@@ -1973,8 +2106,7 @@ namespace WPinternals
 
         private static void OnSetWidthCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e)
         {
-            var element = dependencyObject as GridViewColumn;
-            if (element != null)
+            if (dependencyObject is GridViewColumn element)
             {
                 GridViewColumnResizeBehavior behavior = GetOrCreateBehavior(element);
                 behavior.Width = e.NewValue as string;
@@ -1988,8 +2120,7 @@ namespace WPinternals
 
         private static void OnSetEnabledCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e)
         {
-            var element = dependencyObject as ListView;
-            if (element != null)
+            if (dependencyObject is ListView element)
             {
                 ListViewResizeBehavior behavior = GetOrCreateBehavior(element);
                 behavior.Enabled = (bool)e.NewValue;
@@ -2002,8 +2133,7 @@ namespace WPinternals
 
         private static ListViewResizeBehavior GetOrCreateBehavior(ListView element)
         {
-            var behavior = element.GetValue(GridViewColumnResizeBehaviorProperty) as ListViewResizeBehavior;
-            if (behavior == null)
+            if (element.GetValue(GridViewColumnResizeBehaviorProperty) is not ListViewResizeBehavior behavior)
             {
                 behavior = new ListViewResizeBehavior(element);
                 element.SetValue(ListViewResizeBehaviorProperty, behavior);
@@ -2014,8 +2144,7 @@ namespace WPinternals
 
         private static GridViewColumnResizeBehavior GetOrCreateBehavior(GridViewColumn element)
         {
-            var behavior = element.GetValue(GridViewColumnResizeBehaviorProperty) as GridViewColumnResizeBehavior;
-            if (behavior == null)
+            if (element.GetValue(GridViewColumnResizeBehaviorProperty) is not GridViewColumnResizeBehavior behavior)
             {
                 behavior = new GridViewColumnResizeBehavior(element);
                 element.SetValue(GridViewColumnResizeBehaviorProperty, behavior);
@@ -2054,8 +2183,7 @@ namespace WPinternals
             {
                 get
                 {
-                    double result;
-                    return double.TryParse(Width, out result) ? result : -1;
+                    return double.TryParse(Width, out double result) ? result : -1;
                 }
             }
 
@@ -2075,11 +2203,14 @@ namespace WPinternals
             {
                 get
                 {
-                    if (Width == "*" || Width == "1*") return 1;
+                    if (Width == "*" || Width == "1*")
+                    {
+                        return 1;
+                    }
+
                     if (Width.EndsWith("*"))
                     {
-                        double perc;
-                        if (double.TryParse(Width.Substring(0, Width.Length - 1), out perc))
+                        if (double.TryParse(Width[0..^1], out double perc))
                         {
                             return perc;
                         }
@@ -2123,8 +2254,7 @@ namespace WPinternals
 
             public ListViewResizeBehavior(ListView element)
             {
-                if (element == null) throw new ArgumentNullException("element");
-                _element = element;
+                _element = element ?? throw new ArgumentNullException(nameof(element));
                 element.Loaded += OnLoaded;
 
                 // Action for resizing and re-enable the size lookup
@@ -2140,7 +2270,6 @@ namespace WPinternals
 
             public bool Enabled { get; set; }
 
-
             private void OnLoaded(object sender, RoutedEventArgs e)
             {
                 _element.SizeChanged += OnSizeChanged;
@@ -2160,11 +2289,10 @@ namespace WPinternals
                 if (Enabled)
                 {
                     double totalWidth = _element.ActualWidth;
-                    var gv = _element.View as GridView;
-                    if (gv != null)
+                    if (_element.View is GridView gv)
                     {
                         double allowedSpace = totalWidth - GetAllocatedSpace(gv);
-                        allowedSpace = allowedSpace - Margin;
+                        allowedSpace -= Margin;
                         double totalPercentage = GridViewColumnResizeBehaviors(gv).Sum(x => x.Percentage);
                         foreach (GridViewColumnResizeBehavior behavior in GridViewColumnResizeBehaviors(gv))
                         {
@@ -2178,9 +2306,7 @@ namespace WPinternals
             {
                 foreach (GridViewColumn t in gv.Columns)
                 {
-                    var gridViewColumnResizeBehavior =
-                        t.GetValue(GridViewColumnResizeBehaviorProperty) as GridViewColumnResizeBehavior;
-                    if (gridViewColumnResizeBehavior != null)
+                    if (t.GetValue(GridViewColumnResizeBehaviorProperty) is GridViewColumnResizeBehavior gridViewColumnResizeBehavior)
                     {
                         yield return gridViewColumnResizeBehavior;
                     }
@@ -2192,9 +2318,7 @@ namespace WPinternals
                 double totalWidth = 0;
                 foreach (GridViewColumn t in gv.Columns)
                 {
-                    var gridViewColumnResizeBehavior =
-                        t.GetValue(GridViewColumnResizeBehaviorProperty) as GridViewColumnResizeBehavior;
-                    if (gridViewColumnResizeBehavior != null)
+                    if (t.GetValue(GridViewColumnResizeBehaviorProperty) is GridViewColumnResizeBehavior gridViewColumnResizeBehavior)
                     {
                         if (gridViewColumnResizeBehavior.IsStatic)
                         {
@@ -2219,20 +2343,16 @@ namespace WPinternals
         // https://stackoverflow.com/a/22078975
         public static async Task<TResult> TimeoutAfter<TResult>(this Task<TResult> task, TimeSpan timeout)
         {
-
-            using (var timeoutCancellationTokenSource = new CancellationTokenSource())
+            using var timeoutCancellationTokenSource = new CancellationTokenSource();
+            var completedTask = await Task.WhenAny(task, Task.Delay(timeout, timeoutCancellationTokenSource.Token));
+            if (completedTask == task)
             {
-
-                var completedTask = await Task.WhenAny(task, Task.Delay(timeout, timeoutCancellationTokenSource.Token));
-                if (completedTask == task)
-                {
-                    timeoutCancellationTokenSource.Cancel();
-                    return await task;  // Very important in order to propagate exceptions
-                }
-                else
-                {
-                    throw new TimeoutException("The operation has timed out.");
-                }
+                timeoutCancellationTokenSource.Cancel();
+                return await task;  // Very important in order to propagate exceptions
+            }
+            else
+            {
+                throw new TimeoutException("The operation has timed out.");
             }
         }
     }
diff --git a/Models/ByteOperations.cs b/Models/ByteOperations.cs
index 4e1e050..45d6f7b 100644
--- a/Models/ByteOperations.cs
+++ b/Models/ByteOperations.cs
@@ -44,12 +44,16 @@ namespace WPinternals
         internal static void WriteAsciiString(byte[] ByteArray, UInt32 Offset, string Text, UInt32? MaxBufferLength = null)
         {
             if (MaxBufferLength != null)
+            {
                 Array.Clear(ByteArray, (int)Offset, (int)MaxBufferLength);
+            }
 
             byte[] TextBytes = System.Text.ASCIIEncoding.ASCII.GetBytes(Text);
             int WriteLength = TextBytes.Length;
             if (WriteLength > MaxBufferLength)
+            {
                 WriteLength = (int)MaxBufferLength;
+            }
 
             Buffer.BlockCopy(TextBytes, 0, ByteArray, (int)Offset, WriteLength);
         }
@@ -57,12 +61,16 @@ namespace WPinternals
         internal static void WriteUnicodeString(byte[] ByteArray, UInt32 Offset, string Text, UInt32? MaxBufferLength = null)
         {
             if (MaxBufferLength != null)
+            {
                 Array.Clear(ByteArray, (int)Offset, (int)MaxBufferLength);
+            }
 
             byte[] TextBytes = System.Text.UnicodeEncoding.Unicode.GetBytes(Text);
             int WriteLength = TextBytes.Length;
             if (WriteLength > MaxBufferLength)
+            {
                 WriteLength = (int)MaxBufferLength;
+            }
 
             Buffer.BlockCopy(TextBytes, 0, ByteArray, (int)Offset, WriteLength);
         }
@@ -152,9 +160,13 @@ namespace WPinternals
         internal static UInt32 Align(UInt32 Base, UInt32 Offset, UInt32 Alignment)
         {
             if (((Offset - Base) % Alignment) == 0)
+            {
                 return Offset;
+            }
             else
+            {
                 return ((((Offset - Base) / Alignment) + 1) * Alignment) + Base;
+            }
         }
 
         internal static UInt32? FindPatternInFile(string FileName, byte[] Pattern, byte[] Mask, out byte[] OutPattern)
@@ -164,7 +176,7 @@ namespace WPinternals
 
             UInt32? Result = null;
 
-            FileStream Stream = new FileStream(FileName, FileMode.Open, FileAccess.Read);
+            FileStream Stream = new(FileName, FileMode.Open, FileAccess.Read);
 
             byte[] Buffer = new byte[0x10000 + Pattern.Length - 1];
             UInt32 BufferReadPosition = 0; // Position in buffer where file-chunk is being read.
@@ -200,11 +212,13 @@ namespace WPinternals
                 for (i = 0; i < Pattern.Length; i++)
                 {
                     if (Buffer[SearchPositionBuffer + i] != Pattern[i])
+                    {
                         if ((Mask == null) || (Mask[i] == 0))
                         {
                             Match = false;
                             break;
                         }
+                    }
                 }
 
                 if (Match)
@@ -227,17 +241,17 @@ namespace WPinternals
 
         internal static UInt32? FindAscii(byte[] SourceBuffer, string Pattern)
         {
-            return FindPattern(SourceBuffer, System.Text.ASCIIEncoding.ASCII.GetBytes((string)Pattern), null, null);
+            return FindPattern(SourceBuffer, System.Text.ASCIIEncoding.ASCII.GetBytes(Pattern), null, null);
         }
 
         internal static UInt32? FindUnicode(byte[] SourceBuffer, string Pattern)
         {
-            return FindPattern(SourceBuffer, System.Text.UnicodeEncoding.Unicode.GetBytes((string)Pattern), null, null);
+            return FindPattern(SourceBuffer, System.Text.UnicodeEncoding.Unicode.GetBytes(Pattern), null, null);
         }
 
         internal static UInt32? FindUint(byte[] SourceBuffer, UInt32 Pattern)
         {
-            return FindPattern(SourceBuffer, BitConverter.GetBytes((UInt32)Pattern), null, null);
+            return FindPattern(SourceBuffer, BitConverter.GetBytes(Pattern), null, null);
         }
 
         internal static UInt32? FindPattern(byte[] SourceBuffer, byte[] Pattern, byte[] Mask, byte[] OutPattern)
@@ -267,11 +281,13 @@ namespace WPinternals
                 for (i = 0; i < Pattern.Length; i++)
                 {
                     if (SourceBuffer[SearchPosition + i] != Pattern[i])
+                    {
                         if ((Mask == null) || (Mask[i] == 0))
                         {
                             Match = false;
                             break;
                         }
+                    }
                 }
 
                 if (Match)
@@ -279,7 +295,10 @@ namespace WPinternals
                     Result = SearchPosition;
 
                     if (OutPattern != null)
+                    {
                         System.Buffer.BlockCopy(SourceBuffer, (int)SearchPosition, OutPattern, 0, Pattern.Length);
+                    }
+
                     break;
                 }
 
@@ -294,7 +313,9 @@ namespace WPinternals
             byte Checksum = 0;
 
             for (UInt32 i = Offset; i < (Offset + Size); i++)
+            {
                 Checksum += Buffer[i];
+            }
 
             return (byte)(0x100 - Checksum);
         }
@@ -304,12 +325,14 @@ namespace WPinternals
             UInt16 Checksum = 0;
 
             for (UInt32 i = Offset; i < (Offset + Size - 1); i += 2)
+            {
                 Checksum += BitConverter.ToUInt16(Buffer, (int)i);
+            }
 
             return (UInt16)(0x10000 - Checksum);
         }
 
-        private static UInt32[] CRC32Table = new UInt32[] {
+        private static readonly UInt32[] CRC32Table = new UInt32[] {
             0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F,
             0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
             0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2,
@@ -358,7 +381,9 @@ namespace WPinternals
         internal static UInt32 CRC32(byte[] Input, UInt32 Offset, UInt32 Length)
         {
             if ((Input == null) || ((Offset + Length) > Input.Length))
+            {
                 throw new ArgumentException();
+            }
 
             unchecked
             {
diff --git a/Models/FFU.cs b/Models/FFU.cs
index faa4bba..599ebfa 100644
--- a/Models/FFU.cs
+++ b/Models/FFU.cs
@@ -31,7 +31,7 @@ namespace WPinternals
         internal byte[] SecurityHeader;
         internal byte[] ImageHeader;
         internal byte[] StoreHeader;
-        private int?[] ChunkIndexes;
+        private readonly int?[] ChunkIndexes;
         private FileStream FFUFile = null;
         private int FileOpenCount = 0;
 
@@ -55,7 +55,10 @@ namespace WPinternals
                 byte[] ShortSecurityHeader = new byte[0x20];
                 FFUFile.Read(ShortSecurityHeader, 0, 0x20);
                 if (ByteOperations.ReadAsciiString(ShortSecurityHeader, 0x04, 0x0C) != "SignedImage ")
+                {
                     throw new BadImageFormatException();
+                }
+
                 ChunkSize = ByteOperations.ReadInt32(ShortSecurityHeader, 0x10) * 1024;
                 UInt32 SecurityHeaderSize = ByteOperations.ReadUInt32(ShortSecurityHeader, 0x00);
                 UInt32 CatalogSize = ByteOperations.ReadUInt32(ShortSecurityHeader, 0x18);
@@ -68,7 +71,10 @@ namespace WPinternals
                 byte[] ShortImageHeader = new byte[0x1C];
                 FFUFile.Read(ShortImageHeader, 0, 0x1C);
                 if (ByteOperations.ReadAsciiString(ShortImageHeader, 0x04, 0x0C) != "ImageFlash  ")
+                {
                     throw new BadImageFormatException();
+                }
+
                 UInt32 ImageHeaderSize = ByteOperations.ReadUInt32(ShortImageHeader, 0x00);
                 UInt32 ManifestSize = ByteOperations.ReadUInt32(ShortImageHeader, 0x10);
                 ImageHeader = new byte[RoundUpToChunks(ImageHeaderSize + ManifestSize)];
@@ -107,7 +113,9 @@ namespace WPinternals
                         if (DiskAccessMethod == 0) // 0 = From begin, 2 = From end. We ignore chunks at end of disk. These contain secondairy GPT.
                         {
                             if ((ChunkIndex + ChunkCount - 1) > HighestChunkIndex)
+                            {
                                 HighestChunkIndex = ChunkIndex + ChunkCount - 1;
+                            }
                         }
                     }
                     WriteDescriptorEntryOffset += 8 + (LocationCount * 0x08);
@@ -148,7 +156,9 @@ namespace WPinternals
                 TotalSize = HeaderSize + PayloadSize;
 
                 if (TotalSize != (UInt64)FFUFile.Length)
+                {
                     throw new WPinternalsException("Bad FFU file", "Bad FFU file: " + Path + "." + Environment.NewLine + "Expected size: " + TotalSize.ToString() + ". Actual size: " + FFUFile.Length + ".");
+                }
             }
             catch (WPinternalsException)
             {
@@ -168,7 +178,7 @@ namespace WPinternals
         {
             bool Result = false;
 
-            FileStream FFUFile = new FileStream(FileName, FileMode.Open, FileAccess.Read);
+            FileStream FFUFile = new(FileName, FileMode.Open, FileAccess.Read);
 
             byte[] Signature = new byte[0x10];
             FFUFile.Read(Signature, 0, 0x10);
@@ -207,24 +217,34 @@ namespace WPinternals
             if (FFUFile != null)
             {
                 if (FFUFile.Position != Position)
+                {
                     FFUFile.Seek(Position, SeekOrigin.Begin);
+                }
             }
         }
 
         internal UInt32 RoundUpToChunks(UInt32 Size)
         {
             if ((Size % ChunkSize) > 0)
+            {
                 return (UInt32)(((Size / ChunkSize) + 1) * ChunkSize);
+            }
             else
+            {
                 return Size;
+            }
         }
 
         internal UInt32 RoundDownToChunks(UInt32 Size)
         {
             if ((Size % ChunkSize) > 0)
+            {
                 return (UInt32)((Size / ChunkSize) * ChunkSize);
+            }
             else
+            {
                 return Size;
+            }
         }
 
         internal byte[] GetSectors(int StartSector, int SectorCount)
@@ -248,10 +268,14 @@ namespace WPinternals
                 int LastSector = (ChunkSize / 0x200) - 1;
 
                 if (j == FirstChunk)
+                {
                     FirstSector = GetSectorNumberInChunkFromSectorIndex(StartSector);
+                }
 
                 if (j == LastChunk)
+                {
                     LastSector = GetSectorNumberInChunkFromSectorIndex(StartSector + SectorCount - 1);
+                }
 
                 int Offset = FirstSector * 0x200;
                 int Size = (LastSector - FirstSector + 1) * 0x200;
@@ -268,9 +292,12 @@ namespace WPinternals
 
         internal byte[] GetPartition(string Name)
         {
-            Partition Target = GPT.Partitions.Where(p => (string.Compare(p.Name, Name, true) == 0)).FirstOrDefault();
+            Partition Target = GPT.Partitions.Find(p => (string.Compare(p.Name, Name, true) == 0));
             if (Target == null)
+            {
                 throw new ArgumentOutOfRangeException();
+            }
+
             return GetSectors((int)Target.FirstSector, (int)(Target.LastSector - Target.FirstSector + 1));
         }
 
@@ -291,22 +318,26 @@ namespace WPinternals
 
         private void WritePartition(string Name, string FilePath, Action<int, TimeSpan?> ProgressUpdateCallback, ProgressUpdater UpdaterPerSector, bool Compress = false)
         {
-            Partition Target = GPT.Partitions.Where(p => (string.Compare(p.Name, Name, true) == 0)).FirstOrDefault();
+            Partition Target = GPT.Partitions.Find(p => (string.Compare(p.Name, Name, true) == 0));
             if (Target == null)
+            {
                 throw new ArgumentOutOfRangeException();
+            }
 
             int FirstChunk = GetChunkIndexFromSectorIndex((int)Target.FirstSector);
             int LastChunk = GetChunkIndexFromSectorIndex((int)Target.LastSector);
 
             ProgressUpdater Updater = UpdaterPerSector;
             if ((Updater == null) && (ProgressUpdateCallback != null))
+            {
                 Updater = new ProgressUpdater(Target.LastSector - Target.FirstSector + 1, ProgressUpdateCallback);
+            }
 
             byte[] Buffer = new byte[ChunkSize];
 
             OpenFile();
 
-            FileStream OutputFile = new FileStream(FilePath, FileMode.Create, FileAccess.Write);
+            FileStream OutputFile = new(FilePath, FileMode.Create, FileAccess.Write);
             Stream OutStream = OutputFile;
 
             // We use gzip compression
@@ -333,18 +364,21 @@ namespace WPinternals
                 int LastSector = (ChunkSize / 0x200) - 1;
 
                 if (j == FirstChunk)
+                {
                     FirstSector = GetSectorNumberInChunkFromSectorIndex((int)Target.FirstSector);
+                }
 
                 if (j == LastChunk)
+                {
                     LastSector = GetSectorNumberInChunkFromSectorIndex((int)Target.LastSector);
+                }
 
                 int Offset = FirstSector * 0x200;
                 int Size = (LastSector - FirstSector + 1) * 0x200;
 
                 OutStream.Write(Buffer, Offset, Size);
 
-                if (Updater != null)
-                    Updater.IncreaseProgress((UInt64)(ChunkSize / 0x200));
+                Updater?.IncreaseProgress((UInt64)(ChunkSize / 0x200));
             }
 
             OutStream.Close();
@@ -356,7 +390,9 @@ namespace WPinternals
         {
             long BaseOffset = (long)SecurityHeader.Length + ImageHeader.Length + StoreHeader.Length;
             if (ChunkIndexes[ChunkIndex] == null)
+            {
                 return new byte[ChunkSize];
+            }
             else
             {
                 OpenFile();
@@ -372,7 +408,9 @@ namespace WPinternals
         {
             long BaseOffset = SecurityHeader.Length + ImageHeader.Length + StoreHeader.Length;
             if (ChunkIndexes[ChunkIndex] == null)
+            {
                 Array.Clear(Chunk, 0, ChunkSize);
+            }
             else
             {
                 OpenFile();
@@ -398,9 +436,12 @@ namespace WPinternals
         {
             Partition Target = GPT.GetPartition(PartitionName);
             if (Target == null)
+            {
                 throw new InvalidOperationException("Partitionname is not found!");
+            }
+
             int ChunkIndex = GetChunkIndexFromSectorIndex((int)Target.FirstSector);
-            return (ChunkIndexes[ChunkIndex] != null);
+            return ChunkIndexes[ChunkIndex] != null;
         }
 
         private int GetChunkIndexFromSectorIndex(ulong p)
@@ -423,7 +464,10 @@ namespace WPinternals
                     uint Length = (uint)ByteOperations.FindPattern(Data, Start, 0x100, new byte[] { 0x00 }, null, null) - Start;
                     uint? Offset0D = ByteOperations.FindPattern(Data, Start, 0x100, new byte[] { 0x0D }, null, null);
                     if ((Offset0D != null) && (Offset0D < (Start + Length)))
+                    {
                         Length = (uint)Offset0D - Start;
+                    }
+
                     Result = ByteOperations.ReadAsciiString(Data, Start, Length);
                 }
             }
@@ -434,10 +478,10 @@ namespace WPinternals
         internal string GetOSVersion()
         {
             byte[] efiesp = GetPartition("EFIESP");
-            MemoryStream s = new MemoryStream(efiesp);
-            DiscUtils.Fat.FatFileSystem fs = new DiscUtils.Fat.FatFileSystem(s);
+            MemoryStream s = new(efiesp);
+            DiscUtils.Fat.FatFileSystem fs = new(s);
             Stream mss = fs.OpenFile(@"Windows\System32\Boot\mobilestartup.efi", FileMode.Open, FileAccess.Read);
-            MemoryStream msms = new MemoryStream();
+            MemoryStream msms = new();
             mss.CopyTo(msms);
             byte[] mobilestartup = msms.ToArray();
             Version OSVersion = PE.GetProductVersion(mobilestartup);
diff --git a/Models/GPT.cs b/Models/GPT.cs
index 6de3733..b53ab92 100644
--- a/Models/GPT.cs
+++ b/Models/GPT.cs
@@ -31,18 +31,18 @@ namespace WPinternals
     public class GPT
     {
         private byte[] GPTBuffer;
-        private UInt32 HeaderOffset;
-        private UInt32 HeaderSize;
+        private readonly UInt32 HeaderOffset;
+        private readonly UInt32 HeaderSize;
         private UInt32 TableOffset;
         private UInt32 TableSize;
-        private UInt32 PartitionEntrySize;
-        private UInt32 MaxPartitions;
+        private readonly UInt32 PartitionEntrySize;
+        private readonly UInt32 MaxPartitions;
         internal UInt64 FirstUsableSector;
         internal UInt64 LastUsableSector;
         internal bool HasChanged = false;
 
         [XmlElement("Partition")]
-        public List<Partition> Partitions = new List<Partition>();
+        public List<Partition> Partitions = new();
 
         public GPT() // Only for serialization
         {
@@ -53,7 +53,10 @@ namespace WPinternals
             this.GPTBuffer = GPTBuffer;
             UInt32? TempHeaderOffset = ByteOperations.FindAscii(GPTBuffer, "EFI PART");
             if (TempHeaderOffset == null)
+            {
                 throw new WPinternalsException("Bad GPT", "The GPT read isn't valid. Couldn't find the text \"EFI PART\".");
+            }
+
             HeaderOffset = (UInt32)TempHeaderOffset;
             HeaderSize = ByteOperations.ReadUInt32(GPTBuffer, HeaderOffset + 0x0C);
             TableOffset = HeaderOffset + 0x200;
@@ -63,7 +66,9 @@ namespace WPinternals
             PartitionEntrySize = ByteOperations.ReadUInt32(GPTBuffer, HeaderOffset + 0x54);
             TableSize = MaxPartitions * PartitionEntrySize;
             if ((TableOffset + TableSize) > GPTBuffer.Length)
+            {
                 throw new WPinternalsException("Bad GPT", "The GPT read isn't valid. The sizes defined in the GPT header exceed the provided GPT size.");
+            }
 
             UInt32 PartitionOffset = TableOffset;
 
@@ -71,8 +76,11 @@ namespace WPinternals
             {
                 string Name = ByteOperations.ReadUnicodeString(GPTBuffer, PartitionOffset + 0x38, 0x48).TrimEnd(new char[] { (char)0, ' ' });
                 if (Name.Length == 0)
+                {
                     break;
-                Partition CurrentPartition = new Partition();
+                }
+
+                Partition CurrentPartition = new();
                 CurrentPartition.Name = Name;
                 CurrentPartition.FirstSector = ByteOperations.ReadUInt64(GPTBuffer, PartitionOffset + 0x20);
                 CurrentPartition.LastSector = ByteOperations.ReadUInt64(GPTBuffer, PartitionOffset + 0x28);
@@ -88,30 +96,34 @@ namespace WPinternals
 
         internal Partition GetPartition(string Name)
         {
-            return Partitions.Where(p => (string.Compare(p.Name, Name, true) == 0)).FirstOrDefault();
+            return Partitions.Find(p => (string.Compare(p.Name, Name, true) == 0));
         }
 
         // Magic!
         // SecureBoot hack for Bootloader Spec A starts here
         internal byte[] InsertHack()
         {
-            Partition HackPartition = Partitions.Where(p => (p.Name == "HACK")).FirstOrDefault();
-            Partition SBL1 = Partitions.Where(p => (p.Name == "SBL1")).FirstOrDefault();
-            Partition SBL2 = Partitions.Where(p => (p.Name == "SBL2")).FirstOrDefault();
+            Partition HackPartition = Partitions.Find(p => (p.Name == "HACK"));
+            Partition SBL1 = Partitions.Find(p => (p.Name == "SBL1"));
+            Partition SBL2 = Partitions.Find(p => (p.Name == "SBL2"));
 
             if ((SBL1 == null) || (SBL2 == null))
+            {
                 throw new WPinternalsException("Bad GPT", "Can't patch GPT for the Secure Boot hack for Spec A devices. The provided GPT does not include a SBL1 and/or SBL2 partition.");
+            }
 
             if (HackPartition == null)
             {
-                HackPartition = new Partition();
-                HackPartition.Name = "HACK";
-                HackPartition.Attributes = SBL2.Attributes;
-                HackPartition.FirstSector = SBL1.LastSector;
-                HackPartition.LastSector = SBL1.LastSector;
+                HackPartition = new Partition
+                {
+                    Name = "HACK",
+                    Attributes = SBL2.Attributes,
+                    FirstSector = SBL1.LastSector,
+                    LastSector = SBL1.LastSector,
 
-                HackPartition.PartitionTypeGuid = SBL2.PartitionTypeGuid;
-                HackPartition.PartitionGuid = SBL2.PartitionGuid;
+                    PartitionTypeGuid = SBL2.PartitionTypeGuid,
+                    PartitionGuid = SBL2.PartitionGuid
+                };
 
                 Partitions.Add(HackPartition);
 
@@ -128,12 +140,14 @@ namespace WPinternals
 
         internal byte[] RemoveHack()
         {
-            Partition HackPartition = Partitions.Where(p => (p.Name == "HACK")).FirstOrDefault();
-            Partition SBL1 = Partitions.Where(p => (p.Name == "SBL1")).FirstOrDefault();
-            Partition SBL2 = Partitions.Where(p => (p.Name == "SBL2")).FirstOrDefault();
+            Partition HackPartition = Partitions.Find(p => (p.Name == "HACK"));
+            Partition SBL1 = Partitions.Find(p => (p.Name == "SBL1"));
+            Partition SBL2 = Partitions.Find(p => (p.Name == "SBL2"));
 
             if ((SBL1 == null) || (SBL2 == null))
+            {
                 throw new WPinternalsException("Bad GPT", "Can't un-patch GPT for the Secure Boot hack for Spec A devices. The provided GPT does not include a SBL1 and/or SBL2 partition.");
+            }
 
             if (HackPartition != null)
             {
@@ -159,7 +173,9 @@ namespace WPinternals
                 GPTBuffer = new byte[TableSize];
             }
             else
+            {
                 Array.Clear(GPTBuffer, (int)TableOffset, (int)TableSize);
+            }
 
             UInt32 PartitionOffset = TableOffset;
             foreach (Partition CurrentPartition in Partitions)
@@ -188,21 +204,21 @@ namespace WPinternals
 
         internal void MergePartitionsFromStream(Stream Partitions, bool RoundToChunks)
         {
-            using (TextReader tr = new StreamReader(Partitions))
-            {
-                MergePartitions(tr.ReadToEnd(), RoundToChunks);
-            }
+            using TextReader tr = new StreamReader(Partitions);
+            MergePartitions(tr.ReadToEnd(), RoundToChunks);
         }
 
         internal void MergePartitions(string Xml, bool RoundToChunks, ZipArchive Archive = null)
         {
             GPT GptToMerge;
             if (Xml == null)
+            {
                 GptToMerge = new GPT();
+            }
             else
             {
-                XmlSerializer x = new XmlSerializer(typeof(GPT), "");
-                MemoryStream s = new MemoryStream(System.Text.Encoding.ASCII.GetBytes(Xml));
+                XmlSerializer x = new(typeof(GPT), "");
+                MemoryStream s = new(System.Text.Encoding.ASCII.GetBytes(Xml));
                 GptToMerge = (GPT)x.Deserialize(s);
                 s.Dispose();
             }
@@ -211,7 +227,7 @@ namespace WPinternals
             {
                 foreach (Partition NewPartition in GptToMerge.Partitions)
                 {
-                    ZipArchiveEntry Entry = Archive.Entries.Where(e => ((string.Compare(e.Name, NewPartition.Name, true) == 0) || (e.Name.StartsWith(NewPartition.Name + ".", true, System.Globalization.CultureInfo.GetCultureInfo("en-US"))))).FirstOrDefault();
+                    ZipArchiveEntry Entry = Archive.Entries.FirstOrDefault(e => ((string.Compare(e.Name, NewPartition.Name, true) == 0) || (e.Name.StartsWith(NewPartition.Name + ".", true, System.Globalization.CultureInfo.GetCultureInfo("en-US")))));
                     if (Entry == null)
                     {
                         // There is a partition entry in the xml, but this partition is not present in the archive.
@@ -234,9 +250,14 @@ namespace WPinternals
                             // If the location of the new partition is specified, it must be the same as the current partition.
 
                             if ((NewPartition.FirstSector != 0) && (NewPartition.FirstSector != OldPartition.FirstSector))
+                            {
                                 throw new WPinternalsException("Incorrect location for partition \"" + NewPartition.Name + "\". A partition defined in the xml file got its boundaries updated, but as the partition isn't provided in the archive, it is not possible to relocate it.");
+                            }
+
                             if ((NewPartition.LastSector != 0) && (NewPartition.LastSector != OldPartition.LastSector))
+                            {
                                 throw new WPinternalsException("Incorrect length for partition \"" + NewPartition.Name + "\". A partition defined in the xml file got its boundaries updated, but as the partition isn't provided in the archive, it is not possible to relocate it.");
+                            }
 
                             NewPartition.FirstSector = OldPartition.FirstSector;
                             NewPartition.LastSector = OldPartition.LastSector;
@@ -248,7 +269,7 @@ namespace WPinternals
                         // If the length is specified in the xml, it must match the file in the archive.
 
                         ulong StreamLengthInSectors = (ulong)Entry.Length / 0x200;
-                        using (DecompressedStream DecompressedStream = new DecompressedStream(Entry.Open()))
+                        using (DecompressedStream DecompressedStream = new(Entry.Open()))
                         {
                             try
                             {
@@ -264,7 +285,9 @@ namespace WPinternals
                         else
                         {
                             if (NewPartition.SizeInSectors != StreamLengthInSectors)
+                            {
                                 throw new WPinternalsException("Inconsistent length specified for partition \"" + NewPartition.Name + "\". The provided partition in the archive does not match the length specified in the xml file.");
+                            }
                         }
                     }
                 }
@@ -293,9 +316,14 @@ namespace WPinternals
                         // If the location of the new partition is specified, it must be the same as the current partition.
 
                         if ((NewPartition.FirstSector != 0) && (NewPartition.FirstSector != OldPartition.FirstSector))
+                        {
                             throw new WPinternalsException("Incorrect location for partition \"" + NewPartition.Name + "\". A partition defined in the xml file got its boundaries updated, but as the partition isn't provided in the archive, it is not possible to relocate it.");
+                        }
+
                         if ((NewPartition.LastSector != 0) && (NewPartition.LastSector != OldPartition.LastSector))
+                        {
                             throw new WPinternalsException("Incorrect length for partition \"" + NewPartition.Name + "\". A partition defined in the xml file got its boundaries updated, but as the partition isn't provided in the archive, it is not possible to relocate it.");
+                        }
 
                         NewPartition.FirstSector = OldPartition.FirstSector;
                         NewPartition.LastSector = OldPartition.LastSector;
@@ -303,7 +331,7 @@ namespace WPinternals
                 }
             }
 
-            List<Partition> DynamicPartitions = new List<Partition>();
+            List<Partition> DynamicPartitions = new();
             if (Archive != null)
             {
                 // Partitions which are present in the archive, and which have no start-sector in the new GPT data (dynamic relocation),
@@ -314,7 +342,7 @@ namespace WPinternals
                     Partition OldPartition = SortedPartitions.ElementAt(i);
 
                     // Present in archive?
-                    ZipArchiveEntry Entry = Archive.Entries.Where(e => ((string.Compare(e.Name, OldPartition.Name, true) == 0) || (e.Name.StartsWith(OldPartition.Name + ".", true, System.Globalization.CultureInfo.GetCultureInfo("en-US"))))).FirstOrDefault();
+                    ZipArchiveEntry Entry = Archive.Entries.FirstOrDefault(e => ((string.Compare(e.Name, OldPartition.Name, true) == 0) || (e.Name.StartsWith(OldPartition.Name + ".", true, System.Globalization.CultureInfo.GetCultureInfo("en-US")))));
                     if (Entry != null)
                     {
                         // Not present in new GPT or present in GPT without FirstSector?
@@ -325,10 +353,14 @@ namespace WPinternals
                             this.Partitions.Remove(OldPartition);
                         }
                         else
+                        {
                             break;
+                        }
                     }
                     else
+                    {
                         break;
+                    }
                 }
             }
 
@@ -339,22 +371,31 @@ namespace WPinternals
             UInt64 LowestSector = 0;
             Partition DPP = this.GetPartition("DPP");
             if (DPP != null)
+            {
                 LowestSector = DPP.LastSector + 1;
+            }
+
             foreach (Partition NewPartition in GptToMerge.Partitions)
             {
                 // If the new partition is a dynamic partition, then skip it here. It will be added later.
                 if (DynamicPartitions.Select(p => p.Name).Any(n => string.Compare(n, NewPartition.Name, true) == 0))
+                {
                     continue;
+                }
 
                 // Sanity check
                 if (NewPartition.FirstSector < LowestSector)
+                {
                     throw new WPinternalsException("Bad sector alignment for partition: " + NewPartition.Name + ". The partition is located before DPP.");
+                }
 
                 Partition CurrentPartition = this.GetPartition(NewPartition.Name);
                 if (CurrentPartition == null)
                 {
-                    CurrentPartition = new Partition();
-                    CurrentPartition.Name = NewPartition.Name;
+                    CurrentPartition = new Partition
+                    {
+                        Name = NewPartition.Name
+                    };
                     this.Partitions.Add(CurrentPartition);
                     HasChanged = true;
                 }
@@ -376,18 +417,34 @@ namespace WPinternals
                 }
 
                 if ((NewPartition.PartitionGuid != Guid.Empty) || (NewPartition.PartitionGuid != CurrentPartition.PartitionGuid))
+                {
                     HasChanged = true;
+                }
+
                 if (NewPartition.PartitionGuid != Guid.Empty)
+                {
                     CurrentPartition.PartitionGuid = NewPartition.PartitionGuid;
+                }
+
                 if (CurrentPartition.PartitionGuid != Guid.Empty)
+                {
                     CurrentPartition.PartitionGuid = Guid.NewGuid();
+                }
 
                 if ((NewPartition.PartitionTypeGuid != Guid.Empty) || (NewPartition.PartitionTypeGuid != CurrentPartition.PartitionTypeGuid))
+                {
                     HasChanged = true;
+                }
+
                 if (NewPartition.PartitionTypeGuid != Guid.Empty)
+                {
                     CurrentPartition.PartitionTypeGuid = NewPartition.PartitionTypeGuid;
+                }
+
                 if (CurrentPartition.PartitionTypeGuid != Guid.Empty)
+                {
                     CurrentPartition.PartitionTypeGuid = Guid.NewGuid();
+                }
 
                 for (int i = this.Partitions.Count - 1; i >= 0; i--)
                 {
@@ -408,10 +465,10 @@ namespace WPinternals
                 // Check if the sizes of the partitions in the archive do not exceed the size of the partition, as listed in the GPT.
                 foreach (Partition OldPartition in this.Partitions)
                 {
-                    ZipArchiveEntry Entry = Archive.Entries.Where(e => ((string.Compare(e.Name, OldPartition.Name, true) == 0) || (e.Name.StartsWith(OldPartition.Name + ".", true, System.Globalization.CultureInfo.GetCultureInfo("en-US"))))).FirstOrDefault();
+                    ZipArchiveEntry Entry = Archive.Entries.FirstOrDefault(e => ((string.Compare(e.Name, OldPartition.Name, true) == 0) || (e.Name.StartsWith(OldPartition.Name + ".", true, System.Globalization.CultureInfo.GetCultureInfo("en-US")))));
                     if (Entry != null)
                     {
-                        DecompressedStream DecompressedStream = new DecompressedStream(Entry.Open());
+                        DecompressedStream DecompressedStream = new(Entry.Open());
                         ulong StreamLengthInSectors = (ulong)Entry.Length / 0x200;
                         try
                         {
@@ -423,7 +480,10 @@ namespace WPinternals
                         UInt64 MaxPartitionSizeInSectors = OldPartition.SizeInSectors;
                         Partition NextPartition = this.Partitions.Where(p => p.FirstSector > OldPartition.FirstSector).OrderBy(p => p.FirstSector).FirstOrDefault();
                         if (NextPartition != null)
+                        {
                             MaxPartitionSizeInSectors = NextPartition.FirstSector - OldPartition.FirstSector;
+                        }
+
                         if (StreamLengthInSectors > MaxPartitionSizeInSectors)
                         {
                             throw new WPinternalsException("Incorrect length for partition \"" + OldPartition.Name + "\". The provided partition in the archive does not match the length specified in the xml file.");
@@ -446,8 +506,9 @@ namespace WPinternals
 
                     // Always start a new partition on a new chunk (0x100 sector boundary), to be more flexible during custom flash
                     if (RoundToChunks && (((double)FirstFreeSector % 0x100) != 0))
+                    {
                         FirstFreeSector = (UInt64)(Math.Ceiling((double)FirstFreeSector / 0x100) * 0x100);
-
+                    }
                 }
                 foreach (Partition NewPartition in DynamicPartitions)
                 {
@@ -456,8 +517,8 @@ namespace WPinternals
                         NewPartition.FirstSector = FirstFreeSector;
                         HasChanged = true;
                     }
-                    ZipArchiveEntry Entry = Archive.Entries.Where(e => ((string.Compare(e.Name, NewPartition.Name, true) == 0) || (e.Name.StartsWith(NewPartition.Name + ".", true, System.Globalization.CultureInfo.GetCultureInfo("en-US"))))).FirstOrDefault();
-                    DecompressedStream DecompressedStream = new DecompressedStream(Entry.Open());
+                    ZipArchiveEntry Entry = Archive.Entries.FirstOrDefault(e => ((string.Compare(e.Name, NewPartition.Name, true) == 0) || (e.Name.StartsWith(NewPartition.Name + ".", true, System.Globalization.CultureInfo.GetCultureInfo("en-US")))));
+                    DecompressedStream DecompressedStream = new(Entry.Open());
                     ulong StreamLengthInSectors = (ulong)Entry.Length / 0x200;
                     try
                     {
@@ -475,7 +536,9 @@ namespace WPinternals
 
                     // Always start a new partition on a new chunk (0x100 sector boundary), to be more flexible during custom flash
                     if (RoundToChunks && (((double)FirstFreeSector % 0x100) != 0))
+                    {
                         FirstFreeSector = (UInt64)(Math.Ceiling((double)FirstFreeSector / 0x100) * 0x100);
+                    }
                 }
             }
 
@@ -486,31 +549,31 @@ namespace WPinternals
         {
             string DirPath = System.IO.Path.GetDirectoryName(Path);
             if (!Directory.Exists(DirPath))
+            {
                 Directory.CreateDirectory(DirPath);
+            }
 
-            XmlSerializer x = new XmlSerializer(typeof(GPT), "");
+            XmlSerializer x = new(typeof(GPT), "");
 
-            XmlSerializerNamespaces ns = new XmlSerializerNamespaces();
+            XmlSerializerNamespaces ns = new();
             ns.Add("", "");
-            System.IO.StreamWriter FileWriter = new System.IO.StreamWriter(Path);
+            StreamWriter FileWriter = new(Path);
             x.Serialize(FileWriter, this, ns);
             FileWriter.Close();
         }
 
         internal static GPT ReadPartitions(string Path)
         {
-            XmlSerializer x = new XmlSerializer(typeof(GPT), "");
-            using (FileStream s = new FileStream(Path, FileMode.Open))
-            {
-                return (GPT)x.Deserialize(s);
-            }
+            XmlSerializer x = new(typeof(GPT), "");
+            using FileStream s = new(Path, FileMode.Open);
+            return (GPT)x.Deserialize(s);
         }
 
         internal void RestoreBackupPartitions()
         {
             // This is necessary, because the partitions and backup-partitions can exchange.
             // This may cause the startsector to be higher than the maximum allowed sector for flashing with a Lumia V1 programmer (hardcoded in programmer)
-            List<string> RevisePartitions = new List<string>(new string[] { "SBL1", "SBL2", "SBL3", "UEFI", "TZ", "RPM", "WINSECAPP" });
+            List<string> RevisePartitions = new(new string[] { "SBL1", "SBL2", "SBL3", "UEFI", "TZ", "RPM", "WINSECAPP" });
             foreach (string RevisePartitionName in RevisePartitions)
             {
                 Partition RevisePartition = GetPartition(RevisePartitionName);
@@ -528,9 +591,10 @@ namespace WPinternals
                 }
 
                 if (RevisePartition.LastSector >= 0xF400)
+                {
                     throw new WPinternalsException("Unsupported partition layout!", "The last sector of one of the BACKUP partitions defined in GPT exceeds the maximum threshold expected in order to restore BACKUP partitions to the device.");
+                }
             }
-
         }
     }
 
@@ -552,15 +616,21 @@ namespace WPinternals
             get
             {
                 if (_SizeInSectors != 0)
+                {
                     return _SizeInSectors;
+                }
                 else
+                {
                     return LastSector - FirstSector + 1;
+                }
             }
             set
             {
                 _SizeInSectors = value;
                 if (FirstSector != 0)
+                {
                     LastSector = FirstSector + _SizeInSectors - 1;
+                }
             }
         }
 
@@ -575,7 +645,9 @@ namespace WPinternals
             {
                 _FirstSector = value;
                 if (_SizeInSectors != 0)
+                {
                     _LastSector = FirstSector + _SizeInSectors - 1;
+                }
             }
         }
 
diff --git a/Models/LZMA.cs b/Models/LZMA.cs
index 7902ec3..bf6423a 100644
--- a/Models/LZMA.cs
+++ b/Models/LZMA.cs
@@ -40,13 +40,13 @@ namespace WPinternals
 
             UInt64 OutputSize = ByteOperations.ReadUInt64(Input, Offset + 5);
 
-            SevenZip.Compression.LZMA.Decoder Coder = new SevenZip.Compression.LZMA.Decoder();
+            SevenZip.Compression.LZMA.Decoder Coder = new();
             Coder.SetDecoderProperties(Properties);
 
-            MemoryStream InStream = new MemoryStream(Input, (int)Offset + 0x0D, (int)InputSize - 0x0D);
+            MemoryStream InStream = new(Input, (int)Offset + 0x0D, (int)InputSize - 0x0D);
 
             byte[] Output = new byte[OutputSize];
-            MemoryStream OutStream = new MemoryStream(Output, true);
+            MemoryStream OutStream = new(Output, true);
 
             Coder.Code(InStream, OutStream, (Int64)InputSize - 0x0D, (Int64)OutputSize, null);
 
@@ -59,10 +59,10 @@ namespace WPinternals
 
         internal static byte[] Compress(byte[] Input, UInt32 Offset, UInt32 InputSize)
         {
-            SevenZip.Compression.LZMA.Encoder Coder = new SevenZip.Compression.LZMA.Encoder();
+            SevenZip.Compression.LZMA.Encoder Coder = new();
 
-            MemoryStream InStream = new MemoryStream(Input, (int)Offset, (int)InputSize);
-            MemoryStream OutStream = new MemoryStream();
+            MemoryStream InStream = new(Input, (int)Offset, (int)InputSize);
+            MemoryStream OutStream = new();
 
             // Write the encoder properties
             Coder.WriteCoderProperties(OutStream);
@@ -71,7 +71,7 @@ namespace WPinternals
             OutStream.Write(BitConverter.GetBytes(InStream.Length), 0, 8);
 
             // Encode the file
-            Coder.Code(InStream, OutStream, (Int64)InputSize, -1, null);
+            Coder.Code(InStream, OutStream, InputSize, -1, null);
 
             byte[] Output = new byte[OutStream.Length];
             Buffer.BlockCopy(OutStream.GetBuffer(), 0, Output, 0, (int)OutStream.Length);
@@ -86,14 +86,14 @@ namespace WPinternals
 
     public class LZMACompressionStream : Stream
     {
-        private SevenZip.Compression.LZMA.Encoder Encoder = null;
-        private SevenZip.Compression.LZMA.Decoder Decoder = null;
-        private PumpStream BufferStream;
-        private Stream stream;
-        private bool LeaveOpen;
-        private Thread WorkThread;
-        private CancellationTokenSource source;
-        private CancellationToken token;
+        private readonly SevenZip.Compression.LZMA.Encoder Encoder = null;
+        private readonly SevenZip.Compression.LZMA.Decoder Decoder = null;
+        private readonly PumpStream BufferStream;
+        private readonly Stream stream;
+        private readonly bool LeaveOpen;
+        private readonly Thread WorkThread;
+        private readonly CancellationTokenSource source;
+        private readonly CancellationToken token;
 
         public LZMACompressionStream(Stream stream, CompressionMode mode, bool LeaveOpen, int DictionarySize, int PosStateBits,
            int LitContextBits, int LitPosBits, int Algorithm, int NumFastBytes, string MatchFinder, bool EndMarker)
@@ -108,10 +108,13 @@ namespace WPinternals
             {
                 Encoder = new SevenZip.Compression.LZMA.Encoder();
                 if (DictionarySize != 0)
+                {
                     Encoder.SetCoderProperties(
-                      new SevenZip.CoderPropID[8] {CoderPropID.DictionarySize, CoderPropID.PosStateBits, CoderPropID.LitContextBits,
+                      new CoderPropID[8] {CoderPropID.DictionarySize, CoderPropID.PosStateBits, CoderPropID.LitContextBits,
                         CoderPropID.LitPosBits, CoderPropID.Algorithm, CoderPropID.NumFastBytes, CoderPropID.MatchFinder, CoderPropID.EndMarker},
                       new object[8] { DictionarySize, PosStateBits, LitContextBits, LitPosBits, Algorithm, NumFastBytes, MatchFinder, EndMarker });
+                }
+
                 Encoder.WriteCoderProperties(stream);
                 WorkThread = new Thread(new ThreadStart(Encode));
             }
@@ -135,26 +138,31 @@ namespace WPinternals
         private void Encode()
         {
             Encoder.Code(BufferStream, stream, -1, -1, null, token);
-            if (LeaveOpen == false)
+            if (!LeaveOpen)
+            {
                 stream.Close();
+            }
         }
 
         private void Decode()
         {
             Decoder.Code(stream, BufferStream, -1, -1, null, token);
             BufferStream.Close();
-            if (LeaveOpen == false)
+            if (!LeaveOpen)
+            {
                 stream.Close();
+            }
         }
 
         public override void Close()
         {
             if (Encoder != null)
+            {
                 BufferStream.Close();
+            }
             else if (WorkThread.IsAlive)
             {
-                if (source != null)
-                    source.Cancel();
+                source?.Cancel();
                 WorkThread.Join();
             }
         }
@@ -169,9 +177,9 @@ namespace WPinternals
             BufferStream.Write(buffer, offset, count);
         }
 
-        public override bool CanRead { get { return (Decoder != null); } }
+        public override bool CanRead { get { return Decoder != null; } }
         public override bool CanSeek { get { return false; } }
-        public override bool CanWrite { get { return (Encoder != null); } }
+        public override bool CanWrite { get { return Encoder != null; } }
         public override void Flush() { }
         public override long Length { get { return 0; } }
         public override long Position { get { return 0; } set { } }
@@ -181,9 +189,9 @@ namespace WPinternals
 
     public class PumpStream : Stream
     {
-        private Queue<byte[]> BufferQueue;
+        private readonly Queue<byte[]> BufferQueue;
         private int BufferOffset;
-        private long MaxBufferSize;
+        private readonly long MaxBufferSize;
         private long BufferSize;
         private bool Closed;
         private bool EOF;
@@ -214,7 +222,9 @@ namespace WPinternals
         {
             Closed = true;
             lock (BufferQueue)
+            {
                 Monitor.Pulse(BufferQueue);
+            }
         }
 
         public override int Read(byte[] buffer, int offset, int count)
@@ -222,7 +232,7 @@ namespace WPinternals
             int BytesRead = 0;
             lock (BufferQueue)
             {
-                while (BytesRead < count && EOF == false)
+                while (BytesRead < count && !EOF)
                 {
                     if (BufferQueue.Count > 0)
                     {
@@ -230,7 +240,7 @@ namespace WPinternals
 
                         if ((b.Length - BufferOffset) <= (count - BytesRead))
                         {
-                            Array.Copy(b, BufferOffset, buffer, offset + BytesRead, (b.Length - BufferOffset));
+                            Array.Copy(b, BufferOffset, buffer, offset + BytesRead, b.Length - BufferOffset);
 
                             BufferQueue.Dequeue();
                             BufferSize -= b.Length;
@@ -241,22 +251,25 @@ namespace WPinternals
                         }
                         else
                         {
-                            Array.Copy(b, BufferOffset, buffer, offset + BytesRead, (count - BytesRead));
+                            Array.Copy(b, BufferOffset, buffer, offset + BytesRead, count - BytesRead);
 
                             BufferOffset += (count - BytesRead);
                             BytesRead += (count - BytesRead);
                         }
-
                     }
                     else
                     {
-                        if (Closed == false)
+                        if (!Closed)
                         {
-                            if (Monitor.Wait(BufferQueue, ReadTimeout) == false)
+                            if (!Monitor.Wait(BufferQueue, ReadTimeout))
+                            {
                                 throw new IOException("Could not read from stream: Timeout expired waiting for data to be written.");
+                            }
                         }
                         else
+                        {
                             EOF = true;
+                        }
                     }
                 }
             }
@@ -269,8 +282,12 @@ namespace WPinternals
             lock (BufferQueue)
             {
                 while (BufferSize >= MaxBufferSize)
-                    if (Monitor.Wait(BufferQueue, WriteTimeout) == false)
+                {
+                    if (!Monitor.Wait(BufferQueue, WriteTimeout))
+                    {
                         throw new IOException("Could not write to stream: Timeout expired waiting for data to be read.");
+                    }
+                }
 
                 byte[] b = new byte[count];
                 Array.Copy(buffer, offset, b, 0, count);
diff --git a/Models/LumiaDownloadModel.cs b/Models/LumiaDownloadModel.cs
index 14aa701..490d948 100644
--- a/Models/LumiaDownloadModel.cs
+++ b/Models/LumiaDownloadModel.cs
@@ -38,18 +38,25 @@ namespace WPinternals
     {
         internal static string SearchFFU(string ProductType, string ProductCode, string OperatorCode)
         {
-            string FoundProductType;
-            return SearchFFU(ProductType, ProductCode, OperatorCode, out FoundProductType);
+            return SearchFFU(ProductType, ProductCode, OperatorCode, out string FoundProductType);
         }
 
         internal static string SearchFFU(string ProductType, string ProductCode, string OperatorCode, out string FoundProductType)
         {
-            if (ProductType == "")
+            if (ProductType?.Length == 0)
+            {
                 ProductType = null;
-            if (ProductCode == "")
+            }
+
+            if (ProductCode?.Length == 0)
+            {
                 ProductCode = null;
-            if (OperatorCode == "")
+            }
+
+            if (OperatorCode?.Length == 0)
+            {
                 OperatorCode = null;
+            }
 
             if (ProductCode != null)
             {
@@ -61,12 +68,16 @@ namespace WPinternals
             {
                 ProductType = ProductType.ToUpper();
                 if (ProductType.StartsWith("RM") && !ProductType.StartsWith("RM-"))
-                    ProductType = "RM-" + ProductType.Substring(2);
+                {
+                    ProductType = "RM-" + ProductType[2..];
+                }
             }
             if (OperatorCode != null)
+            {
                 OperatorCode = OperatorCode.ToUpper();
+            }
 
-            DiscoveryQueryParameters DiscoveryQueryParams = new DiscoveryQueryParameters
+            DiscoveryQueryParameters DiscoveryQueryParams = new()
             {
                 manufacturerName = "Microsoft",
                 manufacturerProductLine = "Lumia",
@@ -76,20 +87,20 @@ namespace WPinternals
                 manufacturerHardwareVariant = ProductCode,
                 operatorName = OperatorCode
             };
-            DiscoveryParameters DiscoveryParams = new DiscoveryParameters
+            DiscoveryParameters DiscoveryParams = new()
             {
                 query = DiscoveryQueryParams
             };
 
-            DataContractJsonSerializer Serializer1 = new DataContractJsonSerializer(typeof(DiscoveryParameters));
-            MemoryStream JsonStream1 = new MemoryStream();
+            DataContractJsonSerializer Serializer1 = new(typeof(DiscoveryParameters));
+            MemoryStream JsonStream1 = new();
             Serializer1.WriteObject(JsonStream1, DiscoveryParams);
             JsonStream1.Seek(0L, SeekOrigin.Begin);
             string JsonContent = new StreamReader(JsonStream1).ReadToEnd();
 
-            Uri RequestUri = new Uri("https://api.swrepository.com/rest-api/discovery/1/package");
+            Uri RequestUri = new("https://api.swrepository.com/rest-api/discovery/1/package");
 
-            HttpClient HttpClient = new HttpClient();
+            HttpClient HttpClient = new();
             HttpClient.DefaultRequestHeaders.UserAgent.TryParseAdd("SoftwareRepository");
             HttpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
 
@@ -106,33 +117,35 @@ namespace WPinternals
             }
 
             SoftwarePackage Package = null;
-            using (MemoryStream JsonStream2 = new MemoryStream(Encoding.UTF8.GetBytes(JsonResultString)))
+            using (MemoryStream JsonStream2 = new(Encoding.UTF8.GetBytes(JsonResultString)))
             {
-                DataContractJsonSerializer Serializer2 = new DataContractJsonSerializer(typeof(SoftwarePackages));
+                DataContractJsonSerializer Serializer2 = new(typeof(SoftwarePackages));
                 SoftwarePackages SoftwarePackages = (SoftwarePackages)Serializer2.ReadObject(JsonStream2);
                 if (SoftwarePackages != null)
                 {
-                    Package = SoftwarePackages.softwarePackages.FirstOrDefault<SoftwarePackage>();
+                    Package = SoftwarePackages.softwarePackages.FirstOrDefault();
                 }
             }
 
             if (Package == null)
+            {
                 throw new WPinternalsException("FFU not found", "No FFU has been found in the remote software repository for the requested model.");
+            }
 
             FoundProductType = Package.manufacturerHardwareModel[0];
 
-            SoftwareFile FileInfo = Package.files.Where(f => f.fileName.EndsWith(".ffu", StringComparison.OrdinalIgnoreCase)).First();
+            SoftwareFile FileInfo = Package.files.First(f => f.fileName.EndsWith(".ffu", StringComparison.OrdinalIgnoreCase));
 
-            Uri FileInfoUri = new Uri("https://api.swrepository.com/rest-api/discovery/fileurl/1/" + Package.id + "/" + FileInfo.fileName);
+            Uri FileInfoUri = new("https://api.swrepository.com/rest-api/discovery/fileurl/1/" + Package.id + "/" + FileInfo.fileName);
             Task<string> GetFileInfoTask = HttpClient.GetStringAsync(FileInfoUri);
             GetFileInfoTask.Wait();
             string FileInfoString = GetFileInfoTask.Result;
 
             string FfuUrl = "";
             FileUrlResult FileUrl = null;
-            using (MemoryStream JsonStream3 = new MemoryStream(Encoding.UTF8.GetBytes(FileInfoString)))
+            using (MemoryStream JsonStream3 = new(Encoding.UTF8.GetBytes(FileInfoString)))
             {
-                DataContractJsonSerializer Serializer3 = new DataContractJsonSerializer(typeof(FileUrlResult));
+                DataContractJsonSerializer Serializer3 = new(typeof(FileUrlResult));
                 FileUrl = (FileUrlResult)Serializer3.ReadObject(JsonStream3);
                 if (FileUrl != null)
                 {
@@ -147,17 +160,21 @@ namespace WPinternals
 
         internal static string SearchENOSW(string ProductType, string PhoneFirmwareRevision)
         {
-            if (ProductType == "")
+            if (ProductType?.Length == 0)
+            {
                 ProductType = null;
+            }
 
             if (ProductType != null)
             {
                 ProductType = ProductType.ToUpper();
                 if (ProductType.StartsWith("RM") && !ProductType.StartsWith("RM-"))
-                    ProductType = "RM-" + ProductType.Substring(2);
+                {
+                    ProductType = "RM-" + ProductType[2..];
+                }
             }
 
-            DiscoveryQueryParameters DiscoveryQueryParams = new DiscoveryQueryParameters
+            DiscoveryQueryParameters DiscoveryQueryParams = new()
             {
                 manufacturerName = "Microsoft",
                 manufacturerProductLine = "Lumia",
@@ -165,20 +182,20 @@ namespace WPinternals
                 packageClass = "Public",
                 manufacturerHardwareModel = ProductType
             };
-            DiscoveryParameters DiscoveryParams = new DiscoveryParameters
+            DiscoveryParameters DiscoveryParams = new()
             {
                 query = DiscoveryQueryParams
             };
 
-            DataContractJsonSerializer Serializer1 = new DataContractJsonSerializer(typeof(DiscoveryParameters));
-            MemoryStream JsonStream1 = new MemoryStream();
+            DataContractJsonSerializer Serializer1 = new(typeof(DiscoveryParameters));
+            MemoryStream JsonStream1 = new();
             Serializer1.WriteObject(JsonStream1, DiscoveryParams);
             JsonStream1.Seek(0L, SeekOrigin.Begin);
             string JsonContent = new StreamReader(JsonStream1).ReadToEnd();
 
-            Uri RequestUri = new Uri("https://api.swrepository.com/rest-api/discovery/1/package");
+            Uri RequestUri = new("https://api.swrepository.com/rest-api/discovery/1/package");
 
-            HttpClient HttpClient = new HttpClient();
+            HttpClient HttpClient = new();
             HttpClient.DefaultRequestHeaders.UserAgent.TryParseAdd("SoftwareRepository");
             HttpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
 
@@ -195,33 +212,37 @@ namespace WPinternals
             }
 
             SoftwarePackage Package = null;
-            using (MemoryStream JsonStream2 = new MemoryStream(Encoding.UTF8.GetBytes(JsonResultString)))
+            using (MemoryStream JsonStream2 = new(Encoding.UTF8.GetBytes(JsonResultString)))
             {
-                DataContractJsonSerializer Serializer2 = new DataContractJsonSerializer(typeof(SoftwarePackages));
+                DataContractJsonSerializer Serializer2 = new(typeof(SoftwarePackages));
                 SoftwarePackages SoftwarePackages = (SoftwarePackages)Serializer2.ReadObject(JsonStream2);
                 if (SoftwarePackages != null)
                 {
                     foreach (SoftwarePackage pkg in SoftwarePackages.softwarePackages)
-                        Package = SoftwarePackages.softwarePackages.FirstOrDefault<SoftwarePackage>();
+                    {
+                        Package = SoftwarePackages.softwarePackages.FirstOrDefault();
+                    }
                 }
             }
 
             if (Package == null)
+            {
                 throw new WPinternalsException("ENOSW package not found", "No ENOSW package has been found in the remote software repository for the requested model.");
+            }
 
-            SoftwareFile FileInfo = Package.files.Where(f => f.fileName.EndsWith(".secwim", StringComparison.OrdinalIgnoreCase)).First();
+            SoftwareFile FileInfo = Package.files.First(f => f.fileName.EndsWith(".secwim", StringComparison.OrdinalIgnoreCase));
 
-            SoftwareFile DPLF = Package.files.Where(f => f.fileName.EndsWith(".dpl", StringComparison.OrdinalIgnoreCase)).First();
-            Uri DPLUri = new Uri("https://api.swrepository.com/rest-api/discovery/fileurl/1/" + Package.id + "/" + DPLF.fileName);
+            SoftwareFile DPLF = Package.files.First(f => f.fileName.EndsWith(".dpl", StringComparison.OrdinalIgnoreCase));
+            Uri DPLUri = new("https://api.swrepository.com/rest-api/discovery/fileurl/1/" + Package.id + "/" + DPLF.fileName);
             Task<string> GetDPLTask = HttpClient.GetStringAsync(DPLUri);
             GetDPLTask.Wait();
             string DPLString = GetDPLTask.Result;
 
             string DPLUrl = "";
             FileUrlResult FileUrlDPL = null;
-            using (MemoryStream JsonStream3 = new MemoryStream(Encoding.UTF8.GetBytes(DPLString)))
+            using (MemoryStream JsonStream3 = new(Encoding.UTF8.GetBytes(DPLString)))
             {
-                DataContractJsonSerializer Serializer3 = new DataContractJsonSerializer(typeof(FileUrlResult));
+                DataContractJsonSerializer Serializer3 = new(typeof(FileUrlResult));
                 FileUrlDPL = (FileUrlResult)Serializer3.ReadObject(JsonStream3);
                 if (FileUrlDPL != null)
                 {
@@ -229,16 +250,18 @@ namespace WPinternals
                 }
             }
 
-            if (DPLUrl == "")
+            if (DPLUrl?.Length == 0)
+            {
                 throw new WPinternalsException("DPL not found", "No DPL has been found in the remote software repository for the requested model.");
+            }
 
             Task<string> GetDPLStrTask = HttpClient.GetStringAsync(DPLUrl);
             GetDPLStrTask.Wait();
             string DPLStrString = GetDPLStrTask.Result;
 
             DPL.Package dpl;
-            XmlSerializer serializer = new XmlSerializer(typeof(DPL.Package));
-            using (StringReader reader = new StringReader(DPLStrString.Replace("ft:", "").Replace("dpl:", "").Replace("typedes:", "")))
+            XmlSerializer serializer = new(typeof(DPL.Package));
+            using (StringReader reader = new(DPLStrString.Replace("ft:", "").Replace("dpl:", "").Replace("typedes:", "")))
             {
                 dpl = (DPL.Package)serializer.Deserialize(reader);
             }
@@ -250,19 +273,21 @@ namespace WPinternals
                 DPL.Range range = file.Extensions.MmosWimFile.UseCaseCompatibilities.Compatibility.FirstOrDefault().Range;
 
                 if (IsFirmwareBetween(PhoneFirmwareRevision, range.From, range.To))
-                    FileInfo = Package.files.Where(f => f.fileName.EndsWith(name, StringComparison.OrdinalIgnoreCase)).First();
+                {
+                    FileInfo = Package.files.First(f => f.fileName.EndsWith(name, StringComparison.OrdinalIgnoreCase));
+                }
             }
 
-            Uri FileInfoUri = new Uri("https://api.swrepository.com/rest-api/discovery/fileurl/1/" + Package.id + "/" + FileInfo.fileName);
+            Uri FileInfoUri = new("https://api.swrepository.com/rest-api/discovery/fileurl/1/" + Package.id + "/" + FileInfo.fileName);
             Task<string> GetFileInfoTask = HttpClient.GetStringAsync(FileInfoUri);
             GetFileInfoTask.Wait();
             string FileInfoString = GetFileInfoTask.Result;
 
             string ENOSWUrl = "";
             FileUrlResult FileUrl = null;
-            using (MemoryStream JsonStream3 = new MemoryStream(Encoding.UTF8.GetBytes(FileInfoString)))
+            using (MemoryStream JsonStream3 = new(Encoding.UTF8.GetBytes(FileInfoString)))
             {
-                DataContractJsonSerializer Serializer3 = new DataContractJsonSerializer(typeof(FileUrlResult));
+                DataContractJsonSerializer Serializer3 = new(typeof(FileUrlResult));
                 FileUrl = (FileUrlResult)Serializer3.ReadObject(JsonStream3);
                 if (FileUrl != null)
                 {
@@ -291,7 +316,9 @@ namespace WPinternals
         {
             ProductType = ProductType.ToUpper();
             if (ProductType.StartsWith("RM") && !ProductType.StartsWith("RM-"))
-                ProductType = "RM-" + ProductType.Substring(2);
+            {
+                ProductType = "RM-" + ProductType[2..];
+            }
 
             LogFile.Log("Getting Emergency files for: " + ProductType, LogType.FileAndConsole);
 
@@ -301,15 +328,15 @@ namespace WPinternals
                 ProductType = "RM-1113";
             }
 
-            List<string> Result = new List<string>();
+            List<string> Result = new();
 
-            WebClient Client = new WebClient();
+            WebClient Client = new();
             string Src;
             string FileName;
             string Config = null;
             try
             {
-                Config = Client.DownloadString(@"https://repairavoidance.blob.core.windows.net/packages/EmergencyFlash/" + ProductType + "/emergency_flash_config.xml");
+                Config = Client.DownloadString("https://repairavoidance.blob.core.windows.net/packages/EmergencyFlash/" + ProductType + "/emergency_flash_config.xml");
             }
             catch
             {
@@ -318,7 +345,7 @@ namespace WPinternals
             }
             Client.Dispose();
 
-            XmlDocument Doc = new XmlDocument();
+            XmlDocument Doc = new();
             Doc.LoadXml(Config);
 
             // Hex
@@ -326,7 +353,7 @@ namespace WPinternals
             if (Node != null)
             {
                 FileName = Node.Attributes["image_path"].InnerText;
-                Src = @"https://repairavoidance.blob.core.windows.net/packages/EmergencyFlash/" + ProductType + "/" + FileName;
+                Src = "https://repairavoidance.blob.core.windows.net/packages/EmergencyFlash/" + ProductType + "/" + FileName;
                 LogFile.Log("Hex-file: " + Src);
                 Result.Add(Src);
             }
@@ -336,7 +363,7 @@ namespace WPinternals
             if (Node != null)
             {
                 FileName = Node.Attributes["image_path"].InnerText;
-                Src = @"https://repairavoidance.blob.core.windows.net/packages/EmergencyFlash/" + ProductType + "/" + FileName;
+                Src = "https://repairavoidance.blob.core.windows.net/packages/EmergencyFlash/" + ProductType + "/" + FileName;
                 LogFile.Log("Mbn-file: " + Src);
                 Result.Add(Src);
             }
@@ -345,7 +372,7 @@ namespace WPinternals
             foreach (XmlNode SubNode in Doc.SelectNodes("//emergency_flash_config/first_boot_images/first_boot_image"))
             {
                 FileName = SubNode.Attributes["image_path"].InnerText;
-                Src = @"https://repairavoidance.blob.core.windows.net/packages/EmergencyFlash/" + ProductType + "/" + FileName;
+                Src = "https://repairavoidance.blob.core.windows.net/packages/EmergencyFlash/" + ProductType + "/" + FileName;
                 LogFile.Log("Firehose-programmer-file: " + Src);
                 Result.Add(Src);
             }
@@ -354,7 +381,7 @@ namespace WPinternals
             foreach (XmlNode SubNode in Doc.SelectNodes("//emergency_flash_config/second_boot_firehose_single_image/firehose_image"))
             {
                 FileName = SubNode.Attributes["image_path"].InnerText;
-                Src = @"https://repairavoidance.blob.core.windows.net/packages/EmergencyFlash/" + ProductType + "/" + FileName;
+                Src = "https://repairavoidance.blob.core.windows.net/packages/EmergencyFlash/" + ProductType + "/" + FileName;
                 LogFile.Log("Firehose-payload-file: " + Src);
                 Result.Add(Src);
             }
diff --git a/Models/MassStorage.cs b/Models/MassStorage.cs
index 0be26b3..20c1206 100644
--- a/Models/MassStorage.cs
+++ b/Models/MassStorage.cs
@@ -51,8 +51,8 @@ namespace WPinternals
                     {
                         foreach (ManagementObject drive in partition.GetRelated("Win32_DiskDrive"))
                         {
-                            if ((drive["PNPDeviceID"].ToString().IndexOf("VEN_QUALCOMM&PROD_MMC_STORAGE") >= 0) ||
-                                (drive["PNPDeviceID"].ToString().IndexOf("VEN_MSFT&PROD_PHONE_MMC_STOR") >= 0))
+                            if ((drive["PNPDeviceID"].ToString().Contains("VEN_QUALCOMM&PROD_MMC_STORAGE", StringComparison.CurrentCulture)) ||
+                                (drive["PNPDeviceID"].ToString().Contains("VEN_MSFT&PROD_PHONE_MMC_STOR", StringComparison.CurrentCulture)))
                             {
                                 Label = (logical["VolumeName"] == null ? "" : logical["VolumeName"].ToString());
                                 if ((Drive == null) || (string.Compare(Label, "MainOS", true) == 0)) // Always prefer the MainOS drive-mapping
@@ -62,11 +62,15 @@ namespace WPinternals
                                     VolumeLabel = Label;
                                 }
                                 if (string.Compare(Label, "MainOS", true) == 0)
+                                {
                                     break;
+                                }
                             }
                         }
                         if (string.Compare(Label, "MainOS", true) == 0)
+                        {
                             break;
+                        }
                     }
                 }
             }
@@ -77,7 +81,7 @@ namespace WPinternals
         {
             try
             {
-                QualcommSerial SerialDevice = new QualcommSerial(DevicePath);
+                QualcommSerial SerialDevice = new(DevicePath);
                 SerialDevice.Close();
                 SerialDevice.Dispose();
 
@@ -97,11 +101,13 @@ namespace WPinternals
         internal void Reboot()
         {
             if (Serial == null)
+            {
                 return;
+            }
 
             try
             {
-                QualcommSerial SerialDevice = new QualcommSerial(Serial);
+                QualcommSerial SerialDevice = new(Serial);
 
                 SerialDevice.EncodeCommands = false;
 
@@ -120,7 +126,9 @@ namespace WPinternals
         protected override void Dispose(bool disposing)
         {
             if (Disposed)
+            {
                 return;
+            }
 
             if (disposing)
             {
@@ -135,7 +143,9 @@ namespace WPinternals
             OpenWithWriteAccess = false;
 
             if (IsVolumeOpen())
+            {
                 throw new Exception("Volume already opened");
+            }
 
             if (WriteAccess)
             {
@@ -169,7 +179,9 @@ namespace WPinternals
             }
 
             if ((int)hVolume == -1)
+            {
                 throw new Exception(Marshal.GetLastWin32Error().ToString());
+            }
 
             OpenWithWriteAccess = WriteAccess;
         }
@@ -197,7 +209,9 @@ namespace WPinternals
         internal void SetSectorPosition(UInt64 Sector)
         {
             if (!IsVolumeOpen())
+            {
                 throw new Exception("Volume is not opened");
+            }
 
             int High = (int)(Sector >> (32 - 9));
             NativeMethods.SetFilePointer(hVolume, (int)(Sector << 9), ref High, EMoveMethod.Begin);
@@ -206,38 +220,49 @@ namespace WPinternals
         internal void WriteSector(byte[] buffer)
         {
             if (!IsVolumeOpen())
+            {
                 throw new Exception("Volume is not opened");
+            }
 
             if (!OpenWithWriteAccess)
+            {
                 throw new Exception("Volume is not opened with Write Acces");
+            }
 
-            uint count = 0;
-            bool result = NativeMethods.WriteFile(hVolume, buffer, 512, out count, IntPtr.Zero);
+            bool result = NativeMethods.WriteFile(hVolume, buffer, 512, out uint count, IntPtr.Zero);
             if (!result)
+            {
                 throw new Exception("Exception: 0x" + Marshal.GetLastWin32Error().ToString("X8"));
+            }
         }
 
         internal void ReadSector(byte[] buffer)
         {
             if (!IsVolumeOpen())
+            {
                 throw new Exception("Volume is not opened");
+            }
 
-            uint count = 1;
-            bool result = NativeMethods.ReadFile(hVolume, buffer, 512, out count, IntPtr.Zero);
+            bool result = NativeMethods.ReadFile(hVolume, buffer, 512, out uint count, IntPtr.Zero);
             if (!result)
+            {
                 throw new Exception("Exception: 0x" + Marshal.GetLastWin32Error().ToString("X8"));
+            }
         }
 
         internal void ReadSectors(byte[] buffer, out uint ActualSectorsRead, uint SizeInSectors = uint.MaxValue)
         {
             if (!IsVolumeOpen())
+            {
                 throw new Exception("Volume is not opened");
+            }
 
-            uint count = 1;
-            bool Result = NativeMethods.ReadFile(hVolume, buffer, (SizeInSectors * 0x200) < buffer.Length ? (SizeInSectors * 0x200) : (uint)buffer.Length, out count, IntPtr.Zero);
+            bool Result = NativeMethods.ReadFile(hVolume, buffer, (SizeInSectors * 0x200) < buffer.Length ? (SizeInSectors * 0x200) : (uint)buffer.Length, out uint count, IntPtr.Zero);
             ActualSectorsRead = count / 0x200;
             if (!Result)
+            {
                 throw new Exception("Failed to read sectors. Exception: 0x" + Marshal.GetLastWin32Error().ToString("X8"));
+            }
         }
 
         internal byte[] ReadSectors(UInt64 StartSector, UInt64 SectorCount)
@@ -246,17 +271,22 @@ namespace WPinternals
 
             bool VolumeWasOpen = IsVolumeOpen();
             if (!VolumeWasOpen)
+            {
                 OpenVolume(false);
+            }
 
             SetSectorPosition(StartSector);
-            uint SectorsRead;
-            ReadSectors(Result, out SectorsRead);
+            ReadSectors(Result, out uint SectorsRead);
 
             if (!VolumeWasOpen)
+            {
                 CloseVolume();
+            }
 
             if (Result == null)
+            {
                 throw new Exception("Failed to read from phone");
+            }
 
             return Result;
         }
@@ -295,28 +325,22 @@ namespace WPinternals
         {
             bool VolumeWasOpen = IsVolumeOpen();
             if (!VolumeWasOpen)
+            {
                 OpenVolume(false);
+            }
 
             SetSectorPosition(StartSector);
             ProgressUpdater Progress = UpdaterPerSector;
             if ((Progress == null) && (ProgressUpdateCallback != null))
-                Progress = new ProgressUpdater(SectorCount, ProgressUpdateCallback);
-
-            byte[] Buffer;
-            if (SectorCount >= 0x80)
-                Buffer = new byte[0x10000];
-            else
-                Buffer = new byte[SectorCount * 0x200];
-
-            Stream Stream;
-            if (Path == null)
-                Stream = OutputStream;
-            else
-                Stream = File.Open(Path, FileMode.Create);
-
-            using (BinaryWriter Writer = new BinaryWriter(Stream))
             {
-                uint ActualSectorsRead;
+                Progress = new ProgressUpdater(SectorCount, ProgressUpdateCallback);
+            }
+
+            byte[] Buffer = SectorCount >= 0x80 ? (new byte[0x10000]) : (new byte[SectorCount * 0x200]);
+
+            Stream Stream = Path == null ? OutputStream : File.Open(Path, FileMode.Create);
+            using (BinaryWriter Writer = new(Stream))
+            {
                 for (UInt64 i = 0; i < SectorCount; i += 0x80)
                 {
                     // TODO: Reading sectors and writing to compressed stream should be on different threads.
@@ -326,16 +350,17 @@ namespace WPinternals
                     // BinaryWriter doesnt support async.
                     // Calling async directly on the EntryStream of a Ziparchive blocks.
 
-                    ReadSectors(Buffer, out ActualSectorsRead, (SectorCount - i) >= 0x80 ? 0x80 : (uint)(SectorCount - i));
+                    ReadSectors(Buffer, out uint ActualSectorsRead, (SectorCount - i) >= 0x80 ? 0x80 : (uint)(SectorCount - i));
                     Writer.Write(Buffer, 0, (int)ActualSectorsRead * 0x200);
-                    if (Progress != null)
-                        Progress.IncreaseProgress(ActualSectorsRead);
+                    Progress?.IncreaseProgress(ActualSectorsRead);
                 }
                 Stream.Flush();
             }
 
             if (!VolumeWasOpen)
+            {
                 CloseVolume();
+            }
         }
 
         internal void BackupPartition(string PartitionName, string Path)
@@ -372,17 +397,21 @@ namespace WPinternals
         {
             bool VolumeWasOpen = IsVolumeOpen();
             if (!VolumeWasOpen)
+            {
                 OpenVolume(false);
+            }
 
             SetSectorPosition(1);
             byte[] GPTBuffer = ReadSectors(1, 33);
-            GPT GPT = new GPT(GPTBuffer);
-            Partition Partition = GPT.Partitions.Where((p) => p.Name == PartitionName).First();
+            GPT GPT = new(GPTBuffer);
+            Partition Partition = GPT.Partitions.First((p) => p.Name == PartitionName);
 
             DumpSectors(Partition.FirstSector, Partition.LastSector - Partition.FirstSector + 1, Path, OutputStream, ProgressUpdateCallback, UpdaterPerSector);
 
             if (!VolumeWasOpen)
+            {
                 CloseVolume();
+            }
         }
 
         internal void WriteSectors(UInt64 StartSector, byte[] Buffer)
@@ -391,29 +420,37 @@ namespace WPinternals
 
             bool VolumeWasOpen = IsVolumeOpen();
             if (!VolumeWasOpen)
+            {
                 OpenVolume(true);
+            }
 
             SetSectorPosition(StartSector);
 
-            uint count = 1;
-            Result = NativeMethods.WriteFile(hVolume, Buffer, (uint)Buffer.Length, out count, IntPtr.Zero);
+            Result = NativeMethods.WriteFile(hVolume, Buffer, (uint)Buffer.Length, out uint count, IntPtr.Zero);
 
             if (!VolumeWasOpen)
+            {
                 CloseVolume();
+            }
 
             if (!Result)
+            {
                 throw new Exception("Failed to write sectors.");
+            }
         }
 
         internal void WriteSectors(byte[] Buffer, uint Length = uint.MaxValue)
         {
             if (!IsVolumeOpen())
+            {
                 throw new Exception("Volume is not opened");
+            }
 
-            uint count = 1;
-            bool Result = NativeMethods.WriteFile(hVolume, Buffer, (Length < Buffer.Length ? Length : (uint)Buffer.Length), out count, IntPtr.Zero);
+            bool Result = NativeMethods.WriteFile(hVolume, Buffer, Length < Buffer.Length ? Length : (uint)Buffer.Length, out uint count, IntPtr.Zero);
             if (!Result)
+            {
                 throw new Exception("Failed to write sectors. Exception: 0x" + Marshal.GetLastWin32Error().ToString("X8"));
+            }
         }
 
         internal void WriteSectors(UInt64 StartSector, string Path)
@@ -435,22 +472,23 @@ namespace WPinternals
         {
             bool VolumeWasOpen = IsVolumeOpen();
             if (!VolumeWasOpen)
+            {
                 OpenVolume(true);
+            }
 
             SetSectorPosition(StartSector);
 
             byte[] Buffer;
 
-            using (BinaryReader Reader = new BinaryReader(File.Open(Path, FileMode.Open)))
+            using (BinaryReader Reader = new(File.Open(Path, FileMode.Open)))
             {
                 ProgressUpdater Progress = UpdaterPerSector;
                 if ((Progress == null) && (ProgressUpdateCallback != null))
+                {
                     Progress = new ProgressUpdater((UInt64)(Reader.BaseStream.Length / 0x200), ProgressUpdateCallback);
+                }
 
-                if (Reader.BaseStream.Length >= 0x10000)
-                    Buffer = new byte[0x10000];
-                else
-                    Buffer = new byte[Reader.BaseStream.Length];
+                Buffer = Reader.BaseStream.Length >= 0x10000 ? (new byte[0x10000]) : (new byte[Reader.BaseStream.Length]);
 
                 int Count;
                 for (UInt64 i = 0; i < (UInt64)(Reader.BaseStream.Length / 0x200); i += 0x80)
@@ -459,13 +497,14 @@ namespace WPinternals
 
                     WriteSectors(Buffer, (uint)Count);
 
-                    if (Progress != null)
-                        Progress.IncreaseProgress((ulong)Count / 0x200);
+                    Progress?.IncreaseProgress((ulong)Count / 0x200);
                 }
             }
 
             if (!VolumeWasOpen)
+            {
                 CloseVolume();
+            }
         }
 
         internal void RestorePartition(string Path, string PartitionName)
@@ -487,21 +526,27 @@ namespace WPinternals
         {
             bool VolumeWasOpen = IsVolumeOpen();
             if (!VolumeWasOpen)
+            {
                 OpenVolume(true);
+            }
 
             SetSectorPosition(1);
             byte[] GPTBuffer = ReadSectors(1, 33);
-            GPT GPT = new GPT(GPTBuffer);
-            Partition Partition = GPT.Partitions.Where((p) => p.Name == PartitionName).First();
+            GPT GPT = new(GPTBuffer);
+            Partition Partition = GPT.Partitions.First((p) => p.Name == PartitionName);
             ulong PartitionSize = (Partition.LastSector - Partition.FirstSector + 1) * 0x200;
             ulong FileSize = (ulong)new FileInfo(Path).Length;
             if (FileSize > PartitionSize)
+            {
                 throw new InvalidOperationException("Partition can not be restored, because its size is too big!");
+            }
 
             WriteSectors(Partition.FirstSector, Path, ProgressUpdateCallback);
 
             if (!VolumeWasOpen)
+            {
                 CloseVolume();
+            }
         }
     }
 }
diff --git a/Models/NokiaFlashModel.cs b/Models/NokiaFlashModel.cs
index 04a77b0..153e0d4 100644
--- a/Models/NokiaFlashModel.cs
+++ b/Models/NokiaFlashModel.cs
@@ -46,7 +46,7 @@ namespace WPinternals
     internal class NokiaFlashModel : NokiaPhoneModel
     {
         private UefiSecurityStatusResponse _SecurityStatus = null;
-        private PhoneInfo Info = new PhoneInfo();
+        private readonly PhoneInfo Info = new();
 
         internal event InterfaceChangedHandler InterfaceChanged = delegate { };
 
@@ -61,7 +61,10 @@ namespace WPinternals
             System.Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Param), 0, Request, 7, Param.Length);
 
             byte[] Response = ExecuteRawMethod(Request);
-            if ((Response == null) || (Response.Length < 0x10)) return null;
+            if ((Response == null) || (Response.Length < 0x10))
+            {
+                return null;
+            }
 
             byte[] Result = new byte[Response[0x10]];
             System.Buffer.BlockCopy(Response, 0x11, Result, 0, Response[0x10]);
@@ -71,7 +74,11 @@ namespace WPinternals
         public string ReadStringParam(string Param)
         {
             byte[] Bytes = ReadParam(Param);
-            if (Bytes == null) return null;
+            if (Bytes == null)
+            {
+                return null;
+            }
+
             return System.Text.ASCIIEncoding.ASCII.GetString(Bytes).Trim(new char[] { '\0' });
         }
 
@@ -99,7 +106,9 @@ namespace WPinternals
         {
             uint? flags = ReadSecurityFlags();
             if (!flags.HasValue)
+            {
                 return null;
+            }
 
             var finalconfig = (Fuse)flags.Value;
             return finalconfig.HasFlag(fuse);
@@ -108,7 +117,10 @@ namespace WPinternals
         public uint? ReadSecurityFlags()
         {
             byte[] Response = ReadParam("FCS");
-            if ((Response == null) || (Response.Length != 4)) return null;
+            if ((Response == null) || (Response.Length != 4))
+            {
+                return null;
+            }
 
             // This value is in big endian
             return (UInt32)((Response[0] << 24) | (Response[1] << 16) | (Response[2] << 8) | Response[3]);
@@ -117,7 +129,10 @@ namespace WPinternals
         public uint? ReadCurrentChargeLevel()
         {
             byte[] Response = ReadParam("CS");
-            if ((Response == null) || (Response.Length != 8)) return null;
+            if ((Response == null) || (Response.Length != 8))
+            {
+                return null;
+            }
 
             // This value is in big endian
             return (UInt32)((Response[0] << 24) | (Response[1] << 16) | (Response[2] << 8) | Response[3]) + 1;
@@ -126,7 +141,10 @@ namespace WPinternals
         public int? ReadCurrentChargeCurrent()
         {
             byte[] Response = ReadParam("CS");
-            if ((Response == null) || (Response.Length != 8)) return null;
+            if ((Response == null) || (Response.Length != 8))
+            {
+                return null;
+            }
 
             // This value is in big endian and needs to be XOR'd with 0xFFFFFFFF
             return (Int32)(((Response[4] << 24) | (Response[5] << 16) | (Response[6] << 8) | Response[7]) ^ 0xFFFFFFFF) + 1;
@@ -135,12 +153,17 @@ namespace WPinternals
         public UefiSecurityStatusResponse ReadSecurityStatus()
         {
             if (_SecurityStatus != null)
+            {
                 return _SecurityStatus;
+            }
 
             byte[] Response = ReadParam("SS");
-            if (Response == null) return null;
+            if (Response == null)
+            {
+                return null;
+            }
 
-            UefiSecurityStatusResponse Result = new UefiSecurityStatusResponse();
+            UefiSecurityStatusResponse Result = new();
 
             Result.IsTestDevice = Response[0];
             Result.PlatformSecureBootStatus = Convert.ToBoolean(Response[1]);
@@ -160,7 +183,10 @@ namespace WPinternals
         {
             UefiSecurityStatusResponse SecurityStatus = ReadSecurityStatus();
             if (SecurityStatus != null)
-                return (SecurityStatus.AuthenticationStatus || SecurityStatus.RdcStatus || !SecurityStatus.SecureFfuEfuseStatus);
+            {
+                return SecurityStatus.AuthenticationStatus || SecurityStatus.RdcStatus || !SecurityStatus.SecureFfuEfuseStatus;
+            }
+
             return null;
         }
 
@@ -168,7 +194,7 @@ namespace WPinternals
         {
             byte[] AsskMask = new byte[0x10] { 1, 0, 16, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64 };
             byte[] Request = new byte[0xAC];
-            string Header = "NOKXFT";
+            const string Header = "NOKXFT";
             System.Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
             Request[7] = 1;
             System.Buffer.BlockCopy(BigEndian.GetBytes(0x18, 4), 0, Request, 0x08, 4); // Subblocktype = 0x18
@@ -176,20 +202,23 @@ namespace WPinternals
             System.Buffer.BlockCopy(BigEndian.GetBytes(0x00, 4), 0, Request, 0x10, 4); // AsicIndex = 0x00
             System.Buffer.BlockCopy(AsskMask, 0, Request, 0x14, 0x10);
             byte[] TerminalResponse = ExecuteRawMethod(Request);
-            if ((TerminalResponse != null) && (TerminalResponse.Length > 0x20) && (BigEndian.ToUInt32(TerminalResponse, 0x14) == (TerminalResponse.Length - 0x18)) && (BitConverter.ToUInt32(TerminalResponse, 0x1C) == (TerminalResponse.Length - 0x20)))
+            if ((TerminalResponse?.Length > 0x20) && (BigEndian.ToUInt32(TerminalResponse, 0x14) == (TerminalResponse.Length - 0x18)) && (BitConverter.ToUInt32(TerminalResponse, 0x1C) == (TerminalResponse.Length - 0x20)))
             {
                 // Parse Terminal Response from offset 0x18
                 TerminalResponse ParsedResponse = Terminal.Parse(TerminalResponse, 0x18);
                 return ParsedResponse;
             }
-            else return null;
+            else
+            {
+                return null;
+            }
         }
 
         public void SendFfuHeaderV1(byte[] FfuHeader, byte Options = 0)
         {
             byte[] Request = new byte[FfuHeader.Length + 0x20];
 
-            string Header = "NOKXFS";
+            const string Header = "NOKXFS";
             System.Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
             System.Buffer.BlockCopy(BigEndian.GetBytes(0x0001, 2), 0, Request, 0x06, 2); // Protocol version = 0x0001
             Request[0x08] = 0; // Progress = 0%
@@ -204,17 +233,22 @@ namespace WPinternals
 
             byte[] Response = ExecuteRawMethod(Request);
             if (Response == null)
+            {
                 throw new BadConnectionException();
+            }
+
             int ResultCode = (Response[6] << 8) + Response[7];
             if (ResultCode != 0)
+            {
                 ThrowFlashError(ResultCode);
+            }
         }
 
         public void SendFfuHeaderV2(UInt32 TotalHeaderLength, UInt32 OffsetForThisPart, byte[] FfuHeader, byte Options = 0)
         {
             byte[] Request = new byte[FfuHeader.Length + 0x3C];
 
-            string Header = "NOKXFS";
+            const string Header = "NOKXFS";
             System.Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
             System.Buffer.BlockCopy(BigEndian.GetBytes((int)FfuProtocol.ProtocolSyncV2, 2), 0, Request, 0x06, 2); // Protocol version = 0x0001
             Request[0x08] = 0; // Progress = 0%
@@ -235,19 +269,27 @@ namespace WPinternals
 
             byte[] Response = ExecuteRawMethod(Request);
             if (Response == null)
+            {
                 throw new BadConnectionException();
+            }
+
             if (Response.Length == 4)
+            {
                 throw new WPinternalsException("Flash protocol v2 not supported", "The device reported that the Flash protocol v2 was not supported while sending the FFU header.");
+            }
+
             int ResultCode = (Response[6] << 8) + Response[7];
             if (ResultCode != 0)
+            {
                 ThrowFlashError(ResultCode);
+            }
         }
 
         public void SendFfuPayloadV1(byte[] FfuChunk, int Progress = 0, byte Options = 0)
         {
             byte[] Request = new byte[FfuChunk.Length + 0x1C];
 
-            string Header = "NOKXFS";
+            const string Header = "NOKXFS";
             System.Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
             System.Buffer.BlockCopy(BigEndian.GetBytes((int)FfuProtocol.ProtocolSyncV1, 2), 0, Request, 0x06, 2); // Protocol version = 0x0001
             Request[0x08] = (byte)Progress; // Progress = 0% (0 - 100)
@@ -263,17 +305,22 @@ namespace WPinternals
 
             byte[] Response = ExecuteRawMethod(Request);
             if (Response == null)
+            {
                 throw new BadConnectionException();
+            }
+
             int ResultCode = (Response[6] << 8) + Response[7];
             if (ResultCode != 0)
+            {
                 ThrowFlashError(ResultCode);
+            }
         }
 
         public void SendFfuPayloadV2(byte[] FfuChunk, int Progress = 0, byte Options = 0)
         {
             byte[] Request = new byte[FfuChunk.Length + 0x20];
 
-            string Header = "NOKXFS";
+            const string Header = "NOKXFS";
             System.Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
             System.Buffer.BlockCopy(BigEndian.GetBytes((int)FfuProtocol.ProtocolSyncV2, 2), 0, Request, 0x06, 2); // Protocol
             Request[0x08] = (byte)Progress; // Progress = 0% (0 - 100)
@@ -289,17 +336,22 @@ namespace WPinternals
 
             byte[] Response = ExecuteRawMethod(Request);
             if (Response == null)
+            {
                 throw new BadConnectionException();
+            }
+
             int ResultCode = (Response[6] << 8) + Response[7];
             if (ResultCode != 0)
+            {
                 ThrowFlashError(ResultCode);
+            }
         }
 
         public void SendFfuPayloadV3(byte[] FfuChunk, UInt32 WriteDescriptorIndex, UInt32 CRC, int Progress = 0, byte Options = 0)
         {
             byte[] Request = new byte[FfuChunk.Length + 0x20];
 
-            string Header = "NOKXFS";
+            const string Header = "NOKXFS";
             System.Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
             System.Buffer.BlockCopy(BigEndian.GetBytes((int)FfuProtocol.ProtocolAsyncV3, 2), 0, Request, 0x06, 2); // Protocol
             Request[0x08] = (byte)Progress; // Progress = 0% (0 - 100)
@@ -317,10 +369,15 @@ namespace WPinternals
 
             byte[] Response = ExecuteRawMethod(Request);
             if (Response == null)
+            {
                 throw new BadConnectionException();
+            }
+
             int ResultCode = (Response[6] << 8) + Response[7];
             if (ResultCode != 0)
+            {
                 ThrowFlashError(ResultCode);
+            }
         }
 
         public void BackupPartitionToRam(string PartitionName)
@@ -329,7 +386,7 @@ namespace WPinternals
             if (new string[] { "MODEM_FSG", "MODEM_FS1", "MODEM_FS2", "SSD", "DPP" }.Any(s => s == PartitionName))
             {
                 byte[] Request = new byte[84];
-                string Header = "NOKXFB";
+                const string Header = "NOKXFB";
                 System.Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
                 Request[0x07] = 1; // Subblock count = 1
                 Request[0x08] = 6; // Subblock ID = 6 = Create Partition Backup to RAM
@@ -344,16 +401,20 @@ namespace WPinternals
                 byte[] Response = ExecuteRawMethod(Request);
                 int ResultCode = (Response[6] << 8) + Response[7];
                 if (ResultCode != 0)
+                {
                     ThrowFlashError(ResultCode);
+                }
             }
             else
+            {
                 throw new WPinternalsException("Specified partition cannot be backupped to RAM", "Partition name: \"" + PartitionName + "\".");
+            }
         }
 
         public void LoadMmosBinary(UInt32 TotalLength, UInt32 Offset, bool SkipMmosSupportCheck, byte[] MmosPart)
         {
             byte[] Request = new byte[MmosPart.Length + 0x20];
-            string Header = "NOKXFL";
+            const string Header = "NOKXFL";
             System.Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
             Request[0x07] = 1; // Subblock count = 1
             System.Buffer.BlockCopy(BigEndian.GetBytes(0x0000001E, 4), 0, Request, 0x08, 4); // Subblock ID = Load MMOS Binary = 0x1E
@@ -361,14 +422,19 @@ namespace WPinternals
             System.Buffer.BlockCopy(BigEndian.GetBytes(TotalLength, 4), 0, Request, 0x10, 4);
             System.Buffer.BlockCopy(BigEndian.GetBytes(Offset, 4), 0, Request, 0x14, 4);
             if (SkipMmosSupportCheck)
+            {
                 Request[0x18] = 1;
+            }
+
             System.Buffer.BlockCopy(BigEndian.GetBytes(MmosPart.Length, 4), 0, Request, 0x1C, 4);
             Buffer.BlockCopy(MmosPart, 0, Request, 0x20, MmosPart.Length);
 
             byte[] Response = ExecuteRawMethod(Request);
             int ResultCode = (Response[6] << 8) + Response[7];
             if (ResultCode != 0)
+            {
                 ThrowFlashError(ResultCode);
+            }
         }
 
         internal void SwitchToMmosContext()
@@ -384,51 +450,48 @@ namespace WPinternals
 
         private void ThrowFlashError(int ErrorCode)
         {
-            string SubMessage;
-
-            switch (ErrorCode)
+            string SubMessage = ErrorCode switch
             {
-                case 0x0008: SubMessage = "Unsupported protocol / Invalid options"; break;
-                case 0x000F: SubMessage = "Invalid sub block count"; break;
-                case 0x0010: SubMessage = "Invalid sub block length"; break;
-                case 0x0012: SubMessage = "Authentication required"; break;
-                case 0x000E: SubMessage = "Invalid sub block type"; break;
-                case 0x0013: SubMessage = "Failed async message"; break;
-                case 0x1000: SubMessage = "Invalid header type"; break;
-                case 0x1001: SubMessage = "FFU header contain unknown extra data"; break;
-                case 0x0001: SubMessage = "Couldn't allocate memory"; break;
-                case 0x1106: SubMessage = "Security header validation failed"; break;
-                case 0x1105: SubMessage = "Invalid hash table size"; break;
-                case 0x1104: SubMessage = "Invalid catalog size"; break;
-                case 0x1103: SubMessage = "Invalid chunk size"; break;
-                case 0x1102: SubMessage = "Unsupported algorithm"; break;
-                case 0x1101: SubMessage = "Invalid struct size"; break;
-                case 0x1100: SubMessage = "Invalid signature"; break;
-                case 0x1202: SubMessage = "Invalid struct size"; break;
-                case 0x1203: SubMessage = "Unsupported algorithm"; break;
-                case 0x1204: SubMessage = "Invalid chunk size"; break;
-                case 0x1005: SubMessage = "Data not aligned correctly"; break;
-                case 0x0009: SubMessage = "Locate protocol failed"; break;
-                case 0x1003: SubMessage = "Hash mismatch"; break;
-                case 0x1006: SubMessage = "Couldn't find hash from security header for index"; break;
-                case 0x1004: SubMessage = "Security header import missing / All FFU headers have not been imported"; break;
-                case 0x1304: SubMessage = "Invalid platform ID"; break;
-                case 0x1307: SubMessage = "Invalid write descriptor info"; break;
-                case 0x1306: SubMessage = "Invalid write descriptor info"; break;
-                case 0x1305: SubMessage = "Invalid block size"; break;
-                case 0x1303: SubMessage = "Unsupported FFU version"; break;
-                case 0x1302: SubMessage = "Unsupported struct version"; break;
-                case 0x1301: SubMessage = "Invalid update type"; break;
-                case 0x100B: SubMessage = "Too much payload data, all data has already been written"; break;
-                case 0x1008: SubMessage = "Internal error"; break;
-                case 0x1007: SubMessage = "Payload data does not contain all data"; break;
-                case 0x0004: SubMessage = "Flash write failed"; break;
-                case 0x000D: SubMessage = "Flash verify failed"; break;
-                case 0x0002: SubMessage = "Flash read failed"; break;
-                default: SubMessage = "Unknown error"; break;
-            }
-
-            WPinternalsException Ex = new WPinternalsException("Flash failed!");
+                0x0008 => "Unsupported protocol / Invalid options",
+                0x000F => "Invalid sub block count",
+                0x0010 => "Invalid sub block length",
+                0x0012 => "Authentication required",
+                0x000E => "Invalid sub block type",
+                0x0013 => "Failed async message",
+                0x1000 => "Invalid header type",
+                0x1001 => "FFU header contain unknown extra data",
+                0x0001 => "Couldn't allocate memory",
+                0x1106 => "Security header validation failed",
+                0x1105 => "Invalid hash table size",
+                0x1104 => "Invalid catalog size",
+                0x1103 => "Invalid chunk size",
+                0x1102 => "Unsupported algorithm",
+                0x1101 => "Invalid struct size",
+                0x1100 => "Invalid signature",
+                0x1202 => "Invalid struct size",
+                0x1203 => "Unsupported algorithm",
+                0x1204 => "Invalid chunk size",
+                0x1005 => "Data not aligned correctly",
+                0x0009 => "Locate protocol failed",
+                0x1003 => "Hash mismatch",
+                0x1006 => "Couldn't find hash from security header for index",
+                0x1004 => "Security header import missing / All FFU headers have not been imported",
+                0x1304 => "Invalid platform ID",
+                0x1307 => "Invalid write descriptor info",
+                0x1306 => "Invalid write descriptor info",
+                0x1305 => "Invalid block size",
+                0x1303 => "Unsupported FFU version",
+                0x1302 => "Unsupported struct version",
+                0x1301 => "Invalid update type",
+                0x100B => "Too much payload data, all data has already been written",
+                0x1008 => "Internal error",
+                0x1007 => "Payload data does not contain all data",
+                0x0004 => "Flash write failed",
+                0x000D => "Flash verify failed",
+                0x0002 => "Flash read failed",
+                _ => "Unknown error",
+            };
+            WPinternalsException Ex = new("Flash failed!");
             Ex.SubMessage = "Error 0x" + ErrorCode.ToString("X4") + ": " + SubMessage;
 
             throw Ex;
@@ -452,11 +515,13 @@ namespace WPinternals
 
             PhoneInfo Info = ReadPhoneInfo();
             if ((Info.SecureFfuSupportedProtocolMask & ((ushort)FfuProtocol.ProtocolSyncV1 | (ushort)FfuProtocol.ProtocolSyncV2)) == 0)
+            {
                 throw new WPinternalsException("Flash failed!", "Protocols not supported. The device reports that both Protocol Sync v1 and Protocol Sync v2 are not supported for FFU flashing. Is this an old device?");
+            }
 
             UInt64 CombinedFFUHeaderSize = FFU.HeaderSize;
             byte[] FfuHeader = new byte[CombinedFFUHeaderSize];
-            using (System.IO.FileStream FfuFile = new System.IO.FileStream(FFU.Path, System.IO.FileMode.Open, System.IO.FileAccess.Read))
+            using (FileStream FfuFile = new(FFU.Path, System.IO.FileMode.Open, System.IO.FileAccess.Read))
             {
                 FfuFile.Read(FfuHeader, 0, (int)CombinedFFUHeaderSize);
                 SendFfuHeaderV1(FfuHeader, Options);
@@ -477,8 +542,7 @@ namespace WPinternals
                         SendFfuPayloadV1(Payload, (int)((double)ChunkCount * 100 / FFU.TotalChunkCount), 0);
                         Position += (ulong)Payload.Length;
 
-                        if (Progress != null)
-                            Progress.IncreaseProgress(1);
+                        Progress?.IncreaseProgress(1);
                     }
                 }
                 else
@@ -500,14 +564,15 @@ namespace WPinternals
                         SendFfuPayloadV2(Payload, (int)((double)ChunkCount * 100 / FFU.TotalChunkCount), 0);
                         Position += PayloadSize;
 
-                        if (Progress != null)
-                            Progress.IncreaseProgress((ulong)(PayloadSize / FFU.ChunkSize));
+                        Progress?.IncreaseProgress((ulong)(PayloadSize / FFU.ChunkSize));
                     }
                 }
             }
 
             if (ResetAfterwards)
+            {
                 ResetPhone();
+            }
 
             LogFile.EndAction("FlashFFU");
         }
@@ -520,17 +585,19 @@ namespace WPinternals
 
             PhoneInfo Info = ReadPhoneInfo();
             if (!Info.MmosOverUsbSupported)
+            {
                 throw new WPinternalsException("Flash failed!", "Protocols not supported. The device reports that loading Microsoft Manufacturing Operating System over USB is not supported.");
+            }
 
-            FileInfo info = new FileInfo(MMOSPath);
+            FileInfo info = new(MMOSPath);
             uint length = uint.Parse(info.Length.ToString());
 
             int offset = 0;
-            int maximumbuffersize = 0x00240000;
+            const int maximumbuffersize = 0x00240000;
 
             uint totalcounts = (uint)Math.Truncate((decimal)length / maximumbuffersize);
 
-            using (System.IO.FileStream MMOSFile = new System.IO.FileStream(MMOSPath, System.IO.FileMode.Open, System.IO.FileAccess.Read))
+            using (FileStream MMOSFile = new(MMOSPath, System.IO.FileMode.Open, System.IO.FileAccess.Read))
             {
                 for (int i = 1; i <= (uint)Math.Truncate((decimal)length / maximumbuffersize); i++)
                 {
@@ -565,7 +632,7 @@ namespace WPinternals
 
             byte[] Request = new byte[Data.Length + 0x40];
 
-            string Header = "NOKF";
+            const string Header = "NOKF";
             System.Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
             Request[0x05] = 0; // Device type = 0
             System.Buffer.BlockCopy(BigEndian.GetBytes(StartSector, 4), 0, Request, 0x0B, 4); // Start sector
@@ -582,7 +649,7 @@ namespace WPinternals
         public void DisableRebootTimeOut()
         {
             byte[] Request = new byte[4];
-            string Header = "NOKD";
+            const string Header = "NOKD";
             System.Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
             ExecuteRawMethod(Request);
         }
@@ -590,7 +657,7 @@ namespace WPinternals
         public void Shutdown()
         {
             byte[] Request = new byte[4];
-            string Header = "NOKZ";
+            const string Header = "NOKZ";
             System.Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
             ExecuteRawMethod(Request);
         }
@@ -598,9 +665,12 @@ namespace WPinternals
         public FlashVersion GetFlashVersion()
         {
             byte[] Response = ReadParam("FAI");
-            if ((Response == null) || (Response.Length < 6)) return null;
+            if ((Response == null) || (Response.Length < 6))
+            {
+                return null;
+            }
 
-            FlashVersion Result = new FlashVersion();
+            FlashVersion Result = new();
 
             Result.ProtocolMajor = Response[1];
             Result.ProtocolMinor = Response[2];
@@ -622,7 +692,9 @@ namespace WPinternals
             FlashAppType OriginalAppType = Info.App;
             bool Switch = ((Info.App != FlashAppType.BootManager) && Info.IsBootloaderSecure);
             if (Switch)
+            {
                 SwitchToBootManagerContext();
+            }
 
             byte[] Request = new byte[0x04];
             const string Header = "NOKT";
@@ -631,11 +703,15 @@ namespace WPinternals
 
             byte[] Buffer = ExecuteRawMethod(Request);
             if ((Buffer == null) || (Buffer.Length < 0x4408))
+            {
                 throw new InvalidOperationException("Unable to read GPT!");
+            }
 
             UInt16 Error = (UInt16)((Buffer[6] << 8) + Buffer[7]);
             if (Error > 0)
+            {
                 throw new NotSupportedException("ReadGPT: Error 0x" + Error.ToString("X4"));
+            }
 
             byte[] GPTBuffer = new byte[Buffer.Length - 0x208];
             System.Buffer.BlockCopy(Buffer, 0x208, GPTBuffer, 0, 0x4200);
@@ -643,9 +719,13 @@ namespace WPinternals
             if (Switch)
             {
                 if (OriginalAppType == FlashAppType.FlashApp)
+                {
                     SwitchToFlashAppContext();
+                }
                 else
+                {
                     SwitchToPhoneInfoAppContext();
+                }
             }
 
             return new GPT(GPTBuffer);  // NOKT message header and MBR are ignored
@@ -654,14 +734,18 @@ namespace WPinternals
         internal void WriteGPT(GPT NewGPT)
         {
             bool? unlocked = IsBootLoaderUnlocked();
-            if (unlocked.HasValue && !unlocked.Value)
+            if (unlocked == false)
+            {
                 throw new InvalidOperationException("Bootloader is not unlocked!");
+            }
 
             byte[] Buffer = NewGPT.Rebuild();
 
             UInt32? HeaderOffset = ByteOperations.FindAscii(Buffer, "EFI PART");
             if (HeaderOffset != 0)
+            {
                 throw new BadImageFormatException();
+            }
 
             FlashSectors(1, Buffer);
         }
@@ -694,24 +778,25 @@ namespace WPinternals
         private void FlashRawPartition(string Path, Stream Stream, string PartitionName, Action<int, TimeSpan?> ProgressUpdateCallback, ProgressUpdater UpdaterPerSector)
         {
             bool? unlocked = IsBootLoaderUnlocked();
-            if (unlocked.HasValue && !unlocked.Value)
+            if (unlocked == false)
+            {
                 throw new InvalidOperationException("Bootloader is not unlocked!");
+            }
 
             GPT GPT = ReadGPT();
 
-            Partition Partition = GPT.Partitions.Where((p) => p.Name == PartitionName).First();
+            Partition Partition = GPT.Partitions.First((p) => p.Name == PartitionName);
             ulong PartitionSize = (Partition.LastSector - Partition.FirstSector + 1) * 0x200;
 
             Stream InputStream = null;
 
             if (Path != null)
+            {
                 InputStream = new DecompressedStream(File.Open(Path, FileMode.Open));
+            }
             else if (Stream != null)
             {
-                if (Stream is DecompressedStream)
-                    InputStream = Stream;
-                else
-                    InputStream = new DecompressedStream(Stream);
+                InputStream = Stream is DecompressedStream ? Stream : new DecompressedStream(Stream);
             }
 
             if (InputStream != null)
@@ -726,11 +811,16 @@ namespace WPinternals
                     catch { }
 
                     if ((InputStreamLength != null) && ((UInt64)InputStream.Length > PartitionSize))
+                    {
                         throw new InvalidOperationException("Partition can not be flashed, because its size is too big!");
+                    }
 
                     ProgressUpdater Progress = UpdaterPerSector;
                     if ((Progress == null) && (ProgressUpdateCallback != null) && (InputStreamLength != null))
+                    {
                         Progress = new ProgressUpdater((UInt64)(InputStreamLength / 0x200), ProgressUpdateCallback);
+                    }
+
                     int ProgressPercentage = 0;
 
                     const int FlashBufferSize = 0x200000; // Flash 8 GB phone -> buffersize 0x200000 = 11:45 min, buffersize 0x20000 = 12:30 min
@@ -745,7 +835,9 @@ namespace WPinternals
                         if (BytesRead > 0)
                         {
                             if (BytesRead == FlashBufferSize)
+                            {
                                 FlashBufferFinalSize = FlashBuffer;
+                            }
                             else
                             {
                                 FlashBufferFinalSize = new byte[BytesRead];
@@ -773,10 +865,12 @@ namespace WPinternals
             // Partition "Data" can always be erased.
             // Other partitions can only be erased when a valid RDC certificate is present or full SX authentication was performed.
             if (PartitionName.Length > 0x23)
+            {
                 throw new ArgumentException("PartitionName cannot exceed 0x23 chars!");
+            }
 
             byte[] Request = new byte[0x50];
-            string Header = "NOKXFP";
+            const string Header = "NOKXFP";
             System.Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
             Request[0x06] = 1; // Protocol version must be 1
             Request[0x07] = 0; // Device type = 0
@@ -791,13 +885,14 @@ namespace WPinternals
 
         internal FlashAppType GetFlashAppType()
         {
-            byte[] Request;
-
-            Request = new byte[4];
+            byte[] Request = new byte[4];
             ByteOperations.WriteAsciiString(Request, 0, "NOKV");
             byte[] Response = ExecuteRawMethod(Request);
             if ((Response == null) || (ByteOperations.ReadAsciiString(Response, 0, 4) == "NOKU"))
+            {
                 throw new NotSupportedException();
+            }
+
             return (FlashAppType)Response[5];
         }
 
@@ -811,8 +906,7 @@ namespace WPinternals
 
             if (Result.State == PhoneInfoState.Empty)
             {
-                byte[] Request;
-                Request = new byte[4];
+                byte[] Request = new byte[4];
                 ByteOperations.WriteAsciiString(Request, 0, "NOKV");
                 byte[] Response = ExecuteRawMethod(Request);
                 if ((Response != null) && (ByteOperations.ReadAsciiString(Response, 0, 4) != "NOKU"))
@@ -878,7 +972,7 @@ namespace WPinternals
                                 Result.EmmcSizeInSectors = BigEndian.ToUInt32(Response, SubblockPayloadOffset);
                                 break;
                             case 0x05:
-                                Result.PlatformID = ByteOperations.ReadAsciiString(Response, (uint)SubblockPayloadOffset, (uint)SubblockLength).Trim(new char[] { ' ', '\0' });
+                                Result.PlatformID = ByteOperations.ReadAsciiString(Response, (uint)SubblockPayloadOffset, SubblockLength).Trim(new char[] { ' ', '\0' });
                                 break;
                             case 0x0D:
                                 Result.AsyncSupport = (Response[SubblockPayloadOffset + 1] == 1);
@@ -908,7 +1002,7 @@ namespace WPinternals
                 Result.State = PhoneInfoState.Basic;
             }
 
-            if ((ExtendedInfo) && (Result.State == PhoneInfoState.Basic))
+            if (ExtendedInfo && (Result.State == PhoneInfoState.Basic))
             {
                 FlashAppType OriginalType = Result.App;
 
@@ -946,7 +1040,9 @@ namespace WPinternals
             Result.IsBootloaderSecure = !(Info.Authenticated || Info.RdcPresent || !Info.SecureFfuEnabled);
 
             if (!PhoneInfoLogged)
+            {
                 Result.Log(LogType.FileOnly);
+            }
 
             return Result;
         }
@@ -990,9 +1086,14 @@ namespace WPinternals
             ByteOperations.WriteAsciiString(Request, 0, "NOKI");
             byte[] Response = ExecuteRawMethod(Request);
             if (Response == null)
+            {
                 throw new BadConnectionException();
+            }
+
             if (ByteOperations.ReadAsciiString(Response, 0, 4) != "NOKI")
+            {
                 throw new WPinternalsException("Bad response from phone!", "The phone did not answer properly to the Hello message sent.");
+            }
         }
 
         internal UInt16 ReadSecureFfuSupportedProtocolMask()
@@ -1006,10 +1107,16 @@ namespace WPinternals
             ByteOperations.WriteAsciiString(Request, 0, "NOKXCBP");
             byte[] Response = ExecuteRawMethod(Request);
             if (ByteOperations.ReadAsciiString(Response, 0, 4) == "NOKU")
+            {
                 throw new NotSupportedException();
+            }
+
             UInt16 Error = (UInt16)((Response[6] << 8) + Response[7]);
             if (Error > 0)
+            {
                 throw new NotSupportedException("SwitchToPhoneInfoAppContext: Error 0x" + Error.ToString("X4"));
+            }
+
             DisableRebootTimeOut();
             Info.App = FlashAppType.PhoneInfoApp;
             InterfaceChanged(PhoneInterfaces.Lumia_Flash);
@@ -1027,7 +1134,9 @@ namespace WPinternals
             byte[] Request;
 
             if (Info.State == PhoneInfoState.Empty)
+            {
                 ReadPhoneInfo(ExtendedInfo: false);
+            }
 
             if (Info.App == FlashAppType.BootManager)
             {
@@ -1049,10 +1158,15 @@ namespace WPinternals
                 ByteOperations.WriteAsciiString(Request, 0, "NOKXCBF"); // This will stop charging the phone
                 byte[] Response = ExecuteRawMethod(Request);
                 if (ByteOperations.ReadAsciiString(Response, 0, 4) == "NOKU")
+                {
                     throw new NotSupportedException();
+                }
+
                 UInt16 Error = (UInt16)((Response[6] << 8) + Response[7]);
                 if (Error > 0)
+                {
                     throw new NotSupportedException("SwitchToFlashAppContext: Error 0x" + Error.ToString("X4"));
+                }
             }
 
             DisableRebootTimeOut();
@@ -1061,7 +1175,9 @@ namespace WPinternals
 
             // If current Info class was retrieved while in BootMgr mode, then we need to invalidate this data, because it is incomplete. 
             if (Info.PlatformID == null)
+            {
                 Info.State = PhoneInfoState.Empty;
+            }
 
             InterfaceChanged(PhoneInterfaces.Lumia_Flash);
         }
@@ -1072,12 +1188,21 @@ namespace WPinternals
             ByteOperations.WriteAsciiString(Request, 0, "NOKXCBB");
             byte[] Response = ExecuteRawMethod(Request);
             if (ByteOperations.ReadAsciiString(Response, 0, 4) == "NOKU")
+            {
                 throw new NotSupportedException();
+            }
+
             UInt16 Error = (UInt16)((Response[6] << 8) + Response[7]);
             if (Error > 0)
+            {
                 throw new NotSupportedException("SwitchToBootManagerContext: Error 0x" + Error.ToString("X4"));
+            }
+
             if (DisableTimeOut)
+            {
                 DisableRebootTimeOut();
+            }
+
             Info.App = FlashAppType.BootManager;
             InterfaceChanged(PhoneInterfaces.Lumia_Bootloader);
         }
@@ -1133,7 +1258,9 @@ namespace WPinternals
             byte[] Response = ExecuteRawMethod(Request);
             UInt32 Status = ByteOperations.ReadUInt32(Response, 6);
             if (Status != 0)
+            {
                 ThrowFlashError((int)Status);
+            }
         }
     }
 
@@ -1202,15 +1329,29 @@ namespace WPinternals
             if (State == PhoneInfoState.Extended)
             {
                 if (this.Type != null)
+                {
                     LogFile.Log("Phone type: " + this.Type, Type);
+                }
+
                 if (ProductCode != null)
+                {
                     LogFile.Log("Product code: " + ProductCode, Type);
+                }
+
                 if (RKH != null)
+                {
                     LogFile.Log("Root key hash: " + Converter.ConvertHexToString(RKH, ""), Type);
-                if (Firmware != null && Firmware.Length > 0)
+                }
+
+                if (Firmware?.Length > 0)
+                {
                     LogFile.Log("Firmware version: " + Firmware, Type);
-                if (!(Type == LogType.ConsoleOnly) && (Imei != null))
+                }
+
+                if (Type != LogType.ConsoleOnly && (Imei != null))
+                {
                     LogFile.Log("IMEI: " + Imei, LogType.FileOnly);
+                }
             }
 
             switch (App)
@@ -1234,9 +1375,14 @@ namespace WPinternals
             LogFile.Log("SecureBoot: " + ((!PlatformSecureBootEnabled || !UefiSecureBootEnabled) ? "Disabled" : "Enabled") + " (Platform Secure Boot: " + (PlatformSecureBootEnabled ? "Enabled" : "Disabled") + ", UEFI Secure Boot: " + (PlatformSecureBootEnabled ? "Enabled" : "Disabled") + ")", Type);
 
             if ((Type == LogType.ConsoleOnly) || (Type == LogType.FileAndConsole))
+            {
                 LogFile.Log("Flash app security: " + (!IsBootloaderSecure ? "Disabled" : "Enabled"), LogType.ConsoleOnly);
+            }
+
             if ((Type == LogType.FileOnly) || (Type == LogType.FileAndConsole))
+            {
                 LogFile.Log("Flash app security: " + (!IsBootloaderSecure ? "Disabled" : "Enabled") + " (FFU security: " + (SecureFfuEnabled ? "Enabled" : "Disabled") + ", RDC: " + (RdcPresent ? "Present" : "Not found") + ", Authenticated: " + (Authenticated ? "True" : "False") + ")", LogType.FileOnly);
+            }
 
             LogFile.Log("JTAG: " + (JtagDisabled ? "Disabled" : "Enabled"), Type);
         }
diff --git a/Models/NokiaPhoneModel.cs b/Models/NokiaPhoneModel.cs
index 15c366d..a05c5da 100644
--- a/Models/NokiaPhoneModel.cs
+++ b/Models/NokiaPhoneModel.cs
@@ -29,9 +29,9 @@ namespace WPinternals
     internal class NokiaPhoneModel : IDisposable
     {
         protected bool Disposed = false;
-        private USBDevice Device = null;
+        private readonly USBDevice Device = null;
         private int MessageId = 0;
-        private object UsbLock = new object();
+        private readonly object UsbLock = new();
 
         public NokiaPhoneModel(string DevicePath)
         {
@@ -50,18 +50,22 @@ namespace WPinternals
 
             lock (UsbLock)
             {
-                string jsonrpc = "2.0";
+                const string jsonrpc = "2.0";
                 int id = MessageId++;
                 string method = JsonMethod;
-                Dictionary<string, object> @params = new Dictionary<string, object>();
+                Dictionary<string, object> @params = new();
                 if (Params != null)
                 {
                     foreach (KeyValuePair<string, object> Param in Params)
                     {
-                        if (Param.Value is byte[])
-                            @params.Add(Param.Key, ((byte[])Param.Value).Select(b => (int)b).ToArray()); // convert to int-array
+                        if (Param.Value is byte[] v)
+                        {
+                            @params.Add(Param.Key, v.Select(b => (int)b).ToArray()); // convert to int-array
+                        }
                         else
+                        {
                             @params.Add(Param.Key, Param.Value);
+                        }
                     }
                 }
                 @params.Add("MessageVersion", 0);
@@ -77,7 +81,11 @@ namespace WPinternals
             try
             {
                 JsonElement? ResultToken = ResultMessage.RootElement.GetProperty("result");
-                if ((ResultToken == null) || (ResultElement == null)) return null;
+                if ((ResultToken == null) || (ResultElement == null))
+                {
+                    return null;
+                }
+
                 return ResultToken.Value.GetProperty(ResultElement);
             }
             catch
@@ -88,55 +96,83 @@ namespace WPinternals
 
         public void ExecuteJsonMethod(string JsonMethod, Dictionary<string, object> Params)
         {
-            JsonElement? Token = ExecuteJsonMethodAsJsonToken(JsonMethod, Params, null);
+            _ = ExecuteJsonMethodAsJsonToken(JsonMethod, Params, null);
         }
 
         public string ExecuteJsonMethodAsString(string JsonMethod, Dictionary<string, object> Params, string ResultElement)
         {
             JsonElement? Token = ExecuteJsonMethodAsJsonToken(JsonMethod, Params, ResultElement);
-            if (Token == null) return null;
+            if (Token == null)
+            {
+                return null;
+            }
+
             return Token.Value.GetString();
         }
 
         public string ExecuteJsonMethodAsString(string JsonMethod, string ResultElement)
         {
             JsonElement? Token = ExecuteJsonMethodAsJsonToken(JsonMethod, null, ResultElement);
-            if (Token == null) return null;
+            if (Token == null)
+            {
+                return null;
+            }
+
             return Token.Value.GetString();
         }
 
         public int ExecuteJsonMethodAsInteger(string JsonMethod, Dictionary<string, object> Params, string ResultElement)
         {
             JsonElement? Token = ExecuteJsonMethodAsJsonToken(JsonMethod, Params, ResultElement);
-            if (Token == null) return 0;
+            if (Token == null)
+            {
+                return 0;
+            }
+
             return Token.Value.GetInt32();
         }
 
         public int ExecuteJsonMethodAsInteger(string JsonMethod, string ResultElement)
         {
             JsonElement? Token = ExecuteJsonMethodAsJsonToken(JsonMethod, null, ResultElement);
-            if (Token == null) return 0;
+            if (Token == null)
+            {
+                return 0;
+            }
+
             return Token.Value.GetInt32();
         }
 
         public byte[] ExecuteJsonMethodAsBytes(string JsonMethod, Dictionary<string, object> Params, string ResultElement)
         {
             JsonElement? Token = ExecuteJsonMethodAsJsonToken(JsonMethod, Params, ResultElement);
-            if (Token == null) return null;
+            if (Token == null)
+            {
+                return null;
+            }
+
             return Token.Value.EnumerateArray().Select(x => x.GetByte()).ToArray();
         }
 
         public byte[] ExecuteJsonMethodAsBytes(string JsonMethod, string ResultElement)
         {
             JsonElement? Token = ExecuteJsonMethodAsJsonToken(JsonMethod, null, ResultElement);
-            if (Token == null) return null;
+            if (Token == null)
+            {
+                return null;
+            }
+
             return Token.Value.EnumerateArray().Select(x => x.GetByte()).ToArray();
         }
 
         public bool? ExecuteJsonMethodAsBoolean(string JsonMethod, string ResultElement)
         {
             JsonElement? Token = ExecuteJsonMethodAsJsonToken(JsonMethod, null, ResultElement);
-            if (Token == null) return null;
+            if (Token == null)
+            {
+                return null;
+            }
+
             return Token.Value.GetBoolean();
         }
 
@@ -144,28 +180,29 @@ namespace WPinternals
         {
             lock (UsbLock)
             {
-                string jsonrpc = "2.0";
+                const string jsonrpc = "2.0";
                 int id = MessageId++;
                 string method = JsonMethod;
-                Dictionary<string, object> @params = new Dictionary<string, object>();
+                Dictionary<string, object> @params = new();
                 if (Params != null)
                 {
                     foreach (KeyValuePair<string, object> Param in Params)
                     {
-                        if (Param.Value is byte[])
-                            @params.Add(Param.Key, ((byte[])Param.Value).Select(b => (int)b).ToArray()); // convert to int-array
+                        if (Param.Value is byte[] v)
+                        {
+                            @params.Add(Param.Key, v.Select(b => (int)b).ToArray()); // convert to int-array
+                        }
                         else
+                        {
                             @params.Add(Param.Key, Param.Value);
+                        }
                     }
                 }
                 @params.Add("MessageVersion", 0);
                 string Request = JsonSerializer.Serialize(new { jsonrpc, id, method, @params });
 
                 byte[] OutBuffer = System.Text.Encoding.ASCII.GetBytes(Request);
-                Device.OutputPipe.BeginWrite(OutBuffer, 0, OutBuffer.Length, (AsyncResultWrite) =>
-                {
-                    Device.OutputPipe.EndWrite(AsyncResultWrite);
-                }, null);
+                Device.OutputPipe.BeginWrite(OutBuffer, 0, OutBuffer.Length, (AsyncResultWrite) => Device.OutputPipe.EndWrite(AsyncResultWrite), null);
             }
         }
 
@@ -178,48 +215,48 @@ namespace WPinternals
 
         public void ExecuteJsonMethodAsStringAsync(string JsonMethod, Dictionary<string, object> Params, string ResultElement, object State, JsonMethodCallbackString Callback)
         {
-            ExecuteJsonMethodAsTokenAsync(JsonMethod, Params, ResultElement, State, (ReturnState, Token) => { Callback(ReturnState, Token.Value.GetRawText()); });
+            ExecuteJsonMethodAsTokenAsync(JsonMethod, Params, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.GetRawText()));
         }
 
         public void ExecuteJsonMethodAsStringAsync(string JsonMethod, string ResultElement, object State, JsonMethodCallbackString Callback)
         {
-            ExecuteJsonMethodAsTokenAsync(JsonMethod, null, ResultElement, State, (ReturnState, Token) => { Callback(ReturnState, Token.Value.GetRawText()); });
+            ExecuteJsonMethodAsTokenAsync(JsonMethod, null, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.GetRawText()));
         }
 
         public delegate void JsonMethodCallbackBoolean(object State, bool Result);
 
         public void ExecuteJsonMethodAsBooleanAsync(string JsonMethod, Dictionary<string, object> Params, string ResultElement, object State, JsonMethodCallbackBoolean Callback)
         {
-            ExecuteJsonMethodAsTokenAsync(JsonMethod, Params, ResultElement, State, (ReturnState, Token) => { Callback(ReturnState, Token.Value.GetBoolean()); });
+            ExecuteJsonMethodAsTokenAsync(JsonMethod, Params, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.GetBoolean()));
         }
 
         public void ExecuteJsonMethodAsBooleanAsync(string JsonMethod, string ResultElement, object State, JsonMethodCallbackBoolean Callback)
         {
-            ExecuteJsonMethodAsTokenAsync(JsonMethod, null, ResultElement, State, (ReturnState, Token) => { Callback(ReturnState, Token.Value.GetBoolean()); });
+            ExecuteJsonMethodAsTokenAsync(JsonMethod, null, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.GetBoolean()));
         }
 
         public delegate void JsonMethodCallbackBytes(object State, byte[] Result);
 
         public void ExecuteJsonMethodAsBytesAsync(string JsonMethod, Dictionary<string, object> Params, string ResultElement, object State, JsonMethodCallbackBytes Callback)
         {
-            ExecuteJsonMethodAsTokenAsync(JsonMethod, Params, ResultElement, State, (ReturnState, Token) => { Callback(ReturnState, Token.Value.EnumerateArray().Select(x => x.GetByte()).ToArray()); });
+            ExecuteJsonMethodAsTokenAsync(JsonMethod, Params, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.EnumerateArray().Select(x => x.GetByte()).ToArray()));
         }
 
         public void ExecuteJsonMethodAsBytesAsync(string JsonMethod, string ResultElement, object State, JsonMethodCallbackBytes Callback)
         {
-            ExecuteJsonMethodAsTokenAsync(JsonMethod, null, ResultElement, State, (ReturnState, Token) => { Callback(ReturnState, Token.Value.EnumerateArray().Select(x => x.GetByte()).ToArray()); });
+            ExecuteJsonMethodAsTokenAsync(JsonMethod, null, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.EnumerateArray().Select(x => x.GetByte()).ToArray()));
         }
 
         public delegate void JsonMethodCallbackInteger(object State, int Result);
 
         public void ExecuteJsonMethodAsIntegerAsync(string JsonMethod, Dictionary<string, object> Params, string ResultElement, object State, JsonMethodCallbackInteger Callback)
         {
-            ExecuteJsonMethodAsTokenAsync(JsonMethod, Params, ResultElement, State, (ReturnState, Token) => { Callback(ReturnState, Token.Value.GetInt32()); });
+            ExecuteJsonMethodAsTokenAsync(JsonMethod, Params, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.GetInt32()));
         }
 
         public void ExecuteJsonMethodAsIntegerAsync(string JsonMethod, string ResultElement, object State, JsonMethodCallbackInteger Callback)
         {
-            ExecuteJsonMethodAsTokenAsync(JsonMethod, null, ResultElement, State, (ReturnState, Token) => { Callback(ReturnState, Token.Value.GetInt32()); });
+            ExecuteJsonMethodAsTokenAsync(JsonMethod, null, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.GetInt32()));
         }
 
         public delegate void JsonMethodCallbackToken(object State, JsonElement? Result);
@@ -231,18 +268,22 @@ namespace WPinternals
 
             lock (UsbLock)
             {
-                string jsonrpc = "2.0";
+                const string jsonrpc = "2.0";
                 int id = MessageId++;
                 string method = JsonMethod;
-                Dictionary<string, object> @params = new Dictionary<string, object>();
+                Dictionary<string, object> @params = new();
                 if (Params != null)
                 {
                     foreach (KeyValuePair<string, object> Param in Params)
                     {
-                        if (Param.Value is byte[])
-                            @params.Add(Param.Key, ((byte[])Param.Value).Select(b => (int)b).ToArray()); // convert to int-array
+                        if (Param.Value is byte[] v)
+                        {
+                            @params.Add(Param.Key, v.Select(b => (int)b).ToArray()); // convert to int-array
+                        }
                         else
+                        {
                             @params.Add(Param.Key, Param.Value);
+                        }
                     }
                 }
                 @params.Add("MessageVersion", 0);
@@ -260,7 +301,11 @@ namespace WPinternals
                                 JsonDocument ResultMessage = JsonDocument.Parse(System.Text.ASCIIEncoding.ASCII.GetString(Buffer, 0, Length));
 
                                 JsonElement? ResultToken = ResultMessage.RootElement.GetProperty("result");
-                                if ((ResultToken == null) || (ResultElement == null)) Callback(AsyncResultRead.AsyncState, null);
+                                if ((ResultToken == null) || (ResultElement == null))
+                                {
+                                    Callback(AsyncResultRead.AsyncState, null);
+                                }
+
                                 Callback(AsyncResultRead.AsyncState, ResultToken.Value.GetProperty(ResultElement));
                             }, AsyncResultWrite.AsyncState);
                     }, State);
@@ -349,12 +394,13 @@ namespace WPinternals
         protected virtual void Dispose(bool disposing)
         {
             if (Disposed)
+            {
                 return;
+            }
 
             if (disposing)
             {
-                if (Device != null)
-                    Device.Dispose();
+                Device?.Dispose();
             }
 
             // Clean unmanaged resources here.
diff --git a/Models/PatchEngine.cs b/Models/PatchEngine.cs
index ac012d0..d764594 100644
--- a/Models/PatchEngine.cs
+++ b/Models/PatchEngine.cs
@@ -33,26 +33,26 @@ namespace WPinternals
 {
     internal class PatchEngine
     {
-        internal List<PatchDefinition> PatchDefinitions = new List<PatchDefinition>();
-        internal readonly List<TargetRedirection> TargetRedirections = new List<TargetRedirection>();
+        internal List<PatchDefinition> PatchDefinitions = new();
+        internal readonly List<TargetRedirection> TargetRedirections = new();
 
         internal PatchEngine() { }
 
         internal PatchEngine(string PatchDefinitionsXmlString)
         {
-            XmlSerializer x = new XmlSerializer(PatchDefinitions.GetType(), null, new Type[] { }, new XmlRootAttribute("PatchDefinitions"), "");
-            MemoryStream s = new MemoryStream(System.Text.Encoding.ASCII.GetBytes(PatchDefinitionsXmlString));
+            XmlSerializer x = new(PatchDefinitions.GetType(), null, Array.Empty<Type>(), new XmlRootAttribute("PatchDefinitions"), "");
+            MemoryStream s = new(System.Text.Encoding.ASCII.GetBytes(PatchDefinitionsXmlString));
             PatchDefinitions = (List<PatchDefinition>)x.Deserialize(s);
         }
 
         internal void WriteDefinitions(string FilePath)
         {
-            XmlSerializer x = new XmlSerializer(PatchDefinitions.GetType(), null, new Type[] { }, new XmlRootAttribute("PatchDefinitions"), "");
+            XmlSerializer x = new(PatchDefinitions.GetType(), null, Array.Empty<Type>(), new XmlRootAttribute("PatchDefinitions"), "");
 
-            XmlSerializerNamespaces ns = new XmlSerializerNamespaces();
+            XmlSerializerNamespaces ns = new();
             ns.Add("", "");
 
-            System.IO.StreamWriter FileWriter = new System.IO.StreamWriter(FilePath);
+            StreamWriter FileWriter = new(FilePath);
             XmlWriter XmlWriter = XmlWriter.Create(FileWriter, new XmlWriterSettings() { OmitXmlDeclaration = true, Indent = true, NewLineHandling = NewLineHandling.Entitize });
 
             FileWriter.WriteLine("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
@@ -98,7 +98,6 @@ namespace WPinternals
             }
         }
 
-
         private DiscUtils.DiscFileSystem _TargetImage = null;
         internal DiscUtils.DiscFileSystem TargetImage
         {
@@ -116,7 +115,7 @@ namespace WPinternals
         internal bool Patch(string PatchDefinition)
         {
             bool Result = false;
-            List<FilePatcher> LoadedFiles = new List<FilePatcher>();
+            List<FilePatcher> LoadedFiles = new();
 
             LogFile.Log("Attempt patch: " + PatchDefinition);
 
@@ -142,16 +141,18 @@ namespace WPinternals
                         }
                     }
                     if (TargetPath == null)
+                    {
                         TargetPath = Path.Combine(this.TargetPath + "\\", CurrentTargetFile.Path);
+                    }
 
                     // Lookup file
                     FilePatcher CurrentFile = LoadedFiles.SingleOrDefault(f => string.Compare(f.FilePath, TargetPath, true) == 0);
                     if (CurrentFile == null)
                     {
-                        if ((TargetImage != null) && (!TargetPath.Contains(':')))
-                            CurrentFile = new FilePatcher(TargetPath, TargetImage.OpenFile(TargetPath, FileMode.Open, FileAccess.ReadWrite));
-                        else
-                            CurrentFile = new FilePatcher(TargetPath);
+                        CurrentFile = (TargetImage != null) && (!TargetPath.Contains(':'))
+                            ? new FilePatcher(TargetPath, TargetImage.OpenFile(TargetPath, FileMode.Open, FileAccess.ReadWrite))
+                            : new FilePatcher(TargetPath);
+
                         LoadedFiles.Add(CurrentFile);
                     }
 
@@ -236,7 +237,7 @@ namespace WPinternals
 
         internal void Restore(string PatchDefinition)
         {
-            List<FilePatcher> LoadedFiles = new List<FilePatcher>();
+            List<FilePatcher> LoadedFiles = new();
 
             try
             {
@@ -260,7 +261,9 @@ namespace WPinternals
                             }
                         }
                         if (TargetPath == null)
+                        {
                             TargetPath = Path.Combine(this.TargetPath, CurrentTargetFile.Path);
+                        }
 
                         // Lookup file
                         FilePatcher CurrentFile = LoadedFiles.SingleOrDefault(f => string.Compare(f.FilePath, TargetPath, true) == 0);
@@ -286,7 +289,9 @@ namespace WPinternals
                             }
 
                             if (!Match)
+                            {
                                 break;
+                            }
                         }
                     }
 
@@ -389,22 +394,22 @@ namespace WPinternals
         internal FilePatcher(string FilePath)
         {
             this.FilePath = FilePath;
-            using (FileStream stream = File.OpenRead(FilePath))
-            {
-                SHA1Managed sha = new SHA1Managed();
-                Hash = sha.ComputeHash(stream);
-            }
+            using FileStream stream = File.OpenRead(FilePath);
+            SHA1Managed sha = new();
+            Hash = sha.ComputeHash(stream);
         }
 
         internal FilePatcher(string FilePath, Stream FileStream)
         {
             if (!FileStream.CanSeek || !FileStream.CanWrite)
+            {
                 throw new WPinternalsException("Incorrect filestream", "The provided file stream for patching does not support seeking and/or writing.");
+            }
 
             this.FilePath = FilePath;
             this.Stream = FileStream;
             FileStream.Position = 0;
-            SHA1Managed sha = new SHA1Managed();
+            SHA1Managed sha = new();
             Hash = sha.ComputeHash(FileStream);
             FileStream.Position = 0;
         }
@@ -413,7 +418,7 @@ namespace WPinternals
         {
             if (FilePath.Contains(':'))
             {
-                FileInfo fileInfo = new FileInfo(FilePath);
+                FileInfo fileInfo = new(FilePath);
 
                 // Enable Take Ownership AND Restore ownership to original owner
                 // Take Ownership Privilge is not enough.
@@ -460,7 +465,7 @@ namespace WPinternals
 
             if (FilePath.Contains(':'))
             {
-                FileInfo fileInfo = new FileInfo(FilePath);
+                FileInfo fileInfo = new(FilePath);
 
                 // Restore original owner and access rules.
                 // The OriginalACL cannot be reused directly.
@@ -487,7 +492,7 @@ namespace WPinternals
         [XmlAttribute]
         public string Name;
 
-        public List<TargetVersion> TargetVersions = new List<TargetVersion>();
+        public List<TargetVersion> TargetVersions = new();
     }
 
     public class TargetVersion // Must be public to be serializable
@@ -495,7 +500,7 @@ namespace WPinternals
         [XmlAttribute]
         public string Description;
 
-        public List<TargetFile> TargetFiles = new List<TargetFile>();
+        public List<TargetFile> TargetFiles = new();
     }
 
     public class TargetFile // Must be public to be serializable
@@ -544,8 +549,8 @@ namespace WPinternals
             }
         }
 
-        public List<Patch> Patches = new List<Patch>();
-        public List<TargetFile> Obsolete = new List<TargetFile>();
+        public List<Patch> Patches = new();
+        public List<TargetFile> Obsolete = new();
     }
 
     public class Patch // Must be public to be serializable
@@ -563,7 +568,10 @@ namespace WPinternals
             {
                 string NewValue = value;
                 if (NewValue.StartsWith("0x", StringComparison.OrdinalIgnoreCase))
-                    NewValue = NewValue.Substring(2);
+                {
+                    NewValue = NewValue[2..];
+                }
+
                 Address = Convert.ToUInt32(NewValue, 16);
             }
         }
diff --git a/Models/Privileges.cs b/Models/Privileges.cs
index 4cbe5f3..1a1e125 100644
--- a/Models/Privileges.cs
+++ b/Models/Privileges.cs
@@ -34,10 +34,10 @@ namespace WPinternals
     internal sealed class Privilege
     {
         #region Private static members
-        private static LocalDataStoreSlot tlsSlot = Thread.AllocateDataSlot();
-        private static HybridDictionary privileges = new HybridDictionary();
-        private static HybridDictionary luids = new HybridDictionary();
-        private static ReaderWriterLock privilegeLock = new ReaderWriterLock();
+        private static readonly LocalDataStoreSlot tlsSlot = Thread.AllocateDataSlot();
+        private static readonly HybridDictionary privileges = new();
+        private static readonly HybridDictionary luids = new();
+        private static readonly ReaderWriterLock privilegeLock = new();
         #endregion
 
         #region Private members
@@ -115,7 +115,7 @@ namespace WPinternals
                 {
                     privilegeLock.ReleaseReaderLock();
 
-                    if (false == NativeMethods.LookupPrivilegeValue(null, privilege, ref luid))
+                    if (!NativeMethods.LookupPrivilegeValue(null, privilege, ref luid))
                     {
                         int error = Marshal.GetLastWin32Error();
 
@@ -131,7 +131,7 @@ namespace WPinternals
                         {
                             throw new ArgumentException(
                                 string.Format("{0} is not a valid privilege name", privilege),
-                                "privilege");
+                                nameof(privilege));
                         }
                         else
                         {
@@ -170,11 +170,10 @@ namespace WPinternals
         {
             private bool disposed = false;
             private int referenceCount = 1;
-            private SafeTokenHandle threadHandle = new SafeTokenHandle(IntPtr.Zero);
-            private bool isImpersonating = false;
+            private SafeTokenHandle threadHandle = new(IntPtr.Zero);
 
-            private static SafeTokenHandle processHandle = new SafeTokenHandle(IntPtr.Zero);
-            private static readonly object syncRoot = new object();
+            private static SafeTokenHandle processHandle = new(IntPtr.Zero);
+            private static readonly object syncRoot = new();
 
             #region Constructor and finalizer
             public TlsContents()
@@ -189,7 +188,7 @@ namespace WPinternals
                     {
                         if (processHandle.IsInvalid)
                         {
-                            if (false == NativeMethods.OpenProcessToken(
+                            if (!NativeMethods.OpenProcessToken(
                                             NativeMethods.GetCurrentProcess(),
                                             TokenAccessLevels.Duplicate,
                                             ref processHandle))
@@ -206,13 +205,13 @@ namespace WPinternals
                     // Open the thread token; if there is no thread token,
                     // copy the process token onto the thread
 
-                    if (false == NativeMethods.OpenThreadToken(
+                    if (!NativeMethods.OpenThreadToken(
                         NativeMethods.GetCurrentThread(),
                         TokenAccessLevels.Query | TokenAccessLevels.AdjustPrivileges,
                         true,
                         ref this.threadHandle))
                     {
-                        if (success == true)
+                        if (success)
                         {
                             error = Marshal.GetLastWin32Error();
 
@@ -221,11 +220,11 @@ namespace WPinternals
                                 success = false;
                             }
 
-                            if (success == true)
+                            if (success)
                             {
                                 error = 0;
 
-                                if (false == NativeMethods.DuplicateTokenEx(
+                                if (!NativeMethods.DuplicateTokenEx(
                                     processHandle,
                                     TokenAccessLevels.Impersonate | TokenAccessLevels.Query | TokenAccessLevels.AdjustPrivileges,
                                     IntPtr.Zero,
@@ -238,9 +237,9 @@ namespace WPinternals
                                 }
                             }
 
-                            if (success == true)
+                            if (success)
                             {
-                                if (false == NativeMethods.SetThreadToken(
+                                if (!NativeMethods.SetThreadToken(
                                     IntPtr.Zero,
                                     this.threadHandle))
                                 {
@@ -249,11 +248,11 @@ namespace WPinternals
                                 }
                             }
 
-                            if (success == true)
+                            if (success)
                             {
                                 // This thread is now impersonating; it needs to be reverted to its original state
 
-                                this.isImpersonating = true;
+                                this.IsImpersonating = true;
                             }
                         }
                         else
@@ -307,7 +306,10 @@ namespace WPinternals
 
             private void Dispose(bool disposing)
             {
-                if (this.disposed) return;
+                if (this.disposed)
+                {
+                    return;
+                }
 
                 if (this.threadHandle != null)
                 {
@@ -315,7 +317,7 @@ namespace WPinternals
                     this.threadHandle = null;
                 }
 
-                if (this.isImpersonating)
+                if (this.IsImpersonating)
                 {
                     NativeMethods.RevertToSelf();
                 }
@@ -354,10 +356,7 @@ namespace WPinternals
                 get { return this.threadHandle; }
             }
 
-            public bool IsImpersonating
-            {
-                get { return this.isImpersonating; }
-            }
+            public bool IsImpersonating { get; } = false;
             #endregion
         }
         #endregion
@@ -367,7 +366,7 @@ namespace WPinternals
         {
             if (privilegeName == null)
             {
-                throw new ArgumentNullException("privilegeName");
+                throw new ArgumentNullException(nameof(privilegeName));
             }
 
             this.luid = LuidFromPrivilege(privilegeName);
@@ -422,15 +421,15 @@ namespace WPinternals
                         (this.tlsContents.ReferenceCountValue > 1 ||
                         !this.tlsContents.IsImpersonating))
                     {
-                        NativeMethods.TOKEN_PRIVILEGE newState = new NativeMethods.TOKEN_PRIVILEGE();
+                        NativeMethods.TOKEN_PRIVILEGE newState = new();
                         newState.PrivilegeCount = 1;
                         newState.Privilege.Luid = this.luid;
                         newState.Privilege.Attributes = (this.initialState ? NativeMethods.SE_PRIVILEGE_ENABLED : NativeMethods.SE_PRIVILEGE_DISABLED);
 
-                        NativeMethods.TOKEN_PRIVILEGE previousState = new NativeMethods.TOKEN_PRIVILEGE();
+                        NativeMethods.TOKEN_PRIVILEGE previousState = new();
                         uint previousSize = 0;
 
-                        if (false == NativeMethods.AdjustTokenPrivileges(
+                        if (!NativeMethods.AdjustTokenPrivileges(
                                         this.tlsContents.ThreadHandle,
                                         false,
                                         ref newState,
@@ -475,10 +474,10 @@ namespace WPinternals
         {
             if (callback == null)
             {
-                throw new ArgumentNullException("callback");
+                throw new ArgumentNullException(nameof(callback));
             }
 
-            Privilege p = new Privilege(privilege);
+            Privilege p = new(privilege);
 
             try
             {
@@ -551,17 +550,17 @@ namespace WPinternals
                         this.tlsContents.IncrementReferenceCount();
                     }
 
-                    NativeMethods.TOKEN_PRIVILEGE newState = new NativeMethods.TOKEN_PRIVILEGE();
+                    NativeMethods.TOKEN_PRIVILEGE newState = new();
                     newState.PrivilegeCount = 1;
                     newState.Privilege.Luid = this.luid;
                     newState.Privilege.Attributes = enable ? NativeMethods.SE_PRIVILEGE_ENABLED : NativeMethods.SE_PRIVILEGE_DISABLED;
 
-                    NativeMethods.TOKEN_PRIVILEGE previousState = new NativeMethods.TOKEN_PRIVILEGE();
+                    NativeMethods.TOKEN_PRIVILEGE previousState = new();
                     uint previousSize = 0;
 
                     // Place the new privilege on the thread token and remember the previous state.
 
-                    if (false == NativeMethods.AdjustTokenPrivileges(
+                    if (!NativeMethods.AdjustTokenPrivileges(
                                     this.tlsContents.ThreadHandle,
                                     false,
                                     ref newState,
@@ -633,7 +632,7 @@ namespace WPinternals
 
                 if (this.tlsContents != null)
                 {
-                    if (0 == this.tlsContents.DecrementReferenceCount())
+                    if (this.tlsContents.DecrementReferenceCount() == 0)
                     {
                         this.tlsContents = null;
                         Thread.SetData(tlsSlot, null);
diff --git a/Models/QualcommDownload.cs b/Models/QualcommDownload.cs
index 750c4b0..faf712a 100644
--- a/Models/QualcommDownload.cs
+++ b/Models/QualcommDownload.cs
@@ -26,7 +26,7 @@ namespace WPinternals
 {
     internal class QualcommDownload
     {
-        private QualcommSerial Serial;
+        private readonly QualcommSerial Serial;
 
         public QualcommDownload(QualcommSerial Serial)
         {
@@ -48,11 +48,7 @@ namespace WPinternals
 
         public void SendToPhoneMemory(UInt32 Address, Stream Data, UInt32 Length = UInt32.MaxValue)
         {
-            long Remaining;
-            if (Length > (Data.Length - Data.Position))
-                Remaining = Data.Length - Data.Position;
-            else
-                Remaining = Length;
+            long Remaining = Length > (Data.Length - Data.Position) ? Data.Length - Data.Position : Length;
             UInt32 CurrentLength;
             byte[] Buffer = new byte[0x107];
             Buffer[0] = 0x0F;
@@ -62,10 +58,8 @@ namespace WPinternals
             {
                 System.Buffer.BlockCopy(BitConverter.GetBytes(CurrentAddress).Reverse().ToArray(), 0, Buffer, 1, 4); // Address is in Big Endian
 
-                if (Remaining >= 0x100)
-                    CurrentLength = 0x100;
-                else
-                    CurrentLength = (UInt32)Remaining;
+                CurrentLength = Remaining >= 0x100 ? 0x100 : (UInt32)Remaining;
+
                 CurrentLength = (UInt32)(Data.Read(Buffer, 7, (int)CurrentLength));
                 Serial.SendCommand(Buffer, new byte[] { 0x02 });
 
@@ -78,11 +72,12 @@ namespace WPinternals
         {
             long Remaining;
             if (Offset > (Data.Length - 1))
+            {
                 throw new ArgumentException("Wrong offset");
-            if (Length > (Data.Length - Offset))
-                Remaining = Data.Length - Offset;
-            else
-                Remaining = Length;
+            }
+
+            Remaining = Length > (Data.Length - Offset) ? Data.Length - Offset : Length;
+
             UInt32 CurrentLength;
             UInt32 CurrentOffset = Offset;
             byte[] Buffer = new byte[0x107];
@@ -90,7 +85,6 @@ namespace WPinternals
             byte[] CurrentBytes;
             while (Remaining > 0)
             {
-
                 if (Remaining >= 0x100)
                 {
                     CurrentLength = 0x100;
diff --git a/Models/QualcommFlasher.cs b/Models/QualcommFlasher.cs
index bcc3201..e77fcfc 100644
--- a/Models/QualcommFlasher.cs
+++ b/Models/QualcommFlasher.cs
@@ -31,7 +31,7 @@ namespace WPinternals
 
     internal class QualcommFlasher
     {
-        private QualcommSerial Serial;
+        private readonly QualcommSerial Serial;
 
         public QualcommFlasher(QualcommSerial Serial)
         {
@@ -99,11 +99,9 @@ namespace WPinternals
 
         public void Flash(UInt32 StartInBytes, Stream Data, Action<int, TimeSpan?> ProgressUpdateCallback, ProgressUpdater UpdaterPerSector, UInt32 LengthInBytes = UInt32.MaxValue)
         {
-            long Remaining;
-            if ((LengthInBytes == UInt32.MaxValue) || (LengthInBytes > (Data.Length - Data.Position)))
-                Remaining = Data.Length - Data.Position;
-            else
-                Remaining = LengthInBytes;
+            long Remaining = (LengthInBytes == UInt32.MaxValue) || (LengthInBytes > (Data.Length - Data.Position))
+                ? Data.Length - Data.Position
+                : LengthInBytes;
             UInt32 CurrentLength;
             byte[] Buffer = new byte[0x405];
             byte[] ResponsePattern = new byte[5];
@@ -114,17 +112,16 @@ namespace WPinternals
 
             ProgressUpdater Progress = UpdaterPerSector;
             if ((Progress == null) && (ProgressUpdateCallback != null))
+            {
                 Progress = new ProgressUpdater(GetSectorCount((UInt64)Remaining), ProgressUpdateCallback);
+            }
 
             while (Remaining > 0)
             {
                 System.Buffer.BlockCopy(BitConverter.GetBytes(CurrentPosition), 0, Buffer, 1, 4); // Start is in bytes and in Little Endian (on Samsung devices start is in sectors!)
                 System.Buffer.BlockCopy(BitConverter.GetBytes(CurrentPosition), 0, ResponsePattern, 1, 4); // Start is in bytes and in Little Endian (on Samsung devices start is in sectors!)
 
-                if (Remaining >= 0x400)
-                    CurrentLength = 0x400;
-                else
-                    CurrentLength = (UInt32)Remaining;
+                CurrentLength = Remaining >= 0x400 ? 0x400 : (UInt32)Remaining;
 
                 CurrentLength = (uint)Data.Read(Buffer, 5, (int)CurrentLength);
 
@@ -134,15 +131,16 @@ namespace WPinternals
                     System.Buffer.BlockCopy(Buffer, 0, FinalCommand, 0, (int)CurrentLength + 5);
                 }
                 else
+                {
                     FinalCommand = Buffer;
+                }
 
                 Serial.SendCommand(FinalCommand, ResponsePattern);
 
                 CurrentPosition += CurrentLength;
                 Remaining -= CurrentLength;
 
-                if (Progress != null)
-                    Progress.IncreaseProgress(GetSectorCount(CurrentLength));
+                Progress?.IncreaseProgress(GetSectorCount(CurrentLength));
             }
         }
 
@@ -165,11 +163,14 @@ namespace WPinternals
         {
             long RemainingBytes;
             if (OffsetInBytes > (Data.Length - 1))
+            {
                 throw new ArgumentException("Wrong offset");
-            if ((LengthInBytes == UInt32.MaxValue) || (LengthInBytes > (Data.Length - OffsetInBytes)))
-                RemainingBytes = Data.Length - OffsetInBytes;
-            else
-                RemainingBytes = LengthInBytes;
+            }
+
+            RemainingBytes = (LengthInBytes == UInt32.MaxValue) || (LengthInBytes > (Data.Length - OffsetInBytes))
+                ? Data.Length - OffsetInBytes
+                : LengthInBytes;
+
             UInt32 CurrentLength;
             UInt32 CurrentOffset = OffsetInBytes;
             byte[] Buffer = new byte[0x405];
@@ -181,17 +182,17 @@ namespace WPinternals
 
             ProgressUpdater Progress = UpdaterPerSector;
             if ((Progress == null) && (ProgressUpdateCallback != null))
+            {
                 Progress = new ProgressUpdater(GetSectorCount((UInt64)RemainingBytes), ProgressUpdateCallback);
+            }
 
             while (RemainingBytes > 0)
             {
                 System.Buffer.BlockCopy(BitConverter.GetBytes(CurrentPosition), 0, Buffer, 1, 4); // Start position is in bytes and in Little Endian (on Samsung phones the start position is in Sectors!!)
                 System.Buffer.BlockCopy(BitConverter.GetBytes(CurrentPosition), 0, ResponsePattern, 1, 4); // Start position is in bytes and in Little Endian (on Samsung phones the start position is in Sectors!!)
 
-                if (RemainingBytes >= 0x400)
-                    CurrentLength = 0x400;
-                else
-                    CurrentLength = (UInt32)RemainingBytes;
+                CurrentLength = RemainingBytes >= 0x400 ? 0x400 : (UInt32)RemainingBytes;
+
                 System.Buffer.BlockCopy(Data, (int)CurrentOffset, Buffer, 5, (int)CurrentLength);
 
                 if (CurrentLength < 0x400)
@@ -200,7 +201,9 @@ namespace WPinternals
                     System.Buffer.BlockCopy(Buffer, 0, FinalCommand, 0, (int)CurrentLength + 5);
                 }
                 else
+                {
                     FinalCommand = Buffer;
+                }
 
                 Serial.SendCommand(FinalCommand, ResponsePattern);
 
@@ -208,14 +211,13 @@ namespace WPinternals
                 CurrentOffset += CurrentLength;
                 RemainingBytes -= CurrentLength;
 
-                if (Progress != null)
-                    Progress.IncreaseProgress(GetSectorCount(CurrentLength));
+                Progress?.IncreaseProgress(GetSectorCount(CurrentLength));
             }
         }
 
         public UInt64 GetSectorCount(UInt64 ByteCount)
         {
-            return (ByteCount / 0x200) + ((ByteCount % 0x200) > 0 ? (UInt64)1 : (UInt64)0);
+            return (ByteCount / 0x200) + ((ByteCount % 0x200) > 0 ? 1 : (UInt64)0);
         }
 
         public void Reboot()
diff --git a/Models/QualcommLoader.cs b/Models/QualcommLoader.cs
index 45ff109..0e25832 100644
--- a/Models/QualcommLoader.cs
+++ b/Models/QualcommLoader.cs
@@ -29,7 +29,7 @@ namespace WPinternals
     {
         internal static List<QualcommPartition> GetPossibleLoadersForRootKeyHash(string Path, byte[] RootKeyHash)
         {
-            List<QualcommPartition> Result = new List<QualcommPartition>();
+            List<QualcommPartition> Result = new();
 
             try
             {
@@ -38,7 +38,7 @@ namespace WPinternals
                 {
                     try
                     {
-                        FileInfo Info = new FileInfo(FilePath);
+                        FileInfo Info = new(FilePath);
                         if (Info.Length <= 0x80000)
                         {
                             QualcommPartition Loader;
@@ -48,10 +48,7 @@ namespace WPinternals
 #endif
 
                             byte[] Binary = ParseAsHexFile(FilePath);
-                            if (Binary == null)
-                                Loader = new QualcommPartition(FilePath);
-                            else
-                                Loader = new QualcommPartition(Binary);
+                            Loader = Binary == null ? new QualcommPartition(FilePath) : new QualcommPartition(Binary);
 
                             // Make sure the RootKeyHash is not blank
                             // If the RootKeyHash is blank, this is an engineering device, and it will accept any RKH
@@ -66,7 +63,7 @@ namespace WPinternals
                             }
                             else
                             {
-                                if ((ByteOperations.FindUnicode(Loader.Binary, "QHSUSB_ARMPRG") != null)) // To detect that this is a loader, and not SBL1 or something. V1 loaders are QHSUSB_ARMPRG. V2 loaders are QHSUSB__BULK. Only V1 supported for now, because V2 only accepts signed payload.
+                                if (ByteOperations.FindUnicode(Loader.Binary, "QHSUSB_ARMPRG") != null) // To detect that this is a loader, and not SBL1 or something. V1 loaders are QHSUSB_ARMPRG. V2 loaders are QHSUSB__BULK. Only V1 supported for now, because V2 only accepts signed payload.
                                 {
                                     Result.Add(Loader);
                                 }
@@ -94,15 +91,21 @@ namespace WPinternals
                 foreach (string Line in Lines)
                 {
                     if (Line[0] != ':')
+                    {
                         throw new BadImageFormatException();
+                    }
 
-                    byte[] LineBytes = Converter.ConvertStringToHex(Line.Substring(1));
+                    byte[] LineBytes = Converter.ConvertStringToHex(Line[1..]);
 
                     if ((LineBytes[0] + 5) != LineBytes.Length)
+                    {
                         throw new BadImageFormatException();
+                    }
 
                     if (Buffer == null)
+                    {
                         Buffer = new byte[0x40000];
+                    }
 
                     if (LineBytes[3] == 0) // This is mem data
                     {
diff --git a/Models/QualcommPartition.cs b/Models/QualcommPartition.cs
index 8d07a89..f4d4c29 100644
--- a/Models/QualcommPartition.cs
+++ b/Models/QualcommPartition.cs
@@ -88,7 +88,9 @@ namespace WPinternals
                     HeaderOffset = ImageOffset + 8;
                 }
                 else
+                {
                     throw new WPinternalsException("Invalid programmer", "The type of elf image could not be determined from the provided programmer.");
+                }
             }
             else if (ByteOperations.FindPattern(Binary, Offset, (uint)LongHeaderPattern.Length, LongHeaderPattern, LongHeaderMask, null) == null)
             {
@@ -104,11 +106,17 @@ namespace WPinternals
             }
 
             if (ByteOperations.ReadUInt32(Binary, HeaderOffset + 0X00) != 0)
+            {
                 ImageOffset = ByteOperations.ReadUInt32(Binary, HeaderOffset + 0X00);
+            }
             else if (HeaderType == QualcommPartitionHeaderType.Short)
+            {
                 ImageOffset += 0x28;
+            }
             else
+            {
                 ImageOffset += 0x50;
+            }
 
             ImageAddress = ByteOperations.ReadUInt32(Binary, HeaderOffset + 0X04);
             ImageSize = ByteOperations.ReadUInt32(Binary, HeaderOffset + 0X08);
diff --git a/Models/QualcommSahara.cs b/Models/QualcommSahara.cs
index 889abe1..9f1f0c3 100644
--- a/Models/QualcommSahara.cs
+++ b/Models/QualcommSahara.cs
@@ -35,7 +35,7 @@ namespace WPinternals
 
     internal class QualcommSahara
     {
-        private QualcommSerial Serial;
+        private readonly QualcommSerial Serial;
 
         public QualcommSahara(QualcommSerial Serial)
         {
@@ -58,8 +58,7 @@ namespace WPinternals
             try
             {
                 Step = 1;
-                byte[] Hello = null;
-                Hello = Serial.GetResponse(new byte[] { 0x01, 0x00, 0x00, 0x00 });
+                byte[] Hello = Serial.GetResponse(new byte[] { 0x01, 0x00, 0x00, 0x00 });
 
                 // Incoming Hello packet:
                 // 00000001 = Hello command id
@@ -91,34 +90,40 @@ namespace WPinternals
                 Serial.SendData(HelloResponse);
 
                 Step = 3;
-                using (System.IO.FileStream FileStream = new System.IO.FileStream(Path, System.IO.FileMode.Open, System.IO.FileAccess.Read))
+                using System.IO.FileStream FileStream = new(Path, System.IO.FileMode.Open, System.IO.FileAccess.Read);
+                while (true)
                 {
-                    while (true)
+                    Step = 4;
+                    byte[] ReadDataRequest = Serial.GetResponse(null);
+                    UInt32 ResponseID = ByteOperations.ReadUInt32(ReadDataRequest, 0);
+                    if (ResponseID == 4)
                     {
-                        Step = 4;
-                        byte[] ReadDataRequest = Serial.GetResponse(null);
-                        UInt32 ResponseID = ByteOperations.ReadUInt32(ReadDataRequest, 0);
-                        if (ResponseID == 4)
-                            break;
-                        if (ResponseID != 3)
-                        {
-                            Step = 5;
-                            throw new BadConnectionException();
-                        }
-
-                        Offset = ByteOperations.ReadUInt32(ReadDataRequest, 0x0C);
-                        Length = ByteOperations.ReadUInt32(ReadDataRequest, 0x10);
-                        if ((ImageBuffer == null) || (ImageBuffer.Length != Length))
-                            ImageBuffer = new byte[Length];
-                        if (FileStream.Position != Offset)
-                            FileStream.Seek(Offset, System.IO.SeekOrigin.Begin);
-
-                        Step = 6;
-                        FileStream.Read(ImageBuffer, 0, (int)Length);
-
-                        Step = 7;
-                        Serial.SendData(ImageBuffer);
+                        break;
                     }
+
+                    if (ResponseID != 3)
+                    {
+                        Step = 5;
+                        throw new BadConnectionException();
+                    }
+
+                    Offset = ByteOperations.ReadUInt32(ReadDataRequest, 0x0C);
+                    Length = ByteOperations.ReadUInt32(ReadDataRequest, 0x10);
+                    if ((ImageBuffer == null) || (ImageBuffer.Length != Length))
+                    {
+                        ImageBuffer = new byte[Length];
+                    }
+
+                    if (FileStream.Position != Offset)
+                    {
+                        FileStream.Seek(Offset, System.IO.SeekOrigin.Begin);
+                    }
+
+                    Step = 6;
+                    FileStream.Read(ImageBuffer, 0, (int)Length);
+
+                    Step = 7;
+                    Serial.SendData(ImageBuffer);
                 }
             }
             catch (Exception Ex)
@@ -128,7 +133,9 @@ namespace WPinternals
             }
 
             if (Result)
+            {
                 LogFile.Log("Programmer loaded into phone memory", LogType.FileOnly);
+            }
 
             return Result;
         }
@@ -232,7 +239,7 @@ namespace WPinternals
                     {
                         Incoming = System.Text.Encoding.ASCII.GetString(Serial.GetResponse(null));
                         LogFile.Log("In: " + Incoming, LogType.FileOnly);
-                    };
+                    }
 
                     LogFile.Log("Incoming Hello-response received", LogType.FileOnly);
                     HandshakeCompleted = true;
@@ -242,9 +249,13 @@ namespace WPinternals
             while (!HandshakeCompleted && (HelloSendCount < 6));
 
             if (HandshakeCompleted)
+            {
                 LogFile.Log("Handshake completed with programmer in testmode", LogType.FileOnly);
+            }
             else
+            {
                 LogFile.Log("Handshake with programmer failed", LogType.FileOnly);
+            }
 
             return HandshakeCompleted;
         }
@@ -253,16 +264,20 @@ namespace WPinternals
         {
             bool SendImageResult = await Task.Run(() => SendImage(ProgrammerPath));
             if (!SendImageResult)
+            {
                 return false;
+            }
 
             await Task.Run(() => StartProgrammer());
 
             bool Connected = await Task.Run(() => ConnectToProgrammerInTestMode());
             if (!Connected)
+            {
                 return false;
+            }
 
             LogFile.Log("Rebooting phone", LogType.FileAndConsole);
-            string Command03 = "<?xml version=\"1.0\" ?><data><power value=\"reset\"/></data>";
+            const string Command03 = "<?xml version=\"1.0\" ?><data><power value=\"reset\"/></data>";
             LogFile.Log("Out: " + Command03, LogType.FileOnly);
             Serial.SendData(System.Text.Encoding.ASCII.GetBytes(Command03));
 
diff --git a/Models/QualcommSerial.cs b/Models/QualcommSerial.cs
index 9ab23e9..9a75eb0 100644
--- a/Models/QualcommSerial.cs
+++ b/Models/QualcommSerial.cs
@@ -27,9 +27,9 @@ namespace WPinternals
     internal class QualcommSerial : IDisposable
     {
         private bool Disposed = false;
-        private SerialPort Port = null;
-        private USBDevice USBDevice = null;
-        private CRC16 CRC16;
+        private readonly SerialPort Port = null;
+        private readonly USBDevice USBDevice = null;
+        private readonly CRC16 CRC16;
 
         public bool EncodeCommands = true;
         public bool DecodeResponses = true;
@@ -44,9 +44,11 @@ namespace WPinternals
                 string PortName = (string)Microsoft.Win32.Registry.GetValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Enum\USB\" + DevicePathElements[1] + @"\" + DevicePathElements[2] + @"\Device Parameters", "PortName", null);
                 if (PortName != null)
                 {
-                    Port = new SerialPort(PortName, 115200);
-                    Port.ReadTimeout = 1000;
-                    Port.WriteTimeout = 1000;
+                    Port = new SerialPort(PortName, 115200)
+                    {
+                        ReadTimeout = 1000,
+                        WriteTimeout = 1000
+                    };
                     Port.Open();
                 }
             }
@@ -62,30 +64,22 @@ namespace WPinternals
 
         public void SendData(byte[] Data)
         {
-            byte[] FormattedData;
-            if (EncodeCommands)
-                FormattedData = FormatCommand(Data);
-            else
-                FormattedData = Data;
-
-            if (Port != null)
-                Port.Write(FormattedData, 0, FormattedData.Length);
+            byte[] FormattedData = EncodeCommands ? FormatCommand(Data) : Data;
+            Port?.Write(FormattedData, 0, FormattedData.Length);
             if (USBDevice != null)
+            {
                 USBDevice.OutputPipe.Write(FormattedData);
+            }
         }
 
         public byte[] SendCommand(byte[] Command, byte[] ResponsePattern)
         {
-            byte[] FormattedCommand;
-            if (EncodeCommands)
-                FormattedCommand = FormatCommand(Command);
-            else
-                FormattedCommand = Command;
-
-            if (Port != null)
-                Port.Write(FormattedCommand, 0, FormattedCommand.Length);
+            byte[] FormattedCommand = EncodeCommands ? FormatCommand(Command) : Command;
+            Port?.Write(FormattedCommand, 0, FormattedCommand.Length);
             if (USBDevice != null)
+            {
                 USBDevice.OutputPipe.Write(FormattedCommand);
+            }
 
             return GetResponse(ResponsePattern);
         }
@@ -105,9 +99,14 @@ namespace WPinternals
                     int BytesRead = 0;
 
                     if (Port != null)
+                    {
                         BytesRead = Port.Read(ResponseBuffer, Length, ResponseBuffer.Length - Length);
+                    }
+
                     if (USBDevice != null)
+                    {
                         BytesRead = USBDevice.InputPipe.Read(ResponseBuffer);
+                    }
 
                     if (BytesRead == 0)
                     {
@@ -130,6 +129,7 @@ namespace WPinternals
                     if (ResponsePattern != null)
                     {
                         for (int i = 0; i < ResponsePattern.Length; i++)
+                        {
                             if (DecodedResponse[i] != ResponsePattern[i])
                             {
                                 byte[] LogResponse = new byte[DecodedResponse.Length < 0x10 ? DecodedResponse.Length : 0x10];
@@ -137,6 +137,7 @@ namespace WPinternals
                                 LogFile.Log("Expected: " + Converter.ConvertHexToString(ResponsePattern, ""), LogType.FileOnly);
                                 throw new BadMessageException();
                             }
+                        }
                     }
 
                     return DecodedResponse;
@@ -149,10 +150,11 @@ namespace WPinternals
             }
             while (IsIncomplete);
 
-            if (Port != null)
-                Port.DiscardInBuffer();
+            Port?.DiscardInBuffer();
             if (USBDevice != null)
+            {
                 USBDevice.InputPipe.Flush();
+            }
 
             throw new BadConnectionException();
         }
@@ -160,7 +162,9 @@ namespace WPinternals
         private byte[] FormatCommand(byte[] Command)
         {
             if ((Command == null) || (Command.Length == 0))
+            {
                 throw new BadMessageException();
+            }
 
             byte[] Decoded = new byte[(Command.Length * 2) + 4];
             int Length = 0;
@@ -175,7 +179,9 @@ namespace WPinternals
                     Decoded[Length++] = (byte)(Command[i] ^ 0x20);
                 }
                 else
+                {
                     Decoded[Length++] = Command[i];
+                }
             }
 
             UInt16 Checksum = CRC16.CalculateChecksum(Command);
@@ -185,14 +191,20 @@ namespace WPinternals
                 Decoded[Length++] = (byte)((Checksum & 0xFF) ^ 0x20);
             }
             else
+            {
                 Decoded[Length++] = (byte)(Checksum & 0xFF);
+            }
+
             if (((byte)(Checksum >> 8) == 0x7D) || ((byte)(Checksum >> 8) == 0x7E))
             {
                 Decoded[Length++] = 0x7D;
                 Decoded[Length++] = (byte)((Checksum >> 8) ^ 0x20);
             }
             else
+            {
                 Decoded[Length++] = (byte)(Checksum >> 8);
+            }
+
             Decoded[Length++] = 0x7E;
 
             if (Length > 0)
@@ -202,13 +214,17 @@ namespace WPinternals
                 return Result;
             }
             else
+            {
                 return null;
+            }
         }
 
         private byte[] DecodeResponse(byte[] Response, UInt32 Length)
         {
             if ((Response == null) || (Response.Length == 0) || (Response[0] != 0x7E))
+            {
                 throw new BadMessageException();
+            }
 
             UInt32 SourceLength = Length;
             Length = 0;
@@ -219,24 +235,33 @@ namespace WPinternals
             while (SourcePos < SourceLength)
             {
                 if (Response[SourcePos] == 0x7E)
+                {
                     break;
-                if (Response[SourcePos] == 0x7D)
-                    Message[Length++] = (byte)(Response[++SourcePos] ^ 0x20);
-                else
-                    Message[Length++] = Response[SourcePos];
+                }
+
+                Message[Length++] = Response[SourcePos] == 0x7D ? (byte)(Response[++SourcePos] ^ 0x20) : Response[SourcePos];
+
                 SourcePos++;
             }
 
-            if (SourcePos == SourceLength) throw new IncompleteMessageException();
+            if (SourcePos == SourceLength)
+            {
+                throw new IncompleteMessageException();
+            }
 
-            if (Length < 3) throw new BadMessageException();
+            if (Length < 3)
+            {
+                throw new BadMessageException();
+            }
 
             byte[] TrimmedMessage = new byte[Length - 2];
             Buffer.BlockCopy(Message, 0, TrimmedMessage, 0, (int)(Length - 2));
 
             UInt16 Checksum = CRC16.CalculateChecksum(TrimmedMessage);
             if (((byte)(Checksum & 0xFF) != Message[Length - 2]) || ((byte)(Checksum >> 8) != Message[Length - 1]))
+            {
                 throw new BadMessageException();
+            }
 
             return TrimmedMessage;
         }
@@ -254,14 +279,16 @@ namespace WPinternals
 
         public void Close()
         {
-            if (Port != null) Port.Close();
-            if (USBDevice != null) USBDevice.Dispose();
+            Port?.Close();
+            USBDevice?.Dispose();
         }
 
         protected virtual void Dispose(bool disposing)
         {
             if (Disposed)
+            {
                 return;
+            }
 
             if (disposing)
             {
@@ -277,7 +304,10 @@ namespace WPinternals
         internal void SetTimeOut(int v)
         {
             if (USBDevice != null)
+            {
                 USBDevice.ControlPipeTimeout = v;
+            }
+
             if (Port != null)
             {
                 Port.ReadTimeout = v;
@@ -292,7 +322,7 @@ namespace WPinternals
 
     public class CRC16
     {
-        private UInt16[] ChecksumTable =
+        private readonly UInt16[] ChecksumTable =
             new UInt16[] {
                 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
                 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7,
@@ -328,7 +358,7 @@ namespace WPinternals
                 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78
             };
 
-        private UInt16 Seed, FinalXor;
+        private readonly UInt16 Seed, FinalXor;
 
         public CRC16(UInt16 Polynomial, UInt16 Seed, UInt16 FinalXor)
         {
diff --git a/Models/SBL1.cs b/Models/SBL1.cs
index e5f5492..9c9122e 100644
--- a/Models/SBL1.cs
+++ b/Models/SBL1.cs
@@ -35,7 +35,9 @@ namespace WPinternals
                     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
                 }, null, null);
             if (Offset == null)
+            {
                 throw new BadImageFormatException();
+            }
 
             UInt32 PartitionLoaderTableOffset = (UInt32)Offset;
 
@@ -49,7 +51,9 @@ namespace WPinternals
                 },
                 FoundPattern);
             if (Offset == null)
+            {
                 throw new BadImageFormatException();
+            }
 
             UInt32 SharedMemoryAddress = ByteOperations.ReadUInt32(FoundPattern, 0x0C);
             UInt32 GlobalIsSecurityEnabledAddress = SharedMemoryAddress + 0x28;
@@ -65,7 +69,9 @@ namespace WPinternals
                 },
                 null);
             if (Offset == null)
+            {
                 throw new BadImageFormatException();
+            }
 
             UInt32 ReturnAddress = (UInt32)Offset - ImageOffset + ImageAddress;
 
diff --git a/Models/SBL2.cs b/Models/SBL2.cs
index bc2242b..6b1bcc3 100644
--- a/Models/SBL2.cs
+++ b/Models/SBL2.cs
@@ -44,7 +44,9 @@ namespace WPinternals
                 null);
 
             if (PatchOffset == null)
+            {
                 throw new BadImageFormatException();
+            }
 
             Buffer.BlockCopy(new byte[] { 0x00, 0x00, 0xA0, 0xE3 }, 0, Binary, (int)PatchOffset + 8, 4);
 
diff --git a/Models/SBL3.cs b/Models/SBL3.cs
index f3ce784..8a85864 100644
--- a/Models/SBL3.cs
+++ b/Models/SBL3.cs
@@ -41,7 +41,7 @@ namespace WPinternals
             {
                 if (FFU.IsFFU(FileName))
                 {
-                    FFU FFUFile = new FFU(FileName);
+                    FFU FFUFile = new(FileName);
                     Binary = FFUFile.GetPartition("SBL3");
                 }
             }
@@ -50,18 +50,17 @@ namespace WPinternals
             // If not succeeded, then try to parse it as raw image
             if (Binary == null)
             {
-                byte[] SBL3Header;
                 byte[] SBL3Pattern = new byte[] { 0x18, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x8F, 0xFF, 0xFF, 0xFF, 0xFF };
                 byte[] SBL3Mask = new byte[] { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF };
 
-                UInt32? Offset = ByteOperations.FindPatternInFile(FileName, SBL3Pattern, SBL3Mask, out SBL3Header);
+                UInt32? Offset = ByteOperations.FindPatternInFile(FileName, SBL3Pattern, SBL3Mask, out byte[] SBL3Header);
 
                 if (Offset != null)
                 {
                     UInt32 Length = ByteOperations.ReadUInt32(SBL3Header, 0x10) + 0x28; // SBL3 Image Size + Header Size
                     Binary = new byte[Length];
 
-                    FileStream Stream = new FileStream(FileName, FileMode.Open, FileAccess.Read);
+                    FileStream Stream = new(FileName, FileMode.Open, FileAccess.Read);
                     Stream.Seek((long)Offset, SeekOrigin.Begin);
                     Stream.Read(Binary, 0, (int)Length);
                     Stream.Close();
@@ -77,7 +76,9 @@ namespace WPinternals
                 null, null);
 
             if (PatchOffset == null)
+            {
                 throw new BadImageFormatException();
+            }
 
             Buffer.BlockCopy(new byte[] { 0x00, 0x00, 0xA0, 0xE3 }, 0, Binary, (int)PatchOffset + 4, 4);
 
diff --git a/Models/UEFI.cs b/Models/UEFI.cs
index 58023c9..d01d8cb 100644
--- a/Models/UEFI.cs
+++ b/Models/UEFI.cs
@@ -39,22 +39,22 @@ namespace WPinternals
     {
         internal byte[] Binary;
         private byte[] DecompressedImage;
-        internal List<EFI> EFIs = new List<EFI>();
-        private byte PaddingByteValue = 0xFF;
-        private UInt32 DecompressedVolumeSectionHeaderOffset;
-        private UInt32 DecompressedVolumeHeaderOffset;
-        private UInt32 VolumeSize;
-        private UInt16 VolumeHeaderSize;
-        private UInt32 FileHeaderOffset;
-        private UInt32 SectionHeaderOffset;
-        private UInt32 CompressedSubImageOffset;
+        internal List<EFI> EFIs = new();
+        private readonly byte PaddingByteValue = 0xFF;
+        private readonly UInt32 DecompressedVolumeSectionHeaderOffset;
+        private readonly UInt32 DecompressedVolumeHeaderOffset;
+        private readonly UInt32 VolumeSize;
+        private readonly UInt16 VolumeHeaderSize;
+        private readonly UInt32 FileHeaderOffset;
+        private readonly UInt32 SectionHeaderOffset;
+        private readonly UInt32 CompressedSubImageOffset;
         private UInt32 CompressedSubImageSize;
 
         // First 0x28 bytes are Qualcomm partition header
         // Inside the attributes of the VolumeHeader, the Volume-alignment is set to 8 (on Windows Phone UEFI images)
         // The Volume always starts right after the Qualcomm header at position 0x28.
         // So the VolumeHeader-alignment is always complied.
-        private UInt32 VolumeHeaderOffset = 0x28;
+        private readonly UInt32 VolumeHeaderOffset = 0x28;
 
         internal UEFI(byte[] UefiBinary)
         {
@@ -62,13 +62,12 @@ namespace WPinternals
 
             string VolumeHeaderMagic;
             UInt32? Offset = ByteOperations.FindAscii(Binary, "_FVH");
-            if (Offset == null)
-                throw new BadImageFormatException();
-            else
-                VolumeHeaderOffset = (UInt32)Offset - 0x28;
+            VolumeHeaderOffset = Offset == null ? throw new BadImageFormatException() : (UInt32)Offset - 0x28;
 
             if (!VerifyVolumeChecksum(Binary, VolumeHeaderOffset))
+            {
                 throw new BadImageFormatException();
+            }
 
             VolumeSize = ByteOperations.ReadUInt32(Binary, VolumeHeaderOffset + 0x20); // TODO: This is actually a QWORD
             VolumeHeaderSize = ByteOperations.ReadUInt16(Binary, VolumeHeaderOffset + 0x30);
@@ -83,7 +82,9 @@ namespace WPinternals
             do
             {
                 if (!VerifyFileChecksum(Binary, FileHeaderOffset))
+                {
                     throw new BadImageFormatException();
+                }
 
                 FileType = ByteOperations.ReadUInt8(Binary, FileHeaderOffset + 0x12);
                 FileSize = ByteOperations.ReadUInt24(Binary, FileHeaderOffset + 0x14);
@@ -105,7 +106,9 @@ namespace WPinternals
             while (!VolumeFound && (FileHeaderOffset < (VolumeHeaderOffset + VolumeSize)));
 
             if (!VolumeFound)
+            {
                 throw new BadImageFormatException();
+            }
 
             // Look in file for section of type EFI_SECTION_GUID_DEFINED (0x02)
 
@@ -136,7 +139,9 @@ namespace WPinternals
             while (!DecompressedVolumeFound && (SectionHeaderOffset < (FileHeaderOffset + FileSize)));
 
             if (!DecompressedVolumeFound)
+            {
                 throw new BadImageFormatException();
+            }
 
             // Decompress subvolume
             CompressedSubImageOffset = SectionHeaderOffset + SectionHeaderSize;
@@ -170,17 +175,23 @@ namespace WPinternals
             while (!DecompressedVolumeFound && (DecompressedVolumeSectionHeaderOffset < DecompressedImage.Length));
 
             if (!DecompressedVolumeFound)
+            {
                 throw new BadImageFormatException();
+            }
 
             DecompressedVolumeHeaderOffset = DecompressedVolumeSectionHeaderOffset + 4;
 
             // PARSE COMPRESSED VOLUME
             VolumeHeaderMagic = ByteOperations.ReadAsciiString(DecompressedImage, DecompressedVolumeHeaderOffset + 0x28, 0x04);
             if (VolumeHeaderMagic != "_FVH")
+            {
                 throw new BadImageFormatException();
+            }
 
             if (!VerifyVolumeChecksum(DecompressedImage, DecompressedVolumeHeaderOffset))
+            {
                 throw new BadImageFormatException();
+            }
 
             Int32 DecompressedVolumeSize = ByteOperations.ReadInt32(DecompressedImage, DecompressedVolumeHeaderOffset + 0x20); // TODO: This is actually a QWORD
             UInt16 DecompressedVolumeHeaderSize = ByteOperations.ReadUInt16(DecompressedImage, DecompressedVolumeHeaderOffset + 0x30);
@@ -191,7 +202,9 @@ namespace WPinternals
             do
             {
                 if ((DecompressedFileHeaderOffset + 0x18) >= (DecompressedVolumeHeaderOffset + DecompressedVolumeSize))
+                {
                     break;
+                }
 
                 bool ContentFound = false;
                 for (int i = 0; i < 0x18; i++)
@@ -203,19 +216,26 @@ namespace WPinternals
                     }
                 }
                 if (!ContentFound)
+                {
                     break;
+                }
 
                 FileSize = ByteOperations.ReadUInt24(DecompressedImage, DecompressedFileHeaderOffset + 0x14);
 
                 if ((DecompressedFileHeaderOffset + FileSize) >= (DecompressedVolumeHeaderOffset + DecompressedVolumeSize))
+                {
                     break;
+                }
 
                 if (!VerifyFileChecksum(DecompressedImage, DecompressedFileHeaderOffset))
+                {
                     throw new BadImageFormatException();
+                }
 
-                CurrentEFI = new EFI();
-
-                CurrentEFI.Type = ByteOperations.ReadUInt8(DecompressedImage, DecompressedFileHeaderOffset + 0x12);
+                CurrentEFI = new EFI
+                {
+                    Type = ByteOperations.ReadUInt8(DecompressedImage, DecompressedFileHeaderOffset + 0x12)
+                };
                 byte[] FileGuidBytes = new byte[0x10];
                 System.Buffer.BlockCopy(DecompressedImage, (int)DecompressedFileHeaderOffset + 0x00, FileGuidBytes, 0, 0x10);
                 CurrentEFI.Guid = new Guid(FileGuidBytes);
@@ -266,9 +286,11 @@ namespace WPinternals
 
         internal byte[] GetFile(string Name)
         {
-            EFI File = EFIs.Where(f => (string.Compare(Name, f.Name, true) == 0) || (string.Compare(Name, f.Guid.ToString(), true) == 0)).FirstOrDefault();
+            EFI File = EFIs.Find(f => (string.Compare(Name, f.Name, true) == 0) || (string.Compare(Name, f.Guid.ToString(), true) == 0));
             if (File == null)
+            {
                 return null;
+            }
 
             byte[] Bytes = new byte[File.Size];
             Buffer.BlockCopy(DecompressedImage, (int)File.BinaryOffset, Bytes, 0, (int)File.Size);
@@ -278,9 +300,11 @@ namespace WPinternals
 
         internal byte[] GetFile(Guid Guid)
         {
-            EFI File = EFIs.Where(f => (Guid == f.Guid)).FirstOrDefault();
+            EFI File = EFIs.Find(f => (Guid == f.Guid));
             if (File == null)
+            {
                 return null;
+            }
 
             byte[] Bytes = new byte[File.Size];
             Buffer.BlockCopy(DecompressedImage, (int)File.BinaryOffset, Bytes, 0, (int)File.Size);
@@ -290,9 +314,11 @@ namespace WPinternals
 
         internal void ReplaceFile(string Name, byte[] Binary)
         {
-            EFI File = EFIs.Where(f => (string.Compare(Name, f.Name, true) == 0) || (string.Compare(Name, f.Guid.ToString(), true) == 0)).FirstOrDefault();
+            EFI File = EFIs.Find(f => (string.Compare(Name, f.Name, true) == 0) || (string.Compare(Name, f.Guid.ToString(), true) == 0));
             if (File == null)
+            {
                 throw new ArgumentOutOfRangeException();
+            }
 
             UInt32 OldBinarySize = File.Size;
             UInt32 NewBinarySize = (UInt32)Binary.Length;
@@ -318,7 +344,9 @@ namespace WPinternals
 
                 // Insert section-padding
                 for (int i = 0; i < NewSectionPadding; i++)
+                {
                     NewImage[File.BinaryOffset + NewBinarySize + i] = PaddingByteValue;
+                }
 
                 // Copy file-tail
                 Buffer.BlockCopy(
@@ -330,7 +358,9 @@ namespace WPinternals
 
                 // Insert file-padding
                 for (int i = 0; i < NewFilePadding; i++)
+                {
                     NewImage[File.BinaryOffset + NewFileSize + i] = PaddingByteValue;
+                }
 
                 // Copy volume-tail
                 Buffer.BlockCopy(
@@ -371,7 +401,9 @@ namespace WPinternals
             {
                 Buffer.BlockCopy(Binary, 0, DecompressedImage, (int)File.BinaryOffset, Binary.Length);
                 for (int i = 0; i < NewSectionPadding; i++)
+                {
                     DecompressedImage[File.BinaryOffset + Binary.Length + i] = PaddingByteValue;
+                }
             }
 
             // Calculate File-checksum
@@ -408,28 +440,38 @@ namespace WPinternals
             // Filesize includes fileheader. But it does not include the padding-bytes. Not even the padding bytes of the last section.
             UInt32 NewFileSize;
             if ((CompressedSubImageOffset + CompressedSubImageSize + OldSectionPadding) >= (FileHeaderOffset + OldFileSize))
+            {
                 // Compressed image is the last section of this file
                 NewFileSize = CompressedSubImageOffset - FileHeaderOffset + (UInt32)NewCompressedImage.Length;
+            }
             else
+            {
                 // Compressed image is NOT the last section of this file
                 NewFileSize = OldFileSize - CompressedSubImageSize - OldSectionPadding + (UInt32)NewCompressedImage.Length + NewSectionPadding;
+            }
 
             // Add section padding
             for (int i = 0; i < NewSectionPadding; i++)
+            {
                 NewBinary[CompressedSubImageOffset + NewCompressedImage.Length + i] = PaddingByteValue;
+            }
 
             // If there are more bytes after the section padding of the compressed image, then copy the trailing sections
             if (((Int32)FileHeaderOffset + OldFileSize - CompressedSubImageOffset - CompressedSubImageSize - OldSectionPadding) > 0)
+            {
                 Buffer.BlockCopy(Binary, (int)(CompressedSubImageOffset + CompressedSubImageSize + OldSectionPadding), NewBinary,
                     (int)(CompressedSubImageOffset + NewCompressedImage.Length + NewSectionPadding),
                     (int)(FileHeaderOffset + OldFileSize - CompressedSubImageOffset - CompressedSubImageSize - OldSectionPadding));
+            }
 
             // Add file padding
             // Filesize does not include last section padding or file padding
             UInt32 OldFilePadding = ByteOperations.Align(0, OldFileSize, 8) - OldFileSize;
             UInt32 NewFilePadding = ByteOperations.Align(0, NewFileSize, 8) - NewFileSize;
             for (int i = 0; i < NewFilePadding; i++)
+            {
                 NewBinary[FileHeaderOffset + NewFileSize + i] = PaddingByteValue;
+            }
 
             if (NewCompressedImage.Length > CompressedSubImageSize)
             {
@@ -441,7 +483,9 @@ namespace WPinternals
                 Buffer.BlockCopy(Binary, (int)(FileHeaderOffset + OldFileSize + OldFilePadding), NewBinary, (int)(FileHeaderOffset + NewFileSize + NewFilePadding),
                     (int)(VolumeHeaderOffset + VolumeSize - FileHeaderOffset - OldFileSize - OldFilePadding));
                 for (int i = (int)(VolumeHeaderOffset + VolumeSize - OldFileSize - OldFilePadding + NewFileSize + NewFilePadding); i < VolumeHeaderOffset + VolumeSize; i++)
+                {
                     NewBinary[i] = PaddingByteValue;
+                }
             }
             CompressedSubImageSize = (UInt32)NewCompressedImage.Length;
 
@@ -475,12 +519,12 @@ namespace WPinternals
             ByteOperations.WriteUInt16(Header, 0x32, 0); // Clear checksum
             UInt16 CurrentChecksum = ByteOperations.ReadUInt16(Image, Offset + 0x32);
             UInt16 NewChecksum = ByteOperations.CalculateChecksum16(Header, 0, VolumeHeaderSize);
-            return (CurrentChecksum == NewChecksum);
+            return CurrentChecksum == NewChecksum;
         }
 
         private void CalculateFileChecksum(byte[] Image, UInt32 Offset)
         {
-            UInt16 FileHeaderSize = 0x18;
+            const UInt16 FileHeaderSize = 0x18;
             UInt32 FileSize = ByteOperations.ReadUInt24(Image, Offset + 0x14);
 
             ByteOperations.WriteUInt16(Image, Offset + 0x10, 0); // Clear checksum
@@ -505,7 +549,7 @@ namespace WPinternals
         {
             // This function only checks fixed checksum-values 0x55 and 0xAA.
 
-            UInt16 FileHeaderSize = 0x18;
+            const UInt16 FileHeaderSize = 0x18;
             UInt32 FileSize = ByteOperations.ReadUInt24(Image, Offset + 0x14);
 
             byte[] Header = new byte[FileHeaderSize - 1];
@@ -515,7 +559,9 @@ namespace WPinternals
             byte CalculatedHeaderChecksum = ByteOperations.CalculateChecksum8(Header, 0, (UInt32)FileHeaderSize - 1);
 
             if (CurrentHeaderChecksum != CalculatedHeaderChecksum)
+            {
                 return false;
+            }
 
             byte FileAttribs = ByteOperations.ReadUInt8(Image, Offset + 0x13);
             byte CurrentFileChecksum = ByteOperations.ReadUInt8(Image, Offset + 0x11);
@@ -524,13 +570,17 @@ namespace WPinternals
                 // Calculate file checksum
                 byte CalculatedFileChecksum = ByteOperations.CalculateChecksum8(Image, Offset + FileHeaderSize, FileSize - FileHeaderSize);
                 if (CurrentFileChecksum != CalculatedFileChecksum)
+                {
                     return false;
+                }
             }
             else
             {
                 // Fixed file checksum
                 if ((CurrentFileChecksum != 0xAA) && (CurrentFileChecksum != 0x55))
+                {
                     return false;
+                }
             }
 
             return true;
@@ -554,7 +604,9 @@ namespace WPinternals
                 null);
 
             if (PatchOffset == null)
+            {
                 throw new BadImageFormatException();
+            }
 
             Buffer.BlockCopy(new byte[] { 0x00, 0x00, 0xA0, 0xE3, 0x1E, 0xFF, 0x2F, 0xE1 }, 0, SecurityDxe, (int)PatchOffset, 8);
 
@@ -569,7 +621,9 @@ namespace WPinternals
                 null);
 
             if (PatchOffset == null)
+            {
                 throw new BadImageFormatException();
+            }
 
             ByteOperations.WriteUInt8(SecurityServicesDxe, (UInt32)PatchOffset + 0x0B, 0xEA);
 
@@ -579,7 +633,9 @@ namespace WPinternals
                 null);
 
             if (PatchOffset == null)
+            {
                 throw new BadImageFormatException();
+            }
 
             ByteOperations.WriteUInt8(SecurityServicesDxe, (UInt32)PatchOffset + 0x0B, 0xEA);
 
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index 3664302..1b1ecdf 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -28,7 +28,6 @@ using System.Windows;
 
 //[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
 
-
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
                                      //(used if a resource is not found in the page, 
@@ -38,7 +37,6 @@ using System.Windows;
                                               // app, or any theme specific resource dictionaries)
 )]
 
-
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
diff --git a/Terminal.cs b/Terminal.cs
index 7911d4f..262833e 100644
--- a/Terminal.cs
+++ b/Terminal.cs
@@ -27,7 +27,7 @@ namespace WPinternals
     {
         public static TerminalResponse Parse(byte[] Buffer, int Offset)
         {
-            TerminalResponse Response = new TerminalResponse();
+            TerminalResponse Response = new();
 
             // Get root node
             if (Buffer.Length >= (Offset + 8))
@@ -61,7 +61,7 @@ namespace WPinternals
 
     internal class TerminalResponse
     {
-        public Dictionary<int, byte[]> RawEntries = new Dictionary<int, byte[]>();
+        public Dictionary<int, byte[]> RawEntries = new();
         public byte[] PublicId = null;
         public byte[] RootKeyHash = null;
     }
diff --git a/TestCode.cs b/TestCode.cs
index a11c31f..a3270f6 100644
--- a/TestCode.cs
+++ b/TestCode.cs
@@ -43,14 +43,14 @@ namespace WPinternals
         {
             byte[] GPT = File.ReadAllBytes(GPTPath);
 
-            PhoneNotifierViewModel PhoneNotifier = new PhoneNotifierViewModel();
+            PhoneNotifierViewModel PhoneNotifier = new();
             PhoneNotifier.Start();
             await SwitchModeViewModel.SwitchTo(PhoneNotifier, PhoneInterfaces.Qualcomm_Download);
 
             byte[] RootKeyHash = null;
             if (PhoneNotifier.CurrentInterface == PhoneInterfaces.Qualcomm_Download)
             {
-                QualcommDownload Download2 = new QualcommDownload((QualcommSerial)PhoneNotifier.CurrentModel);
+                QualcommDownload Download2 = new((QualcommSerial)PhoneNotifier.CurrentModel);
                 RootKeyHash = Download2.GetRKH();
             }
 
@@ -73,7 +73,7 @@ namespace WPinternals
             }
 
             QualcommSerial Serial = (QualcommSerial)PhoneNotifier.CurrentModel;
-            QualcommDownload Download = new QualcommDownload(Serial);
+            QualcommDownload Download = new(Serial);
             if (Download.IsAlive())
             {
                 int Attempt = 1;
@@ -92,14 +92,18 @@ namespace WPinternals
                     catch { }
 
                     if (Result)
+                    {
                         break;
+                    }
 
                     Attempt++;
                 }
                 Serial.Close();
 
                 if (!Result)
+                {
                     LogFile.Log("Loader failed", LogType.ConsoleOnly);
+                }
             }
             else
             {
@@ -108,15 +112,20 @@ namespace WPinternals
             }
 
             if (PhoneNotifier.CurrentInterface != PhoneInterfaces.Qualcomm_Flash)
+            {
                 await PhoneNotifier.WaitForArrival();
+            }
+
             if (PhoneNotifier.CurrentInterface != PhoneInterfaces.Qualcomm_Flash)
+            {
                 throw new WPinternalsException("Phone failed to switch to emergency flash mode.");
+            }
 
             // Flash bootloader
             QualcommSerial Serial2 = (QualcommSerial)PhoneNotifier.CurrentModel;
             Serial2.EncodeCommands = false;
 
-            QualcommFlasher Flasher = new QualcommFlasher(Serial2);
+            QualcommFlasher Flasher = new(Serial2);
 
             Flasher.Hello();
             Flasher.SetSecurityMode(0);
@@ -138,7 +147,7 @@ namespace WPinternals
 
         internal static async Task RewriteGPT(string GPTPath)
         {
-            PhoneNotifierViewModel Notifier = new PhoneNotifierViewModel();
+            PhoneNotifierViewModel Notifier = new();
             Notifier.Start();
             await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_MassStorage);
             MassStorage MassStorage = (MassStorage)Notifier.CurrentModel;
@@ -149,10 +158,10 @@ namespace WPinternals
 
         internal static async Task RewriteMBRGPT()
         {
-            FFU FFU = new FFU(@"E:\Device Backups\Alpha\9200_1230.0025.9200.9825\RX100_9825.ffu");
-            string GPTPath = @"E:\Device Backups\Alpha\9200_1230.0025.9200.9825\CorrectGPT.bin";
+            FFU FFU = new(@"E:\Device Backups\Alpha\9200_1230.0025.9200.9825\RX100_9825.ffu");
+            const string GPTPath = @"E:\Device Backups\Alpha\9200_1230.0025.9200.9825\CorrectGPT.bin";
 
-            PhoneNotifierViewModel Notifier = new PhoneNotifierViewModel();
+            PhoneNotifierViewModel Notifier = new();
             Notifier.Start();
             await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_MassStorage);
             MassStorage MassStorage = (MassStorage)Notifier.CurrentModel;
@@ -167,7 +176,7 @@ namespace WPinternals
 
         internal static async Task RewriteParts(string PartPath)
         {
-            PhoneNotifierViewModel Notifier = new PhoneNotifierViewModel();
+            PhoneNotifierViewModel Notifier = new();
             Notifier.Start();
             await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_MassStorage);
             MassStorage MassStorage = (MassStorage)Notifier.CurrentModel;
@@ -181,60 +190,55 @@ namespace WPinternals
 
                     LogFile.Log("", LogType.ConsoleOnly);
 
-                    MassStorage.RestorePartition(part, partname, (v, t) =>
-                    {
-                        LogFile.Log("Progress: " + v + "%", LogType.ConsoleOnly);
-                    });
+                    MassStorage.RestorePartition(part, partname, (v, t) => LogFile.Log("Progress: " + v + "%", LogType.ConsoleOnly));
                     LogFile.Log("", LogType.ConsoleOnly);
                 }
                 catch
                 {
                     LogFile.Log("", LogType.ConsoleOnly);
                     LogFile.Log($"Failed writing {partname} to the device.", LogType.ConsoleOnly);
-                };
+                }
             }
         }
 
         internal static void PatchImg(string dump)
         {
-            using (var fil = File.Open(dump, FileMode.Open))
-            {
-                byte[] gptbuffer = new byte[0x4200];
+            using var fil = File.Open(dump, FileMode.Open);
+            byte[] gptbuffer = new byte[0x4200];
 
-                fil.Seek(0x200, SeekOrigin.Begin);
-                fil.Read(gptbuffer, 0, 0x4200);
+            fil.Seek(0x200, SeekOrigin.Begin);
+            fil.Read(gptbuffer, 0, 0x4200);
 
-                uint BackupLBA = ByteOperations.ReadUInt32(gptbuffer, 0x20);
-                uint LastUsableLBA = ByteOperations.ReadUInt32(gptbuffer, 0x30);
+            uint BackupLBA = ByteOperations.ReadUInt32(gptbuffer, 0x20);
+            uint LastUsableLBA = ByteOperations.ReadUInt32(gptbuffer, 0x30);
 
-                LogFile.Log("Previous BackupLBA: " + BackupLBA, LogType.ConsoleOnly);
-                LogFile.Log("Previous LastUsableLBA: " + LastUsableLBA, LogType.ConsoleOnly);
+            LogFile.Log("Previous BackupLBA: " + BackupLBA, LogType.ConsoleOnly);
+            LogFile.Log("Previous LastUsableLBA: " + LastUsableLBA, LogType.ConsoleOnly);
 
-                uint NewBackupLBA = 62078975u;
-                uint NewLastUsableLBA = 62078942u;
+            const uint NewBackupLBA = 62078975u;
+            const uint NewLastUsableLBA = 62078942u;
 
-                ByteOperations.WriteUInt32(gptbuffer, 0x20, NewBackupLBA);
-                ByteOperations.WriteUInt32(gptbuffer, 0x30, NewLastUsableLBA);
+            ByteOperations.WriteUInt32(gptbuffer, 0x20, NewBackupLBA);
+            ByteOperations.WriteUInt32(gptbuffer, 0x30, NewLastUsableLBA);
 
-                uint HeaderSize = ByteOperations.ReadUInt32(gptbuffer, 0x0C);
-                uint PrevCRC = ByteOperations.ReadUInt32(gptbuffer, 0x10);
+            uint HeaderSize = ByteOperations.ReadUInt32(gptbuffer, 0x0C);
+            uint PrevCRC = ByteOperations.ReadUInt32(gptbuffer, 0x10);
 
-                LogFile.Log("Previous CRC: " + PrevCRC, LogType.ConsoleOnly);
+            LogFile.Log("Previous CRC: " + PrevCRC, LogType.ConsoleOnly);
 
-                ByteOperations.WriteUInt32(gptbuffer, 0x10, 0);
-                uint NewCRC = ByteOperations.CRC32(gptbuffer, 0, HeaderSize);
+            ByteOperations.WriteUInt32(gptbuffer, 0x10, 0);
+            uint NewCRC = ByteOperations.CRC32(gptbuffer, 0, HeaderSize);
 
-                LogFile.Log("New CRC: " + NewCRC, LogType.ConsoleOnly);
+            LogFile.Log("New CRC: " + NewCRC, LogType.ConsoleOnly);
 
-                ByteOperations.WriteUInt32(gptbuffer, 0x10, NewCRC);
+            ByteOperations.WriteUInt32(gptbuffer, 0x10, NewCRC);
 
-                LogFile.Log("Writing", LogType.ConsoleOnly);
+            LogFile.Log("Writing", LogType.ConsoleOnly);
 
-                fil.Seek(0x200, SeekOrigin.Begin);
-                fil.Write(gptbuffer, 0, 0x4200);
+            fil.Seek(0x200, SeekOrigin.Begin);
+            fil.Write(gptbuffer, 0, 0x4200);
 
-                LogFile.Log("Done!", LogType.ConsoleOnly);
-            }
+            LogFile.Log("Done!", LogType.ConsoleOnly);
         }
 
         internal static async Task TestProgrammer(System.Threading.SynchronizationContext UIContext, string ProgrammerPath)
@@ -244,10 +248,12 @@ namespace WPinternals
             {
                 LogFile.Log("Starting Firehose Test", LogType.FileAndConsole);
 
-                PhoneNotifierViewModel Notifier = new PhoneNotifierViewModel();
+                PhoneNotifierViewModel Notifier = new();
                 UIContext.Send(s => Notifier.Start(), null);
                 if (Notifier.CurrentInterface == PhoneInterfaces.Qualcomm_Download)
+                {
                     LogFile.Log("Phone found in emergency mode", LogType.FileAndConsole);
+                }
                 else
                 {
                     LogFile.Log("Phone needs to be switched to emergency mode.", LogType.FileAndConsole);
@@ -256,18 +262,25 @@ namespace WPinternals
                     Info.Log(LogType.ConsoleOnly);
                     await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Qualcomm_Download);
                     if (Notifier.CurrentInterface != PhoneInterfaces.Qualcomm_Download)
+                    {
                         throw new WPinternalsException("Switching mode failed.", "Could not switch the phone to Qualcomm Emergency 9008.");
+                    }
+
                     LogFile.Log("Phone is in emergency mode.", LogType.FileAndConsole);
                 }
 
                 // Send and start programmer
                 QualcommSerial Serial = (QualcommSerial)Notifier.CurrentModel;
-                QualcommSahara Sahara = new QualcommSahara(Serial);
+                QualcommSahara Sahara = new(Serial);
 
                 if (await Sahara.Reset(ProgrammerPath))
+                {
                     LogFile.Log("Emergency programmer test succeeded", LogType.FileAndConsole);
+                }
                 else
+                {
                     LogFile.Log("Emergency programmer test failed", LogType.FileAndConsole);
+                }
             }
             catch (Exception Ex)
             {
diff --git a/ViewModels/BackupTargetSelectionViewModel.cs b/ViewModels/BackupTargetSelectionViewModel.cs
index ebe4627..198baa3 100644
--- a/ViewModels/BackupTargetSelectionViewModel.cs
+++ b/ViewModels/BackupTargetSelectionViewModel.cs
@@ -25,10 +25,10 @@ namespace WPinternals
 {
     internal class BackupTargetSelectionViewModel : ContextViewModel
     {
-        private PhoneNotifierViewModel PhoneNotifier;
-        private Action<string, string, string> BackupCallback;
-        private Action<string> BackupArchiveCallback;
-        private Action<string> BackupArchiveProvisioningCallback;
+        private readonly PhoneNotifierViewModel PhoneNotifier;
+        private readonly Action<string, string, string> BackupCallback;
+        private readonly Action<string> BackupArchiveCallback;
+        private readonly Action<string> BackupArchiveProvisioningCallback;
         internal Action SwitchToUnlockBoot;
 
         internal BackupTargetSelectionViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToUnlockBoot, Action<string> BackupArchiveCallback, Action<string, string, string> BackupCallback, Action<string> BackupArchiveProvisioningCallback)
@@ -58,7 +58,7 @@ namespace WPinternals
                 if (value != _ArchivePath)
                 {
                     _ArchivePath = value;
-                    OnPropertyChanged("ArchivePath");
+                    OnPropertyChanged(nameof(ArchivePath));
                 }
             }
         }
@@ -75,7 +75,7 @@ namespace WPinternals
                 if (value != _EFIESPPath)
                 {
                     _EFIESPPath = value;
-                    OnPropertyChanged("EFIESPPath");
+                    OnPropertyChanged(nameof(EFIESPPath));
                 }
             }
         }
@@ -92,7 +92,7 @@ namespace WPinternals
                 if (value != _MainOSPath)
                 {
                     _MainOSPath = value;
-                    OnPropertyChanged("MainOSPath");
+                    OnPropertyChanged(nameof(MainOSPath));
                 }
             }
         }
@@ -109,7 +109,7 @@ namespace WPinternals
                 if (value != _DataPath)
                 {
                     _DataPath = value;
-                    OnPropertyChanged("DataPath");
+                    OnPropertyChanged(nameof(DataPath));
                 }
             }
         }
@@ -126,7 +126,7 @@ namespace WPinternals
                 if (value != _ArchiveProvisioningPath)
                 {
                     _ArchiveProvisioningPath = value;
-                    OnPropertyChanged("ArchiveProvisioningPath");
+                    OnPropertyChanged(nameof(ArchiveProvisioningPath));
                 }
             }
         }
@@ -143,7 +143,7 @@ namespace WPinternals
                 if (value != _IsPhoneDisconnected)
                 {
                     _IsPhoneDisconnected = value;
-                    OnPropertyChanged("IsPhoneDisconnected");
+                    OnPropertyChanged(nameof(IsPhoneDisconnected));
                 }
             }
         }
@@ -160,7 +160,7 @@ namespace WPinternals
                 if (value != _IsPhoneInMassStorage)
                 {
                     _IsPhoneInMassStorage = value;
-                    OnPropertyChanged("IsPhoneInMassStorage");
+                    OnPropertyChanged(nameof(IsPhoneInMassStorage));
                 }
             }
         }
@@ -177,7 +177,7 @@ namespace WPinternals
                 if (value != _IsPhoneInOtherMode)
                 {
                     _IsPhoneInOtherMode = value;
-                    OnPropertyChanged("IsPhoneInOtherMode");
+                    OnPropertyChanged(nameof(IsPhoneInOtherMode));
                 }
             }
         }
@@ -187,11 +187,7 @@ namespace WPinternals
         {
             get
             {
-                if (_BackupArchiveCommand == null)
-                {
-                    _BackupArchiveCommand = new DelegateCommand(() => { BackupArchiveCallback(ArchivePath); }, () => ((ArchivePath != null) && (PhoneNotifier.CurrentInterface != null)));
-                }
-                return _BackupArchiveCommand;
+                return _BackupArchiveCommand ??= new DelegateCommand(() => BackupArchiveCallback(ArchivePath), () => ((ArchivePath != null) && (PhoneNotifier.CurrentInterface != null)));
             }
         }
 
@@ -200,11 +196,7 @@ namespace WPinternals
         {
             get
             {
-                if (_BackupCommand == null)
-                {
-                    _BackupCommand = new DelegateCommand(() => { BackupCallback(EFIESPPath, MainOSPath, DataPath); }, () => (((EFIESPPath != null) || (MainOSPath != null) || (DataPath != null)) && (PhoneNotifier.CurrentInterface != null)));
-                }
-                return _BackupCommand;
+                return _BackupCommand ??= new DelegateCommand(() => BackupCallback(EFIESPPath, MainOSPath, DataPath), () => (((EFIESPPath != null) || (MainOSPath != null) || (DataPath != null)) && (PhoneNotifier.CurrentInterface != null)));
             }
         }
 
@@ -213,11 +205,7 @@ namespace WPinternals
         {
             get
             {
-                if (_BackupArchiveProvisioningCommand == null)
-                {
-                    _BackupArchiveProvisioningCommand = new DelegateCommand(() => { BackupArchiveProvisioningCallback(ArchiveProvisioningPath); }, () => ((ArchiveProvisioningPath != null) && (PhoneNotifier.CurrentInterface != null)));
-                }
-                return _BackupArchiveProvisioningCommand;
+                return _BackupArchiveProvisioningCommand ??= new DelegateCommand(() => BackupArchiveProvisioningCallback(ArchiveProvisioningPath), () => ((ArchiveProvisioningPath != null) && (PhoneNotifier.CurrentInterface != null)));
             }
         }
 
@@ -226,12 +214,12 @@ namespace WPinternals
             PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
         }
 
-        void NewDeviceArrived(ArrivalEventArgs Args)
+        private void NewDeviceArrived(ArrivalEventArgs Args)
         {
             new Thread(() => EvaluateViewState()).Start();
         }
 
-        void DeviceRemoved()
+        private void DeviceRemoved()
         {
             new Thread(() => EvaluateViewState()).Start();
         }
diff --git a/ViewModels/BackupViewModel.cs b/ViewModels/BackupViewModel.cs
index 761fb5c..cc3f482 100644
--- a/ViewModels/BackupViewModel.cs
+++ b/ViewModels/BackupViewModel.cs
@@ -28,9 +28,9 @@ namespace WPinternals
 {
     internal class BackupViewModel : ContextViewModel
     {
-        private PhoneNotifierViewModel PhoneNotifier;
-        private Action Callback;
-        private Action SwitchToUnlockBoot;
+        private readonly PhoneNotifierViewModel PhoneNotifier;
+        private readonly Action Callback;
+        private readonly Action SwitchToUnlockBoot;
 
         internal BackupViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToUnlockBoot, Action Callback)
             : base()
@@ -45,7 +45,9 @@ namespace WPinternals
         internal override void EvaluateViewState()
         {
             if (!IsActive)
+            {
                 return;
+            }
 
             if (SubContextViewModel == null)
             {
@@ -54,7 +56,9 @@ namespace WPinternals
             }
 
             if (SubContextViewModel is BackupTargetSelectionViewModel)
+            {
                 ((BackupTargetSelectionViewModel)SubContextViewModel).EvaluateViewState();
+            }
         }
 
         internal async void DoBackup(string EFIESPPath, string MainOSPath, string DataPath)
@@ -118,27 +122,27 @@ namespace WPinternals
 
                     Phone.OpenVolume(false);
                     byte[] GPTBuffer = Phone.ReadSectors(1, 33);
-                    GPT GPT = new WPinternals.GPT(GPTBuffer);
+                    GPT GPT = new(GPTBuffer);
                     Partition Partition;
                     try
                     {
                         if (EFIESPPath != null)
                         {
-                            Partition = GPT.Partitions.Where(p => p.Name == "EFIESP").First();
+                            Partition = GPT.Partitions.First(p => p.Name == "EFIESP");
                             TotalSizeSectors += Partition.SizeInSectors;
                             PartitionCount++;
                         }
 
                         if (MainOSPath != null)
                         {
-                            Partition = GPT.Partitions.Where(p => p.Name == "MainOS").First();
+                            Partition = GPT.Partitions.First(p => p.Name == "MainOS");
                             TotalSizeSectors += Partition.SizeInSectors;
                             PartitionCount++;
                         }
 
                         if (DataPath != null)
                         {
-                            Partition = GPT.Partitions.Where(p => p.Name == "Data").First();
+                            Partition = GPT.Partitions.First(p => p.Name == "Data");
                             TotalSizeSectors += Partition.SizeInSectors;
                             PartitionCount++;
                         }
@@ -149,7 +153,7 @@ namespace WPinternals
                         Result = false;
                     }
 
-                    BusyViewModel Busy = new BusyViewModel("Create backup...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
+                    BusyViewModel Busy = new("Create backup...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
                     ProgressUpdater Updater = Busy.ProgressUpdater;
                     ActivateSubContext(Busy);
 
@@ -161,7 +165,7 @@ namespace WPinternals
                             if (EFIESPPath != null)
                             {
                                 i++;
-                                Busy.Message = "Create backup of partition EFIESP (" + i.ToString() + @"/" + PartitionCount.ToString() + ")";
+                                Busy.Message = "Create backup of partition EFIESP (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
                                 Phone.BackupPartition("EFIESP", EFIESPPath, Updater);
                             }
                         }
@@ -179,7 +183,7 @@ namespace WPinternals
                             if (MainOSPath != null)
                             {
                                 i++;
-                                Busy.Message = "Create backup of partition MainOS (" + i.ToString() + @"/" + PartitionCount.ToString() + ")";
+                                Busy.Message = "Create backup of partition MainOS (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
                                 Phone.BackupPartition("MainOS", MainOSPath, Updater);
                             }
                         }
@@ -197,7 +201,7 @@ namespace WPinternals
                             if (DataPath != null)
                             {
                                 i++;
-                                Busy.Message = "Create backup of partition Data (" + i.ToString() + @"/" + PartitionCount.ToString() + ")";
+                                Busy.Message = "Create backup of partition Data (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
                                 Phone.BackupPartition("Data", DataPath, Updater);
                             }
                         }
@@ -230,7 +234,7 @@ namespace WPinternals
                 ActivateSubContext(new BusyViewModel("Initializing backup..."));
 
                 ulong TotalSizeSectors = 0;
-                int PartitionCount = 3;
+                const int PartitionCount = 3;
 
                 MassStorage Phone = (MassStorage)PhoneNotifier.CurrentModel;
 
@@ -238,19 +242,19 @@ namespace WPinternals
                 {
                     Phone.OpenVolume(false);
                     byte[] GPTBuffer = Phone.ReadSectors(1, 33);
-                    GPT GPT = new WPinternals.GPT(GPTBuffer);
+                    GPT GPT = new(GPTBuffer);
 
                     Partition Partition;
 
                     try
                     {
-                        Partition = GPT.Partitions.Where(p => p.Name == "EFIESP").First();
+                        Partition = GPT.Partitions.First(p => p.Name == "EFIESP");
                         TotalSizeSectors += Partition.SizeInSectors;
 
-                        Partition = GPT.Partitions.Where(p => p.Name == "MainOS").First();
+                        Partition = GPT.Partitions.First(p => p.Name == "MainOS");
                         TotalSizeSectors += Partition.SizeInSectors;
 
-                        Partition = GPT.Partitions.Where(p => p.Name == "Data").First();
+                        Partition = GPT.Partitions.First(p => p.Name == "Data");
                         TotalSizeSectors += Partition.SizeInSectors;
                     }
                     catch (Exception Ex)
@@ -259,86 +263,79 @@ namespace WPinternals
                         Result = false;
                     }
 
-                    BusyViewModel Busy = new BusyViewModel("Create backup...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
+                    BusyViewModel Busy = new("Create backup...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
                     ProgressUpdater Updater = Busy.ProgressUpdater;
                     ActivateSubContext(Busy);
                     ZipArchiveEntry Entry;
                     Stream EntryStream = null;
 
-                    using (FileStream FileStream = new FileStream(ArchivePath, FileMode.Create))
+                    using FileStream FileStream = new(ArchivePath, FileMode.Create);
+                    using ZipArchive Archive = new(FileStream, ZipArchiveMode.Create);
+                    int i = 0;
+
+                    if (Result)
                     {
-                        using (ZipArchive Archive = new ZipArchive(FileStream, ZipArchiveMode.Create))
+                        try
                         {
-                            int i = 0;
+                            Entry = Archive.CreateEntry("EFIESP.bin", CompressionLevel.Optimal);
+                            EntryStream = Entry.Open();
+                            i++;
+                            Busy.Message = "Create backup of partition EFIESP (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
+                            Phone.BackupPartition("EFIESP", EntryStream, Updater);
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                            Result = false;
+                        }
+                        finally
+                        {
+                            EntryStream?.Close();
+                            EntryStream = null;
+                        }
+                    }
 
-                            if (Result)
-                            {
-                                try
-                                {
-                                    Entry = Archive.CreateEntry("EFIESP.bin", CompressionLevel.Optimal);
-                                    EntryStream = Entry.Open();
-                                    i++;
-                                    Busy.Message = "Create backup of partition EFIESP (" + i.ToString() + @"/" + PartitionCount.ToString() + ")";
-                                    Phone.BackupPartition("EFIESP", EntryStream, Updater);
-                                }
-                                catch (Exception Ex)
-                                {
-                                    LogFile.LogException(Ex);
-                                    Result = false;
-                                }
-                                finally
-                                {
-                                    if (EntryStream != null)
-                                        EntryStream.Close();
-                                    EntryStream = null;
-                                }
-                            }
+                    if (Result)
+                    {
+                        try
+                        {
+                            Entry = Archive.CreateEntry("MainOS.bin", CompressionLevel.Optimal);
+                            EntryStream = Entry.Open();
+                            i++;
+                            Busy.Message = "Create backup of partition MainOS (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
+                            Phone.BackupPartition("MainOS", EntryStream, Updater);
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                            Result = false;
+                        }
+                        finally
+                        {
+                            EntryStream?.Close();
+                            EntryStream = null;
+                        }
+                    }
 
-                            if (Result)
-                            {
-                                try
-                                {
-                                    Entry = Archive.CreateEntry("MainOS.bin", CompressionLevel.Optimal);
-                                    EntryStream = Entry.Open();
-                                    i++;
-                                    Busy.Message = "Create backup of partition MainOS (" + i.ToString() + @"/" + PartitionCount.ToString() + ")";
-                                    Phone.BackupPartition("MainOS", EntryStream, Updater);
-                                }
-                                catch (Exception Ex)
-                                {
-                                    LogFile.LogException(Ex);
-                                    Result = false;
-                                }
-                                finally
-                                {
-                                    if (EntryStream != null)
-                                        EntryStream.Close();
-                                    EntryStream = null;
-                                }
-                            }
-
-                            if (Result)
-                            {
-                                try
-                                {
-                                    Entry = Archive.CreateEntry("Data.bin", CompressionLevel.Optimal);
-                                    EntryStream = Entry.Open();
-                                    i++;
-                                    Busy.Message = "Create backup of partition Data (" + i.ToString() + @"/" + PartitionCount.ToString() + ")";
-                                    Phone.BackupPartition("Data", EntryStream, Updater);
-                                }
-                                catch (Exception Ex)
-                                {
-                                    LogFile.LogException(Ex);
-                                    Result = false;
-                                }
-                                finally
-                                {
-                                    if (EntryStream != null)
-                                        EntryStream.Close();
-                                    EntryStream = null;
-                                }
-                            }
+                    if (Result)
+                    {
+                        try
+                        {
+                            Entry = Archive.CreateEntry("Data.bin", CompressionLevel.Optimal);
+                            EntryStream = Entry.Open();
+                            i++;
+                            Busy.Message = "Create backup of partition Data (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
+                            Phone.BackupPartition("Data", EntryStream, Updater);
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                            Result = false;
+                        }
+                        finally
+                        {
+                            EntryStream?.Close();
+                            EntryStream = null;
                         }
                     }
                 }
@@ -398,7 +395,7 @@ namespace WPinternals
                 {
                     Phone.OpenVolume(false);
                     byte[] GPTBuffer = Phone.ReadSectors(1, 33);
-                    GPT GPT = new WPinternals.GPT(GPTBuffer);
+                    GPT GPT = new(GPTBuffer);
 
                     Partition Partition;
 
@@ -408,10 +405,10 @@ namespace WPinternals
                         {
                             if (GPT.Partitions.Any(p => p.Name == PartitionName))
                             {
-                                Partition = GPT.Partitions.Where(p => p.Name == PartitionName).First();
+                                Partition = GPT.Partitions.First(p => p.Name == PartitionName);
                                 if (PartitionName == "UEFI_BS_NV" && GPT.Partitions.Any(p => p.Name == "BACKUP_BS_NV"))
                                 {
-                                    Partition = GPT.Partitions.Where(p => p.Name == "BACKUP_BS_NV").First();
+                                    Partition = GPT.Partitions.First(p => p.Name == "BACKUP_BS_NV");
                                 }
 
                                 TotalSizeSectors += Partition.SizeInSectors;
@@ -425,51 +422,46 @@ namespace WPinternals
                         Result = false;
                     }
 
-                    BusyViewModel Busy = new BusyViewModel("Create backup...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
+                    BusyViewModel Busy = new("Create backup...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
                     ProgressUpdater Updater = Busy.ProgressUpdater;
                     ActivateSubContext(Busy);
                     ZipArchiveEntry Entry;
                     Stream EntryStream = null;
 
-                    using (FileStream FileStream = new FileStream(ArchiveProvisioningPath, FileMode.Create))
-                    {
-                        using (ZipArchive Archive = new ZipArchive(FileStream, ZipArchiveMode.Create))
-                        {
-                            int i = 0;
+                    using FileStream FileStream = new(ArchiveProvisioningPath, FileMode.Create);
+                    using ZipArchive Archive = new(FileStream, ZipArchiveMode.Create);
+                    int i = 0;
 
-                            foreach (string PartitionName in ProvisioningPartitions)
+                    foreach (string PartitionName in ProvisioningPartitions)
+                    {
+                        if (GPT.Partitions.Any(p => p.Name == PartitionName))
+                        {
+                            if (Result)
                             {
-                                if (GPT.Partitions.Any(p => p.Name == PartitionName))
+                                try
                                 {
-                                    if (Result)
+                                    Entry = Archive.CreateEntry(PartitionName + ".bin", CompressionLevel.Optimal);
+                                    EntryStream = Entry.Open();
+                                    i++;
+                                    Busy.Message = "Create backup of partition " + PartitionName + " (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
+                                    if (PartitionName == "UEFI_BS_NV" && GPT.Partitions.Any(p => p.Name == "BACKUP_BS_NV"))
                                     {
-                                        try
-                                        {
-                                            Entry = Archive.CreateEntry(PartitionName + ".bin", CompressionLevel.Optimal);
-                                            EntryStream = Entry.Open();
-                                            i++;
-                                            Busy.Message = "Create backup of partition " + PartitionName + " (" + i.ToString() + @"/" + PartitionCount.ToString() + ")";
-                                            if (PartitionName == "UEFI_BS_NV" && GPT.Partitions.Any(p => p.Name == "BACKUP_BS_NV"))
-                                            {
-                                                Phone.BackupPartition("BACKUP_BS_NV", EntryStream, Updater);
-                                            }
-                                            else
-                                            {
-                                                Phone.BackupPartition(PartitionName, EntryStream, Updater);
-                                            }
-                                        }
-                                        catch (Exception Ex)
-                                        {
-                                            LogFile.LogException(Ex);
-                                            Result = false;
-                                        }
-                                        finally
-                                        {
-                                            if (EntryStream != null)
-                                                EntryStream.Close();
-                                            EntryStream = null;
-                                        }
+                                        Phone.BackupPartition("BACKUP_BS_NV", EntryStream, Updater);
                                     }
+                                    else
+                                    {
+                                        Phone.BackupPartition(PartitionName, EntryStream, Updater);
+                                    }
+                                }
+                                catch (Exception Ex)
+                                {
+                                    LogFile.LogException(Ex);
+                                    Result = false;
+                                }
+                                finally
+                                {
+                                    EntryStream?.Close();
+                                    EntryStream = null;
                                 }
                             }
                         }
diff --git a/ViewModels/BusyViewModel.cs b/ViewModels/BusyViewModel.cs
index 39d1426..720fcb4 100644
--- a/ViewModels/BusyViewModel.cs
+++ b/ViewModels/BusyViewModel.cs
@@ -25,7 +25,7 @@ namespace WPinternals
 {
     internal class BusyViewModel : ContextViewModel
     {
-        private ulong MaxProgressValue = 0;
+        private readonly ulong MaxProgressValue = 0;
         internal ProgressUpdater ProgressUpdater = null;
 
         // UIContext can be passed to BusyViewModel, when it needs to update progress-controls and it is created on a worker-thread.
@@ -33,10 +33,7 @@ namespace WPinternals
         {
             LogFile.Log(Message);
 
-            if (UIContext == null)
-                this.UIContext = SynchronizationContext.Current;
-            else
-                this.UIContext = UIContext;
+            this.UIContext = UIContext ?? SynchronizationContext.Current;
 
             this.Message = Message;
             this.SubMessage = SubMessage;
@@ -73,7 +70,9 @@ namespace WPinternals
         internal void SetProgress(ulong Value)
         {
             if (ProgressUpdater != null)
-                UIContext.Post((s) => { ProgressUpdater.SetProgress(Value); }, null);
+            {
+                UIContext.Post((s) => ProgressUpdater.SetProgress(Value), null);
+            }
         }
 
         private string _Message = null;
@@ -86,7 +85,7 @@ namespace WPinternals
             set
             {
                 _Message = value;
-                OnPropertyChanged("Message");
+                OnPropertyChanged(nameof(Message));
             }
         }
 
@@ -100,7 +99,7 @@ namespace WPinternals
             set
             {
                 _SubMessage = value;
-                OnPropertyChanged("SubMessage");
+                OnPropertyChanged(nameof(SubMessage));
             }
         }
 
@@ -116,8 +115,8 @@ namespace WPinternals
                 if (_ProgressPercentage != value)
                 {
                     _ProgressPercentage = value;
-                    OnPropertyChanged("ProgressPercentage");
-                    OnPropertyChanged("ShowAnimation");
+                    OnPropertyChanged(nameof(ProgressPercentage));
+                    OnPropertyChanged(nameof(ShowAnimation));
                     UpdateProgressText();
                 }
             }
@@ -135,7 +134,7 @@ namespace WPinternals
                 if (_TimeRemaining != value)
                 {
                     _TimeRemaining = value;
-                    OnPropertyChanged("TimeRemaining");
+                    OnPropertyChanged(nameof(TimeRemaining));
                     UpdateProgressText();
                 }
             }
@@ -151,9 +150,13 @@ namespace WPinternals
             if (TimeRemaining != null)
             {
                 if (NewText == null)
+                {
                     NewText = "";
+                }
                 else
+                {
                     NewText += " - ";
+                }
 
                 NewText += "Estimated time remaining: " + ((TimeSpan)TimeRemaining).ToString(@"h\:mm\:ss");
             }
@@ -172,7 +175,7 @@ namespace WPinternals
                 if (_ProgressText != value)
                 {
                     _ProgressText = value;
-                    OnPropertyChanged("ProgressText");
+                    OnPropertyChanged(nameof(ProgressText));
                 }
             }
         }
@@ -189,7 +192,7 @@ namespace WPinternals
                 if (_ShowAnimation != value)
                 {
                     _ShowAnimation = value;
-                    OnPropertyChanged("ShowAnimation");
+                    OnPropertyChanged(nameof(ShowAnimation));
                 }
             }
         }
@@ -206,7 +209,7 @@ namespace WPinternals
                 if (_ShowRebootHelp != value)
                 {
                     _ShowRebootHelp = value;
-                    OnPropertyChanged("ShowRebootHelp");
+                    OnPropertyChanged(nameof(ShowRebootHelp));
                 }
             }
         }
diff --git a/ViewModels/ContextViewModel.cs b/ViewModels/ContextViewModel.cs
index 6de1bbc..7044d0c 100644
--- a/ViewModels/ContextViewModel.cs
+++ b/ViewModels/ContextViewModel.cs
@@ -30,19 +30,22 @@ namespace WPinternals
 
         public bool IsSwitchingInterface = false;
         public bool IsFlashModeOperation = false;
-        private bool _IsActive = false;
 
         public event PropertyChangedEventHandler PropertyChanged = delegate { };
 
         protected void OnPropertyChanged(string propertyName)
         {
             if ((UIContext == null) && (SynchronizationContext.Current != null))
+            {
                 UIContext = SynchronizationContext.Current;
+            }
 
             if (this.PropertyChanged != null)
             {
                 if (SynchronizationContext.Current == UIContext)
+                {
                     PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+                }
                 else
                 {
                     UIContext.Post((s) => PropertyChanged(this, new PropertyChangedEventArgs(propertyName)), null);
@@ -60,11 +63,17 @@ namespace WPinternals
             private set
             {
                 if (_SubContextViewModel != null)
+                {
                     _SubContextViewModel.IsActive = false;
+                }
+
                 _SubContextViewModel = value;
                 if (_SubContextViewModel != null)
+                {
                     _SubContextViewModel.IsActive = IsActive;
-                OnPropertyChanged("SubContextViewModel");
+                }
+
+                OnPropertyChanged(nameof(SubContextViewModel));
             }
         }
 
@@ -82,41 +91,36 @@ namespace WPinternals
             SubContextViewModel = SubContext;
         }
 
-        internal bool IsActive
-        {
-            get
-            {
-                return _IsActive;
-            }
-            set
-            {
-                _IsActive = value;
-            }
-        }
+        internal bool IsActive { get; set; } = false;
 
         internal virtual void EvaluateViewState()
         {
-
         }
 
         internal void Activate()
         {
             IsActive = true;
             EvaluateViewState();
-            if (SubContextViewModel != null)
-                SubContextViewModel.Activate();
+            SubContextViewModel?.Activate();
         }
 
         internal void ActivateSubContext(ContextViewModel NewSubContext)
         {
             if (_SubContextViewModel != null)
+            {
                 _SubContextViewModel.IsActive = false;
+            }
+
             if (NewSubContext != null)
             {
                 if (IsActive)
+                {
                     NewSubContext.Activate();
+                }
                 else
+                {
                     NewSubContext.IsActive = false;
+                }
             }
             SubContextViewModel = NewSubContext;
         }
@@ -128,9 +132,8 @@ namespace WPinternals
 
         internal void UpdateWorkingStatus(string Message, string SubMessage, ulong? CurrentProgressValue, WPinternalsStatus Status = WPinternalsStatus.Undefined)
         {
-            if (SubContextViewModel is BusyViewModel)
+            if (SubContextViewModel is BusyViewModel Busy)
             {
-                BusyViewModel Busy = (BusyViewModel)SubContextViewModel;
                 if (Message != null)
                 {
                     Busy.Message = Message;
diff --git a/ViewModels/DisclaimerAndNdaViewModel.cs b/ViewModels/DisclaimerAndNdaViewModel.cs
index 005d653..0501f7b 100644
--- a/ViewModels/DisclaimerAndNdaViewModel.cs
+++ b/ViewModels/DisclaimerAndNdaViewModel.cs
@@ -26,7 +26,7 @@ namespace WPinternals
 {
     internal class DisclaimerAndNdaViewModel : ContextViewModel
     {
-        Action Accepted;
+        private readonly Action Accepted;
 
         internal DisclaimerAndNdaViewModel(Action Accepted)
             : base()
@@ -39,14 +39,7 @@ namespace WPinternals
         {
             get
             {
-                if (_ExitCommand == null)
-                {
-                    _ExitCommand = new DelegateCommand(() =>
-                    {
-                        Application.Current.Shutdown();
-                    });
-                }
-                return _ExitCommand;
+                return _ExitCommand ??= new DelegateCommand(() => Application.Current.Shutdown());
             }
         }
 
@@ -55,16 +48,12 @@ namespace WPinternals
         {
             get
             {
-                if (_ContinueCommand == null)
-                {
-                    _ContinueCommand = new DelegateCommand(() =>
+                return _ContinueCommand ??= new DelegateCommand(() =>
                     {
                         Registry.CurrentUser.OpenSubKey("Software\\WPInternals", true).SetValue("DisclaimerAccepted", 1, RegistryValueKind.DWord);
                         Registry.CurrentUser.OpenSubKey("Software\\WPInternals", true).SetValue("NdaAccepted", 1, RegistryValueKind.DWord);
                         Accepted();
                     });
-                }
-                return _ContinueCommand;
             }
         }
     }
diff --git a/ViewModels/DisclaimerViewModel.cs b/ViewModels/DisclaimerViewModel.cs
index a09f398..c1cd253 100644
--- a/ViewModels/DisclaimerViewModel.cs
+++ b/ViewModels/DisclaimerViewModel.cs
@@ -28,7 +28,7 @@ namespace WPinternals
 
     internal class DisclaimerViewModel : ContextViewModel
     {
-        Action Accepted;
+        private readonly Action Accepted;
 
         internal DisclaimerViewModel(Action Accepted)
             : base()
@@ -41,14 +41,7 @@ namespace WPinternals
         {
             get
             {
-                if (_ExitCommand == null)
-                {
-                    _ExitCommand = new DelegateCommand(() =>
-                    {
-                        Application.Current.Shutdown();
-                    });
-                }
-                return _ExitCommand;
+                return _ExitCommand ??= new DelegateCommand(() => Application.Current.Shutdown());
             }
         }
 
@@ -57,15 +50,11 @@ namespace WPinternals
         {
             get
             {
-                if (_ContinueCommand == null)
-                {
-                    _ContinueCommand = new DelegateCommand(() =>
+                return _ContinueCommand ??= new DelegateCommand(() =>
                     {
                         Registry.CurrentUser.OpenSubKey("Software\\WPInternals", true).SetValue("DisclaimerAccepted", 1, RegistryValueKind.DWord);
                         Accepted();
                     });
-                }
-                return _ContinueCommand;
             }
         }
     }
diff --git a/ViewModels/DownloadsViewModel.cs b/ViewModels/DownloadsViewModel.cs
index e633b20..b9a44e2 100644
--- a/ViewModels/DownloadsViewModel.cs
+++ b/ViewModels/DownloadsViewModel.cs
@@ -34,8 +34,8 @@ namespace WPinternals
 {
     internal class DownloadsViewModel : ContextViewModel
     {
-        private PhoneNotifierViewModel Notifier;
-        private Timer SpeedTimer;
+        private readonly PhoneNotifierViewModel Notifier;
+        private readonly Timer SpeedTimer;
         private bool IsSearching = false;
 
         internal DownloadsViewModel(PhoneNotifierViewModel Notifier)
@@ -45,9 +45,8 @@ namespace WPinternals
             this.Notifier = Notifier;
             Notifier.NewDeviceArrived += Notifier_NewDeviceArrived;
 
-            RegistryKey Key = Registry.CurrentUser.OpenSubKey(@"Software\WPInternals", true);
-            if (Key == null)
-                Key = Registry.CurrentUser.CreateSubKey(@"Software\WPInternals");
+            RegistryKey Key = Registry.CurrentUser.OpenSubKey(@"Software\WPInternals", true) ?? Registry.CurrentUser.CreateSubKey(@"Software\WPInternals");
+
             DownloadFolder = (string)Key.GetValue("DownloadFolder", @"C:\ProgramData\WPinternals\Repository");
             Key.Close();
 
@@ -57,7 +56,7 @@ namespace WPinternals
             {
                 string FFUPath = null;
 
-                Microsoft.Win32.OpenFileDialog dlg = new Microsoft.Win32.OpenFileDialog();
+                OpenFileDialog dlg = new();
                 dlg.DefaultExt = ".ffu"; // Default file extension
                 dlg.Filter = "ROM images (.ffu)|*.ffu"; // Filter files by extension 
 
@@ -82,7 +81,6 @@ namespace WPinternals
                     {
                         LastStatusText = "Error: File \"" + FFUFile + "\" was not added.";
                     }
-
                 }
                 else
                 {
@@ -101,7 +99,7 @@ namespace WPinternals
             set
             {
                 _LastStatusText = value;
-                OnPropertyChanged("LastStatusText");
+                OnPropertyChanged(nameof(LastStatusText));
             }
         }
 
@@ -116,12 +114,12 @@ namespace WPinternals
                     int Count = (int)((Entry.SpeedIndex + 1) > 10 ? 10 : (Entry.SpeedIndex + 1));
                     long Sum = 0;
                     for (int i = 0; i < Count; i++)
+                    {
                         Sum += Entry.Speeds[i];
+                    }
+
                     Entry.Speed = Sum / Count;
-                    if (Entry.Speed < 1000)
-                        Entry.TimeLeft = Timeout.InfiniteTimeSpan;
-                    else
-                        Entry.TimeLeft = TimeSpan.FromSeconds((Entry.Size - Entry.BytesReceived) / Entry.Speed);
+                    Entry.TimeLeft = Entry.Speed < 1000 ? Timeout.InfiniteTimeSpan : TimeSpan.FromSeconds((Entry.Size - Entry.BytesReceived) / Entry.Speed);
                 }
                 Entry.LastBytesReceived = Entry.BytesReceived;
                 Entry.SpeedIndex++;
@@ -139,7 +137,7 @@ namespace WPinternals
             HttpWebRequest req = (HttpWebRequest)System.Net.HttpWebRequest.Create(URL);
             req.Method = "HEAD";
             req.ServicePoint.ConnectionLimit = 10;
-            using (System.Net.WebResponse resp = req.GetResponse())
+            using (WebResponse resp = req.GetResponse())
             {
                 long.TryParse(resp.Headers.Get("Content-Length"), out Length);
             }
@@ -151,14 +149,19 @@ namespace WPinternals
             string FileName = System.IO.Path.GetFileName(URL);
             int End = FileName.IndexOf('?');
             if (End >= 0)
+            {
                 FileName = FileName.Substring(0, End);
+            }
+
             return FileName;
         }
 
         private void Search()
         {
             if (IsSearching)
+            {
                 return;
+            }
 
             IsSearching = true;
 
@@ -172,23 +175,36 @@ namespace WPinternals
                 try
                 {
                     string TempProductType = ProductType.ToUpper();
-                    if ((TempProductType != null) && TempProductType.StartsWith("RM") && !TempProductType.StartsWith("RM-"))
-                        TempProductType = "RM-" + TempProductType.Substring(2);
+                    if ((TempProductType?.StartsWith("RM") == true) && !TempProductType.StartsWith("RM-"))
+                    {
+                        TempProductType = "RM-" + TempProductType[2..];
+                    }
+
                     ProductType = TempProductType;
                     FFUURL = LumiaDownloadModel.SearchFFU(ProductType, ProductCode, OperatorCode, out TempProductType);
                     if (TempProductType != null)
+                    {
                         ProductType = TempProductType;
+                    }
+
                     if (ProductType != null)
+                    {
                         EmergencyURLs = LumiaDownloadModel.SearchEmergencyFiles(ProductType);
+                    }
                 }
                 catch { }
 
                 UIContext.Post(s =>
                 {
                     if (FFUURL != null)
+                    {
                         SearchResultList.Add(new SearchResult(FFUURL, ProductType, FFUDownloaded, null));
+                    }
+
                     if (EmergencyURLs != null)
+                    {
                         SearchResultList.Add(new SearchResult(ProductType + " emergency-files", EmergencyURLs, ProductType, EmergencyDownloaded, ProductType));
+                    }
                 }, null);
 
                 IsSearching = false;
@@ -197,23 +213,17 @@ namespace WPinternals
 
         internal void Download(string URL, string Category, Action<string[], object> Callback, object State = null)
         {
-            string Folder;
-            if (Category == null)
-                Folder = DownloadFolder;
-            else
-                Folder = Path.Combine(DownloadFolder, Category);
+            string Folder = Category == null ? DownloadFolder : Path.Combine(DownloadFolder, Category);
             DownloadList.Add(new DownloadEntry(URL, Folder, null, Callback, State));
         }
 
         internal void Download(string[] URLs, string Category, Action<string[], object> Callback, object State = null)
         {
-            string Folder;
-            if (Category == null)
-                Folder = DownloadFolder;
-            else
-                Folder = Path.Combine(DownloadFolder, Category);
+            string Folder = Category == null ? DownloadFolder : Path.Combine(DownloadFolder, Category);
             foreach (string URL in URLs)
+            {
                 DownloadList.Add(new DownloadEntry(URL, Folder, URLs, Callback, State));
+            }
         }
 
         private void DownloadAll()
@@ -227,23 +237,36 @@ namespace WPinternals
                 try
                 {
                     string TempProductType = ProductType.ToUpper();
-                    if ((TempProductType != null) && TempProductType.StartsWith("RM") && !TempProductType.StartsWith("RM-"))
-                        TempProductType = "RM-" + TempProductType.Substring(2);
+                    if ((TempProductType?.StartsWith("RM") == true) && !TempProductType.StartsWith("RM-"))
+                    {
+                        TempProductType = "RM-" + TempProductType[2..];
+                    }
+
                     ProductType = TempProductType;
                     FFUURL = LumiaDownloadModel.SearchFFU(ProductType, ProductCode, OperatorCode, out TempProductType);
                     if (TempProductType != null)
+                    {
                         ProductType = TempProductType;
+                    }
+
                     if (ProductType != null)
+                    {
                         EmergencyURLs = LumiaDownloadModel.SearchEmergencyFiles(ProductType);
+                    }
                 }
                 catch { }
 
                 UIContext.Post(s =>
                 {
                     if (FFUURL != null)
+                    {
                         Download(FFUURL, ProductType, FFUDownloadedAndCheckSupported, null);
+                    }
+
                     if (EmergencyURLs != null)
+                    {
                         Download(EmergencyURLs, ProductType, EmergencyDownloaded, ProductType);
+                    }
                 }, null);
             }).Start();
         }
@@ -252,7 +275,9 @@ namespace WPinternals
         {
             IEnumerable<SearchResult> Selection = SearchResultList.Where(r => r.IsSelected);
             foreach (SearchResult Result in Selection)
+            {
                 App.DownloadManager.Download(Result.URLs, Result.Category, Result.Callback, Result.State);
+            }
         }
 
         private void FFUDownloaded(string[] Files, object State)
@@ -264,9 +289,9 @@ namespace WPinternals
         {
             App.Config.AddFfuToRepository(Files[0]);
 
-            if (App.Config.FFURepository.Where(e => App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V2-EFIESP").First().TargetVersions.Any(v => v.Description == e.OSVersion)).Count() == 0)
+            if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
             {
-                string ProductType2 = "RM-1085";
+                const string ProductType2 = "RM-1085";
                 string URL = LumiaDownloadModel.SearchFFU(ProductType2, null, null);
                 Download(URL, ProductType2, FFUDownloaded, null);
             }
@@ -281,46 +306,30 @@ namespace WPinternals
             for (int i = 0; i < Files.Length; i++)
             {
                 if (Files[i].EndsWith(".ede", StringComparison.OrdinalIgnoreCase))
+                {
                     ProgrammerPath = Files[i];
+                }
+
                 if (Files[i].EndsWith(".edp", StringComparison.OrdinalIgnoreCase))
+                {
                     PayloadPath = Files[i];
+                }
             }
 
             if ((Type != null) && (ProgrammerPath != null) && (PayloadPath != null))
+            {
                 App.Config.AddEmergencyToRepository(Type, ProgrammerPath, PayloadPath);
-        }
-
-        private ObservableCollection<DownloadEntry> _DownloadList = new ObservableCollection<DownloadEntry>();
-        public ObservableCollection<DownloadEntry> DownloadList
-        {
-            get
-            {
-                return _DownloadList;
-            }
-        }
-
-        private ObservableCollection<SearchResult> _SearchResultList = new ObservableCollection<SearchResult>();
-        public ObservableCollection<SearchResult> SearchResultList
-        {
-            get
-            {
-                return _SearchResultList;
             }
         }
+        public ObservableCollection<DownloadEntry> DownloadList { get; } = new();
+        public ObservableCollection<SearchResult> SearchResultList { get; } = new();
 
         private DelegateCommand _DownloadSelectedCommand = null;
         public DelegateCommand DownloadSelectedCommand
         {
             get
             {
-                if (_DownloadSelectedCommand == null)
-                {
-                    _DownloadSelectedCommand = new DelegateCommand(() =>
-                    {
-                        DownloadSelected();
-                    });
-                }
-                return _DownloadSelectedCommand;
+                return _DownloadSelectedCommand ??= new DelegateCommand(() => DownloadSelected());
             }
         }
 
@@ -329,14 +338,7 @@ namespace WPinternals
         {
             get
             {
-                if (_SearchCommand == null)
-                {
-                    _SearchCommand = new DelegateCommand(() =>
-                    {
-                        Search();
-                    });
-                }
-                return _SearchCommand;
+                return _SearchCommand ??= new DelegateCommand(() => Search());
             }
         }
 
@@ -345,14 +347,7 @@ namespace WPinternals
         {
             get
             {
-                if (_DownloadAllCommand == null)
-                {
-                    _DownloadAllCommand = new DelegateCommand(() =>
-                    {
-                        DownloadAll();
-                    });
-                }
-                return _DownloadAllCommand;
+                return _DownloadAllCommand ??= new DelegateCommand(() => DownloadAll());
             }
         }
 
@@ -385,14 +380,18 @@ namespace WPinternals
                     if (_DownloadFolder == null)
                     {
                         if (Key.GetValue("DownloadFolder") != null)
+                        {
                             Key.DeleteValue("DownloadFolder");
+                        }
                     }
                     else
+                    {
                         Key.SetValue("DownloadFolder", _DownloadFolder);
+                    }
 
                     Key.Close();
 
-                    OnPropertyChanged("DownloadFolder");
+                    OnPropertyChanged(nameof(DownloadFolder));
                 }
             }
         }
@@ -410,7 +409,7 @@ namespace WPinternals
                 {
                     _ProductCode = value;
 
-                    OnPropertyChanged("ProductCode");
+                    OnPropertyChanged(nameof(ProductCode));
                 }
             }
         }
@@ -428,7 +427,7 @@ namespace WPinternals
                 {
                     _ProductType = value;
 
-                    OnPropertyChanged("ProductType");
+                    OnPropertyChanged(nameof(ProductType));
                 }
             }
         }
@@ -446,7 +445,7 @@ namespace WPinternals
                 {
                     _OperatorCode = value;
 
-                    OnPropertyChanged("OperatorCode");
+                    OnPropertyChanged(nameof(OperatorCode));
                 }
             }
         }
@@ -454,9 +453,11 @@ namespace WPinternals
         internal override void EvaluateViewState()
         {
             if (!IsActive)
+            {
                 return;
+            }
 
-            if ((Notifier.CurrentInterface == PhoneInterfaces.Lumia_Flash))
+            if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Flash)
             {
                 NokiaFlashModel LumiaFlashModel = (NokiaFlashModel)Notifier.CurrentModel;
                 PhoneInfo Info = LumiaFlashModel.ReadPhoneInfo();
@@ -469,24 +470,16 @@ namespace WPinternals
                 NokiaPhoneModel LumiaNormalModel = (NokiaPhoneModel)Notifier.CurrentModel;
                 OperatorCode = LumiaNormalModel.ExecuteJsonMethodAsString("ReadOperatorName", "OperatorName"); // Example: 000-NL
                 string TempProductType = LumiaNormalModel.ExecuteJsonMethodAsString("ReadManufacturerModelName", "ManufacturerModelName"); // RM-821_eu_denmark_251
-                if (TempProductType.IndexOf('_') >= 0) TempProductType = TempProductType.Substring(0, TempProductType.IndexOf('_'));
+                if (TempProductType.Contains('_'))
+                {
+                    TempProductType = TempProductType.Substring(0, TempProductType.IndexOf('_'));
+                }
+
                 ProductType = TempProductType;
                 ProductCode = LumiaNormalModel.ExecuteJsonMethodAsString("ReadProductCode", "ProductCode"); // 059Q9D7
             }
         }
-
-        private DelegateCommand _AddFFUCommand = null;
-        public DelegateCommand AddFFUCommand
-        {
-            get
-            {
-                return _AddFFUCommand;
-            }
-            private set
-            {
-                _AddFFUCommand = value;
-            }
-        }
+        public DelegateCommand AddFFUCommand { get; } = null;
     }
 
     internal enum DownloadStatus
@@ -498,7 +491,7 @@ namespace WPinternals
 
     internal class DownloadEntry : INotifyPropertyChanged
     {
-        private SynchronizationContext UIContext;
+        private readonly SynchronizationContext UIContext;
         public event PropertyChangedEventHandler PropertyChanged = delegate { };
         internal Action<string[], object> Callback;
         internal object State;
@@ -521,7 +514,7 @@ namespace WPinternals
             this.Folder = Folder;
             Directory.CreateDirectory(Folder);
             Name = DownloadsViewModel.GetFileNameFromURL(URL);
-            Uri Uri = new Uri(URL);
+            Uri Uri = new(URL);
             Status = DownloadStatus.Downloading;
             new Thread(() =>
             {
@@ -536,14 +529,13 @@ namespace WPinternals
 
         private void Client_DownloadFileCompleted(object sender, AsyncCompletedEventArgs e)
         {
-
-            Action Finish = () =>
+            void Finish()
             {
                 Status = e.Error == null ? DownloadStatus.Ready : DownloadStatus.Failed;
                 App.DownloadManager.DownloadList.Remove(this);
                 if (Status == DownloadStatus.Ready)
                 {
-                    if ((URLCollection == null) || (!URLCollection.Any(c => App.DownloadManager.DownloadList.Any(d => d.URL == c)))) // if there are no files left to download from this collection, then call the callback-function.
+                    if (URLCollection?.Any(c => App.DownloadManager.DownloadList.Any(d => d.URL == c)) != true) // if there are no files left to download from this collection, then call the callback-function.
                     {
                         string[] Files;
                         if (URLCollection == null)
@@ -555,16 +547,17 @@ namespace WPinternals
                         {
                             Files = new string[URLCollection.Length];
                             for (int i = 0; i < URLCollection.Length; i++)
+                            {
                                 Files[i] = System.IO.Path.Combine(Folder, DownloadsViewModel.GetFileNameFromURL(URLCollection[i]));
+                            }
                         }
 
                         Callback(Files, State);
                     }
                 }
-            };
+            }
 
-            if (UIContext != null)
-                UIContext.Post(d => Finish(), null);
+            UIContext?.Post(d => Finish(), null);
         }
 
         private void Client_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
@@ -578,7 +571,9 @@ namespace WPinternals
             if (this.PropertyChanged != null)
             {
                 if (SynchronizationContext.Current == UIContext)
+                {
                     PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+                }
                 else
                 {
                     UIContext.Post((s) => PropertyChanged(this, new PropertyChangedEventArgs(propertyName)), null);
@@ -598,7 +593,7 @@ namespace WPinternals
                 if (_Status != value)
                 {
                     _Status = value;
-                    OnPropertyChanged("Status");
+                    OnPropertyChanged(nameof(Status));
                 }
             }
         }
@@ -615,7 +610,7 @@ namespace WPinternals
                 if (_Name != value)
                 {
                     _Name = value;
-                    OnPropertyChanged("Name");
+                    OnPropertyChanged(nameof(Name));
                 }
             }
         }
@@ -632,7 +627,7 @@ namespace WPinternals
                 if (_Size != value)
                 {
                     _Size = value;
-                    OnPropertyChanged("Size");
+                    OnPropertyChanged(nameof(Size));
                 }
             }
         }
@@ -649,7 +644,7 @@ namespace WPinternals
                 if (_TimeLeft != value)
                 {
                     _TimeLeft = value;
-                    OnPropertyChanged("TimeLeft");
+                    OnPropertyChanged(nameof(TimeLeft));
                 }
             }
         }
@@ -666,7 +661,7 @@ namespace WPinternals
                 if (_Speed != value)
                 {
                     _Speed = value;
-                    OnPropertyChanged("Speed");
+                    OnPropertyChanged(nameof(Speed));
                 }
             }
         }
@@ -683,7 +678,7 @@ namespace WPinternals
                 if (_Progress != value)
                 {
                     _Progress = value;
-                    OnPropertyChanged("Progress");
+                    OnPropertyChanged(nameof(Progress));
                 }
             }
         }
@@ -691,7 +686,7 @@ namespace WPinternals
 
     internal class SearchResult : INotifyPropertyChanged
     {
-        private SynchronizationContext UIContext;
+        private readonly SynchronizationContext UIContext;
         public event PropertyChangedEventHandler PropertyChanged;
         internal string[] URLs;
         internal Action<string[], object> Callback;
@@ -739,7 +734,9 @@ namespace WPinternals
             if (this.PropertyChanged != null)
             {
                 if (SynchronizationContext.Current == UIContext)
+                {
                     PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+                }
                 else
                 {
                     UIContext.Post((s) => PropertyChanged(this, new PropertyChangedEventArgs(propertyName)), null);
@@ -759,7 +756,7 @@ namespace WPinternals
                 if (_Name != value)
                 {
                     _Name = value;
-                    OnPropertyChanged("Name");
+                    OnPropertyChanged(nameof(Name));
                 }
             }
         }
@@ -776,7 +773,7 @@ namespace WPinternals
                 if (_Size != value)
                 {
                     _Size = value;
-                    OnPropertyChanged("Size");
+                    OnPropertyChanged(nameof(Size));
                 }
             }
         }
@@ -793,7 +790,7 @@ namespace WPinternals
                 if (_IsSelected != value)
                 {
                     _IsSelected = value;
-                    OnPropertyChanged("IsSelected");
+                    OnPropertyChanged(nameof(IsSelected));
                 }
             }
         }
@@ -805,7 +802,7 @@ namespace WPinternals
         {
             HttpWebRequest req = (HttpWebRequest)base.GetWebRequest(address);
             req.ServicePoint.ConnectionLimit = 10;
-            return (WebRequest)req;
+            return req;
         }
     }
 
@@ -831,10 +828,16 @@ namespace WPinternals
         {
             long? Size = value as long?;
             if (Size < 1024)
+            {
                 return Size + " B";
+            }
+
             if (Size < (1024 * 1024))
-                return Math.Round(((double)Size / 1024), 0) + " KB";
-            return Math.Round(((double)Size / 1024 / 1024), 0) + " MB";
+            {
+                return Math.Round((double)Size / 1024, 0) + " KB";
+            }
+
+            return Math.Round((double)Size / 1024 / 1024, 0) + " MB";
         }
 
         public object ConvertBack(object value, Type targetType,
@@ -866,7 +869,10 @@ namespace WPinternals
         {
             TimeSpan TimeLeft = (TimeSpan)value;
             if (TimeLeft == Timeout.InfiniteTimeSpan)
+            {
                 return "";
+            }
+
             return TimeLeft.ToString(@"h\:mm\:ss");
         }
 
diff --git a/ViewModels/DumpRomTargetSelectionViewModel.cs b/ViewModels/DumpRomTargetSelectionViewModel.cs
index 32a4b0d..62a924a 100644
--- a/ViewModels/DumpRomTargetSelectionViewModel.cs
+++ b/ViewModels/DumpRomTargetSelectionViewModel.cs
@@ -25,7 +25,7 @@ namespace WPinternals
 {
     internal class DumpRomTargetSelectionViewModel : ContextViewModel
     {
-        private Action<string, string, bool, string, bool, string, bool> DumpCallback;
+        private readonly Action<string, string, bool, string, bool, string, bool> DumpCallback;
         internal Action SwitchToUnlockBoot;
         internal Action SwitchToUnlockRoot;
         internal Action SwitchToFlashRom;
@@ -53,7 +53,7 @@ namespace WPinternals
                 if (value != _FFUPath)
                 {
                     _FFUPath = value;
-                    OnPropertyChanged("FFUPath");
+                    OnPropertyChanged(nameof(FFUPath));
                 }
             }
         }
@@ -70,7 +70,7 @@ namespace WPinternals
                 if (value != _EFIESPPath)
                 {
                     _EFIESPPath = value;
-                    OnPropertyChanged("EFIESPPath");
+                    OnPropertyChanged(nameof(EFIESPPath));
                 }
             }
         }
@@ -87,7 +87,7 @@ namespace WPinternals
                 if (value != _CompressEFIESP)
                 {
                     _CompressEFIESP = value;
-                    OnPropertyChanged("CompressEFIESP");
+                    OnPropertyChanged(nameof(CompressEFIESP));
                 }
             }
         }
@@ -104,7 +104,7 @@ namespace WPinternals
                 if (value != _MainOSPath)
                 {
                     _MainOSPath = value;
-                    OnPropertyChanged("MainOSPath");
+                    OnPropertyChanged(nameof(MainOSPath));
                 }
             }
         }
@@ -121,7 +121,7 @@ namespace WPinternals
                 if (value != _CompressMainOS)
                 {
                     _CompressMainOS = value;
-                    OnPropertyChanged("CompressMainOS");
+                    OnPropertyChanged(nameof(CompressMainOS));
                 }
             }
         }
@@ -138,7 +138,7 @@ namespace WPinternals
                 if (value != _DataPath)
                 {
                     _DataPath = value;
-                    OnPropertyChanged("DataPath");
+                    OnPropertyChanged(nameof(DataPath));
                 }
             }
         }
@@ -155,7 +155,7 @@ namespace WPinternals
                 if (value != _CompressData)
                 {
                     _CompressData = value;
-                    OnPropertyChanged("CompressData");
+                    OnPropertyChanged(nameof(CompressData));
                 }
             }
         }
@@ -172,7 +172,7 @@ namespace WPinternals
                 if (value != _IsPhoneDisconnected)
                 {
                     _IsPhoneDisconnected = value;
-                    OnPropertyChanged("IsPhoneDisconnected");
+                    OnPropertyChanged(nameof(IsPhoneDisconnected));
                 }
             }
         }
@@ -189,7 +189,7 @@ namespace WPinternals
                 if (value != _IsPhoneInMassStorage)
                 {
                     _IsPhoneInMassStorage = value;
-                    OnPropertyChanged("IsPhoneInMassStorage");
+                    OnPropertyChanged(nameof(IsPhoneInMassStorage));
                 }
             }
         }
@@ -206,7 +206,7 @@ namespace WPinternals
                 if (value != _IsPhoneInOtherMode)
                 {
                     _IsPhoneInOtherMode = value;
-                    OnPropertyChanged("IsPhoneInOtherMode");
+                    OnPropertyChanged(nameof(IsPhoneInOtherMode));
                 }
             }
         }
@@ -216,11 +216,7 @@ namespace WPinternals
         {
             get
             {
-                if (_DumpCommand == null)
-                {
-                    _DumpCommand = new DelegateCommand(() => { DumpCallback(FFUPath, EFIESPPath, CompressEFIESP, MainOSPath, CompressMainOS, DataPath, CompressData); }, () => ((FFUPath != null) && ((EFIESPPath != null) || (MainOSPath != null) || (DataPath != null))));
-                }
-                return _DumpCommand;
+                return _DumpCommand ??= new DelegateCommand(() => DumpCallback(FFUPath, EFIESPPath, CompressEFIESP, MainOSPath, CompressMainOS, DataPath, CompressData), () => ((FFUPath != null) && ((EFIESPPath != null) || (MainOSPath != null) || (DataPath != null))));
             }
         }
 
diff --git a/ViewModels/DumpRomViewModel.cs b/ViewModels/DumpRomViewModel.cs
index 5454ae3..942b46f 100644
--- a/ViewModels/DumpRomViewModel.cs
+++ b/ViewModels/DumpRomViewModel.cs
@@ -26,9 +26,9 @@ namespace WPinternals
 {
     internal class DumpRomViewModel : ContextViewModel
     {
-        private Action SwitchToUnlockBoot;
-        private Action SwitchToUnlockRoot;
-        private Action SwitchToFlashRom;
+        private readonly Action SwitchToUnlockBoot;
+        private readonly Action SwitchToUnlockRoot;
+        private readonly Action SwitchToFlashRom;
 
         internal DumpRomViewModel(Action SwitchToUnlockBoot, Action SwitchToUnlockRoot, Action SwitchToFlashRom)
             : base()
@@ -41,10 +41,14 @@ namespace WPinternals
         internal override void EvaluateViewState()
         {
             if (!IsActive)
+            {
                 return;
+            }
 
             if (SubContextViewModel == null)
+            {
                 ActivateSubContext(new DumpRomTargetSelectionViewModel(SwitchToUnlockBoot, SwitchToUnlockRoot, SwitchToFlashRom, DoDumpRom));
+            }
         }
 
         internal void DoDumpRom(string FFUPath, string EFIESPPath, bool CompressEFIESP, string MainOSPath, bool CompressMainOS, string DataPath, bool CompressData)
@@ -65,21 +69,21 @@ namespace WPinternals
 
                         if (EFIESPPath != null)
                         {
-                            Partition = FFU.GPT.Partitions.Where(p => p.Name == "EFIESP").First();
+                            Partition = FFU.GPT.Partitions.First(p => p.Name == "EFIESP");
                             TotalSizeSectors += Partition.SizeInSectors;
                             PartitionCount++;
                         }
 
                         if (MainOSPath != null)
                         {
-                            Partition = FFU.GPT.Partitions.Where(p => p.Name == "MainOS").First();
+                            Partition = FFU.GPT.Partitions.First(p => p.Name == "MainOS");
                             TotalSizeSectors += Partition.SizeInSectors;
                             PartitionCount++;
                         }
 
                         if (DataPath != null)
                         {
-                            Partition = FFU.GPT.Partitions.Where(p => p.Name == "Data").First();
+                            Partition = FFU.GPT.Partitions.First(p => p.Name == "Data");
                             TotalSizeSectors += Partition.SizeInSectors;
                             PartitionCount++;
                         }
@@ -92,7 +96,7 @@ namespace WPinternals
 
                     // We are on a worker thread!
                     // So we must pass the SynchronizationContext of the UI thread
-                    BusyViewModel Busy = new BusyViewModel("Dumping ROM...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
+                    BusyViewModel Busy = new("Dumping ROM...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
                     ProgressUpdater Updater = Busy.ProgressUpdater;
                     ActivateSubContext(Busy);
 
@@ -104,7 +108,7 @@ namespace WPinternals
                             if (EFIESPPath != null)
                             {
                                 i++;
-                                Busy.Message = "Dumping partition EFIESP (" + i.ToString() + @"/" + PartitionCount.ToString() + ")";
+                                Busy.Message = "Dumping partition EFIESP (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
                                 FFU.WritePartition("EFIESP", EFIESPPath, Updater, CompressEFIESP);
                             }
                         }
@@ -122,7 +126,7 @@ namespace WPinternals
                             if (MainOSPath != null)
                             {
                                 i++;
-                                Busy.Message = "Dumping partition MainOS (" + i.ToString() + @"/" + PartitionCount.ToString() + ")";
+                                Busy.Message = "Dumping partition MainOS (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
                                 FFU.WritePartition("MainOS", MainOSPath, Updater, CompressMainOS);
                             }
                         }
@@ -140,7 +144,7 @@ namespace WPinternals
                             if (DataPath != null)
                             {
                                 i++;
-                                Busy.Message = "Dumping partition Data (" + i.ToString() + @"/" + PartitionCount.ToString() + ")";
+                                Busy.Message = "Dumping partition Data (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
                                 FFU.WritePartition("Data", DataPath, Updater, CompressData);
                             }
                         }
diff --git a/ViewModels/LumiaFlashRomSourceSelectionViewModel.cs b/ViewModels/LumiaFlashRomSourceSelectionViewModel.cs
index bf492c9..268f056 100644
--- a/ViewModels/LumiaFlashRomSourceSelectionViewModel.cs
+++ b/ViewModels/LumiaFlashRomSourceSelectionViewModel.cs
@@ -25,11 +25,11 @@ namespace WPinternals
 {
     internal class LumiaFlashRomSourceSelectionViewModel : ContextViewModel
     {
-        private PhoneNotifierViewModel PhoneNotifier;
-        private Action<string, string, string> FlashPartitionsCallback;
-        private Action<string> FlashFFUCallback;
-        private Action<string> FlashMMOSCallback;
-        private Action<string> FlashArchiveCallback;
+        private readonly PhoneNotifierViewModel PhoneNotifier;
+        private readonly Action<string, string, string> FlashPartitionsCallback;
+        private readonly Action<string> FlashFFUCallback;
+        private readonly Action<string> FlashMMOSCallback;
+        private readonly Action<string> FlashArchiveCallback;
         internal Action SwitchToUnlockBoot;
         internal Action SwitchToUnlockRoot;
         internal Action SwitchToDumpFFU;
@@ -66,7 +66,7 @@ namespace WPinternals
                 if (value != _EFIESPPath)
                 {
                     _EFIESPPath = value;
-                    OnPropertyChanged("EFIESPPath");
+                    OnPropertyChanged(nameof(EFIESPPath));
                 }
             }
         }
@@ -83,7 +83,7 @@ namespace WPinternals
                 if (value != _MainOSPath)
                 {
                     _MainOSPath = value;
-                    OnPropertyChanged("MainOSPath");
+                    OnPropertyChanged(nameof(MainOSPath));
                 }
             }
         }
@@ -100,7 +100,7 @@ namespace WPinternals
                 if (value != _DataPath)
                 {
                     _DataPath = value;
-                    OnPropertyChanged("DataPath");
+                    OnPropertyChanged(nameof(DataPath));
                 }
             }
         }
@@ -117,7 +117,7 @@ namespace WPinternals
                 if (value != _ArchivePath)
                 {
                     _ArchivePath = value;
-                    OnPropertyChanged("ArchivePath");
+                    OnPropertyChanged(nameof(ArchivePath));
                 }
             }
         }
@@ -134,7 +134,7 @@ namespace WPinternals
                 if (value != _FFUPath)
                 {
                     _FFUPath = value;
-                    OnPropertyChanged("FFUPath");
+                    OnPropertyChanged(nameof(FFUPath));
                 }
             }
         }
@@ -151,7 +151,7 @@ namespace WPinternals
                 if (value != _MMOSPath)
                 {
                     _MMOSPath = value;
-                    OnPropertyChanged("MMOSPath");
+                    OnPropertyChanged(nameof(MMOSPath));
                 }
             }
         }
@@ -168,7 +168,7 @@ namespace WPinternals
                 if (value != _IsPhoneDisconnected)
                 {
                     _IsPhoneDisconnected = value;
-                    OnPropertyChanged("IsPhoneDisconnected");
+                    OnPropertyChanged(nameof(IsPhoneDisconnected));
                 }
             }
         }
@@ -185,7 +185,7 @@ namespace WPinternals
                 if (value != _IsPhoneInFlashMode)
                 {
                     _IsPhoneInFlashMode = value;
-                    OnPropertyChanged("IsPhoneInFlashMode");
+                    OnPropertyChanged(nameof(IsPhoneInFlashMode));
                 }
             }
         }
@@ -202,7 +202,7 @@ namespace WPinternals
                 if (value != _IsPhoneInOtherMode)
                 {
                     _IsPhoneInOtherMode = value;
-                    OnPropertyChanged("IsPhoneInOtherMode");
+                    OnPropertyChanged(nameof(IsPhoneInOtherMode));
                 }
             }
         }
@@ -212,11 +212,7 @@ namespace WPinternals
         {
             get
             {
-                if (_FlashPartitionsCommand == null)
-                {
-                    _FlashPartitionsCommand = new DelegateCommand(() => { FlashPartitionsCallback(EFIESPPath, MainOSPath, DataPath); }, () => (((EFIESPPath != null) || (MainOSPath != null) || (DataPath != null)) && (PhoneNotifier.CurrentInterface != null)));
-                }
-                return _FlashPartitionsCommand;
+                return _FlashPartitionsCommand ??= new DelegateCommand(() => FlashPartitionsCallback(EFIESPPath, MainOSPath, DataPath), () => (((EFIESPPath != null) || (MainOSPath != null) || (DataPath != null)) && (PhoneNotifier.CurrentInterface != null)));
             }
         }
 
@@ -225,11 +221,7 @@ namespace WPinternals
         {
             get
             {
-                if (_FlashFFUCommand == null)
-                {
-                    _FlashFFUCommand = new DelegateCommand(() => { FlashFFUCallback(FFUPath); }, () => ((FFUPath != null) && (PhoneNotifier.CurrentInterface != null)));
-                }
-                return _FlashFFUCommand;
+                return _FlashFFUCommand ??= new DelegateCommand(() => FlashFFUCallback(FFUPath), () => ((FFUPath != null) && (PhoneNotifier.CurrentInterface != null)));
             }
         }
 
@@ -238,11 +230,7 @@ namespace WPinternals
         {
             get
             {
-                if (_FlashMMOSCommand == null)
-                {
-                    _FlashMMOSCommand = new DelegateCommand(() => { FlashMMOSCallback(MMOSPath); }, () => ((MMOSPath != null) && (PhoneNotifier.CurrentInterface != null)));
-                }
-                return _FlashMMOSCommand;
+                return _FlashMMOSCommand ??= new DelegateCommand(() => FlashMMOSCallback(MMOSPath), () => ((MMOSPath != null) && (PhoneNotifier.CurrentInterface != null)));
             }
         }
 
@@ -251,11 +239,7 @@ namespace WPinternals
         {
             get
             {
-                if (_FlashArchiveCommand == null)
-                {
-                    _FlashArchiveCommand = new DelegateCommand(() => { FlashArchiveCallback(ArchivePath); }, () => ((ArchivePath != null) && (PhoneNotifier.CurrentInterface != null)));
-                }
-                return _FlashArchiveCommand;
+                return _FlashArchiveCommand ??= new DelegateCommand(() => FlashArchiveCallback(ArchivePath), () => ((ArchivePath != null) && (PhoneNotifier.CurrentInterface != null)));
             }
         }
 
@@ -264,7 +248,7 @@ namespace WPinternals
             PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
         }
 
-        void NewDeviceArrived(ArrivalEventArgs Args)
+        private void NewDeviceArrived(ArrivalEventArgs Args)
         {
             new Thread(() =>
                 {
@@ -276,7 +260,7 @@ namespace WPinternals
                 }).Start();
         }
 
-        void DeviceRemoved()
+        private void DeviceRemoved()
         {
             new Thread(() => EvaluateViewState()).Start();
         }
diff --git a/ViewModels/LumiaFlashRomViewModel.cs b/ViewModels/LumiaFlashRomViewModel.cs
index d6484f6..86aec67 100644
--- a/ViewModels/LumiaFlashRomViewModel.cs
+++ b/ViewModels/LumiaFlashRomViewModel.cs
@@ -30,12 +30,12 @@ namespace WPinternals
 {
     internal class LumiaFlashRomViewModel : ContextViewModel
     {
-        private PhoneNotifierViewModel PhoneNotifier;
+        private readonly PhoneNotifierViewModel PhoneNotifier;
         internal Action SwitchToUnlockBoot;
         internal Action SwitchToUnlockRoot;
         internal Action SwitchToDumpFFU;
         internal Action SwitchToBackup;
-        private Action Callback;
+        private readonly Action Callback;
 
         internal LumiaFlashRomViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToUnlockBoot, Action SwitchToUnlockRoot, Action SwitchToDumpFFU, Action SwitchToBackup, Action Callback)
             : base()
@@ -54,10 +54,14 @@ namespace WPinternals
         internal override void EvaluateViewState()
         {
             if (!IsActive)
+            {
                 return;
+            }
 
             if (SubContextViewModel == null)
+            {
                 ActivateSubContext(new LumiaFlashRomSourceSelectionViewModel(PhoneNotifier, SwitchToUnlockBoot, SwitchToUnlockRoot, SwitchToDumpFFU, SwitchToBackup, FlashPartitions, FlashArchive, FlashFFU, FlashMMOS));
+            }
         }
 
         // Called from an event-handler. So, "async void" is valid here.
@@ -70,9 +74,13 @@ namespace WPinternals
                     (msg, sub) =>
                         ActivateSubContext(new BusyViewModel(msg, sub)));
                 if (((NokiaFlashModel)PhoneNotifier.CurrentModel).ReadPhoneInfo(ExtendedInfo: false).FlashAppProtocolVersionMajor < 2)
+                {
                     FlashPartitionsTask(EFIESPPath, MainOSPath, DataPath);
+                }
                 else
+                {
                     await Task.Run(async () => await LumiaV2UnlockBootViewModel.LumiaV2FlashPartitions(PhoneNotifier, EFIESPPath, MainOSPath, DataPath, SetWorkingStatus, UpdateWorkingStatus, ExitSuccess, ExitFailure));
+                }
             }
             catch (Exception Ex)
             {
@@ -104,46 +112,40 @@ namespace WPinternals
                     {
                         if (EFIESPPath != null)
                         {
-                            using (Stream Stream = new DecompressedStream(File.Open(EFIESPPath, FileMode.Open)))
+                            using Stream Stream = new DecompressedStream(File.Open(EFIESPPath, FileMode.Open));
+                            ulong StreamLengthInSectors = (ulong)Stream.Length / 0x200;
+                            TotalSizeSectors += StreamLengthInSectors;
+                            PartitionCount++;
+                            Partition Partition = GPT.Partitions.Find(p => string.Compare(p.Name, "EFIESP", true) == 0);
+                            if (StreamLengthInSectors > Partition.SizeInSectors)
                             {
-                                ulong StreamLengthInSectors = (ulong)Stream.Length / 0x200;
-                                TotalSizeSectors += StreamLengthInSectors;
-                                PartitionCount++;
-                                Partition Partition = GPT.Partitions.Where(p => string.Compare(p.Name, "EFIESP", true) == 0).FirstOrDefault();
-                                if (StreamLengthInSectors > Partition.SizeInSectors)
-                                {
-                                    LogFile.Log("Flash failed! Size of partition 'EFIESP' is too big.");
-                                    ExitFailure("Flash failed!", "Size of partition 'EFIESP' is too big.");
-                                    return;
-                                }
+                                LogFile.Log("Flash failed! Size of partition 'EFIESP' is too big.");
+                                ExitFailure("Flash failed!", "Size of partition 'EFIESP' is too big.");
+                                return;
                             }
                         }
 
                         if (MainOSPath != null)
                         {
-                            using (Stream Stream = new DecompressedStream(File.Open(MainOSPath, FileMode.Open)))
-                            {
-                                ulong StreamLengthInSectors = (ulong)Stream.Length / 0x200;
-                                TotalSizeSectors += StreamLengthInSectors;
-                                PartitionCount++;
-                                Partition Partition = GPT.Partitions.Where(p => string.Compare(p.Name, "MainOS", true) == 0).FirstOrDefault();
-                                MainOSOldSectorCount = Partition.SizeInSectors;
-                                MainOSNewSectorCount = StreamLengthInSectors;
-                                FirstMainOSSector = Partition.FirstSector;
-                            }
+                            using Stream Stream = new DecompressedStream(File.Open(MainOSPath, FileMode.Open));
+                            ulong StreamLengthInSectors = (ulong)Stream.Length / 0x200;
+                            TotalSizeSectors += StreamLengthInSectors;
+                            PartitionCount++;
+                            Partition Partition = GPT.Partitions.Find(p => string.Compare(p.Name, "MainOS", true) == 0);
+                            MainOSOldSectorCount = Partition.SizeInSectors;
+                            MainOSNewSectorCount = StreamLengthInSectors;
+                            FirstMainOSSector = Partition.FirstSector;
                         }
 
                         if (DataPath != null)
                         {
-                            using (Stream Stream = new DecompressedStream(File.Open(DataPath, FileMode.Open)))
-                            {
-                                ulong StreamLengthInSectors = (ulong)Stream.Length / 0x200;
-                                TotalSizeSectors += StreamLengthInSectors;
-                                PartitionCount++;
-                                Partition Partition = GPT.Partitions.Where(p => string.Compare(p.Name, "Data", true) == 0).FirstOrDefault();
-                                DataOldSectorCount = Partition.SizeInSectors;
-                                DataNewSectorCount = StreamLengthInSectors;
-                            }
+                            using Stream Stream = new DecompressedStream(File.Open(DataPath, FileMode.Open));
+                            ulong StreamLengthInSectors = (ulong)Stream.Length / 0x200;
+                            TotalSizeSectors += StreamLengthInSectors;
+                            PartitionCount++;
+                            Partition Partition = GPT.Partitions.Find(p => string.Compare(p.Name, "Data", true) == 0);
+                            DataOldSectorCount = Partition.SizeInSectors;
+                            DataNewSectorCount = StreamLengthInSectors;
                         }
                     }
                     catch (Exception Ex)
@@ -160,8 +162,8 @@ namespace WPinternals
                             if ((MainOSNewSectorCount + DataNewSectorCount) <= OSSpace)
                             {
                                 // MainOS and Data partitions need to be re-aligned!
-                                Partition MainOSPartition = GPT.Partitions.Where(p => string.Compare(p.Name, "MainOS", true) == 0).Single();
-                                Partition DataPartition = GPT.Partitions.Where(p => string.Compare(p.Name, "Data", true) == 0).Single();
+                                Partition MainOSPartition = GPT.Partitions.Single(p => string.Compare(p.Name, "MainOS", true) == 0);
+                                Partition DataPartition = GPT.Partitions.Single(p => string.Compare(p.Name, "Data", true) == 0);
                                 MainOSPartition.LastSector = MainOSPartition.FirstSector + MainOSNewSectorCount - 1;
                                 DataPartition.FirstSector = MainOSPartition.LastSector + 1;
                                 DataPartition.LastSector = DataPartition.FirstSector + DataNewSectorCount - 1;
@@ -188,7 +190,7 @@ namespace WPinternals
                         return;
                     }
 
-                    BusyViewModel Busy = new BusyViewModel("Flashing...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
+                    BusyViewModel Busy = new("Flashing...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
                     ProgressUpdater Updater = Busy.ProgressUpdater;
                     ActivateSubContext(Busy);
 
@@ -200,7 +202,7 @@ namespace WPinternals
                             if (EFIESPPath != null)
                             {
                                 i++;
-                                Busy.Message = "Flashing partition EFIESP (" + i.ToString() + @"/" + PartitionCount.ToString() + ")";
+                                Busy.Message = "Flashing partition EFIESP (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
                                 Phone.FlashRawPartition(EFIESPPath, "EFIESP", Updater);
                             }
                         }
@@ -218,7 +220,7 @@ namespace WPinternals
                             if (MainOSPath != null)
                             {
                                 i++;
-                                Busy.Message = "Flashing partition MainOS (" + i.ToString() + @"/" + PartitionCount.ToString() + ")";
+                                Busy.Message = "Flashing partition MainOS (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
                                 Phone.FlashRawPartition(MainOSPath, "MainOS", Updater);
                             }
                         }
@@ -236,7 +238,7 @@ namespace WPinternals
                             if (DataPath != null)
                             {
                                 i++;
-                                Busy.Message = "Flashing partition Data (" + i.ToString() + @"/" + PartitionCount.ToString() + ")";
+                                Busy.Message = "Flashing partition Data (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
                                 Phone.FlashRawPartition(DataPath, "Data", Updater);
                             }
                         }
@@ -267,9 +269,13 @@ namespace WPinternals
                     (msg, sub) =>
                         ActivateSubContext(new BusyViewModel(msg, sub)));
                 if (((NokiaFlashModel)PhoneNotifier.CurrentModel).ReadPhoneInfo(ExtendedInfo: false).FlashAppProtocolVersionMajor < 2)
+                {
                     FlashArchiveTask(ArchivePath);
+                }
                 else
+                {
                     await Task.Run(async () => await LumiaV2UnlockBootViewModel.LumiaV2FlashArchive(PhoneNotifier, ArchivePath, SetWorkingStatus, UpdateWorkingStatus, ExitSuccess, ExitFailure));
+                }
             }
             catch (Exception Ex)
             {
@@ -298,159 +304,158 @@ namespace WPinternals
                 {
                     GPT GPT = Phone.ReadGPT();
 
-                    using (FileStream FileStream = new FileStream(ArchivePath, FileMode.Open))
+                    using FileStream FileStream = new(ArchivePath, FileMode.Open);
+                    using ZipArchive Archive = new(FileStream, ZipArchiveMode.Read);
+                    foreach (ZipArchiveEntry Entry in Archive.Entries)
                     {
-                        using (ZipArchive Archive = new ZipArchive(FileStream, ZipArchiveMode.Read))
+                        // Determine if there is a partition layout present
+                        ZipArchiveEntry PartitionEntry = Archive.GetEntry("Partitions.xml");
+                        if (PartitionEntry == null)
                         {
-                            foreach (ZipArchiveEntry Entry in Archive.Entries)
+                            GPT.MergePartitions(null, false, Archive);
+                            GPTChanged |= GPT.HasChanged;
+                        }
+                        else
+                        {
+                            using Stream ZipStream = PartitionEntry.Open();
+                            using StreamReader ZipReader = new(ZipStream);
+                            string PartitionXml = ZipReader.ReadToEnd();
+                            GPT.MergePartitions(PartitionXml, false, Archive);
+                            GPTChanged |= GPT.HasChanged;
+                        }
+
+                        // First determine if we need a new GPT!
+                        if (!Entry.FullName.Contains("/")) // No subfolders
+                        {
+                            string PartitionName = System.IO.Path.GetFileNameWithoutExtension(Entry.Name);
+                            int P = PartitionName.IndexOf('.');
+                            if (P >= 0)
                             {
-                                // Determine if there is a partition layout present
-                                ZipArchiveEntry PartitionEntry = Archive.GetEntry("Partitions.xml");
-                                if (PartitionEntry == null)
-                                {
-                                    GPT.MergePartitions(null, false, Archive);
-                                    GPTChanged |= GPT.HasChanged;
-                                }
-                                else
-                                {
-                                    using (Stream ZipStream = PartitionEntry.Open())
-                                    {
-                                        using (StreamReader ZipReader = new StreamReader(ZipStream))
-                                        {
-                                            string PartitionXml = ZipReader.ReadToEnd();
-                                            GPT.MergePartitions(PartitionXml, false, Archive);
-                                            GPTChanged |= GPT.HasChanged;
-                                        }
-                                    }
-                                }
-
-                                // First determine if we need a new GPT!
-                                if (!Entry.FullName.Contains("/")) // No subfolders
-                                {
-                                    string PartitionName = System.IO.Path.GetFileNameWithoutExtension(Entry.Name);
-                                    int P = PartitionName.IndexOf('.');
-                                    if (P >= 0)
-                                        PartitionName = PartitionName.Substring(0, P); // Example: Data.bin.gz -> Data
-                                    Partition Partition = GPT.Partitions.Where(p => string.Compare(p.Name, PartitionName, true) == 0).FirstOrDefault();
-                                    if (Partition != null)
-                                    {
-                                        DecompressedStream DecompressedStream = new DecompressedStream(Entry.Open());
-                                        ulong StreamLengthInSectors = (ulong)Entry.Length / 0x200;
-                                        try
-                                        {
-                                            StreamLengthInSectors = (ulong)DecompressedStream.Length / 0x200;
-                                        }
-                                        catch { }
-
-                                        TotalSizeSectors += StreamLengthInSectors;
-                                        PartitionCount++;
-
-                                        if (string.Compare(PartitionName, "MainOS", true) == 0)
-                                        {
-                                            MainOSOldSectorCount = Partition.SizeInSectors;
-                                            MainOSNewSectorCount = StreamLengthInSectors;
-                                            FirstMainOSSector = Partition.FirstSector;
-                                        }
-                                        else if (string.Compare(PartitionName, "Data", true) == 0)
-                                        {
-                                            DataOldSectorCount = Partition.SizeInSectors;
-                                            DataNewSectorCount = StreamLengthInSectors;
-                                        }
-                                        else if (StreamLengthInSectors > Partition.SizeInSectors)
-                                        {
-                                            LogFile.Log("Flash failed! Size of partition '" + PartitionName + "' is too big.");
-                                            ExitFailure("Flash failed!", "Size of partition '" + PartitionName + "' is too big.");
-                                            return;
-                                        }
-                                    }
-                                }
+                                PartitionName = PartitionName.Substring(0, P); // Example: Data.bin.gz -> Data
                             }
 
-                            if ((MainOSNewSectorCount > 0) && (DataNewSectorCount > 0))
+                            Partition Partition = GPT.Partitions.Find(p => string.Compare(p.Name, PartitionName, true) == 0);
+                            if (Partition != null)
                             {
-                                if ((MainOSNewSectorCount > MainOSOldSectorCount) || (DataNewSectorCount > DataOldSectorCount))
+                                DecompressedStream DecompressedStream = new(Entry.Open());
+                                ulong StreamLengthInSectors = (ulong)Entry.Length / 0x200;
+                                try
                                 {
-                                    UInt64 OSSpace = GPT.LastUsableSector - FirstMainOSSector + 1;
-                                    if ((MainOSNewSectorCount + DataNewSectorCount) <= OSSpace)
-                                    {
-                                        // MainOS and Data partitions need to be re-aligned!
-                                        Partition MainOSPartition = GPT.Partitions.Where(p => string.Compare(p.Name, "MainOS", true) == 0).Single();
-                                        Partition DataPartition = GPT.Partitions.Where(p => string.Compare(p.Name, "Data", true) == 0).Single();
-                                        MainOSPartition.LastSector = MainOSPartition.FirstSector + MainOSNewSectorCount - 1;
-                                        DataPartition.FirstSector = MainOSPartition.LastSector + 1;
-                                        DataPartition.LastSector = DataPartition.FirstSector + DataNewSectorCount - 1;
+                                    StreamLengthInSectors = (ulong)DecompressedStream.Length / 0x200;
+                                }
+                                catch { }
 
-                                        GPTChanged = true;
-                                    }
-                                    else
-                                    {
-                                        LogFile.Log("Flash failed! Size of partitions 'MainOS' and 'Data' together are too big.");
-                                        ExitFailure("Flash failed!", "Sizes of partitions 'MainOS' and 'Data' together are too big.");
-                                        return;
-                                    }
+                                TotalSizeSectors += StreamLengthInSectors;
+                                PartitionCount++;
+
+                                if (string.Compare(PartitionName, "MainOS", true) == 0)
+                                {
+                                    MainOSOldSectorCount = Partition.SizeInSectors;
+                                    MainOSNewSectorCount = StreamLengthInSectors;
+                                    FirstMainOSSector = Partition.FirstSector;
+                                }
+                                else if (string.Compare(PartitionName, "Data", true) == 0)
+                                {
+                                    DataOldSectorCount = Partition.SizeInSectors;
+                                    DataNewSectorCount = StreamLengthInSectors;
+                                }
+                                else if (StreamLengthInSectors > Partition.SizeInSectors)
+                                {
+                                    LogFile.Log("Flash failed! Size of partition '" + PartitionName + "' is too big.");
+                                    ExitFailure("Flash failed!", "Size of partition '" + PartitionName + "' is too big.");
+                                    return;
                                 }
                             }
-                            else if ((MainOSNewSectorCount > 0) && (MainOSNewSectorCount > MainOSOldSectorCount))
+                        }
+                    }
+
+                    if ((MainOSNewSectorCount > 0) && (DataNewSectorCount > 0))
+                    {
+                        if ((MainOSNewSectorCount > MainOSOldSectorCount) || (DataNewSectorCount > DataOldSectorCount))
+                        {
+                            UInt64 OSSpace = GPT.LastUsableSector - FirstMainOSSector + 1;
+                            if ((MainOSNewSectorCount + DataNewSectorCount) <= OSSpace)
                             {
-                                LogFile.Log("Flash failed! Size of partition 'MainOS' is too big.");
-                                ExitFailure("Flash failed!", "Size of partition 'MainOS' is too big.");
-                                return;
-                            }
-                            else if ((DataNewSectorCount > 0) && (DataNewSectorCount > DataOldSectorCount))
-                            {
-                                LogFile.Log("Flash failed! Size of partition 'Data' is too big.");
-                                ExitFailure("Flash failed!", "Size of partition 'Data' is too big.");
-                                return;
-                            }
+                                // MainOS and Data partitions need to be re-aligned!
+                                Partition MainOSPartition = GPT.Partitions.Single(p => string.Compare(p.Name, "MainOS", true) == 0);
+                                Partition DataPartition = GPT.Partitions.Single(p => string.Compare(p.Name, "Data", true) == 0);
+                                MainOSPartition.LastSector = MainOSPartition.FirstSector + MainOSNewSectorCount - 1;
+                                DataPartition.FirstSector = MainOSPartition.LastSector + 1;
+                                DataPartition.LastSector = DataPartition.FirstSector + DataNewSectorCount - 1;
 
-                            if (GPTChanged)
-                                Phone.WriteGPT(GPT);
-
-                            if (PartitionCount > 0)
-                            {
-                                BusyViewModel Busy = new BusyViewModel("Flashing...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
-                                ProgressUpdater Updater = Busy.ProgressUpdater;
-                                ActivateSubContext(Busy);
-
-                                int i = 0;
-
-                                foreach (ZipArchiveEntry Entry in Archive.Entries)
-                                {
-                                    // "MainOS.bin.gz" => "MainOS"
-                                    string PartitionName = Entry.Name;
-                                    int Pos = PartitionName.IndexOf('.');
-                                    if (Pos >= 0)
-                                        PartitionName = PartitionName.Substring(0, Pos);
-
-                                    Partition Partition = GPT.Partitions.Where(p => string.Compare(p.Name, PartitionName, true) == 0).FirstOrDefault();
-                                    if (Partition != null)
-                                    {
-                                        Stream DecompressedStream = new DecompressedStream(Entry.Open());
-                                        ulong StreamLengthInSectors = (ulong)Entry.Length / 0x200;
-                                        try
-                                        {
-                                            StreamLengthInSectors = (ulong)DecompressedStream.Length / 0x200;
-                                        }
-                                        catch { }
-
-                                        if (StreamLengthInSectors <= Partition.SizeInSectors)
-                                        {
-                                            i++;
-                                            Busy.Message = "Flashing partition " + Partition.Name + " (" + i.ToString() + @"/" + PartitionCount.ToString() + ")";
-                                            Phone.FlashRawPartition(DecompressedStream, Partition.Name, Updater);
-                                        }
-                                        DecompressedStream.Close();
-                                    }
-                                }
+                                GPTChanged = true;
                             }
                             else
                             {
-                                LogFile.Log("Flash failed! No valid partitions found in the archive.");
-                                ExitFailure("Flash failed!", "No valid partitions found in the archive");
+                                LogFile.Log("Flash failed! Size of partitions 'MainOS' and 'Data' together are too big.");
+                                ExitFailure("Flash failed!", "Sizes of partitions 'MainOS' and 'Data' together are too big.");
                                 return;
                             }
                         }
                     }
+                    else if ((MainOSNewSectorCount > 0) && (MainOSNewSectorCount > MainOSOldSectorCount))
+                    {
+                        LogFile.Log("Flash failed! Size of partition 'MainOS' is too big.");
+                        ExitFailure("Flash failed!", "Size of partition 'MainOS' is too big.");
+                        return;
+                    }
+                    else if ((DataNewSectorCount > 0) && (DataNewSectorCount > DataOldSectorCount))
+                    {
+                        LogFile.Log("Flash failed! Size of partition 'Data' is too big.");
+                        ExitFailure("Flash failed!", "Size of partition 'Data' is too big.");
+                        return;
+                    }
+
+                    if (GPTChanged)
+                    {
+                        Phone.WriteGPT(GPT);
+                    }
+
+                    if (PartitionCount > 0)
+                    {
+                        BusyViewModel Busy = new("Flashing...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
+                        ProgressUpdater Updater = Busy.ProgressUpdater;
+                        ActivateSubContext(Busy);
+
+                        int i = 0;
+
+                        foreach (ZipArchiveEntry Entry in Archive.Entries)
+                        {
+                            // "MainOS.bin.gz" => "MainOS"
+                            string PartitionName = Entry.Name;
+                            int Pos = PartitionName.IndexOf('.');
+                            if (Pos >= 0)
+                            {
+                                PartitionName = PartitionName.Substring(0, Pos);
+                            }
+
+                            Partition Partition = GPT.Partitions.Find(p => string.Compare(p.Name, PartitionName, true) == 0);
+                            if (Partition != null)
+                            {
+                                Stream DecompressedStream = new DecompressedStream(Entry.Open());
+                                ulong StreamLengthInSectors = (ulong)Entry.Length / 0x200;
+                                try
+                                {
+                                    StreamLengthInSectors = (ulong)DecompressedStream.Length / 0x200;
+                                }
+                                catch { }
+
+                                if (StreamLengthInSectors <= Partition.SizeInSectors)
+                                {
+                                    i++;
+                                    Busy.Message = "Flashing partition " + Partition.Name + " (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
+                                    Phone.FlashRawPartition(DecompressedStream, Partition.Name, Updater);
+                                }
+                                DecompressedStream.Close();
+                            }
+                        }
+                    }
+                    else
+                    {
+                        LogFile.Log("Flash failed! No valid partitions found in the archive.");
+                        ExitFailure("Flash failed!", "No valid partitions found in the archive");
+                        return;
+                    }
                 }
                 catch (Exception Ex)
                 {
@@ -460,7 +465,10 @@ namespace WPinternals
                         ExitFailure("Flash failed!", ((WPinternalsException)Ex).SubMessage);
                     }
                     else
+                    {
                         ExitFailure("Flash failed!", null);
+                    }
+
                     return;
                 }
 
@@ -506,9 +514,9 @@ namespace WPinternals
                 if (Info.FlashAppProtocolVersionMajor >= 2)
                 {
                     byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(Phone, 0x20000); // TODO: Get proper profile FFU and get ChunkSizeInBytes
-                    GPT GPT = new GPT(GPTChunk);
+                    GPT GPT = new(GPTChunk);
                     FlashPart Part;
-                    List<FlashPart> FlashParts = new List<FlashPart>();
+                    List<FlashPart> FlashParts = new();
 
                     Partition NvBackupPartition = GPT.GetPartition("BACKUP_BS_NV");
                     if (NvBackupPartition != null)
@@ -521,9 +529,11 @@ namespace WPinternals
                         GPT.Partitions.Remove(NvPartition);
 
                         GPT.Rebuild();
-                        Part = new FlashPart();
-                        Part.StartSector = 0;
-                        Part.Stream = new MemoryStream(GPTChunk);
+                        Part = new FlashPart
+                        {
+                            StartSector = 0,
+                            Stream = new MemoryStream(GPTChunk)
+                        };
                         FlashParts.Add(Part);
                     }
 
@@ -550,26 +560,40 @@ namespace WPinternals
                             SetWorkingStatus: (m, s, v, a, st) =>
                             {
                                 if ((st == WPinternalsStatus.Scanning) || (st == WPinternalsStatus.WaitingForManualReset))
+                                {
                                     SetWorkingStatus(m, s, v, a, st);
+                                }
                                 else if ((LastStatus == WPinternalsStatus.Scanning) || (LastStatus == WPinternalsStatus.WaitingForManualReset))
+                                {
                                     SetWorkingStatus("Restoring bootloader...", null, null, Status: WPinternalsStatus.Flashing);
+                                }
+
                                 LastStatus = st;
                             },
                             UpdateWorkingStatus: (m, s, v, st) =>
                             {
                                 if ((st == WPinternalsStatus.Scanning) || (st == WPinternalsStatus.WaitingForManualReset))
+                                {
                                     UpdateWorkingStatus(m, s, v, st);
+                                }
                                 else if ((LastStatus == WPinternalsStatus.Scanning) || (LastStatus == WPinternalsStatus.WaitingForManualReset))
+                                {
                                     SetWorkingStatus("Restoring bootloader...", null, null, Status: WPinternalsStatus.Flashing);
+                                }
+
                                 LastStatus = st;
                             }
                         ).Wait();
 
                         if ((PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader) && (PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_Flash))
+                        {
                             PhoneNotifier.WaitForArrival().Wait();
+                        }
 
                         if (PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
+                        {
                             ((NokiaFlashModel)PhoneNotifier.CurrentModel).SwitchToFlashAppContext();
+                        }
                     }
                 }
 
@@ -583,23 +607,28 @@ namespace WPinternals
 
                 try
                 {
-                    FFU FFU = new FFU(FFUPath);
-                    BusyViewModel Busy = new BusyViewModel("Flashing original FFU...", MaxProgressValue: FFU.TotalChunkCount, UIContext: UIContext);
+                    FFU FFU = new(FFUPath);
+                    BusyViewModel Busy = new("Flashing original FFU...", MaxProgressValue: FFU.TotalChunkCount, UIContext: UIContext);
                     ActivateSubContext(Busy);
                     byte Options = 0;
                     if (!Info.IsBootloaderSecure)
+                    {
                         Options = (byte)((FlashOptions)Options | FlashOptions.SkipSignatureCheck);
+                    }
+
                     Phone.FlashFFU(FFU, Busy.ProgressUpdater, true, Options);
                 }
                 catch (Exception Ex)
                 {
                     LogFile.LogException(Ex);
                     if (Ex is WPinternalsException)
+                    {
                         ErrorSubMessage = ((WPinternalsException)Ex).SubMessage;
+                    }
+
                     Result = false;
                 }
 
-
                 if (!Result)
                 {
                     ExitFailure("Flash failed!", ErrorSubMessage);
@@ -631,7 +660,9 @@ namespace WPinternals
         {
             NokiaFlashModel Phone = (NokiaFlashModel)PhoneNotifier.CurrentModel;
             if (PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
+            {
                 Phone.SwitchToFlashAppContext();
+            }
 
             new Thread(() =>
             {
@@ -643,11 +674,11 @@ namespace WPinternals
 
                 try
                 {
-                    FileInfo info = new FileInfo(MMOSPath);
+                    FileInfo info = new(MMOSPath);
                     uint length = uint.Parse(info.Length.ToString());
-                    int maximumbuffersize = 0x00240000;
+                    const int maximumbuffersize = 0x00240000;
                     uint totalcounts = (uint)Math.Truncate((decimal)length / maximumbuffersize);
-                    BusyViewModel Busy = new BusyViewModel("Flashing Test Mode package...", MaxProgressValue: totalcounts, UIContext: UIContext);
+                    BusyViewModel Busy = new("Flashing Test Mode package...", MaxProgressValue: totalcounts, UIContext: UIContext);
                     ActivateSubContext(Busy);
 
                     Phone.FlashMMOS(MMOSPath, Busy.ProgressUpdater);
@@ -660,7 +691,10 @@ namespace WPinternals
                 {
                     LogFile.LogException(Ex);
                     if (Ex is WPinternalsException)
+                    {
                         ErrorSubMessage = ((WPinternalsException)Ex).SubMessage;
+                    }
+
                     Result = false;
                 }
 
@@ -713,7 +747,7 @@ namespace WPinternals
 
         internal void ExitSuccess(string Message, string SubMessage)
         {
-            MessageViewModel SuccessMessageViewModel = new MessageViewModel(Message, () =>
+            MessageViewModel SuccessMessageViewModel = new(Message, () =>
             {
                 // No need to call Exit() to go to normal mode, because it already switches to normal mode automatically.
                 IsSwitchingInterface = false; // From here on a device will be forced to Flash mode again on this screen which is meant for flashing
@@ -726,7 +760,7 @@ namespace WPinternals
 
         internal void ExitFailure(string Message, string SubMessage)
         {
-            MessageViewModel ErrorMessageViewModel = new MessageViewModel(Message, () =>
+            MessageViewModel ErrorMessageViewModel = new(Message, () =>
             {
                 IsSwitchingInterface = false;
                 Callback();
diff --git a/ViewModels/LumiaInfoViewModel.cs b/ViewModels/LumiaInfoViewModel.cs
index c521b6c..776e39c 100644
--- a/ViewModels/LumiaInfoViewModel.cs
+++ b/ViewModels/LumiaInfoViewModel.cs
@@ -27,8 +27,8 @@ namespace WPinternals
         internal PhoneInterfaces? CurrentInterface;
         internal IDisposable CurrentModel;
         internal PhoneNotifierViewModel PhoneNotifier;
-        private Action<PhoneInterfaces> ModeSwitchRequestCallback;
-        private Action SwitchToGettingStarted;
+        private readonly Action<PhoneInterfaces> ModeSwitchRequestCallback;
+        private readonly Action SwitchToGettingStarted;
 
         internal LumiaInfoViewModel(PhoneNotifierViewModel PhoneNotifier, Action<PhoneInterfaces> ModeSwitchRequestCallback, Action SwitchToGettingStarted)
             : base()
@@ -50,14 +50,14 @@ namespace WPinternals
             PhoneNotifier.DeviceRemoved -= DeviceRemoved;
         }
 
-        void DeviceRemoved()
+        private void DeviceRemoved()
         {
             CurrentInterface = null;
             CurrentModel = null;
             ActivateSubContext(null);
         }
 
-        void NewDeviceArrived(ArrivalEventArgs Args)
+        private void NewDeviceArrived(ArrivalEventArgs Args)
         {
             CurrentInterface = Args.NewInterface;
             CurrentModel = Args.NewModel;
@@ -82,7 +82,7 @@ namespace WPinternals
                 case PhoneInterfaces.Lumia_MassStorage:
                     ActivateSubContext(new NokiaMassStorageViewModel((MassStorage)CurrentModel));
                     break;
-            };
+            }
         }
     }
 }
diff --git a/ViewModels/LumiaModeViewModel.cs b/ViewModels/LumiaModeViewModel.cs
index 098f53a..066124a 100644
--- a/ViewModels/LumiaModeViewModel.cs
+++ b/ViewModels/LumiaModeViewModel.cs
@@ -27,7 +27,7 @@ namespace WPinternals
         internal PhoneInterfaces? CurrentInterface;
         internal IDisposable CurrentModel;
         internal PhoneNotifierViewModel PhoneNotifier;
-        private Action Callback;
+        private readonly Action Callback;
 
         internal LumiaModeViewModel(PhoneNotifierViewModel PhoneNotifier, Action Callback)
             : base()
@@ -48,28 +48,34 @@ namespace WPinternals
             PhoneNotifier.DeviceRemoved -= DeviceRemoved;
         }
 
-        void DeviceRemoved()
+        private void DeviceRemoved()
         {
             CurrentInterface = null;
             CurrentModel = null;
 
             if (!IsSwitchingInterface)
+            {
                 ActivateSubContext(null);
+            }
         }
 
-        void NewDeviceArrived(ArrivalEventArgs Args)
+        private void NewDeviceArrived(ArrivalEventArgs Args)
         {
             CurrentInterface = Args.NewInterface;
             CurrentModel = Args.NewModel;
 
             if (!IsSwitchingInterface && IsActive)
+            {
                 Refresh();
+            }
         }
 
         internal override void EvaluateViewState()
         {
             if (!IsSwitchingInterface && IsActive)
+            {
                 Refresh();
+            }
         }
 
         private void Refresh()
@@ -96,7 +102,7 @@ namespace WPinternals
                 case PhoneInterfaces.Lumia_MassStorage:
                     ActivateSubContext(new NokiaModeMassStorageViewModel((MassStorage)CurrentModel, OnModeSwitchRequested));
                     break;
-            };
+            }
         }
 
         // Called from eventhandler, so "async void" is valid here.
diff --git a/ViewModels/LumiaUnlockBootViewModel.cs b/ViewModels/LumiaUnlockBootViewModel.cs
index 7d6a045..e12f679 100644
--- a/ViewModels/LumiaUnlockBootViewModel.cs
+++ b/ViewModels/LumiaUnlockBootViewModel.cs
@@ -40,8 +40,8 @@ namespace WPinternals
 
     internal class LumiaUnlockBootViewModel : ContextViewModel
     {
-        private PhoneNotifierViewModel PhoneNotifier;
-        private Action Callback;
+        private readonly PhoneNotifierViewModel PhoneNotifier;
+        private readonly Action Callback;
         private string FFUPath;
         private string LoadersPath;
         private string SBL3Path;
@@ -50,12 +50,12 @@ namespace WPinternals
         private string SupportedFFUPath;
         private bool IsBootLoaderUnlocked;
         private byte[] RootKeyHash = null;
-        private Action SwitchToFlashRom;
-        private Action SwitchToUndoRoot;
-        private Action SwitchToDownload;
-        private bool DoUnlock;
+        private readonly Action SwitchToFlashRom;
+        private readonly Action SwitchToUndoRoot;
+        private readonly Action SwitchToDownload;
+        private readonly bool DoUnlock;
         private MachineState State;
-        private object EvaluateViewStateLockObject = new object();
+        private readonly object EvaluateViewStateLockObject = new();
 
         internal LumiaUnlockBootViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToFlashRom, Action SwitchToUndoRoot, Action SwitchToDownload, bool DoUnlock, Action Callback)
             : base()
@@ -86,10 +86,14 @@ namespace WPinternals
         internal override void EvaluateViewState()
         {
             if (!IsActive)
+            {
                 return;
+            }
 
             if (State == MachineState.LumiaUnlockBoot)
+            {
                 return;
+            }
 
             lock (EvaluateViewStateLockObject)
             {
@@ -135,20 +139,21 @@ namespace WPinternals
 
                             UefiSecurityStatusResponse SecurityStatus = ((NokiaFlashModel)PhoneNotifier.CurrentModel).ReadSecurityStatus();
                             if (SecurityStatus != null)
+                            {
                                 IsBootLoaderUnlocked = (SecurityStatus.AuthenticationStatus || SecurityStatus.RdcStatus || !SecurityStatus.SecureFfuEfuseStatus);
+                            }
 
                             TestPos = 2;
 
                             PhoneInfo Info = ((NokiaFlashModel)PhoneNotifier.CurrentModel).ReadPhoneInfo();
                             if (SecurityStatus == null)
+                            {
                                 IsBootLoaderUnlocked = !Info.IsBootloaderSecure;
+                            }
 
                             if (RootKeyHash == null)
                             {
-                                RootKeyHash = Info.RKH;
-
-                                if (RootKeyHash == null)
-                                    RootKeyHash = new byte[32];
+                                RootKeyHash = Info.RKH ?? (new byte[32]);
                             }
 
                             TestPos = 3;
@@ -156,7 +161,7 @@ namespace WPinternals
                             if (Info.FlashAppProtocolVersionMajor < 2)
                             {
                                 // This action is executed after the resources are selected by the user.
-                                Action<string, string, string, string, string, string, bool> ReturnFunction = (FFUPath, LoadersPath, SBL3Path, ProfileFFUPath, EDEPath, SupportedFFUPath, DoFixBoot) =>
+                                void ReturnFunction(string FFUPath, string LoadersPath, string SBL3Path, string ProfileFFUPath, string EDEPath, string SupportedFFUPath, bool DoFixBoot)
                                 {
                                     // Stop responding to device arrival here, because all connections are handled by subfunctions, not here.
                                     IsSwitchingInterface = true;
@@ -174,36 +179,38 @@ namespace WPinternals
                                     LogFile.Log("FFU: " + FFUPath);
                                     LogFile.Log("Loaders: " + LoadersPath);
                                     if (SBL3Path == null)
+                                    {
                                         LogFile.Log("No SBL3 specified");
+                                    }
                                     else
+                                    {
                                         LogFile.Log("SBL3: " + SBL3Path);
+                                    }
 
                                     ActivateSubContext(new BusyViewModel("Processing resources..."));
 
                                     if (DoUnlock)
                                     {
-                                        Task.Run(async () =>
-                                        {
-                                            await LumiaUnlockBootloaderViewModel.LumiaV1UnlockFirmware(PhoneNotifier, FFUPath, LoadersPath, SBL3Path, SupportedFFUPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage);
-                                        });
+                                        Task.Run(async () => await LumiaUnlockBootloaderViewModel.LumiaV1UnlockFirmware(PhoneNotifier, FFUPath, LoadersPath, SBL3Path, SupportedFFUPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage));
                                     }
                                     else
                                     {
-                                        Task.Run(async () =>
-                                        {
-                                            await LumiaUnlockBootloaderViewModel.LumiaV1RelockFirmware(PhoneNotifier, FFUPath, LoadersPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage);
-                                        });
+                                        Task.Run(async () => await LumiaUnlockBootloaderViewModel.LumiaV1RelockFirmware(PhoneNotifier, FFUPath, LoadersPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage));
                                     }
-                                };
+                                }
 
                                 if (DoUnlock)
+                                {
                                     ActivateSubContext(new BootUnlockResourcesViewModel("Lumia Flash mode", RootKeyHash, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, ReturnFunction, Abort, IsBootLoaderUnlocked, false));
+                                }
                                 else
+                                {
                                     ActivateSubContext(new BootRestoreResourcesViewModel("Lumia Flash mode", RootKeyHash, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, ReturnFunction, Abort, IsBootLoaderUnlocked, false));
+                                }
                             }
                             else
                             {
-                                bool AlreadyUnlocked = false;
+                                const bool AlreadyUnlocked = false;
                                 if (DoUnlock)
                                 {
                                     NokiaFlashModel FlashModel = (NokiaFlashModel)PhoneNotifier.CurrentModel;
@@ -222,7 +229,7 @@ namespace WPinternals
                                 IsSwitchingInterface = true;
 
                                 // This action is executed after the resources are selected by the user.
-                                Action<string, string, string, string, string, string, bool> ReturnFunction = (FFUPath, LoadersPath, SBL3Path, ProfileFFUPath, EDEPath, SupportedFFUPath, DoFixBoot) =>
+                                void ReturnFunction(string FFUPath, string LoadersPath, string SBL3Path, string ProfileFFUPath, string EDEPath, string SupportedFFUPath, bool DoFixBoot)
                                 {
                                     IsSwitchingInterface = true;
                                     State = MachineState.LumiaUnlockBoot;
@@ -236,24 +243,36 @@ namespace WPinternals
                                         StorePaths();
 
                                         if (DoFixBoot)
+                                        {
                                             LogFile.Log("Fix Boot");
+                                        }
                                         else
+                                        {
                                             LogFile.Log("Unlock Bootloader");
+                                        }
 
                                         LogFile.Log("Processing resources:");
                                         LogFile.Log("Profile FFU: " + ProfileFFUPath);
                                         LogFile.Log("EDE file: " + EDEPath);
                                         if (SupportedFFUPath != null)
+                                        {
                                             LogFile.Log("Donor-FFU with supported OS version: " + SupportedFFUPath);
+                                        }
 
                                         Task.Run(async () =>
                                             {
                                                 if (DoFixBoot)
+                                                {
                                                     await LumiaV2UnlockBootViewModel.LumiaV2FixBoot(PhoneNotifier, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage);
+                                                }
                                                 else if (!AlreadyUnlocked)
+                                                {
                                                     await LumiaUnlockBootloaderViewModel.LumiaV2UnlockUEFI(PhoneNotifier, ProfileFFUPath, EDEPath, SupportedFFUPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage);
+                                                }
                                                 else
+                                                {
                                                     await LumiaUnlockBootloaderViewModel.LumiaV2UnlockUEFI(PhoneNotifier, ProfileFFUPath, EDEPath, SupportedFFUPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage, true);
+                                                }
                                             });
                                     }
                                     else
@@ -263,24 +282,27 @@ namespace WPinternals
                                             FFU ProfileFFU = null;
 
                                             List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => (Info.PlatformID.StartsWith(e.PlatformID, StringComparison.OrdinalIgnoreCase) && e.Exists())).ToList();
-                                            if (FFUs.Count() > 0)
-                                                ProfileFFU = new FFU(FFUs[0].Path);
-                                            else
-                                                throw new WPinternalsException("Profile FFU missing", "No profile FFU has been found in the repository for your device. You can add a profile FFU within the download section of the tool or by using the command line.");
+                                            ProfileFFU = FFUs.Count > 0
+                                                ? new FFU(FFUs[0].Path)
+                                                : throw new WPinternalsException("Profile FFU missing", "No profile FFU has been found in the repository for your device. You can add a profile FFU within the download section of the tool or by using the command line.");
 
                                             LogFile.Log("Profile FFU: " + ProfileFFU.Path);
 
                                             await LumiaUnlockBootloaderViewModel.LumiaV2RelockUEFI(PhoneNotifier, ProfileFFU.Path, true, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage);
                                         });
                                     }
-                                };
+                                }
 
                                 TestPos = 5;
 
                                 if (DoUnlock)
+                                {
                                     ActivateSubContext(new BootUnlockResourcesViewModel("Lumia Flash mode", RootKeyHash, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, ReturnFunction, Abort, IsBootLoaderUnlocked, true, Info.PlatformID, Info.Type));
+                                }
                                 else
+                                {
                                     ActivateSubContext(new BootRestoreResourcesViewModel("Lumia Flash mode", RootKeyHash, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, ReturnFunction, Abort, IsBootLoaderUnlocked, true, Info.PlatformID, Info.Type));
+                                }
                             }
                         }
                         catch (Exception Ex)
@@ -292,7 +314,7 @@ namespace WPinternals
                         IsSwitchingInterface = false;
 
                         // If resources are not confirmed yet, then display view with device info and request for resources.
-                        QualcommDownload Download = new QualcommDownload((QualcommSerial)PhoneNotifier.CurrentModel);
+                        QualcommDownload Download = new((QualcommSerial)PhoneNotifier.CurrentModel);
                         byte[] QualcommRootKeyHash;
 
                         try
@@ -306,7 +328,9 @@ namespace WPinternals
                         }
 
                         if (RootKeyHash == null)
+                        {
                             RootKeyHash = QualcommRootKeyHash;
+                        }
                         else if (!StructuralComparisons.StructuralEqualityComparer.Equals(RootKeyHash, QualcommRootKeyHash))
                         {
                             LogFile.Log("Error: Root Key Hash in Qualcomm Emergency mode does not match!");
@@ -330,32 +354,34 @@ namespace WPinternals
                             LogFile.Log("FFU: " + FFUPath);
                             LogFile.Log("Loaders: " + LoadersPath);
                             if (SBL3Path == null)
+                            {
                                 LogFile.Log("No SBL3 specified");
+                            }
                             else
+                            {
                                 LogFile.Log("SBL3: " + SBL3Path);
+                            }
 
                             ActivateSubContext(new BusyViewModel("Processing resources..."));
 
                             if (DoUnlock)
                             {
-                                Task.Run(async () =>
-                                {
-                                    await LumiaUnlockBootloaderViewModel.LumiaV1UnlockFirmware(PhoneNotifier, FFUPath, LoadersPath, SBL3Path, SupportedFFUPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage);
-                                });
+                                Task.Run(async () => await LumiaUnlockBootloaderViewModel.LumiaV1UnlockFirmware(PhoneNotifier, FFUPath, LoadersPath, SBL3Path, SupportedFFUPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage));
                             }
                             else
                             {
-                                Task.Run(async () =>
-                                {
-                                    await LumiaUnlockBootloaderViewModel.LumiaV1RelockFirmware(PhoneNotifier, FFUPath, LoadersPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage);
-                                });
+                                Task.Run(async () => await LumiaUnlockBootloaderViewModel.LumiaV1RelockFirmware(PhoneNotifier, FFUPath, LoadersPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage));
                             }
                         };
 
                         if (DoUnlock)
+                        {
                             ActivateSubContext(new BootUnlockResourcesViewModel("Qualcomm Emergency Download mode", RootKeyHash, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, ReturnFunctionD, Abort, IsBootLoaderUnlocked, false));
+                        }
                         else
+                        {
                             ActivateSubContext(new BootRestoreResourcesViewModel("Qualcomm Emergency Download mode", RootKeyHash, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, ReturnFunctionD, Abort, IsBootLoaderUnlocked, false));
+                        }
 
                         break;
                     case PhoneInterfaces.Qualcomm_Flash:
@@ -371,24 +397,15 @@ namespace WPinternals
                             FFUPath = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "FFUPath", null);
                             SupportedFFUPath = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "SupportedFFUPath", null);
                             LoadersPath = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "LoadersPath", null);
-                            if (DoUnlock)
-                                SBL3Path = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "SBL3Path", null);
-                            else
-                                SBL3Path = null;
+                            SBL3Path = DoUnlock ? (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "SBL3Path", null) : null;
 
                             if (DoUnlock)
                             {
-                                Task.Run(async () =>
-                                {
-                                    await LumiaUnlockBootloaderViewModel.LumiaV1UnlockFirmware(PhoneNotifier, FFUPath, LoadersPath, SBL3Path, SupportedFFUPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage);
-                                });
+                                Task.Run(async () => await LumiaUnlockBootloaderViewModel.LumiaV1UnlockFirmware(PhoneNotifier, FFUPath, LoadersPath, SBL3Path, SupportedFFUPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage));
                             }
                             else
                             {
-                                Task.Run(async () =>
-                                {
-                                    await LumiaUnlockBootloaderViewModel.LumiaV1RelockFirmware(PhoneNotifier, FFUPath, LoadersPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage);
-                                });
+                                Task.Run(async () => await LumiaUnlockBootloaderViewModel.LumiaV1RelockFirmware(PhoneNotifier, FFUPath, LoadersPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage));
                             }
                             break;
                         }
@@ -436,41 +453,53 @@ namespace WPinternals
 
         private void StorePaths()
         {
-            RegistryKey Key = Registry.CurrentUser.OpenSubKey(@"Software\WPInternals", true);
-            if (Key == null)
-                Key = Registry.CurrentUser.CreateSubKey(@"Software\WPInternals");
+            RegistryKey Key = Registry.CurrentUser.OpenSubKey(@"Software\WPInternals", true) ?? Registry.CurrentUser.CreateSubKey(@"Software\WPInternals");
 
             if (FFUPath == null)
             {
                 if (Key.GetValue("FFUPath") != null)
+                {
                     Key.DeleteValue("FFUPath");
+                }
             }
             else
+            {
                 Key.SetValue("FFUPath", FFUPath);
+            }
 
             if (LoadersPath == null)
             {
                 if (Key.GetValue("LoadersPath") != null)
+                {
                     Key.DeleteValue("LoadersPath");
+                }
             }
             else
+            {
                 Key.SetValue("LoadersPath", LoadersPath);
+            }
 
             if (DoUnlock)
             {
                 if (SBL3Path == null)
                 {
                     if (Key.GetValue("SBL3Path") != null)
+                    {
                         Key.DeleteValue("SBL3Path");
+                    }
                 }
                 else
+                {
                     Key.SetValue("SBL3Path", SBL3Path);
+                }
             }
 
             if (ProfileFFUPath == null)
             {
                 if (Key.GetValue("ProfileFFUPath") != null)
+                {
                     Key.DeleteValue("ProfileFFUPath");
+                }
             }
             else
             {
@@ -487,7 +516,9 @@ namespace WPinternals
                 if (EDEPath == null)
                 {
                     if (Key.GetValue("EDEPath") != null)
+                    {
                         Key.DeleteValue("EDEPath");
+                    }
                 }
                 else
                 {
@@ -522,7 +553,7 @@ namespace WPinternals
         internal void ExitMessage(string Message, string SubMessage)
         {
             // SecureBoot Unlock v2 is done. Reactivate phone arrival events.
-            MessageViewModel SuccessMessageViewModel = new MessageViewModel(Message, () =>
+            MessageViewModel SuccessMessageViewModel = new(Message, () =>
             {
                 State = MachineState.Default;
                 Exit();
@@ -531,7 +562,7 @@ namespace WPinternals
             ActivateSubContext(SuccessMessageViewModel);
         }
 
-        void NewDeviceArrived(ArrivalEventArgs Args)
+        private void NewDeviceArrived(ArrivalEventArgs Args)
         {
             // Do not start on a new thread, because EvaluateViewState will also create new ViewModels and those should be created on the UI thread.
             EvaluateViewState();
@@ -561,8 +592,8 @@ namespace WPinternals
         internal Action SwitchToFlashRom;
         internal Action SwitchToUndoRoot;
         internal Action SwitchToDownload;
-        private string PlatformID;
-        private string ProductType;
+        private readonly string PlatformID;
+        private readonly string ProductType;
         private string ValidatedSupportedFfuPath = null;
 
         internal FlashResourcesViewModel(string CurrentMode, byte[] RootKeyHash, Action SwitchToFlashRom, Action SwitchToUndoRoot, Action SwitchToDownload, Action<string, string, string, string, string, string, bool> Result, Action Abort, bool IsBootLoaderUnlocked, bool TargetHasNewFlashProtocol, string PlatformID = null, string ProductType = null) : base()
@@ -577,7 +608,7 @@ namespace WPinternals
             this.SwitchToDownload = SwitchToDownload;
             this.IsBootLoaderUnlocked = IsBootLoaderUnlocked;
             OkCommand = new DelegateCommand(() => Result(FFUPath, LoadersPath, SBL3Path, ProfileFFUPath, EDEPath, IsSupportedFfuNeeded ? SupportedFFUPath : null, false),
-                () => (!TargetHasNewFlashProtocol && (!IsSupportedFfuNeeded || (IsSupportedFfuValid && (SupportedFFUPath != null))) || ((ProfileFFUPath != null) && (!IsSupportedFfuNeeded || (IsSupportedFfuValid && (SupportedFFUPath != null))))));
+                () => ((!TargetHasNewFlashProtocol && (!IsSupportedFfuNeeded || (IsSupportedFfuValid && (SupportedFFUPath != null)))) || ((ProfileFFUPath != null) && (!IsSupportedFfuNeeded || (IsSupportedFfuValid && (SupportedFFUPath != null))))));
             FixCommand = new DelegateCommand(() => Result(null, null, null, null, null, null, true));
             CancelCommand = new DelegateCommand(Abort);
             this.TargetHasNewFlashProtocol = TargetHasNewFlashProtocol;
@@ -630,13 +661,15 @@ namespace WPinternals
             catch { }
 
             List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => (PlatformID.StartsWith(e.PlatformID, StringComparison.OrdinalIgnoreCase) && e.Exists())).ToList();
-            if (FFUs.Count() > 0)
+            if (FFUs.Count > 0)
             {
                 IsProfileFfuValid = true;
                 ProfileFFUPath = FFUs[0].Path;
             }
             else
+            {
                 IsProfileFfuValid = false;
+            }
         }
 
         private void SetEDEPath()
@@ -650,7 +683,9 @@ namespace WPinternals
                 {
                     Programmer = new QualcommPartition(_EDEPath);
                     if (ByteOperations.Compare(Programmer.RootKeyHash, RootKeyHash))
+                    {
                         return;
+                    }
                 }
             }
             catch { }
@@ -694,8 +729,8 @@ namespace WPinternals
 
                 try
                 {
-                    FFU FFU = new FFU(_FFUPath);
-                    IsSupportedFfuNeeded = !(App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V1.1-EFIESP").First().TargetVersions.Any(v => v.Description == FFU.GetOSVersion()));
+                    FFU FFU = new(_FFUPath);
+                    IsSupportedFfuNeeded = !App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V1.1-EFIESP").TargetVersions.Any(v => v.Description == FFU.GetOSVersion());
                 }
                 catch
                 {
@@ -712,8 +747,10 @@ namespace WPinternals
                         if (_SupportedFFUPath != null)
                         {
                             SupportedFFU = new FFU(_SupportedFFUPath);
-                            if (App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V1.1-EFIESP").First().TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion()))
+                            if (App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V1.1-EFIESP").TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion()))
+                            {
                                 return;
+                            }
                         }
                     }
                     catch { }
@@ -724,7 +761,7 @@ namespace WPinternals
                         if (TempSupportedFFUPath != null)
                         {
                             SupportedFFU = new FFU(TempSupportedFFUPath);
-                            if (App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V1.1-EFIESP").First().TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion()))
+                            if (App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V1.1-EFIESP").TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion()))
                             {
                                 ValidatedSupportedFfuPath = TempSupportedFFUPath;
                                 SupportedFFUPath = TempSupportedFFUPath;
@@ -735,8 +772,8 @@ namespace WPinternals
                     }
                     catch { }
 
-                    List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V1.1-EFIESP").First().TargetVersions.Any(v => v.Description == e.OSVersion)).ToList();
-                    if (FFUs.Count() > 0)
+                    List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V1.1-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)).ToList();
+                    if (FFUs.Count > 0)
                     {
                         ValidatedSupportedFfuPath = FFUs[0].Path;
                         SupportedFFUPath = FFUs[0].Path;
@@ -754,8 +791,8 @@ namespace WPinternals
 
                 try
                 {
-                    FFU ProfileFFU = new FFU(_ProfileFFUPath);
-                    IsSupportedFfuNeeded = !(App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V2-EFIESP").First().TargetVersions.Any(v => v.Description == ProfileFFU.GetOSVersion()));
+                    FFU ProfileFFU = new(_ProfileFFUPath);
+                    IsSupportedFfuNeeded = !App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == ProfileFFU.GetOSVersion());
                 }
                 catch
                 {
@@ -772,8 +809,10 @@ namespace WPinternals
                         if (_SupportedFFUPath != null)
                         {
                             SupportedFFU = new FFU(_SupportedFFUPath);
-                            if (App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V2-EFIESP").First().TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion()))
+                            if (App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion()))
+                            {
                                 return;
+                            }
                         }
                     }
                     catch { }
@@ -784,7 +823,7 @@ namespace WPinternals
                         if (TempSupportedFFUPath != null)
                         {
                             SupportedFFU = new FFU(TempSupportedFFUPath);
-                            if (App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V2-EFIESP").First().TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion()))
+                            if (App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion()))
                             {
                                 ValidatedSupportedFfuPath = TempSupportedFFUPath;
                                 SupportedFFUPath = TempSupportedFFUPath;
@@ -795,8 +834,8 @@ namespace WPinternals
                     }
                     catch { }
 
-                    List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V2-EFIESP").First().TargetVersions.Any(v => v.Description == e.OSVersion)).ToList();
-                    if (FFUs.Count() > 0)
+                    List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)).ToList();
+                    if (FFUs.Count > 0)
                     {
                         ValidatedSupportedFfuPath = FFUs[0].Path;
                         SupportedFFUPath = FFUs[0].Path;
@@ -818,43 +857,28 @@ namespace WPinternals
                     }
                     else
                     {
-
                         if (!TargetHasNewFlashProtocol)
                         {
-                            if (App.Config.FFURepository.Any(e => ((e.Path == SupportedFFUPath) && (App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V1.1-EFIESP").First().TargetVersions.Any(v => v.Description == e.OSVersion)))))
+                            if (App.Config.FFURepository.Any(e => ((e.Path == SupportedFFUPath) && (App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V1.1-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))))
                             {
                                 IsSupportedFfuValid = true;
                             }
                             else
                             {
-                                FFU SupportedFFU = new FFU(SupportedFFUPath);
-                                if (App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V1.1-EFIESP").First().TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion()))
-                                {
-                                    IsSupportedFfuValid = true;
-                                }
-                                else
-                                {
-                                    IsSupportedFfuValid = false;
-                                }
+                                FFU SupportedFFU = new(SupportedFFUPath);
+                                IsSupportedFfuValid = App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V1.1-EFIESP").TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion());
                             }
                         }
                         else
                         {
-                            if (App.Config.FFURepository.Any(e => ((e.Path == SupportedFFUPath) && (App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V2-EFIESP").First().TargetVersions.Any(v => v.Description == e.OSVersion)))))
+                            if (App.Config.FFURepository.Any(e => ((e.Path == SupportedFFUPath) && (App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))))
                             {
                                 IsSupportedFfuValid = true;
                             }
                             else
                             {
-                                FFU SupportedFFU = new FFU(SupportedFFUPath);
-                                if (App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V2-EFIESP").First().TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion()))
-                                {
-                                    IsSupportedFfuValid = true;
-                                }
-                                else
-                                {
-                                    IsSupportedFfuValid = false;
-                                }
+                                FFU SupportedFFU = new(SupportedFFUPath);
+                                IsSupportedFfuValid = App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion());
                             }
                         }
                     }
@@ -865,7 +889,9 @@ namespace WPinternals
                 }
 
                 if (IsSupportedFfuValid && (SupportedFFUPath != null))
+                {
                     ValidatedSupportedFfuPath = SupportedFFUPath;
+                }
             }
             catch
             {
@@ -883,7 +909,7 @@ namespace WPinternals
             set
             {
                 _IsSupportedFfuNeeded = value;
-                OnPropertyChanged("IsSupportedFfuNeeded");
+                OnPropertyChanged(nameof(IsSupportedFfuNeeded));
                 OkCommand.RaiseCanExecuteChanged();
             }
         }
@@ -898,7 +924,7 @@ namespace WPinternals
             set
             {
                 _IsSupportedFfuValid = value;
-                OnPropertyChanged("IsSupportedFfuValid");
+                OnPropertyChanged(nameof(IsSupportedFfuValid));
                 OkCommand.RaiseCanExecuteChanged();
             }
         }
@@ -913,7 +939,7 @@ namespace WPinternals
             set
             {
                 _IsProfileFfuValid = value;
-                OnPropertyChanged("IsProfileFfuValid");
+                OnPropertyChanged(nameof(IsProfileFfuValid));
             }
         }
 
@@ -927,7 +953,7 @@ namespace WPinternals
             set
             {
                 _TargetHasNewFlashProtocol = value;
-                OnPropertyChanged("TargetHasNewFlashProtocol");
+                OnPropertyChanged(nameof(TargetHasNewFlashProtocol));
                 OkCommand.RaiseCanExecuteChanged();
             }
         }
@@ -942,7 +968,7 @@ namespace WPinternals
             set
             {
                 _IsBootLoaderUnlocked = value;
-                OnPropertyChanged("IsBootLoaderUnlocked");
+                OnPropertyChanged(nameof(IsBootLoaderUnlocked));
             }
         }
 
@@ -956,7 +982,7 @@ namespace WPinternals
             set
             {
                 _FFUPath = value;
-                OnPropertyChanged("FFUPath");
+                OnPropertyChanged(nameof(FFUPath));
                 SetSupportedFFUPath();
                 OkCommand.RaiseCanExecuteChanged();
             }
@@ -974,7 +1000,7 @@ namespace WPinternals
                 if (_ProfileFFUPath != value)
                 {
                     _ProfileFFUPath = value;
-                    OnPropertyChanged("ProfileFFUPath");
+                    OnPropertyChanged(nameof(ProfileFFUPath));
                     SetSupportedFFUPath();
                     OkCommand.RaiseCanExecuteChanged();
                 }
@@ -993,10 +1019,12 @@ namespace WPinternals
                 if (_SupportedFFUPath != value)
                 {
                     _SupportedFFUPath = value;
-                    OnPropertyChanged("SupportedFFUPath");
+                    OnPropertyChanged(nameof(SupportedFFUPath));
 
                     if (value != ValidatedSupportedFfuPath)
+                    {
                         ValidateSupportedFfuPath();
+                    }
                 }
             }
         }
@@ -1011,7 +1039,7 @@ namespace WPinternals
             set
             {
                 _LoadersPath = value;
-                OnPropertyChanged("LoadersPath");
+                OnPropertyChanged(nameof(LoadersPath));
             }
         }
 
@@ -1025,7 +1053,7 @@ namespace WPinternals
             set
             {
                 _EDEPath = value;
-                OnPropertyChanged("EDEPath");
+                OnPropertyChanged(nameof(EDEPath));
             }
         }
 
@@ -1039,7 +1067,7 @@ namespace WPinternals
             set
             {
                 _SBL3Path = value;
-                OnPropertyChanged("SBL3Path");
+                OnPropertyChanged(nameof(SBL3Path));
             }
         }
 
@@ -1053,7 +1081,7 @@ namespace WPinternals
             set
             {
                 _CurrentMode = value;
-                OnPropertyChanged("CurrentMode");
+                OnPropertyChanged(nameof(CurrentMode));
             }
         }
 
@@ -1067,47 +1095,11 @@ namespace WPinternals
             set
             {
                 _RootKeyHash = value;
-                OnPropertyChanged("RootKeyHash");
-            }
-        }
-
-        private DelegateCommand _OkCommand = null;
-        public DelegateCommand OkCommand
-        {
-            get
-            {
-                return _OkCommand;
-            }
-            private set
-            {
-                _OkCommand = value;
-            }
-        }
-
-        private DelegateCommand _CancelCommand = null;
-        public DelegateCommand CancelCommand
-        {
-            get
-            {
-                return _CancelCommand;
-            }
-            private set
-            {
-                _CancelCommand = value;
-            }
-        }
-
-        private DelegateCommand _FixCommand = null;
-        public DelegateCommand FixCommand
-        {
-            get
-            {
-                return _FixCommand;
-            }
-            private set
-            {
-                _FixCommand = value;
+                OnPropertyChanged(nameof(RootKeyHash));
             }
         }
+        public DelegateCommand OkCommand { get; } = null;
+        public DelegateCommand CancelCommand { get; } = null;
+        public DelegateCommand FixCommand { get; } = null;
     }
 }
diff --git a/ViewModels/LumiaUnlockBootloaderViewModel.cs b/ViewModels/LumiaUnlockBootloaderViewModel.cs
index c03035e..4dfe134 100644
--- a/ViewModels/LumiaUnlockBootloaderViewModel.cs
+++ b/ViewModels/LumiaUnlockBootloaderViewModel.cs
@@ -37,7 +37,7 @@ namespace WPinternals
             // Send FFU headers
             UInt64 CombinedFFUHeaderSize = FFU.HeaderSize;
             byte[] FfuHeader = new byte[CombinedFFUHeaderSize];
-            System.IO.FileStream FfuFile = new System.IO.FileStream(FFU.Path, System.IO.FileMode.Open, System.IO.FileAccess.Read);
+            FileStream FfuFile = new(FFU.Path, System.IO.FileMode.Open, System.IO.FileAccess.Read);
             FfuFile.Read(FfuHeader, 0, (int)CombinedFFUHeaderSize);
             FfuFile.Close();
 
@@ -56,13 +56,15 @@ namespace WPinternals
         private static void SendLoader(PhoneNotifierViewModel PhoneNotifier, List<QualcommPartition> PossibleLoaders)
         {
             // Assume 9008 mode
-            if (!((PhoneNotifier.CurrentModel is QualcommSerial) && (PossibleLoaders != null) && (PossibleLoaders.Count > 0)))
+            if (!((PhoneNotifier.CurrentModel is QualcommSerial) && (PossibleLoaders?.Count > 0)))
+            {
                 return;
+            }
 
             LogFile.Log("Sending loader");
 
             QualcommSerial Serial = (QualcommSerial)PhoneNotifier.CurrentModel;
-            QualcommDownload Download = new QualcommDownload(Serial);
+            QualcommDownload Download = new(Serial);
             if (Download.IsAlive())
             {
                 int Attempt = 1;
@@ -81,14 +83,18 @@ namespace WPinternals
                     catch { }
 
                     if (Result)
+                    {
                         break;
+                    }
 
                     Attempt++;
                 }
                 Serial.Close();
 
                 if (!Result)
+                {
                     LogFile.Log("Loader failed");
+                }
             }
             else
             {
@@ -99,35 +105,57 @@ namespace WPinternals
 
         internal static async Task LumiaV2RelockUEFI(PhoneNotifierViewModel Notifier, string FFUPath = null, bool DoResetFirst = true, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null, ExitSuccess ExitSuccess = null, ExitFailure ExitFailure = null)
         {
-            if (SetWorkingStatus == null) SetWorkingStatus = (m, s, v, a, st) => { };
-            if (UpdateWorkingStatus == null) UpdateWorkingStatus = (m, s, v, st) => { };
-            if (ExitSuccess == null) ExitSuccess = (m, s) => { };
-            if (ExitFailure == null) ExitFailure = (m, s) => { };
-
-            ExitFailure tmpExitFailure = (m, s) =>
+            if (SetWorkingStatus == null)
             {
-                ExitFailure(m, s);
-            };
+                SetWorkingStatus = (m, s, v, a, st) => { };
+            }
 
-            ExitSuccess tmpExitSuccess = async (m, s) =>
+            if (UpdateWorkingStatus == null)
+            {
+                UpdateWorkingStatus = (m, s, v, st) => { };
+            }
+
+            if (ExitSuccess == null)
+            {
+                ExitSuccess = (m, s) => { };
+            }
+
+            if (ExitFailure == null)
+            {
+                ExitFailure = (m, s) => { };
+            }
+
+            void tmpExitFailure(string m, string s = null) => ExitFailure(m, s);
+
+            async void tmpExitSuccess(string m, string s = null)
             {
                 SetWorkingStatus("Booting phone...");
                 await Notifier.WaitForArrival();
 
                 if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
+                {
                     ((NokiaFlashModel)Notifier.CurrentModel).ContinueBoot();
+                }
 
                 if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Normal)
+                {
                     await Notifier.WaitForArrival();
+                }
 
                 if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
+                {
                     ((NokiaFlashModel)Notifier.CurrentModel).ContinueBoot();
+                }
 
                 if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Normal)
+                {
                     await Notifier.WaitForArrival();
+                }
 
                 if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
+                {
                     ((NokiaFlashModel)Notifier.CurrentModel).ContinueBoot();
+                }
 
                 if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Normal)
                 {
@@ -136,43 +164,64 @@ namespace WPinternals
                 }
 
                 ExitSuccess("Bootloader restored successfully!");
-            };
+            }
 
             await LumiaUnlockBootloaderViewModel.LumiaRelockUEFI(Notifier, FFUPath, DoResetFirst, SetWorkingStatus, UpdateWorkingStatus, tmpExitSuccess, tmpExitFailure);
-
         }
 
         internal static async Task LumiaV2UnlockUEFI(PhoneNotifierViewModel Notifier, string ProfileFFUPath, string EDEPath, string SupportedFFUPath, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null, ExitSuccess ExitSuccess = null, ExitFailure ExitFailure = null, bool ReUnlockDevice = false)
         {
-            if (SetWorkingStatus == null) SetWorkingStatus = (m, s, v, a, st) => { };
-            if (UpdateWorkingStatus == null) UpdateWorkingStatus = (m, s, v, st) => { };
-            if (ExitSuccess == null) ExitSuccess = (m, s) => { };
-            if (ExitFailure == null) ExitFailure = (m, s) => { };
-
-            ExitFailure tmpExitFailure = (m, s) => 
+            if (SetWorkingStatus == null)
             {
-                ExitFailure(m, s);
-            };
+                SetWorkingStatus = (m, s, v, a, st) => { };
+            }
 
-            ExitSuccess tmpExitSuccess = async (m, s) => 
+            if (UpdateWorkingStatus == null)
+            {
+                UpdateWorkingStatus = (m, s, v, st) => { };
+            }
+
+            if (ExitSuccess == null)
+            {
+                ExitSuccess = (m, s) => { };
+            }
+
+            if (ExitFailure == null)
+            {
+                ExitFailure = (m, s) => { };
+            }
+
+            void tmpExitFailure(string m, string s = null) => ExitFailure(m, s);
+
+            async void tmpExitSuccess(string m, string s = null)
             {
                 SetWorkingStatus("Booting phone...");
                 await Notifier.WaitForArrival();
 
                 if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
+                {
                     ((NokiaFlashModel)Notifier.CurrentModel).ContinueBoot();
+                }
 
                 if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Normal)
+                {
                     await Notifier.WaitForArrival();
+                }
 
                 if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
+                {
                     ((NokiaFlashModel)Notifier.CurrentModel).ContinueBoot();
+                }
 
                 if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Normal)
+                {
                     await Notifier.WaitForArrival();
+                }
 
                 if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
+                {
                     ((NokiaFlashModel)Notifier.CurrentModel).ContinueBoot();
+                }
 
                 if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Normal)
                 {
@@ -181,10 +230,9 @@ namespace WPinternals
                 }
 
                 ExitSuccess("Bootloader unlocked successfully!", null);
-            };
+            }
 
             await LumiaUnlockBootloaderViewModel.LumiaUnlockUEFI(Notifier, ProfileFFUPath, EDEPath, SupportedFFUPath, SetWorkingStatus, UpdateWorkingStatus, tmpExitSuccess, tmpExitFailure, ReUnlockDevice: ReUnlockDevice);
-
         }
 
         // Magic!
@@ -198,10 +246,25 @@ namespace WPinternals
         {
             LogFile.BeginAction("RelockBootloader");
 
-            if (SetWorkingStatus == null) SetWorkingStatus = (m, s, v, a, st) => { };
-            if (UpdateWorkingStatus == null) UpdateWorkingStatus = (m, s, v, st) => { };
-            if (ExitSuccess == null) ExitSuccess = (m, s) => { };
-            if (ExitFailure == null) ExitFailure = (m, s) => { };
+            if (SetWorkingStatus == null)
+            {
+                SetWorkingStatus = (m, s, v, a, st) => { };
+            }
+
+            if (UpdateWorkingStatus == null)
+            {
+                UpdateWorkingStatus = (m, s, v, st) => { };
+            }
+
+            if (ExitSuccess == null)
+            {
+                ExitSuccess = (m, s) => { };
+            }
+
+            if (ExitFailure == null)
+            {
+                ExitFailure = (m, s) => { };
+            }
 
             try
             {
@@ -215,23 +278,33 @@ namespace WPinternals
                     });
 
                     if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader && Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash)
+                    {
                         await Notifier.WaitForArrival();
+                    }
 
                     if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
+                    {
                         await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
+                    }
                 }
 
                 LogFile.Log("Assembling data for relock", LogType.FileAndConsole);
                 SetWorkingStatus("Assembling data for relock", null, null);
 
-                if ((FFUPath == null) || (FFUPath.Length == 0))
+                if (string.IsNullOrEmpty(FFUPath))
+                {
                     throw new ArgumentNullException("FFU path is missing");
+                }
 
                 if (Notifier.CurrentInterface == PhoneInterfaces.Qualcomm_Download)
-                    if ((LoadersPath == null) || (LoadersPath.Length == 0))
+                {
+                    if (string.IsNullOrEmpty(LoadersPath))
+                    {
                         throw new Exception("Error: Path for Loaders is mandatory.");
+                    }
+                }
 
-                bool DumpPartitions = false;
+                const bool DumpPartitions = false;
                 string DumpFilePrefix = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\") + DateTime.Now.ToString("yyyy-MM-dd hh.mm.ss") + " - ";
                 bool IsBootLoaderUnlocked = false;
 
@@ -250,9 +323,14 @@ namespace WPinternals
                 {
                     FlashVersion FlashVersion = ((NokiaFlashModel)Notifier.CurrentModel).GetFlashVersion();
                     if (FlashVersion == null)
+                    {
                         throw new Exception("Error: The version of the Flash Application on the phone could not be determined.");
+                    }
+
                     if ((FlashVersion.ApplicationMajor < 1) || ((FlashVersion.ApplicationMajor == 1) && (FlashVersion.ApplicationMinor < 28)))
+                    {
                         throw new Exception("Error: The version of the Flash Application on the phone is too old. Update your phone using Windows Updates or flash a newer ROM to your phone. Then try again.");
+                    }
 
                     UefiSecurityStatusResponse SecurityStatus = ((NokiaFlashModel)Notifier.CurrentModel).ReadSecurityStatus();
                     IsBootLoaderUnlocked = (SecurityStatus.AuthenticationStatus || SecurityStatus.RdcStatus || !SecurityStatus.SecureFfuEfuseStatus);
@@ -277,20 +355,28 @@ namespace WPinternals
                     ((NokiaFlashModel)Notifier.CurrentModel).ResetPhone();
 
                     if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader)
+                    {
                         await Notifier.WaitForArrival();
+                    }
 
                     if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader)
+                    {
                         throw new WPinternalsException("Phone is in an unexpected mode.", "The phone should have been detected in bootloader mode. Instead it has been detected in " + Notifier.CurrentInterface.ToString() + " mode.");
+                    }
 
                     NewGPT = ((NokiaFlashModel)Notifier.CurrentModel).ReadGPT();
 
                     await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
 
                     if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash)
+                    {
                         await Notifier.WaitForArrival();
+                    }
 
                     if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash)
+                    {
                         throw new WPinternalsException("Phone is in an unexpected mode.", "The phone should have been detected in flash mode. Instead it has been detected in " + Notifier.CurrentInterface.ToString() + " mode.");
+                    }
                 }
                 else
                 {
@@ -359,7 +445,7 @@ namespace WPinternals
                 byte[] RootKeyHash = null;
                 if (Notifier.CurrentInterface == PhoneInterfaces.Qualcomm_Download)
                 {
-                    QualcommDownload Download = new QualcommDownload((QualcommSerial)Notifier.CurrentModel);
+                    QualcommDownload Download = new((QualcommSerial)Notifier.CurrentModel);
                     RootKeyHash = Download.GetRKH();
                 }
                 else if (Notifier.CurrentInterface != PhoneInterfaces.Qualcomm_Flash)
@@ -501,7 +587,7 @@ namespace WPinternals
                         (UInt64)(UEFI.Length / 0x200);
 
                     SetWorkingStatus("Flashing original bootloader...", MaxProgressValue: 100, Status: WPinternalsStatus.Flashing);
-                    ProgressUpdater Progress = new ProgressUpdater(TotalSectorCount, (int ProgressPercentage, TimeSpan? TimeSpan) => UpdateWorkingStatus("Flashing original bootloader...", CurrentProgressValue: (ulong)ProgressPercentage, Status: WPinternalsStatus.Flashing));
+                    ProgressUpdater Progress = new(TotalSectorCount, (int ProgressPercentage, TimeSpan? TimeSpan) => UpdateWorkingStatus("Flashing original bootloader...", CurrentProgressValue: (ulong)ProgressPercentage, Status: WPinternalsStatus.Flashing));
 
                     LogFile.Log("Flash GPT at 0x" + ((UInt32)0x200).ToString("X8"));
                     CurrentModel.FlashSectors(1, GPT, 0);
@@ -524,9 +610,14 @@ namespace WPinternals
                         SetWorkingStatus("Switching to Emergency Download mode...");
                         PerformSoftBrick(Notifier, FFU);
                         if (Notifier.CurrentInterface != PhoneInterfaces.Qualcomm_Download)
+                        {
                             await Notifier.WaitForArrival();
+                        }
+
                         if (Notifier.CurrentInterface != PhoneInterfaces.Qualcomm_Download)
+                        {
                             throw new WPinternalsException("Phone failed to switch to emergency download mode.");
+                        }
                     }
 
                     // Send loader
@@ -535,16 +626,21 @@ namespace WPinternals
                         SetWorkingStatus("Sending loader...");
                         SendLoader(Notifier, PossibleLoaders);
                         if (Notifier.CurrentInterface != PhoneInterfaces.Qualcomm_Flash)
+                        {
                             await Notifier.WaitForArrival();
+                        }
+
                         if (Notifier.CurrentInterface != PhoneInterfaces.Qualcomm_Flash)
+                        {
                             throw new WPinternalsException("Phone failed to switch to emergency flash mode.");
+                        }
                     }
 
                     // Flash bootloader
                     QualcommSerial Serial = (QualcommSerial)Notifier.CurrentModel;
                     Serial.EncodeCommands = false;
 
-                    QualcommFlasher Flasher = new QualcommFlasher(Serial);
+                    QualcommFlasher Flasher = new(Serial);
 
                     UInt64 TotalSectorCount = (UInt64)1 + 0x21 + 1 +
                         (UInt64)(SBL2.Length / 0x200) +
@@ -556,7 +652,7 @@ namespace WPinternals
                         NewGPT.GetPartition("WINSECAPP").SizeInSectors;
 
                     SetWorkingStatus("Flashing original bootloader...", MaxProgressValue: 100, Status: WPinternalsStatus.Flashing);
-                    ProgressUpdater Progress = new ProgressUpdater(TotalSectorCount, (int ProgressPercentage, TimeSpan? TimeSpan) => UpdateWorkingStatus("Flashing original bootloader...", CurrentProgressValue: (ulong)ProgressPercentage, Status: WPinternalsStatus.Flashing));
+                    ProgressUpdater Progress = new(TotalSectorCount, (int ProgressPercentage, TimeSpan? TimeSpan) => UpdateWorkingStatus("Flashing original bootloader...", CurrentProgressValue: (ulong)ProgressPercentage, Status: WPinternalsStatus.Flashing));
 
                     Flasher.Hello();
                     Flasher.SetSecurityMode(0);
@@ -591,7 +687,10 @@ namespace WPinternals
                     UInt32 Length = (UInt32)FFU.GetPartition("WINSECAPP").Length;
                     UInt32 Start = (UInt32)NewGPT.GetPartition("WINSECAPP").FirstSector * 0x200;
                     if ((Start + Length) > 0x1E7FE00)
+                    {
                         Length = 0x1E7FE00 - Start;
+                    }
+
                     LogFile.Log("Flash WINSECAPP at 0x" + ((UInt32)NewGPT.GetPartition("WINSECAPP").FirstSector * 0x200).ToString("X8"));
                     Flasher.Flash(Start, FFU.GetPartition("WINSECAPP"), Progress, 0, Length);
 
@@ -606,10 +705,14 @@ namespace WPinternals
                     Flasher.CloseSerial();
 
                     if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader && Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash)
+                    {
                         await Notifier.WaitForArrival();
+                    }
 
                     if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader && Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash)
+                    {
                         throw new WPinternalsException("Phone is in an unexpected mode.", "The phone should have been detected in flash mode. Instead it has been detected in " + Notifier.CurrentInterface.ToString() + " mode.");
+                    }
 
                     if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
                     {
@@ -625,32 +728,48 @@ namespace WPinternals
                 await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Bootloader);
 
                 if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader && Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash)
+                {
                     await Notifier.WaitForArrival();
+                }
 
                 if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader && Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash)
+                {
                     throw new WPinternalsException("Phone is in an unexpected mode.", "The phone should have been detected in flash mode. Instead it has been detected in " + Notifier.CurrentInterface.ToString() + " mode.");
+                }
 
                 NokiaFlashModel FlashModel = (NokiaFlashModel)Notifier.CurrentModel;
                 if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Flash && FlashModel.ReadParam("FS")[3] > 0)
+                {
                     ExitSuccess("Bootloader is restored", "NOTE: You need to flash a stock ROM because you recovered a phone from a bootloader unlock failure.");
+                }
                 else
                 {
                     SetWorkingStatus("Booting phone...");
 
                     if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
+                    {
                         ((NokiaFlashModel)Notifier.CurrentModel).ContinueBoot();
+                    }
 
                     if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Normal)
+                    {
                         await Notifier.WaitForArrival();
+                    }
 
                     if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
+                    {
                         ((NokiaFlashModel)Notifier.CurrentModel).ContinueBoot();
+                    }
 
                     if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Normal)
+                    {
                         await Notifier.WaitForArrival();
+                    }
 
                     if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
+                    {
                         ((NokiaFlashModel)Notifier.CurrentModel).ContinueBoot();
+                    }
 
                     if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Normal)
                     {
@@ -685,20 +804,37 @@ namespace WPinternals
         {
             LogFile.BeginAction("UnlockBootloader");
 
-            if (SetWorkingStatus == null) SetWorkingStatus = (m, s, v, a, st) => { };
-            if (UpdateWorkingStatus == null) UpdateWorkingStatus = (m, s, v, st) => { };
-            if (ExitSuccess == null) ExitSuccess = (m, s) => { };
-            if (ExitFailure == null) ExitFailure = (m, s) => { };
+            if (SetWorkingStatus == null)
+            {
+                SetWorkingStatus = (m, s, v, a, st) => { };
+            }
+
+            if (UpdateWorkingStatus == null)
+            {
+                UpdateWorkingStatus = (m, s, v, st) => { };
+            }
+
+            if (ExitSuccess == null)
+            {
+                ExitSuccess = (m, s) => { };
+            }
+
+            if (ExitFailure == null)
+            {
+                ExitFailure = (m, s) => { };
+            }
 
             try
             {
                 LogFile.Log("Assembling data for unlock", LogType.FileAndConsole);
                 SetWorkingStatus("Assembling data for unlock", null, null);
 
-                if ((FFUPath == null) || (FFUPath.Length == 0))
+                if (string.IsNullOrEmpty(FFUPath))
+                {
                     throw new ArgumentNullException("FFU path is missing");
+                }
 
-                bool DumpPartitions = false;
+                const bool DumpPartitions = false;
                 string DumpFilePrefix = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\") + DateTime.Now.ToString("yyyy-MM-dd hh.mm.ss") + " - ";
                 bool IsBootLoaderUnlocked = false;
 
@@ -717,9 +853,14 @@ namespace WPinternals
                 {
                     FlashVersion FlashVersion = ((NokiaFlashModel)Notifier.CurrentModel).GetFlashVersion();
                     if (FlashVersion == null)
+                    {
                         throw new Exception("Error: The version of the Flash Application on the phone could not be determined.");
+                    }
+
                     if ((FlashVersion.ApplicationMajor < 1) || ((FlashVersion.ApplicationMajor == 1) && (FlashVersion.ApplicationMinor < 28)))
+                    {
                         throw new Exception("Error: The version of the Flash Application on the phone is too old. Update your phone using Windows Updates or flash a newer ROM to your phone. Then try again.");
+                    }
 
                     UefiSecurityStatusResponse SecurityStatus = ((NokiaFlashModel)Notifier.CurrentModel).ReadSecurityStatus();
                     IsBootLoaderUnlocked = (SecurityStatus.AuthenticationStatus || SecurityStatus.RdcStatus || !SecurityStatus.SecureFfuEfuseStatus);
@@ -727,12 +868,14 @@ namespace WPinternals
 
                 if (!IsBootLoaderUnlocked)
                 {
-                    if ((LoadersPath == null) || (LoadersPath.Length == 0))
+                    if (string.IsNullOrEmpty(LoadersPath))
+                    {
                         throw new Exception("Error: Path for Loaders is mandatory.");
+                    }
                 }
 
                 FFU SupportedFFU = null;
-                if (App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V1.1-EFIESP").First().TargetVersions.Any(v => v.Description == FFU.GetOSVersion()))
+                if (App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V1.1-EFIESP").TargetVersions.Any(v => v.Description == FFU.GetOSVersion()))
                 {
                     SupportedFFU = FFU;
                 }
@@ -751,8 +894,10 @@ namespace WPinternals
                         LogFile.LogException(Ex);
                         throw new Exception("Error: Parsing Supported FFU-file failed.");
                     }
-                    if (!App.PatchEngine.PatchDefinitions.Where(p => p.Name == "SecureBootHack-V1.1-EFIESP").First().TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion()))
+                    if (!App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V1.1-EFIESP").TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion()))
+                    {
                         throw new ArgumentNullException("Donor-FFU with supported OS version was not provided");
+                    }
                 }
 
                 if (DumpPartitions)
@@ -768,27 +913,34 @@ namespace WPinternals
                     }
                 }
 
-
                 GPT NewGPT = null;
                 if (Notifier.CurrentModel is NokiaFlashModel)
                 {
                     ((NokiaFlashModel)Notifier.CurrentModel).ResetPhone();
 
                     if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader)
+                    {
                         await Notifier.WaitForArrival();
+                    }
 
                     if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader)
+                    {
                         throw new WPinternalsException("Phone is in an unexpected mode.", "The phone should have been detected in bootloader mode. Instead it has been detected in " + Notifier.CurrentInterface.ToString() + " mode.");
+                    }
 
                     NewGPT = ((NokiaFlashModel)Notifier.CurrentModel).ReadGPT();
 
                     await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
 
                     if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash)
+                    {
                         await Notifier.WaitForArrival();
+                    }
 
                     if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash)
+                    {
                         throw new WPinternalsException("Phone is in an unexpected mode.", "The phone should have been detected in flash mode. Instead it has been detected in " + Notifier.CurrentInterface.ToString() + " mode.");
+                    }
                 }
                 else
                 {
@@ -814,13 +966,15 @@ namespace WPinternals
                     Partition IsUnlockedFlag = NewGPT.GetPartition("IS_UNLOCKED_SBL3");
                     if (IsUnlockedFlag == null)
                     {
-                        IsUnlockedFlag = new Partition();
-                        IsUnlockedFlag.Name = "IS_UNLOCKED_SBL3";
-                        IsUnlockedFlag.Attributes = 0;
-                        IsUnlockedFlag.PartitionGuid = Guid.NewGuid();
-                        IsUnlockedFlag.PartitionTypeGuid = Guid.NewGuid();
-                        IsUnlockedFlag.FirstSector = 0x40;
-                        IsUnlockedFlag.LastSector = 0x40;
+                        IsUnlockedFlag = new Partition
+                        {
+                            Name = "IS_UNLOCKED_SBL3",
+                            Attributes = 0,
+                            PartitionGuid = Guid.NewGuid(),
+                            PartitionTypeGuid = Guid.NewGuid(),
+                            FirstSector = 0x40,
+                            LastSector = 0x40
+                        };
                         NewGPT.Partitions.Add(IsUnlockedFlag);
                         GPT = NewGPT.Rebuild();
                     }
@@ -866,7 +1020,7 @@ namespace WPinternals
                 byte[] RootKeyHash = null;
                 if (Notifier.CurrentInterface == PhoneInterfaces.Qualcomm_Download)
                 {
-                    QualcommDownload Download = new QualcommDownload((QualcommSerial)Notifier.CurrentModel);
+                    QualcommDownload Download = new((QualcommSerial)Notifier.CurrentModel);
                     RootKeyHash = Download.GetRKH();
                 }
                 else if (Notifier.CurrentInterface != PhoneInterfaces.Qualcomm_Flash)
@@ -1126,7 +1280,7 @@ namespace WPinternals
                         (UInt64)(UEFI.Length / 0x200);
 
                     SetWorkingStatus("Flashing unlocked bootloader (part 1)...", MaxProgressValue: 100, Status: WPinternalsStatus.Flashing);
-                    ProgressUpdater Progress = new ProgressUpdater(TotalSectorCount, (int ProgressPercentage, TimeSpan? TimeSpan) => UpdateWorkingStatus("Flashing unlocked bootloader (part 1)...", CurrentProgressValue: (ulong)ProgressPercentage, Status: WPinternalsStatus.Flashing));
+                    ProgressUpdater Progress = new(TotalSectorCount, (int ProgressPercentage, TimeSpan? TimeSpan) => UpdateWorkingStatus("Flashing unlocked bootloader (part 1)...", CurrentProgressValue: (ulong)ProgressPercentage, Status: WPinternalsStatus.Flashing));
 
                     LogFile.Log("Flash GPT at 0x" + ((UInt32)0x200).ToString("X8"));
                     CurrentModel.FlashSectors(1, GPT, 0);
@@ -1155,9 +1309,14 @@ namespace WPinternals
                         SetWorkingStatus("Switching to Emergency Download mode...");
                         PerformSoftBrick(Notifier, FFU);
                         if (Notifier.CurrentInterface != PhoneInterfaces.Qualcomm_Download)
+                        {
                             await Notifier.WaitForArrival();
+                        }
+
                         if (Notifier.CurrentInterface != PhoneInterfaces.Qualcomm_Download)
+                        {
                             throw new WPinternalsException("Phone failed to switch to emergency download mode.");
+                        }
                     }
 
                     // Send loader
@@ -1166,16 +1325,21 @@ namespace WPinternals
                         SetWorkingStatus("Sending loader...");
                         SendLoader(Notifier, PossibleLoaders);
                         if (Notifier.CurrentInterface != PhoneInterfaces.Qualcomm_Flash)
+                        {
                             await Notifier.WaitForArrival();
+                        }
+
                         if (Notifier.CurrentInterface != PhoneInterfaces.Qualcomm_Flash)
+                        {
                             throw new WPinternalsException("Phone failed to switch to emergency flash mode.");
+                        }
                     }
 
                     // Flash bootloader
                     QualcommSerial Serial = (QualcommSerial)Notifier.CurrentModel;
                     Serial.EncodeCommands = false;
 
-                    QualcommFlasher Flasher = new QualcommFlasher(Serial);
+                    QualcommFlasher Flasher = new(Serial);
 
                     UInt64 TotalSectorCount = (UInt64)1 + 0x21 + 1 +
                         (UInt64)(SBL2.Length / 0x200) +
@@ -1187,7 +1351,7 @@ namespace WPinternals
                         NewGPT.GetPartition("WINSECAPP").SizeInSectors;
 
                     SetWorkingStatus("Flashing unlocked bootloader (part 1)...", MaxProgressValue: 100, Status: WPinternalsStatus.Flashing);
-                    ProgressUpdater Progress = new ProgressUpdater(TotalSectorCount, (int ProgressPercentage, TimeSpan? TimeSpan) => UpdateWorkingStatus("Flashing unlocked bootloader (part 1)...", CurrentProgressValue: (ulong)ProgressPercentage, Status: WPinternalsStatus.Flashing));
+                    ProgressUpdater Progress = new(TotalSectorCount, (int ProgressPercentage, TimeSpan? TimeSpan) => UpdateWorkingStatus("Flashing unlocked bootloader (part 1)...", CurrentProgressValue: (ulong)ProgressPercentage, Status: WPinternalsStatus.Flashing));
 
                     Flasher.Hello();
                     Flasher.SetSecurityMode(0);
@@ -1228,7 +1392,10 @@ namespace WPinternals
                     UInt32 Length = (UInt32)FFU.GetPartition("WINSECAPP").Length;
                     UInt32 Start = (UInt32)NewGPT.GetPartition("WINSECAPP").FirstSector * 0x200;
                     if ((Start + Length) > 0x1E7FE00)
+                    {
                         Length = 0x1E7FE00 - Start;
+                    }
+
                     LogFile.Log("Flash WINSECAPP at 0x" + ((UInt32)NewGPT.GetPartition("WINSECAPP").FirstSector * 0x200).ToString("X8"));
                     Flasher.Flash(Start, FFU.GetPartition("WINSECAPP"), Progress, 0, Length);
 
@@ -1243,10 +1410,14 @@ namespace WPinternals
                     Flasher.CloseSerial();
 
                     if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader && Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash)
+                    {
                         await Notifier.WaitForArrival();
+                    }
 
                     if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader && Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash)
+                    {
                         throw new WPinternalsException("Phone is in an unexpected mode.", "The phone should have been detected in flash mode. Instead it has been detected in " + Notifier.CurrentInterface.ToString() + " mode.");
+                    }
 
                     if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
                     {
@@ -1270,19 +1441,29 @@ namespace WPinternals
                 SetWorkingStatus("Booting phone...");
 
                 if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
+                {
                     ((NokiaFlashModel)Notifier.CurrentModel).ContinueBoot();
+                }
 
                 if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Normal)
+                {
                     await Notifier.WaitForArrival();
+                }
 
                 if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
+                {
                     ((NokiaFlashModel)Notifier.CurrentModel).ContinueBoot();
+                }
 
                 if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Normal)
+                {
                     await Notifier.WaitForArrival();
+                }
 
                 if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
+                {
                     ((NokiaFlashModel)Notifier.CurrentModel).ContinueBoot();
+                }
 
                 if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Normal)
                 {
@@ -1315,7 +1496,9 @@ namespace WPinternals
             FlashAppType OriginalAppType = Info.App;
             bool Switch = ((Info.App != FlashAppType.BootManager) && Info.IsBootloaderSecure);
             if (Switch)
+            {
                 FlashModel.SwitchToBootManagerContext();
+            }
 
             byte[] Request = new byte[0x04];
             const string Header = "NOKT";
@@ -1324,20 +1507,28 @@ namespace WPinternals
 
             byte[] Buffer = FlashModel.ExecuteRawMethod(Request);
             if ((Buffer == null) || (Buffer.Length < 0x4408))
+            {
                 throw new InvalidOperationException("Unable to read GPT!");
+            }
 
             UInt16 Error = (UInt16)((Buffer[6] << 8) + Buffer[7]);
             if (Error > 0)
+            {
                 throw new NotSupportedException("ReadGPT: Error 0x" + Error.ToString("X4"));
+            }
 
             System.Buffer.BlockCopy(Buffer, 8, GPTChunk, 0, 0x4400);
 
             if (Switch)
             {
                 if (OriginalAppType == FlashAppType.FlashApp)
+                {
                     FlashModel.SwitchToFlashAppContext();
+                }
                 else
+                {
                     FlashModel.SwitchToPhoneInfoAppContext();
+                }
             }
 
             return GPTChunk;
@@ -1350,10 +1541,25 @@ namespace WPinternals
         //
         internal static async Task LumiaRelockUEFI(PhoneNotifierViewModel Notifier, string FFUPath = null, bool DoResetFirst = true, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null, ExitSuccess ExitSuccess = null, ExitFailure ExitFailure = null)
         {
-            if (SetWorkingStatus == null) SetWorkingStatus = (m, s, v, a, st) => { };
-            if (UpdateWorkingStatus == null) UpdateWorkingStatus = (m, s, v, st) => { };
-            if (ExitSuccess == null) ExitSuccess = (m, s) => { };
-            if (ExitFailure == null) ExitFailure = (m, s) => { };
+            if (SetWorkingStatus == null)
+            {
+                SetWorkingStatus = (m, s, v, a, st) => { };
+            }
+
+            if (UpdateWorkingStatus == null)
+            {
+                UpdateWorkingStatus = (m, s, v, st) => { };
+            }
+
+            if (ExitSuccess == null)
+            {
+                ExitSuccess = (m, s) => { };
+            }
+
+            if (ExitFailure == null)
+            {
+                ExitFailure = (m, s) => { };
+            }
 
             LogFile.BeginAction("RelockPhone");
             try
@@ -1365,7 +1571,9 @@ namespace WPinternals
                 LogFile.Log("Command: Relock phone", LogType.FileAndConsole);
 
                 if (Notifier.CurrentInterface == null)
+                {
                     await Notifier.WaitForArrival();
+                }
 
                 byte[] EFIESPBackup = null;
 
@@ -1378,13 +1586,17 @@ namespace WPinternals
                     ((NokiaFlashModel)Notifier.CurrentModel).ResetPhone();
 
                     if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader)
+                    {
                         await Notifier.WaitForArrival();
+                    }
 
                     if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader)
+                    {
                         throw new WPinternalsException("Phone is in an unexpected mode.", "The phone should have been detected in bootloader mode. Instead it has been detected in " + Notifier.CurrentInterface.ToString() + " mode.");
+                    }
                 }
 
-                byte[] GPTChunk = GetGptChunk(((NokiaFlashModel)Notifier.CurrentModel), 0x20000);
+                byte[] GPTChunk = GetGptChunk((NokiaFlashModel)Notifier.CurrentModel, 0x20000);
                 GPT = new GPT(GPTChunk);
                 bool GPTChanged = false;
                 Partition IsUnlockedPartitionSBL3 = GPT.GetPartition("IS_UNLOCKED_SBL3");
@@ -1392,7 +1604,9 @@ namespace WPinternals
                 {
                     Partition BackNV = GPT.GetPartition("BACKUP_BS_NV");
                     if (BackNV != null)
+                    {
                         UndoEFIESPPadding = true;
+                    }
                 }
 
                 if (!IsSpecB)
@@ -1400,10 +1614,14 @@ namespace WPinternals
                     await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
 
                     if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash)
+                    {
                         await Notifier.WaitForArrival();
+                    }
 
                     if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash)
+                    {
                         throw new WPinternalsException("Phone is in an unexpected mode.", "The phone should have been detected in flash mode. Instead it has been detected in " + Notifier.CurrentInterface.ToString() + " mode.");
+                    }
                 }
 
                 if (IsSpecB || IsUnlockedPartitionSBL3 != null)
@@ -1416,7 +1634,9 @@ namespace WPinternals
                         }
 
                         if (!(Notifier.CurrentModel is MassStorage))
+                        {
                             throw new WPinternalsException("Failed to switch to Mass Storage mode");
+                        }
 
                         SetWorkingStatus("Patching...", null, null, Status: WPinternalsStatus.Patching);
 
@@ -1434,20 +1654,22 @@ namespace WPinternals
 
                         // Edit BCD
                         LogFile.Log("Edit BCD");
-                        using (Stream BCDFileStream = new System.IO.FileStream(Storage.Drive + @"\EFIESP\efi\Microsoft\Boot\BCD", FileMode.Open, FileAccess.ReadWrite))
+                        using (Stream BCDFileStream = new FileStream(Storage.Drive + @"\EFIESP\efi\Microsoft\Boot\BCD", FileMode.Open, FileAccess.ReadWrite))
                         {
-                            using (DiscUtils.Registry.RegistryHive BCDHive = new DiscUtils.Registry.RegistryHive(BCDFileStream))
+                            using DiscUtils.Registry.RegistryHive BCDHive = new(BCDFileStream);
+                            DiscUtils.BootConfig.Store BCDStore = new(BCDHive.Root);
+                            DiscUtils.BootConfig.BcdObject MobileStartupObject = BCDStore.GetObject(new Guid("{01de5a27-8705-40db-bad6-96fa5187d4a6}"));
+                            DiscUtils.BootConfig.Element NoCodeIntegrityElement = MobileStartupObject.GetElement(0x16000048);
+                            if (NoCodeIntegrityElement != null)
                             {
-                                DiscUtils.BootConfig.Store BCDStore = new DiscUtils.BootConfig.Store(BCDHive.Root);
-                                DiscUtils.BootConfig.BcdObject MobileStartupObject = BCDStore.GetObject(new Guid("{01de5a27-8705-40db-bad6-96fa5187d4a6}"));
-                                DiscUtils.BootConfig.Element NoCodeIntegrityElement = MobileStartupObject.GetElement(0x16000048);
-                                if (NoCodeIntegrityElement != null)
-                                    MobileStartupObject.RemoveElement(0x16000048);
+                                MobileStartupObject.RemoveElement(0x16000048);
+                            }
 
-                                DiscUtils.BootConfig.BcdObject WinLoadObject = BCDStore.GetObject(new Guid("{7619dcc9-fafe-11d9-b411-000476eba25f}"));
-                                NoCodeIntegrityElement = WinLoadObject.GetElement(0x16000048);
-                                if (NoCodeIntegrityElement != null)
-                                    WinLoadObject.RemoveElement(0x16000048);
+                            DiscUtils.BootConfig.BcdObject WinLoadObject = BCDStore.GetObject(new Guid("{7619dcc9-fafe-11d9-b411-000476eba25f}"));
+                            NoCodeIntegrityElement = WinLoadObject.GetElement(0x16000048);
+                            if (NoCodeIntegrityElement != null)
+                            {
+                                WinLoadObject.RemoveElement(0x16000048);
                             }
                         }
 
@@ -1505,19 +1727,25 @@ namespace WPinternals
 
                 // Phone can also be in normal mode if switching to Mass Storage Mode had failed.
                 if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Normal)
+                {
                     await SwitchModeViewModel.SwitchToWithStatus(Notifier, PhoneInterfaces.Lumia_Flash, SetWorkingStatus, UpdateWorkingStatus);
+                }
 
                 if ((Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader) && (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash))
+                {
                     await Notifier.WaitForArrival();
+                }
 
                 SetWorkingStatus("Flashing...", "The phone may reboot a couple of times. Just wait for it.", null, Status: WPinternalsStatus.Initializing);
 
                 ((NokiaFlashModel)Notifier.CurrentModel).SwitchToFlashAppContext();
 
-                List<FlashPart> FlashParts = new List<FlashPart>();
+                List<FlashPart> FlashParts = new();
 
                 if (UndoEFIESPPadding)
+                {
                     FlashParts = LumiaUnlockBootloaderViewModel.LumiaGenerateUndoEFIESPFlashPayload(GPT, new FFU(FFUPath), IsSpecB);
+                }
 
                 FlashPart Part;
 
@@ -1560,9 +1788,11 @@ namespace WPinternals
                 if (GPTChanged)
                 {
                     GPT.Rebuild();
-                    Part = new FlashPart();
-                    Part.StartSector = 0;
-                    Part.Stream = new MemoryStream(GPTChunk);
+                    Part = new FlashPart
+                    {
+                        StartSector = 0,
+                        Stream = new MemoryStream(GPTChunk)
+                    };
                     FlashParts.Add(Part);
                 }
 
@@ -1597,7 +1827,9 @@ namespace WPinternals
                         if (SetWorkingStatus != null)
                         {
                             if ((st == WPinternalsStatus.Scanning) || (st == WPinternalsStatus.WaitingForManualReset))
+                            {
                                 SetWorkingStatus(m, s, v, a, st);
+                            }
                             else if ((LastStatus == WPinternalsStatus.Scanning) || (LastStatus == WPinternalsStatus.WaitingForManualReset) || (LastStatus == WPinternalsStatus.Undefined))
                             {
                                 MaxProgressValue = v;
@@ -1611,11 +1843,18 @@ namespace WPinternals
                         if (UpdateWorkingStatus != null)
                         {
                             if ((st == WPinternalsStatus.Scanning) || (st == WPinternalsStatus.WaitingForManualReset))
+                            {
                                 UpdateWorkingStatus(m, s, v, st);
+                            }
                             else if ((LastStatus == WPinternalsStatus.Scanning) || (LastStatus == WPinternalsStatus.WaitingForManualReset))
+                            {
                                 SetWorkingStatus("Flashing...", "The phone may reboot a couple of times. Just wait for it.", MaxProgressValue, Status: WPinternalsStatus.Flashing);
+                            }
                             else
+                            {
                                 UpdateWorkingStatus("Flashing...", "The phone may reboot a couple of times. Just wait for it.", v, Status: WPinternalsStatus.Flashing);
+                            }
+
                             LastStatus = st;
                         }
                     });
@@ -1631,10 +1870,14 @@ namespace WPinternals
                     // When phone was forcably crashed, it can be in emergency mode, or still rebooting. Then also wait for device arrival.
                     // But it is also possible that it is already in bootmgr mode after being crashed (Lumia 950 / 950XL). In that case don't wait for arrival.
                     if (!NvCleared || ((Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader) && (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash)))
+                    {
                         await Notifier.WaitForArrival();
+                    }
 
                     if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
+                    {
                         ((NokiaFlashModel)Notifier.CurrentModel).SwitchToFlashAppContext();
+                    }
 
                     if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Flash)
                     {
@@ -1664,10 +1907,25 @@ namespace WPinternals
             LogFile.BeginAction("UnlockBootloader");
             NokiaFlashModel FlashModel = (NokiaFlashModel)Notifier.CurrentModel;
 
-            if (SetWorkingStatus == null) SetWorkingStatus = (m, s, v, a, st) => { };
-            if (UpdateWorkingStatus == null) UpdateWorkingStatus = (m, s, v, st) => { };
-            if (ExitSuccess == null) ExitSuccess = (m, s) => { };
-            if (ExitFailure == null) ExitFailure = (m, s) => { };
+            if (SetWorkingStatus == null)
+            {
+                SetWorkingStatus = (m, s, v, a, st) => { };
+            }
+
+            if (UpdateWorkingStatus == null)
+            {
+                UpdateWorkingStatus = (m, s, v, st) => { };
+            }
+
+            if (ExitSuccess == null)
+            {
+                ExitSuccess = (m, s) => { };
+            }
+
+            if (ExitFailure == null)
+            {
+                ExitFailure = (m, s) => { };
+            }
 
             try
             {
@@ -1675,30 +1933,42 @@ namespace WPinternals
                 bool IsSpecB = Info.FlashAppProtocolVersionMajor >= 2;
 
                 if (ProfileFFUPath == null)
+                {
                     throw new ArgumentNullException("Profile FFU path is missing");
+                }
 
-                FFU ProfileFFU = new FFU(ProfileFFUPath);
+                FFU ProfileFFU = new(ProfileFFUPath);
 
                 if (Info.IsBootloaderSecure)
                 {
                     if (!Info.PlatformID.StartsWith(ProfileFFU.PlatformID, StringComparison.OrdinalIgnoreCase))
+                    {
                         throw new ArgumentNullException("Profile FFU has wrong Platform ID for connected phone");
+                    }
                 }
 
                 string Patch = "SecureBootHack-V1.1-EFIESP";
                 if (IsSpecB)
+                {
                     Patch = "SecureBootHack-V2-EFIESP";
+                }
 
                 FFU SupportedFFU = null;
-                if (App.PatchEngine.PatchDefinitions.Where(p => p.Name == Patch).First().TargetVersions.Any(v => v.Description == ProfileFFU.GetOSVersion()))
+                if (App.PatchEngine.PatchDefinitions.First(p => p.Name == Patch).TargetVersions.Any(v => v.Description == ProfileFFU.GetOSVersion()))
+                {
                     SupportedFFU = ProfileFFU;
+                }
                 else if (SupportedFFUPath == null)
+                {
                     throw new ArgumentNullException("Donor-FFU with supported OS version was not provided");
+                }
                 else
                 {
                     SupportedFFU = new FFU(SupportedFFUPath);
-                    if (!App.PatchEngine.PatchDefinitions.Where(p => p.Name == Patch).First().TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion()))
+                    if (!App.PatchEngine.PatchDefinitions.First(p => p.Name == Patch).TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion()))
+                    {
                         throw new ArgumentNullException("Donor-FFU with supported OS version was not provided");
+                    }
                 }
 
                 // TODO: Check EDE file
@@ -1712,13 +1982,13 @@ namespace WPinternals
                 byte[] GPTChunk = GetGptChunk(FlashModel, (UInt32)ProfileFFU.ChunkSize);
                 byte[] GPTChunkBackup = new byte[GPTChunk.Length];
                 Buffer.BlockCopy(GPTChunk, 0, GPTChunkBackup, 0, GPTChunk.Length);
-                GPT GPT = new GPT(GPTChunk);
+                GPT GPT = new(GPTChunk);
                 bool GPTChanged = false;
 
                 LogFile.Log("Enabling Test Signing", LogType.FileAndConsole);
                 SetWorkingStatus("Enabling Test Signing", null, null);
 
-                List<FlashPart> Parts = new List<FlashPart>();
+                List<FlashPart> Parts = new();
                 FlashPart Part;
 
                 // Now add NV partition
@@ -1732,12 +2002,14 @@ namespace WPinternals
                     BACKUP_BS_NV.Name = "BACKUP_BS_NV";
                     BACKUP_BS_NV.PartitionGuid = Guid.NewGuid();
                     BACKUP_BS_NV.PartitionTypeGuid = Guid.NewGuid();
-                    UEFI_BS_NV = new Partition();
-                    UEFI_BS_NV.Name = "UEFI_BS_NV";
-                    UEFI_BS_NV.Attributes = BACKUP_BS_NV.Attributes;
-                    UEFI_BS_NV.PartitionGuid = OriginalPartitionGuid;
-                    UEFI_BS_NV.PartitionTypeGuid = OriginalPartitionTypeGuid;
-                    UEFI_BS_NV.FirstSector = BACKUP_BS_NV.LastSector + 1;
+                    UEFI_BS_NV = new Partition
+                    {
+                        Name = "UEFI_BS_NV",
+                        Attributes = BACKUP_BS_NV.Attributes,
+                        PartitionGuid = OriginalPartitionGuid,
+                        PartitionTypeGuid = OriginalPartitionTypeGuid,
+                        FirstSector = BACKUP_BS_NV.LastSector + 1
+                    };
                     UEFI_BS_NV.LastSector = UEFI_BS_NV.FirstSector + BACKUP_BS_NV.LastSector - BACKUP_BS_NV.FirstSector;
                     GPT.Partitions.Add(UEFI_BS_NV);
                     GPTChanged = true;
@@ -1765,9 +2037,11 @@ namespace WPinternals
                 if (GPTChanged)
                 {
                     GPT.Rebuild();
-                    Part = new FlashPart();
-                    Part.StartSector = 0;
-                    Part.Stream = new MemoryStream(GPTChunk);
+                    Part = new FlashPart
+                    {
+                        StartSector = 0,
+                        Stream = new MemoryStream(GPTChunk)
+                    };
                     Parts.Add(Part);
                 }
 
@@ -1779,10 +2053,14 @@ namespace WPinternals
                 await LumiaUnlockBootloaderViewModel.LumiaFlashParts(Notifier, ProfileFFU.Path, false, false, Parts, true, false, true, true, false, SetWorkingStatus, UpdateWorkingStatus, null, null, EDEPath);
 
                 if ((Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader) && (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash))
+                {
                     await Notifier.WaitForArrival();
+                }
 
                 if ((Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader) && (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash))
+                {
                     throw new WPinternalsException("Error: Phone is in wrong mode", "The phone should have been detected in bootloader or flash mode. Instead it has been detected in " + Notifier.CurrentInterface.ToString() + " mode.");
+                }
 
                 if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
                 {
@@ -1796,14 +2074,11 @@ namespace WPinternals
 
                 bool SBL3Eng = GPT.GetPartition("IS_UNLOCKED_SBL3") != null;
 
-                bool ShouldApplyOldEFIESPMethod = true;
-                if (IsSpecB)
-                    ShouldApplyOldEFIESPMethod = !ExperimentalSpecBEFIESPUnlock;
-                else
-                    ShouldApplyOldEFIESPMethod = !ExperimentalSpecAEFIESPUnlock;
-
+                bool ShouldApplyOldEFIESPMethod = IsSpecB ? !ExperimentalSpecBEFIESPUnlock : !ExperimentalSpecAEFIESPUnlock;
                 if (!IsSpecB && !SBL3Eng)
+                {
                     ShouldApplyOldEFIESPMethod = false;
+                }
 
                 Parts = ShouldApplyOldEFIESPMethod ? new List<FlashPart>() : LumiaUnlockBootloaderViewModel.LumiaGenerateEFIESPFlashPayload(UnlockedEFIESP, GPT, ProfileFFU, IsSpecB);
                 Part = null;
@@ -1843,16 +2118,18 @@ namespace WPinternals
                         Guid OriginalPartitionTypeGuid = BACKUP_EFIESP.PartitionTypeGuid;
                         Guid OriginalPartitionGuid = BACKUP_EFIESP.PartitionGuid;
                         BACKUP_EFIESP.Name = "BACKUP_EFIESP";
-                        BACKUP_EFIESP.LastSector = BACKUP_EFIESP.FirstSector + ((OriginalEfiespSizeInSectors) / 2) - 1; // Original is 0x10000
+                        BACKUP_EFIESP.LastSector = BACKUP_EFIESP.FirstSector + (OriginalEfiespSizeInSectors / 2) - 1; // Original is 0x10000
                         BACKUP_EFIESP.PartitionGuid = Guid.NewGuid();
                         BACKUP_EFIESP.PartitionTypeGuid = Guid.NewGuid();
-                        EFIESP = new Partition();
-                        EFIESP.Name = "EFIESP";
-                        EFIESP.Attributes = BACKUP_EFIESP.Attributes;
-                        EFIESP.PartitionGuid = OriginalPartitionGuid;
-                        EFIESP.PartitionTypeGuid = OriginalPartitionTypeGuid;
-                        EFIESP.FirstSector = BACKUP_EFIESP.LastSector + 1;
-                        EFIESP.LastSector = EFIESP.FirstSector + ((OriginalEfiespSizeInSectors) / 2) - 1; // Original is 0x10000
+                        EFIESP = new Partition
+                        {
+                            Name = "EFIESP",
+                            Attributes = BACKUP_EFIESP.Attributes,
+                            PartitionGuid = OriginalPartitionGuid,
+                            PartitionTypeGuid = OriginalPartitionTypeGuid,
+                            FirstSector = BACKUP_EFIESP.LastSector + 1
+                        };
+                        EFIESP.LastSector = EFIESP.FirstSector + (OriginalEfiespSizeInSectors / 2) - 1; // Original is 0x10000
                         GPT.Partitions.Add(EFIESP);
                         GPTChanged = true;
                     }
@@ -1881,15 +2158,17 @@ namespace WPinternals
                          */
 
                         EFIESP = GPT.GetPartition("EFIESP");
-                        EFIESP.LastSector = EFIESP.FirstSector + ((OriginalEfiespSizeInSectors) / 2) - 1; // Original is 0x10000
+                        EFIESP.LastSector = EFIESP.FirstSector + (OriginalEfiespSizeInSectors / 2) - 1; // Original is 0x10000
 
-                        BACKUP_EFIESP = new Partition();
-                        BACKUP_EFIESP.Name = "BACKUP_EFIESP";
-                        BACKUP_EFIESP.Attributes = EFIESP.Attributes;
-                        BACKUP_EFIESP.PartitionGuid = Guid.NewGuid();
-                        BACKUP_EFIESP.PartitionTypeGuid = Guid.NewGuid();
-                        BACKUP_EFIESP.FirstSector = EFIESP.LastSector + 1;
-                        BACKUP_EFIESP.LastSector = BACKUP_EFIESP.FirstSector + ((OriginalEfiespSizeInSectors) / 2) - 1; // Original is 0x10000
+                        BACKUP_EFIESP = new Partition
+                        {
+                            Name = "BACKUP_EFIESP",
+                            Attributes = EFIESP.Attributes,
+                            PartitionGuid = Guid.NewGuid(),
+                            PartitionTypeGuid = Guid.NewGuid(),
+                            FirstSector = EFIESP.LastSector + 1
+                        };
+                        BACKUP_EFIESP.LastSector = BACKUP_EFIESP.FirstSector + (OriginalEfiespSizeInSectors / 2) - 1; // Original is 0x10000
                         GPT.Partitions.Add(BACKUP_EFIESP);
                         GPTChanged = true;
                     }
@@ -1904,45 +2183,50 @@ namespace WPinternals
 
                     Partition EFIESPPartition = GPT.GetPartition("EFIESP");
                     if (EFIESPPartition == null)
+                    {
                         throw new WPinternalsException("EFIESP partition not found!", "No EFIESP partition was found in the provided FFU's GPT.");
+                    }
 
                     if ((UInt64)UnlockedEFIESP.Length != (EFIESPPartition.SizeInSectors * 0x200))
+                    {
                         throw new WPinternalsException("New EFIESP partition has wrong size. Size = 0x" + UnlockedEFIESP.Length.ToString("X8") + ". Expected size = 0x" + (EFIESPPartition.SizeInSectors * 0x200).ToString("X8"));
+                    }
 
-                    Part = new FlashPart();
-                    Part.StartSector = (UInt32)EFIESPPartition.FirstSector; // GPT is prepared for 64-bit sector-offset, but flash app isn't.
-                    Part.Stream = new MemoryStream(UnlockedEFIESP);
+                    Part = new FlashPart
+                    {
+                        StartSector = (UInt32)EFIESPPartition.FirstSector, // GPT is prepared for 64-bit sector-offset, but flash app isn't.
+                        Stream = new MemoryStream(UnlockedEFIESP)
+                    };
                     Parts.Add(Part);
                 }
 
                 if (GPTChanged)
                 {
                     GPT.Rebuild();
-                    Part = new FlashPart();
-                    Part.StartSector = 0;
-                    Part.Stream = new MemoryStream(GPTChunk);
+                    Part = new FlashPart
+                    {
+                        StartSector = 0,
+                        Stream = new MemoryStream(GPTChunk)
+                    };
                     Parts.Add(Part);
                 }
 
                 foreach (FlashPart _part in Parts)
                 {
-                    if (IsSpecB)
-                    {
-                        _part.ProgressText = "Flashing unlocked bootloader (part 1)...";
-                    }
-                    else
-                    {
-                        _part.ProgressText = "Flashing unlocked bootloader (part 2)...";
-                    }
+                    _part.ProgressText = IsSpecB ? "Flashing unlocked bootloader (part 1)..." : "Flashing unlocked bootloader (part 2)...";
                 }
 
                 await LumiaUnlockBootloaderViewModel.LumiaFlashParts(Notifier, ProfileFFU.Path, false, false, Parts, true, true, true, true, false, SetWorkingStatus, UpdateWorkingStatus, null, null, EDEPath);
 
                 if ((Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader) && (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash))
+                {
                     await Notifier.WaitForArrival();
+                }
 
                 if ((Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader) && (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash))
+                {
                     throw new WPinternalsException("Error: Phone is in wrong mode", "The phone should have been detected in bootloader or flash mode. Instead it has been detected in " + Notifier.CurrentInterface.ToString() + " mode.");
+                }
 
                 if (!IsSpecB && !SBL3Eng)
                 {
@@ -1978,7 +2262,9 @@ namespace WPinternals
                     SetWorkingStatus("You need to manually reset your phone now!", "The phone is currently in Mass Storage Mode, but the driver of the PC failed to start. Unfortunately this happens sometimes. You need to manually reset the phone now. Keep the phone connected to the PC. Windows Phone Internals will automatically start to revert the changes. After the phone is fully booted again, you can retry to unlock the bootloader.", null, false, WPinternalsStatus.WaitingForManualReset);
                     await Notifier.WaitForArrival(); // Should be detected in Bootmanager mode
                     if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_MassStorage)
+                    {
                         IsPhoneInBadMassStorageMode = true;
+                    }
                 }
 
                 if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_MassStorage)
@@ -1991,9 +2277,11 @@ namespace WPinternals
                     Parts = new List<FlashPart>();
 
                     // Restore original GPT, which will also reference the original NV.
-                    Part = new FlashPart();
-                    Part.StartSector = 0;
-                    Part.Stream = new MemoryStream(GPTChunkBackup);
+                    Part = new FlashPart
+                    {
+                        StartSector = 0,
+                        Stream = new MemoryStream(GPTChunkBackup)
+                    };
                     Parts.Add(Part);
 
                     await LumiaUnlockBootloaderViewModel.LumiaFlashParts(Notifier, ProfileFFU.Path, false, false, Parts, true, false, true, true, false, SetWorkingStatus, UpdateWorkingStatus, null, null, EDEPath);
@@ -2001,7 +2289,9 @@ namespace WPinternals
                     // An old NV backup was restored and it possibly contained the IsFlashing flag.
                     // Can't clear it immeadiately, so we need another flash.
                     if ((Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader) && (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash))
+                    {
                         await Notifier.WaitForArrival();
+                    }
 
                     if ((Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader) || (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Flash))
                     {
@@ -2009,9 +2299,13 @@ namespace WPinternals
                     }
 
                     if (IsPhoneInBadMassStorageMode)
+                    {
                         ExitFailure("Failed to unlock the bootloader due to misbehaving driver. Wait for phone to boot to Windows and then try again.", "The Mass Storage driver of the PC failed to start. Unfortunately this happens sometimes. After the phone is fully booted again, you can retry to unlock the bootloader.");
+                    }
                     else
+                    {
                         ExitFailure("Failed to unlock the bootloader", "It is not possible to unlock the bootloader straight after flashing. NOTE: Fully reboot the phone and then properly shutdown the phone, before you can try to unlock again!");
+                    }
 
                     return;
                 }
@@ -2070,9 +2364,9 @@ namespace WPinternals
 
                     await Notifier.WaitForArrival();
                     if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader)
+                    {
                         throw new WPinternalsException("Phone is in wrong mode", "The phone should have been detected in bootloader mode. Instead it has been detected in " + Notifier.CurrentInterface.ToString() + " mode.");
-
-                    ((NokiaFlashModel)Notifier.CurrentModel).SwitchToFlashAppContext();
+                    } ((NokiaFlashModel)Notifier.CurrentModel).SwitchToFlashAppContext();
 
                     UInt32 OriginalEfiespFirstSector;
                     if (!ReUnlockDevice)
@@ -2144,29 +2438,37 @@ namespace WPinternals
                     Partition IsUnlockedFlag = GPT.GetPartition("IS_UNLOCKED");
                     if (IsUnlockedFlag == null)
                     {
-                        IsUnlockedFlag = new Partition();
-                        IsUnlockedFlag.Name = "IS_UNLOCKED";
-                        IsUnlockedFlag.Attributes = 0;
-                        IsUnlockedFlag.PartitionGuid = Guid.NewGuid();
-                        IsUnlockedFlag.PartitionTypeGuid = Guid.NewGuid();
-                        IsUnlockedFlag.FirstSector = 0x40;
-                        IsUnlockedFlag.LastSector = 0x40;
+                        IsUnlockedFlag = new Partition
+                        {
+                            Name = "IS_UNLOCKED",
+                            Attributes = 0,
+                            PartitionGuid = Guid.NewGuid(),
+                            PartitionTypeGuid = Guid.NewGuid(),
+                            FirstSector = 0x40,
+                            LastSector = 0x40
+                        };
                         GPT.Partitions.Add(IsUnlockedFlag);
                     }
 
                     Parts = new List<FlashPart>();
                     GPT.Rebuild();
-                    Part = new FlashPart();
-                    Part.StartSector = 0;
-                    Part.Stream = new MemoryStream(GPTChunk);
+                    Part = new FlashPart
+                    {
+                        StartSector = 0,
+                        Stream = new MemoryStream(GPTChunk)
+                    };
                     Parts.Add(Part);
-                    Part = new FlashPart();
-                    Part.StartSector = OriginalEfiespFirstSector;
-                    Part.Stream = new MemoryStream(BackupUnlockedEFIESP); // We must keep the Oiriginal EFIESP, but unlocked, for many reasons
+                    Part = new FlashPart
+                    {
+                        StartSector = OriginalEfiespFirstSector,
+                        Stream = new MemoryStream(BackupUnlockedEFIESP) // We must keep the Oiriginal EFIESP, but unlocked, for many reasons
+                    };
                     Parts.Add(Part);
-                    Part = new FlashPart();
-                    Part.StartSector = OriginalEfiespFirstSector + ((OriginalEfiespSizeInSectors) / 2);
-                    Part.Stream = new MemoryStream(BackupEFIESP);
+                    Part = new FlashPart
+                    {
+                        StartSector = OriginalEfiespFirstSector + (OriginalEfiespSizeInSectors / 2),
+                        Stream = new MemoryStream(BackupEFIESP)
+                    };
                     Parts.Add(Part);
 
                     foreach (FlashPart _part in Parts)
@@ -2220,7 +2522,9 @@ namespace WPinternals
 
                         await Notifier.WaitForArrival();
                         if (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader)
+                        {
                             throw new WPinternalsException("Phone is in wrong mode", "The phone should have been detected in bootloader mode. Instead it has been detected in " + Notifier.CurrentInterface.ToString() + " mode.");
+                        }
                     }
                     ((NokiaFlashModel)Notifier.CurrentModel).SwitchToFlashAppContext();
 
@@ -2228,27 +2532,26 @@ namespace WPinternals
 
                     foreach (FlashPart _part in Parts)
                     {
-                        if (IsSpecB)
-                        {
-                            _part.ProgressText = "Flashing unlocked bootloader (part 2)...";
-                        }
-                        else
-                        {
-                            _part.ProgressText = "Flashing unlocked bootloader (part 3)...";
-                        }
+                        _part.ProgressText = IsSpecB ? "Flashing unlocked bootloader (part 2)..." : "Flashing unlocked bootloader (part 3)...";
                     }
 
                     await LumiaUnlockBootloaderViewModel.LumiaFlashParts(Notifier, ProfileFFU.Path, false, false, Parts, true, true, true, true, false, SetWorkingStatus, UpdateWorkingStatus, null, null, EDEPath);
 
                     if (!IsSpecB)
+                    {
                         ((NokiaFlashModel)Notifier.CurrentModel).ResetPhone();
+                    }
                 }
 
                 if ((Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader) && (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash))
+                {
                     await Notifier.WaitForArrival();
+                }
 
                 if ((Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader) && (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash))
+                {
                     throw new WPinternalsException("Error: Phone is in wrong mode", "The phone should have been detected in bootloader or flash mode. Instead it has been detected in " + Notifier.CurrentInterface.ToString() + " mode.");
+                }
 
                 LogFile.Log("Bootloader unlocked!", LogType.FileAndConsole);
                 LogFile.EndAction("UnlockBootloader");
@@ -2272,7 +2575,7 @@ namespace WPinternals
         // while keeping the first half of the partition intact, except the very first chunk
         private static List<FlashPart> LumiaGenerateEFIESPFlashPayload(byte[] NewEFIESP, GPT DeviceGPT, FFU DeviceFFU, bool IsSpecB)
         {
-            uint SectorSize = 512;
+            const uint SectorSize = 512;
 
             Partition EFIESP = DeviceGPT.GetPartition("EFIESP");
             UInt16 ReservedOGSectors = ByteOperations.ReadUInt16(DeviceFFU.GetPartition("EFIESP"), 0xE);
@@ -2283,18 +2586,20 @@ namespace WPinternals
             byte[] FirstSector = DeviceFFU.GetPartition("EFIESP").Take(EFIESPFirstPartSize).ToArray();
             ByteOperations.WriteUInt16(FirstSector, 0xE, ReservedSectors);
 
-            byte[] SecondEFIESP = NewEFIESP.Skip((int)SectorSize * ReservedOGSectors).Take((int)(NewEFIESP.Length - ReservedSectors * SectorSize)).ToArray();
+            byte[] SecondEFIESP = NewEFIESP.Skip((int)SectorSize * ReservedOGSectors).Take((int)(NewEFIESP.Length - (ReservedSectors * SectorSize))).ToArray();
 
-            List<FlashPart> Parts = new List<FlashPart>();
+            List<FlashPart> Parts = new();
 
-            FlashPart Part = new FlashPart();
+            FlashPart Part = new();
             Part.StartSector = (uint)EFIESP.FirstSector;
             Part.Stream = new MemoryStream(FirstSector);
             Parts.Add(Part);
 
-            Part = new FlashPart();
-            Part.StartSector = (uint)(EFIESP.FirstSector + ReservedSectors);
-            Part.Stream = new MemoryStream(SecondEFIESP);
+            Part = new FlashPart
+            {
+                StartSector = (uint)(EFIESP.FirstSector + ReservedSectors),
+                Stream = new MemoryStream(SecondEFIESP)
+            };
             Parts.Add(Part);
 
             return Parts;
@@ -2304,7 +2609,7 @@ namespace WPinternals
         // This function generates a flashing payload which allows us to get back the original device EFIESP without ever going to mass storage mode.
         private static List<FlashPart> LumiaGenerateUndoEFIESPFlashPayload(GPT DeviceGPT, FFU DeviceFFU, bool IsSpecB)
         {
-            uint SectorSize = 512;
+            const uint SectorSize = 512;
 
             Partition EFIESP = DeviceGPT.GetPartition("EFIESP");
             UInt16 ReservedOGSectors = ByteOperations.ReadUInt16(DeviceFFU.GetPartition("EFIESP"), 0xE);
@@ -2314,9 +2619,9 @@ namespace WPinternals
 
             byte[] FirstSector = DeviceFFU.GetPartition("EFIESP").Take(EFIESPFirstPartSize).ToArray();
 
-            List<FlashPart> Parts = new List<FlashPart>();
+            List<FlashPart> Parts = new();
 
-            FlashPart Part = new FlashPart();
+            FlashPart Part = new();
             Part.StartSector = (uint)EFIESP.FirstSector;
             Part.Stream = new MemoryStream(FirstSector);
             Parts.Add(Part);
@@ -2328,7 +2633,7 @@ namespace WPinternals
         // This function gets the first sector of the new EFIESP location without ever going to mass storage mode.
         private static UInt16 LumiaGetFirstEFIESPSectorCount(GPT DeviceGPT, FFU DeviceFFU, bool IsSpecB)
         {
-            uint SectorSize = 512;
+            const uint SectorSize = 512;
             Partition EFIESP = DeviceGPT.GetPartition("EFIESP");
             UInt16 ReservedOGSectors = ByteOperations.ReadUInt16(DeviceFFU.GetPartition("EFIESP"), 0xE);
 
@@ -2358,9 +2663,13 @@ namespace WPinternals
             bool IsSpecA = Info.FlashAppProtocolVersionMajor < 2;
 
             if (IsSpecA)
+            {
                 LumiaV1FlashParts(Notifier, Parts, SetWorkingStatus, UpdateWorkingStatus);
+            }
             else
+            {
                 await LumiaV2UnlockBootViewModel.LumiaV2CustomFlash(Notifier, FFUPath, PerformFullFlashFirst, SkipWrite, Parts, DoResetFirst, ClearFlashingStatusAtEnd, CheckSectorAlignment, ShowProgress, Experimental, SetWorkingStatus, UpdateWorkingStatus, ExitSuccess, ExitFailure, EDEPath);
+            }
         }
 
         private static void LumiaV1FlashParts(PhoneNotifierViewModel Notifier, List<FlashPart> FlashParts, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null)
@@ -2374,7 +2683,9 @@ namespace WPinternals
             int ProgressPercentage = 0;
 
             foreach (FlashPart Part in FlashParts)
+            {
                 InputStreamLength += (ulong)Part.Stream.Length;
+            }
 
             foreach (FlashPart Part in FlashParts)
             {
@@ -2396,7 +2707,9 @@ namespace WPinternals
                             if (BytesRead > 0)
                             {
                                 if (BytesRead == FlashBufferSize)
+                                {
                                     FlashBufferFinalSize = FlashBuffer;
+                                }
                                 else
                                 {
                                     FlashBufferFinalSize = new byte[BytesRead];
@@ -2408,7 +2721,7 @@ namespace WPinternals
 
                             UpdateWorkingStatus(Part.ProgressText, null, (uint)ProgressPercentage, WPinternalsStatus.Flashing);
                             totalwritten += (UInt64)FlashBuffer.Length / 0x200;
-                            ProgressPercentage = (int)((double)totalwritten / (UInt64)(InputStreamLength / 0x200) * 100);
+                            ProgressPercentage = (int)((double)totalwritten / (InputStreamLength / 0x200) * 100);
 
                             i += FlashBufferSize;
                         }
@@ -2422,59 +2735,65 @@ namespace WPinternals
 
         private static void LumiaPatchEFIESP(FFU SupportedFFU, byte[] EFIESPPartition, bool SpecB)
         {
-            using (DiscUtils.Fat.FatFileSystem EFIESPFileSystem = new DiscUtils.Fat.FatFileSystem(new MemoryStream(EFIESPPartition)))
+            using DiscUtils.Fat.FatFileSystem EFIESPFileSystem = new(new MemoryStream(EFIESPPartition));
+            App.PatchEngine.TargetImage = EFIESPFileSystem;
+
+            string PatchDefinition = "SecureBootHack-V1.1-EFIESP";
+            if (SpecB)
             {
-                App.PatchEngine.TargetImage = EFIESPFileSystem;
+                PatchDefinition = "SecureBootHack-V2-EFIESP";
+            }
 
-                string PatchDefinition = "SecureBootHack-V1.1-EFIESP";
-                if (SpecB)
-                    PatchDefinition = "SecureBootHack-V2-EFIESP";
+            bool PatchResult = App.PatchEngine.Patch(PatchDefinition);
+            if (!PatchResult)
+            {
+                LogFile.Log("Donor-FFU: " + SupportedFFU.Path);
+                byte[] SupportedEFIESP = SupportedFFU.GetPartition("EFIESP");
 
-                bool PatchResult = App.PatchEngine.Patch(PatchDefinition);
+                using (DiscUtils.Fat.FatFileSystem SupportedEFIESPFileSystem = new(new MemoryStream(SupportedEFIESP)))
+                using (DiscUtils.Streams.SparseStream SupportedMobileStartupStream = SupportedEFIESPFileSystem.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Open))
+                using (MemoryStream SupportedMobileStartupMemStream = new())
+                using (Stream MobileStartupStream = EFIESPFileSystem.OpenFile(@"Windows\System32\Boot\mobilestartup.efi", FileMode.Create, FileAccess.Write))
+                {
+                    SupportedMobileStartupStream.CopyTo(SupportedMobileStartupMemStream);
+                    byte[] SupportedMobileStartup = SupportedMobileStartupMemStream.ToArray();
+
+                    // Save supported mobilestartup.efi
+                    LogFile.Log("Taking mobilestartup.efi from donor-FFU");
+                    MobileStartupStream.Write(SupportedMobileStartup, 0, SupportedMobileStartup.Length);
+                }
+
+                PatchResult = App.PatchEngine.Patch(PatchDefinition);
                 if (!PatchResult)
                 {
-                    LogFile.Log("Donor-FFU: " + SupportedFFU.Path);
-                    byte[] SupportedEFIESP = SupportedFFU.GetPartition("EFIESP");
-
-                    using (DiscUtils.Fat.FatFileSystem SupportedEFIESPFileSystem = new DiscUtils.Fat.FatFileSystem(new MemoryStream(SupportedEFIESP)))
-                    using (DiscUtils.SparseStream SupportedMobileStartupStream = SupportedEFIESPFileSystem.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Open))
-                    using (MemoryStream SupportedMobileStartupMemStream = new MemoryStream())
-                    using (Stream MobileStartupStream = EFIESPFileSystem.OpenFile(@"Windows\System32\Boot\mobilestartup.efi", FileMode.Create, FileAccess.Write))
-                    {
-                        SupportedMobileStartupStream.CopyTo(SupportedMobileStartupMemStream);
-                        byte[] SupportedMobileStartup = SupportedMobileStartupMemStream.ToArray();
-
-                        // Save supported mobilestartup.efi
-                        LogFile.Log("Taking mobilestartup.efi from donor-FFU");
-                        MobileStartupStream.Write(SupportedMobileStartup, 0, SupportedMobileStartup.Length);
-                    }
-
-                    PatchResult = App.PatchEngine.Patch(PatchDefinition);
-                    if (!PatchResult)
-                        throw new WPinternalsException("Failed to patch bootloader", "An error occured while patching Operating System files on the EFIESP partition provided. Make sure no boot files have been tampered with and you use the latest version of the tool. This error cannot be caused by an incorrect Operating System version as the tool automatically uses replacement if the version isn't supported, unless the replacement files have been tampered with or are not compatible.");
+                    throw new WPinternalsException("Failed to patch bootloader", "An error occured while patching Operating System files on the EFIESP partition provided. Make sure no boot files have been tampered with and you use the latest version of the tool. This error cannot be caused by an incorrect Operating System version as the tool automatically uses replacement if the version isn't supported, unless the replacement files have been tampered with or are not compatible.");
                 }
+            }
 
-                LogFile.Log("Edit BCD");
-                using (Stream BCDFileStream = EFIESPFileSystem.OpenFile(@"efi\Microsoft\Boot\BCD", FileMode.Open, FileAccess.ReadWrite))
-                {
-                    using (DiscUtils.Registry.RegistryHive BCDHive = new DiscUtils.Registry.RegistryHive(BCDFileStream))
-                    {
-                        DiscUtils.BootConfig.Store BCDStore = new DiscUtils.BootConfig.Store(BCDHive.Root);
-                        DiscUtils.BootConfig.BcdObject MobileStartupObject = BCDStore.GetObject(new Guid("{01de5a27-8705-40db-bad6-96fa5187d4a6}"));
-                        DiscUtils.BootConfig.Element NoCodeIntegrityElement = MobileStartupObject.GetElement(0x16000048);
-                        if (NoCodeIntegrityElement != null)
-                            NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
-                        else
-                            MobileStartupObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
+            LogFile.Log("Edit BCD");
+            using Stream BCDFileStream = EFIESPFileSystem.OpenFile(@"efi\Microsoft\Boot\BCD", FileMode.Open, FileAccess.ReadWrite);
+            using DiscUtils.Registry.RegistryHive BCDHive = new(BCDFileStream);
+            DiscUtils.BootConfig.Store BCDStore = new(BCDHive.Root);
+            DiscUtils.BootConfig.BcdObject MobileStartupObject = BCDStore.GetObject(new Guid("{01de5a27-8705-40db-bad6-96fa5187d4a6}"));
+            DiscUtils.BootConfig.Element NoCodeIntegrityElement = MobileStartupObject.GetElement(0x16000048);
+            if (NoCodeIntegrityElement != null)
+            {
+                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
+            }
+            else
+            {
+                MobileStartupObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
+            }
 
-                        DiscUtils.BootConfig.BcdObject WinLoadObject = BCDStore.GetObject(new Guid("{7619dcc9-fafe-11d9-b411-000476eba25f}"));
-                        NoCodeIntegrityElement = WinLoadObject.GetElement(0x16000048);
-                        if (NoCodeIntegrityElement != null)
-                            NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
-                        else
-                            WinLoadObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
-                    }
-                }
+            DiscUtils.BootConfig.BcdObject WinLoadObject = BCDStore.GetObject(new Guid("{7619dcc9-fafe-11d9-b411-000476eba25f}"));
+            NoCodeIntegrityElement = WinLoadObject.GetElement(0x16000048);
+            if (NoCodeIntegrityElement != null)
+            {
+                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
+            }
+            else
+            {
+                WinLoadObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
             }
         }
     }
diff --git a/ViewModels/LumiaUnlockRootTargetSelectionViewModel.cs b/ViewModels/LumiaUnlockRootTargetSelectionViewModel.cs
index 0d10145..d43e2b4 100644
--- a/ViewModels/LumiaUnlockRootTargetSelectionViewModel.cs
+++ b/ViewModels/LumiaUnlockRootTargetSelectionViewModel.cs
@@ -37,12 +37,12 @@ namespace WPinternals
 
     internal class LumiaRootAccessTargetSelectionViewModel : ContextViewModel
     {
-        private PhoneNotifierViewModel PhoneNotifier;
+        private readonly PhoneNotifierViewModel PhoneNotifier;
         internal Action SwitchToUnlockBoot;
         internal Action SwitchToDumpRom;
         internal Action SwitchToFlashRom;
-        private Action UnlockPhoneCallback;
-        private Action<string, string> UnlockImageCallback;
+        private readonly Action UnlockPhoneCallback;
+        private readonly Action<string, string> UnlockImageCallback;
 
         internal LumiaRootAccessTargetSelectionViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToUnlockBoot, Action SwitchToDumpRom, Action SwitchToFlashRom, Action UnlockPhoneCallback, Action<string, string> UnlockImageCallback)
             : base()
@@ -72,7 +72,7 @@ namespace WPinternals
                 if (value != _EFIESPMountPoint)
                 {
                     _EFIESPMountPoint = value;
-                    OnPropertyChanged("EFIESPMountPoint");
+                    OnPropertyChanged(nameof(EFIESPMountPoint));
                 }
             }
         }
@@ -89,7 +89,7 @@ namespace WPinternals
                 if (value != _MainOSMountPoint)
                 {
                     _MainOSMountPoint = value;
-                    OnPropertyChanged("MainOSMountPoint");
+                    OnPropertyChanged(nameof(MainOSMountPoint));
                 }
             }
         }
@@ -106,7 +106,7 @@ namespace WPinternals
                 if (value != _IsPhoneDisconnected)
                 {
                     _IsPhoneDisconnected = value;
-                    OnPropertyChanged("IsPhoneDisconnected");
+                    OnPropertyChanged(nameof(IsPhoneDisconnected));
                 }
             }
         }
@@ -123,7 +123,7 @@ namespace WPinternals
                 if (value != _IsPhoneInMassStorage)
                 {
                     _IsPhoneInMassStorage = value;
-                    OnPropertyChanged("IsPhoneInMassStorage");
+                    OnPropertyChanged(nameof(IsPhoneInMassStorage));
                 }
             }
         }
@@ -140,7 +140,7 @@ namespace WPinternals
                 if (value != _IsPhoneInOtherMode)
                 {
                     _IsPhoneInOtherMode = value;
-                    OnPropertyChanged("IsPhoneInOtherMode");
+                    OnPropertyChanged(nameof(IsPhoneInOtherMode));
                 }
             }
         }
@@ -150,11 +150,7 @@ namespace WPinternals
         {
             get
             {
-                if (_UnlockPhoneCommand == null)
-                {
-                    _UnlockPhoneCommand = new DelegateCommand(() => { UnlockPhoneCallback(); }, () => !IsPhoneDisconnected);
-                }
-                return _UnlockPhoneCommand;
+                return _UnlockPhoneCommand ??= new DelegateCommand(() => UnlockPhoneCallback(), () => !IsPhoneDisconnected);
             }
         }
 
@@ -163,11 +159,7 @@ namespace WPinternals
         {
             get
             {
-                if (_UnlockImageCommand == null)
-                {
-                    _UnlockImageCommand = new DelegateCommand(() => { UnlockImageCallback(EFIESPMountPoint, MainOSMountPoint); }, () => ((EFIESPMountPoint != null) || (MainOSMountPoint != null)));
-                }
-                return _UnlockImageCommand;
+                return _UnlockImageCommand ??= new DelegateCommand(() => UnlockImageCallback(EFIESPMountPoint, MainOSMountPoint), () => ((EFIESPMountPoint != null) || (MainOSMountPoint != null)));
             }
         }
 
@@ -176,12 +168,12 @@ namespace WPinternals
             PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
         }
 
-        void NewDeviceArrived(ArrivalEventArgs Args)
+        private void NewDeviceArrived(ArrivalEventArgs Args)
         {
             new Thread(() => EvaluateViewState()).Start();
         }
 
-        void DeviceRemoved()
+        private void DeviceRemoved()
         {
             new Thread(() => EvaluateViewState()).Start();
         }
diff --git a/ViewModels/LumiaUnlockRootViewModel.cs b/ViewModels/LumiaUnlockRootViewModel.cs
index 7017835..9590917 100644
--- a/ViewModels/LumiaUnlockRootViewModel.cs
+++ b/ViewModels/LumiaUnlockRootViewModel.cs
@@ -26,12 +26,12 @@ namespace WPinternals
 {
     internal class LumiaUnlockRootViewModel : ContextViewModel
     {
-        private PhoneNotifierViewModel PhoneNotifier;
-        private Action SwitchToUnlockBoot;
-        private Action SwitchToDumpRom;
-        private Action SwitchToFlashRom;
-        private Action Callback;
-        private bool DoUnlock;
+        private readonly PhoneNotifierViewModel PhoneNotifier;
+        private readonly Action SwitchToUnlockBoot;
+        private readonly Action SwitchToDumpRom;
+        private readonly Action SwitchToFlashRom;
+        private readonly Action Callback;
+        private readonly bool DoUnlock;
 
         internal LumiaUnlockRootViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToUnlockBoot, Action SwitchToDumpRom, Action SwitchToFlashRom, bool DoUnlock, Action Callback)
             : base()
@@ -50,17 +50,23 @@ namespace WPinternals
         internal override void EvaluateViewState()
         {
             if (!IsActive)
+            {
                 return;
+            }
 
             if (DoUnlock)
             {
                 if ((SubContextViewModel == null) || (SubContextViewModel is LumiaUndoRootTargetSelectionViewModel))
+                {
                     ActivateSubContext(new LumiaUnlockRootTargetSelectionViewModel(PhoneNotifier, SwitchToUnlockBoot, SwitchToDumpRom, SwitchToFlashRom, DoUnlockPhone, DoUnlockImage));
+                }
             }
             else
             {
                 if ((SubContextViewModel == null) || (SubContextViewModel is LumiaUnlockRootTargetSelectionViewModel))
+                {
                     ActivateSubContext(new LumiaUndoRootTargetSelectionViewModel(PhoneNotifier, SwitchToUnlockBoot, SwitchToDumpRom, SwitchToFlashRom, DoUnlockPhone, DoUnlockImage));
+                }
             }
         }
 
@@ -103,18 +109,26 @@ namespace WPinternals
             new Thread(() =>
                 {
                     if (DoUnlock)
+                    {
                         LogFile.BeginAction("EnableRootAccess");
+                    }
                     else
+                    {
                         LogFile.BeginAction("DisableRootAccess");
+                    }
 
                     bool Result = false;
 
                     if (EFIESP != null && !HasV11Patches)
                     {
                         if (DoUnlock)
+                        {
                             ActivateSubContext(new BusyViewModel("Enable Root Access on EFIESP..."));
+                        }
                         else
+                        {
                             ActivateSubContext(new BusyViewModel("Disable Root Access on EFIESP..."));
+                        }
 
                         try
                         {
@@ -157,9 +171,13 @@ namespace WPinternals
                     if (MainOS != null)
                     {
                         if (DoUnlock)
+                        {
                             ActivateSubContext(new BusyViewModel("Enable Root Access on MainOS..."));
+                        }
                         else
+                        {
                             ActivateSubContext(new BusyViewModel("Disable Root Access on MainOS..."));
+                        }
 
                         try
                         {
@@ -169,7 +187,9 @@ namespace WPinternals
                                 Result = App.PatchEngine.Patch("RootAccess-MainOS");
 
                                 if (Result)
+                                {
                                     Result = App.PatchEngine.Patch("SecureBootHack-MainOS");
+                                }
 
                                 if (!Result)
                                 {
@@ -182,7 +202,9 @@ namespace WPinternals
                                 App.PatchEngine.Restore("RootAccess-MainOS");
 
                                 if (!HasNewBootloader)
+                                {
                                     App.PatchEngine.Restore("SecureBootHack-MainOS");
+                                }
 
                                 Result = true;
                             }
@@ -206,16 +228,24 @@ namespace WPinternals
                         else
                         {
                             if (DoUnlock)
+                            {
                                 ActivateSubContext(new MessageViewModel("Root Access successfully enabled!", Exit));
+                            }
                             else
+                            {
                                 ActivateSubContext(new MessageViewModel("Root Access successfully disabled!", Exit));
+                            }
                         }
                     }
 
                     if (DoUnlock)
+                    {
                         LogFile.EndAction("EnableRootAccess");
+                    }
                     else
+                    {
                         LogFile.EndAction("DisableRootAccess");
+                    }
                 }).Start();
         }
 
@@ -232,11 +262,11 @@ namespace WPinternals
             MassStorage Phone = (MassStorage)PhoneNotifier.CurrentModel;
             Phone.OpenVolume(false);
             byte[] GPTBuffer = Phone.ReadSectors(1, 33);
-            GPT GPT = new WPinternals.GPT(GPTBuffer);
+            GPT GPT = new(GPTBuffer);
             Partition Partition = GPT.GetPartition("UEFI");
             byte[] UefiBuffer = Phone.ReadSectors(Partition.FirstSector, Partition.LastSector - Partition.FirstSector + 1);
-            UEFI UEFI = new UEFI(UefiBuffer);
-            string BootMgrName = UEFI.EFIs.Where(efi => ((efi.Name != null) && ((efi.Name.Contains("BootMgrApp")) || (efi.Name.Contains("FlashApp"))))).First().Name;
+            UEFI UEFI = new(UefiBuffer);
+            string BootMgrName = UEFI.EFIs.First(efi => ((efi.Name != null) && ((efi.Name.Contains("BootMgrApp")) || (efi.Name.Contains("FlashApp"))))).Name;
             byte[] BootMgr = UEFI.GetFile(BootMgrName);
             // "Header V2"
             Result = (ByteOperations.FindAscii(BootMgr, "Header V2") != null);
@@ -250,7 +280,7 @@ namespace WPinternals
             MassStorage Phone = (MassStorage)PhoneNotifier.CurrentModel;
             Phone.OpenVolume(false);
             byte[] GPTBuffer = Phone.ReadSectors(1, 33);
-            GPT GPT = new WPinternals.GPT(GPTBuffer);
+            GPT GPT = new(GPTBuffer);
             Partition Partition = GPT.GetPartition("BACKUP_BS_NV");
             Result = Partition != null;
             Phone.CloseVolume();
diff --git a/ViewModels/LumiaV2UnlockBootViewModel.cs b/ViewModels/LumiaV2UnlockBootViewModel.cs
index ca97307..98c4eac 100644
--- a/ViewModels/LumiaV2UnlockBootViewModel.cs
+++ b/ViewModels/LumiaV2UnlockBootViewModel.cs
@@ -32,10 +32,25 @@ namespace WPinternals
     {
         internal static async Task LumiaV2FindFlashingProfile(PhoneNotifierViewModel Notifier, string FFUPath, bool DoResetFirst = true, bool Experimental = false, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null, ExitSuccess ExitSuccess = null, ExitFailure ExitFailure = null)
         {
-            if (SetWorkingStatus == null) SetWorkingStatus = (m, s, v, a, st) => { };
-            if (UpdateWorkingStatus == null) UpdateWorkingStatus = (m, s, v, st) => { };
-            if (ExitSuccess == null) ExitSuccess = (m, s) => { };
-            if (ExitFailure == null) ExitFailure = (m, s) => { };
+            if (SetWorkingStatus == null)
+            {
+                SetWorkingStatus = (m, s, v, a, st) => { };
+            }
+
+            if (UpdateWorkingStatus == null)
+            {
+                UpdateWorkingStatus = (m, s, v, st) => { };
+            }
+
+            if (ExitSuccess == null)
+            {
+                ExitSuccess = (m, s) => { };
+            }
+
+            if (ExitFailure == null)
+            {
+                ExitFailure = (m, s) => { };
+            }
 
             LogFile.BeginAction("FindFlashingProfile");
             try
@@ -54,7 +69,7 @@ namespace WPinternals
                     string FfuFirmware = null;
                     if (FFUPath != null)
                     {
-                        FFU FFU = new FFU(FFUPath);
+                        FFU FFU = new(FFUPath);
                         FfuFirmware = FFU.GetFirmwareVersion();
                     }
                     FlashProfile Profile = App.Config.GetProfile(Info.PlatformID, Info.Firmware, FfuFirmware);
@@ -76,13 +91,17 @@ namespace WPinternals
                     (m, s, v, a, st) =>
                     {
                         if (st == WPinternalsStatus.SwitchingMode)
+                        {
                             SetWorkingStatus(m, s, v, a, st);
+                        }
                     },
                     UpdateWorkingStatus:
                     (m, s, v, st) =>
                     {
                         if (st == WPinternalsStatus.SwitchingMode)
+                        {
                             UpdateWorkingStatus(m, s, v, st);
+                        }
                     },
                     ExitSuccess: ExitSuccess, ExitFailure: ExitFailure);
 
@@ -104,17 +123,17 @@ namespace WPinternals
             try
             {
                 LogFile.Log("Command: Enable testsigning", LogType.FileAndConsole);
-                PhoneNotifierViewModel Notifier = new PhoneNotifierViewModel();
+                PhoneNotifierViewModel Notifier = new();
                 UIContext.Send(s => Notifier.Start(), null);
                 NokiaFlashModel FlashModel = (NokiaFlashModel)(await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash));
 
-                List<FlashPart> Parts = new List<FlashPart>();
+                List<FlashPart> Parts = new();
                 FlashPart Part;
 
                 // Use GetGptChunk() here instead of ReadGPT(), because ReadGPT() skips the first sector.
                 // We need the fist sector if we want to write back the GPT.
                 byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(FlashModel, 0x20000);
-                GPT GPT = new GPT(GPTChunk);
+                GPT GPT = new(GPTChunk);
                 bool GPTChanged = false;
 
                 Partition BACKUP_BS_NV = GPT.GetPartition("BACKUP_BS_NV");
@@ -127,12 +146,14 @@ namespace WPinternals
                     BACKUP_BS_NV.Name = "BACKUP_BS_NV";
                     BACKUP_BS_NV.PartitionGuid = Guid.NewGuid();
                     BACKUP_BS_NV.PartitionTypeGuid = Guid.NewGuid();
-                    UEFI_BS_NV = new Partition();
-                    UEFI_BS_NV.Name = "UEFI_BS_NV";
-                    UEFI_BS_NV.Attributes = BACKUP_BS_NV.Attributes;
-                    UEFI_BS_NV.PartitionGuid = OriginalPartitionGuid;
-                    UEFI_BS_NV.PartitionTypeGuid = OriginalPartitionTypeGuid;
-                    UEFI_BS_NV.FirstSector = BACKUP_BS_NV.LastSector + 1;
+                    UEFI_BS_NV = new Partition
+                    {
+                        Name = "UEFI_BS_NV",
+                        Attributes = BACKUP_BS_NV.Attributes,
+                        PartitionGuid = OriginalPartitionGuid,
+                        PartitionTypeGuid = OriginalPartitionTypeGuid,
+                        FirstSector = BACKUP_BS_NV.LastSector + 1
+                    };
                     UEFI_BS_NV.LastSector = UEFI_BS_NV.FirstSector + BACKUP_BS_NV.LastSector - BACKUP_BS_NV.FirstSector;
                     GPT.Partitions.Add(UEFI_BS_NV);
                     GPTChanged = true;
@@ -140,9 +161,11 @@ namespace WPinternals
                 if (GPTChanged)
                 {
                     GPT.Rebuild();
-                    Part = new FlashPart();
-                    Part.StartSector = 0;
-                    Part.Stream = new MemoryStream(GPTChunk);
+                    Part = new FlashPart
+                    {
+                        StartSector = 0,
+                        Stream = new MemoryStream(GPTChunk)
+                    };
                     Parts.Add(Part);
                 }
 
@@ -217,10 +240,15 @@ namespace WPinternals
 
             MassStorage Storage = null;
             if (Notifier.CurrentModel is MassStorage)
+            {
                 Storage = (MassStorage)Notifier.CurrentModel;
+            }
 
             if (Storage == null)
+            {
                 throw new WPinternalsException("Failed to switch to Mass Storage Mode");
+            }
+
             string Drive = Storage.Drive;
 
             return Drive;
@@ -232,15 +260,15 @@ namespace WPinternals
             try
             {
                 LogFile.Log("Command: Clear NV", LogType.FileAndConsole);
-                PhoneNotifierViewModel Notifier = new PhoneNotifierViewModel();
+                PhoneNotifierViewModel Notifier = new();
                 UIContext.Send(s => Notifier.Start(), null);
                 NokiaFlashModel FlashModel = (NokiaFlashModel)(await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash));
-                List<FlashPart> Parts = new List<FlashPart>();
+                List<FlashPart> Parts = new();
 
                 // Use GetGptChunk() here instead of ReadGPT(), because ReadGPT() skips the first sector.
                 // We need the fist sector if we want to write back the GPT.
                 byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(FlashModel, 0x20000);
-                GPT GPT = new GPT(GPTChunk);
+                GPT GPT = new(GPTChunk);
                 bool GPTChanged = false;
                 Partition BACKUP_BS_NV = GPT.GetPartition("BACKUP_BS_NV");
                 Partition UEFI_BS_NV;
@@ -252,12 +280,14 @@ namespace WPinternals
                     BACKUP_BS_NV.Name = "BACKUP_BS_NV";
                     BACKUP_BS_NV.PartitionGuid = Guid.NewGuid();
                     BACKUP_BS_NV.PartitionTypeGuid = Guid.NewGuid();
-                    UEFI_BS_NV = new Partition();
-                    UEFI_BS_NV.Name = "UEFI_BS_NV";
-                    UEFI_BS_NV.Attributes = BACKUP_BS_NV.Attributes;
-                    UEFI_BS_NV.PartitionGuid = OriginalPartitionGuid;
-                    UEFI_BS_NV.PartitionTypeGuid = OriginalPartitionTypeGuid;
-                    UEFI_BS_NV.FirstSector = BACKUP_BS_NV.LastSector + 1;
+                    UEFI_BS_NV = new Partition
+                    {
+                        Name = "UEFI_BS_NV",
+                        Attributes = BACKUP_BS_NV.Attributes,
+                        PartitionGuid = OriginalPartitionGuid,
+                        PartitionTypeGuid = OriginalPartitionTypeGuid,
+                        FirstSector = BACKUP_BS_NV.LastSector + 1
+                    };
                     UEFI_BS_NV.LastSector = UEFI_BS_NV.FirstSector + BACKUP_BS_NV.LastSector - BACKUP_BS_NV.FirstSector;
                     GPT.Partitions.Add(UEFI_BS_NV);
                     GPTChanged = true;
@@ -265,13 +295,13 @@ namespace WPinternals
                 if (GPTChanged)
                 {
                     GPT.Rebuild();
-                    FlashPart Part = new FlashPart();
+                    FlashPart Part = new();
                     Part.StartSector = 0;
                     Part.Stream = new MemoryStream(GPTChunk);
                     Parts.Add(Part);
                 }
 
-                using (MemoryStream Space = new MemoryStream(new byte[0x40000]))
+                using (MemoryStream Space = new(new byte[0x40000]))
                 {
                     Partition Target = GPT.GetPartition("UEFI_BS_NV");
                     Parts.Add(new FlashPart() { StartSector = (uint)Target.FirstSector, Stream = Space });
@@ -301,9 +331,11 @@ namespace WPinternals
                 LogFile.Log("Partition name: " + PartitionName, LogType.FileAndConsole);
                 LogFile.Log("Partition file: " + PartitionPath, LogType.FileAndConsole);
                 if (FFUPath != null)
+                {
                     LogFile.Log("Profile FFU file: " + FFUPath, LogType.FileAndConsole);
+                }
 
-                PhoneNotifierViewModel Notifier = new PhoneNotifierViewModel();
+                PhoneNotifierViewModel Notifier = new();
                 UIContext.Send(s => Notifier.Start(), null);
 
                 NokiaFlashModel FlashModel = (NokiaFlashModel)(await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash));
@@ -313,16 +345,19 @@ namespace WPinternals
                 // Use GetGptChunk() here instead of ReadGPT(), because ReadGPT() skips the first sector.
                 // We need the fist sector if we want to write back the GPT.
                 byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(FlashModel, 0x20000);
-                GPT GPT = new GPT(GPTChunk);
+                GPT GPT = new(GPTChunk);
 
                 Partition TargetPartition = GPT.GetPartition(PartitionName);
                 if (TargetPartition == null)
+                {
                     throw new WPinternalsException("Target partition not found!", "Couldn't find \"" + PartitionName + "\" from the device GPT.");
+                }
+
                 LogFile.Log("Target-partition found at sector: 0x" + TargetPartition.FirstSector.ToString("X8") + " - 0x" + TargetPartition.LastSector.ToString("X8"), LogType.FileAndConsole);
 
                 bool IsUnlocked = false;
                 bool GPTChanged = false;
-                List<FlashPart> Parts = new List<FlashPart>();
+                List<FlashPart> Parts = new();
                 FlashPart Part;
                 if (string.Compare(PartitionName, "EFIESP", true) == 0)
                 {
@@ -334,13 +369,15 @@ namespace WPinternals
                         Partition IsUnlockedFlag = GPT.GetPartition("IS_UNLOCKED");
                         if (IsUnlockedFlag == null)
                         {
-                            IsUnlockedFlag = new Partition();
-                            IsUnlockedFlag.Name = "IS_UNLOCKED";
-                            IsUnlockedFlag.Attributes = 0;
-                            IsUnlockedFlag.PartitionGuid = Guid.NewGuid();
-                            IsUnlockedFlag.PartitionTypeGuid = Guid.NewGuid();
-                            IsUnlockedFlag.FirstSector = 0x40;
-                            IsUnlockedFlag.LastSector = 0x40;
+                            IsUnlockedFlag = new Partition
+                            {
+                                Name = "IS_UNLOCKED",
+                                Attributes = 0,
+                                PartitionGuid = Guid.NewGuid(),
+                                PartitionTypeGuid = Guid.NewGuid(),
+                                FirstSector = 0x40,
+                                LastSector = 0x40
+                            };
                             GPT.Partitions.Add(IsUnlockedFlag);
                             GPTChanged = true;
                         }
@@ -358,21 +395,27 @@ namespace WPinternals
                     if (GPTChanged)
                     {
                         GPT.Rebuild();
-                        Part = new FlashPart();
-                        Part.StartSector = 0;
-                        Part.Stream = new MemoryStream(GPTChunk);
+                        Part = new FlashPart
+                        {
+                            StartSector = 0,
+                            Stream = new MemoryStream(GPTChunk)
+                        };
                         Parts.Add(Part);
                     }
                 }
 
-                using (FileStream Stream = new FileStream(PartitionPath, FileMode.Open))
+                using (FileStream Stream = new(PartitionPath, FileMode.Open))
                 {
                     if ((UInt64)Stream.Length != (TargetPartition.SizeInSectors * 0x200))
+                    {
                         throw new WPinternalsException("Raw partition has wrong size. Size = 0x" + Stream.Length.ToString("X8") + ". Expected size = 0x" + (TargetPartition.SizeInSectors * 0x200).ToString("X8"));
+                    }
 
-                    Part = new FlashPart();
-                    Part.StartSector = (UInt32)TargetPartition.FirstSector;
-                    Part.Stream = Stream;
+                    Part = new FlashPart
+                    {
+                        StartSector = (UInt32)TargetPartition.FirstSector,
+                        Stream = Stream
+                    };
                     Parts.Add(Part);
                     await LumiaV2CustomFlash(Notifier, FFUPath, false, false, Parts, DoResetFirst, string.Compare(PartitionName, "UEFI_BS_NV", true) != 0);
                 }
@@ -397,9 +440,11 @@ namespace WPinternals
                 LogFile.Log("Start sector: 0x" + StartSector.ToString("X16"), LogType.FileAndConsole);
                 LogFile.Log("Data file: " + DataPath, LogType.FileAndConsole);
                 if (FFUPath != null)
+                {
                     LogFile.Log("FFU file: " + FFUPath, LogType.FileAndConsole);
+                }
 
-                PhoneNotifierViewModel Notifier = new PhoneNotifierViewModel();
+                PhoneNotifierViewModel Notifier = new();
                 UIContext.Send(s => Notifier.Start(), null);
 
                 NokiaFlashModel FlashModel = (NokiaFlashModel)(await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash));
@@ -423,19 +468,17 @@ namespace WPinternals
 
         internal async static Task LumiaV2CustomFlash(PhoneNotifierViewModel Notifier, string FFUPath, bool PerformFullFlashFirst, bool SkipWrite, UInt32 StartSector, byte[] Data, bool DoResetFirst = true, bool ClearFlashingStatusAtEnd = true, bool CheckSectorAlignment = true, bool ShowProgress = true, bool Experimental = false) //, string LoaderPath = null)
         {
-            using (MemoryStream Stream = new MemoryStream(Data))
-            {
-                FlashPart Part = new FlashPart() { StartSector = StartSector, Stream = Stream };
-                List<FlashPart> Parts = new List<FlashPart>();
-                Parts.Add(Part);
-                await LumiaV2CustomFlash(Notifier, FFUPath, PerformFullFlashFirst, SkipWrite, Parts, DoResetFirst, ClearFlashingStatusAtEnd, CheckSectorAlignment, ShowProgress, Experimental);
-            }
+            using MemoryStream Stream = new(Data);
+            FlashPart Part = new() { StartSector = StartSector, Stream = Stream };
+            List<FlashPart> Parts = new();
+            Parts.Add(Part);
+            await LumiaV2CustomFlash(Notifier, FFUPath, PerformFullFlashFirst, SkipWrite, Parts, DoResetFirst, ClearFlashingStatusAtEnd, CheckSectorAlignment, ShowProgress, Experimental);
         }
 
         internal async static Task LumiaV2CustomFlash(PhoneNotifierViewModel Notifier, string FFUPath, bool PerformFullFlashFirst, bool SkipWrite, UInt32 StartSector, Stream Data, bool DoResetFirst = true, bool ClearFlashingStatusAtEnd = true, bool CheckSectorAlignment = true, bool ShowProgress = true, bool Experimental = false) //, string LoaderPath = null)
         {
-            FlashPart Part = new FlashPart() { StartSector = StartSector, Stream = Data };
-            List<FlashPart> Parts = new List<FlashPart>();
+            FlashPart Part = new() { StartSector = StartSector, Stream = Data };
+            List<FlashPart> Parts = new();
             Parts.Add(Part);
             await LumiaV2CustomFlash(Notifier, FFUPath, PerformFullFlashFirst, SkipWrite, Parts, DoResetFirst, ClearFlashingStatusAtEnd, CheckSectorAlignment, ShowProgress, Experimental);
         }
@@ -447,7 +490,7 @@ namespace WPinternals
 
             byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(Model, 131072u);
 
-            GPT GPT = new GPT(GPTChunk);
+            GPT GPT = new(GPTChunk);
 
             Partition UefiBSNV = GPT.GetPartition("UEFI_BS_NV");
 
@@ -473,9 +516,13 @@ namespace WPinternals
             }
 
             if (UseOlderExploit || !ClearFlashingStatusAtEnd)
+            {
                 await LumiaV2CustomFlashInternal(Notifier, FFUPath, PerformFullFlashFirst, SkipWrite, FlashParts, DoResetFirst, ClearFlashingStatusAtEnd, CheckSectorAlignment, ShowProgress, Experimental, SetWorkingStatus, UpdateWorkingStatus, ExitSuccess, ExitFailure, ProgrammerPath);
+            }
             else
+            {
                 await LumiaV3FlashRomViewModel.LumiaV3CustomFlash(Notifier, FlashParts, CheckSectorAlignment, SetWorkingStatus, UpdateWorkingStatus, ExitSuccess, ExitFailure);
+            }
         }
 
         // Magic!
@@ -489,10 +536,25 @@ namespace WPinternals
             bool AutoEmergencyReset = true;
             bool Timeout;
 
-            if (SetWorkingStatus == null) SetWorkingStatus = (m, s, v, a, st) => { };
-            if (UpdateWorkingStatus == null) UpdateWorkingStatus = (m, s, v, st) => { };
-            if (ExitSuccess == null) ExitSuccess = (m, s) => { };
-            if (ExitFailure == null) ExitFailure = (m, s) => { };
+            if (SetWorkingStatus == null)
+            {
+                SetWorkingStatus = (m, s, v, a, st) => { };
+            }
+
+            if (UpdateWorkingStatus == null)
+            {
+                UpdateWorkingStatus = (m, s, v, st) => { };
+            }
+
+            if (ExitSuccess == null)
+            {
+                ExitSuccess = (m, s) => { };
+            }
+
+            if (ExitFailure == null)
+            {
+                ExitFailure = (m, s) => { };
+            }
 
             NokiaFlashModel Model = (NokiaFlashModel)Notifier.CurrentModel;
             PhoneInfo Info = Model.ReadPhoneInfo();
@@ -502,7 +564,9 @@ namespace WPinternals
             {
                 ProgrammerPath = GetProgrammerPath(Info.RKH, Type);
                 if (ProgrammerPath == null)
+                {
                     LogFile.Log("WARNING: No emergency programmer file found. Finding flash profile and rebooting phone may take a long time!", LogType.FileAndConsole);
+                }
             }
             List<FFUEntry> FFUs = null;
             FlashProfile Profile;
@@ -531,43 +595,69 @@ namespace WPinternals
             }
 
             if (FFUPath == null)
+            {
                 throw new WPinternalsException("No valid profile FFU found in repository", "You can download necessary files in the &quot;Download&quot; section");
+            }
 
-            FFU FFU = new FFU(FFUPath);
+            FFU FFU = new(FFUPath);
             UInt32 UpdateType = ByteOperations.ReadUInt32(FFU.StoreHeader, 0);
             if (UpdateType != 0)
+            {
                 throw new WPinternalsException("Only Full Flash images supported", "The provided FFU file reports that it doesn't support Full Flash updates, but may support something else such as Partial Flash updates. This is not supported.");
+            }
 
             if (FlashParts != null)
             {
                 foreach (FlashPart Part in FlashParts)
                 {
                     if (Part.Stream == null)
+                    {
                         throw new ArgumentException("Stream is null");
+                    }
+
                     if (!Part.Stream.CanSeek)
+                    {
                         throw new ArgumentException("Streams must be seekable");
+                    }
+
                     if (((Part.StartSector * 0x200) % FFU.ChunkSize) != 0)
+                    {
                         throw new ArgumentException("Invalid StartSector alignment");
+                    }
+
                     if (CheckSectorAlignment)
                     {
                         if ((Part.Stream.Length % FFU.ChunkSize) != 0)
+                        {
                             throw new ArgumentException("Invalid Data length");
+                        }
                     }
                 }
             }
 
             if ((Info.SecureFfuSupportedProtocolMask & ((ushort)FfuProtocol.ProtocolSyncV2)) == 0) // Exploit needs protocol v2 -> This check is not conclusive, because old phones also report support for this protocol, although it is really not supported.
+            {
                 throw new WPinternalsException("Flash failed!", "Protocols not supported. The phone reports that it does not support the Protocol Sync V2.");
+            }
+
             if (Info.FlashAppProtocolVersionMajor < 2) // Old phones do not support the hack. These phones have Flash protocol 1.x.
+            {
                 throw new WPinternalsException("Flash failed!", "Protocols not supported. The phone reports that Flash App communication protocol is lower than 2. Reported version by the phone: " + Info.FlashAppProtocolVersionMajor + ".");
-            UEFI UEFI = new UEFI(FFU.GetPartition("UEFI"));
-            string BootMgrName = UEFI.EFIs.Where(efi => ((efi.Name != null) && (efi.Name.Contains("BootMgrApp")))).First().Name;
+            }
+
+            UEFI UEFI = new(FFU.GetPartition("UEFI"));
+            string BootMgrName = UEFI.EFIs.First(efi => (efi.Name?.Contains("BootMgrApp") == true)).Name;
             UInt32 EstimatedSizeOfMemGap = (UInt32)UEFI.GetFile(BootMgrName).Length;
             byte Options = 0;
             if (SkipWrite)
+            {
                 Options = (byte)FlashOptions.SkipWrite;
+            }
+
             if (!Info.IsBootloaderSecure)
+            {
                 Options = (byte)((FlashOptions)Options | FlashOptions.SkipSignatureCheck);
+            }
 
             // Gap fill calculation:
             // About 0x18000 of the gap is used for other purposes.
@@ -604,7 +694,7 @@ namespace WPinternals
                 Timeout = false;
                 try
                 {
-                    await Notifier.WaitForArrival().TimeoutAfter<IDisposable>(TimeSpan.FromSeconds(40));
+                    await Notifier.WaitForArrival().TimeoutAfter(TimeSpan.FromSeconds(40));
                 }
                 catch (TimeoutException)
                 {
@@ -638,7 +728,7 @@ namespace WPinternals
                     bool FailedToStartProgrammer = false;
                     if (ProgrammerPath != null)
                     {
-                        QualcommSahara Sahara = new QualcommSahara((QualcommSerial)Notifier.CurrentModel);
+                        QualcommSahara Sahara = new((QualcommSerial)Notifier.CurrentModel);
                         try
                         {
                             await Sahara.Reset(ProgrammerPath);
@@ -665,7 +755,7 @@ namespace WPinternals
                         {
                             try
                             {
-                                await Notifier.WaitForArrival().TimeoutAfter<IDisposable>(TimeSpan.FromSeconds(40));
+                                await Notifier.WaitForArrival().TimeoutAfter(TimeSpan.FromSeconds(40));
                             }
                             catch (TimeoutException)
                             {
@@ -727,7 +817,10 @@ namespace WPinternals
                 #endregion
 
                 if ((Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash) && (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader))
+                {
                     throw new WPinternalsException("Phone is in wrong mode", "The phone should have been detected in bootloader or flash mode. Instead it has been detected in " + Notifier.CurrentInterface.ToString() + " mode.");
+                }
+
                 Model = (NokiaFlashModel)Notifier.CurrentModel;
                 UpdateWorkingStatus("Initializing flash...", null, null);
             }
@@ -754,10 +847,10 @@ namespace WPinternals
             //
             // If you do not order payloads like this, you will get an error, most likely hash mismatch
             //
-            FlashingPayload[] payloads = new FlashingPayload[0];
+            FlashingPayload[] payloads = Array.Empty<FlashingPayload>();
             if (FlashParts != null)
             {
-                payloads = GetNonOptimizedPayloads(FlashParts, FFU.ChunkSize, (uint)(Info.WriteBufferSize / FFU.ChunkSize), SetWorkingStatus, UpdateWorkingStatus).OrderBy(x => x.TargetLocations.Count()).ToArray();
+                payloads = GetNonOptimizedPayloads(FlashParts, FFU.ChunkSize, (uint)(Info.WriteBufferSize / FFU.ChunkSize), SetWorkingStatus, UpdateWorkingStatus).OrderBy(x => x.TargetLocations.Length).ToArray();
             }
 
             bool AssumeImageHeaderFallsInGap = true;
@@ -785,11 +878,16 @@ namespace WPinternals
 
             Profile = App.Config.GetProfile(Info.PlatformID, Info.Firmware, FFU.GetFirmwareVersion());
             if (Profile == null)
+            {
                 LogFile.Log("No flashing profile found", LogType.FileAndConsole);
+            }
             else
             {
                 if (ShowProgress)
+                {
                     LogFile.Log("Flashing profile loaded", LogType.FileAndConsole);
+                }
+
                 CurrentGapFill = Profile.FillSize;
                 ExploitHeaderAllocationSize = Profile.HeaderSize;
                 AllocateAsyncBuffersOnPhone = Profile.AllocateAsyncBuffersOnPhone;
@@ -804,7 +902,10 @@ namespace WPinternals
                     LogFile.Log("Custom flash attempt: " + AttemptCount + " of " + MaximumAttempts, LogType.FileAndConsole);
 
                     if (!Scanning)
+                    {
                         SetWorkingStatus("Scanning for flashing-profile - attempt " + AttemptCount.ToString() + " of " + MaximumAttempts.ToString(), "Your phone may appear to be in a reboot-loop. This is expected behavior. Don't interfere this process.", (uint)MaximumAttempts, Status: WPinternalsStatus.Scanning);
+                    }
+
                     Scanning = true;
                     UpdateWorkingStatus("Scanning for flashing-profile - attempt " + AttemptCount.ToString() + " of " + MaximumAttempts.ToString(), "Your phone may appear to be in a reboot-loop. This is expected behavior. Don't interfere this process.", (uint)AttemptCount, Status: WPinternalsStatus.Scanning);
 
@@ -862,7 +963,7 @@ namespace WPinternals
 
                 CombinedFFUHeaderSize = FFU.HeaderSize;
                 FfuHeader = new byte[CombinedFFUHeaderSize];
-                UInt32 TotalPayloadCount = (uint)payloads.Count();
+                UInt32 TotalPayloadCount = (uint)payloads.Length;
                 bool HeadersFull;
                 int FlashingPhase = 0;
                 UInt32 FlashingPhaseStartPayloadIndex = 0;
@@ -894,7 +995,7 @@ namespace WPinternals
                         Model.SendFfuHeaderV2(CurrentGapFill, 0, PartialHeader, Options); // Fill memory gap -> This will fail on phones with Flash Protocol v1.x !! On Lumia 640 this will hang on receiving the response when EndAsyncFlash was not called.
                     }
 
-                    using (System.IO.FileStream FfuFile = new System.IO.FileStream(FFU.Path, System.IO.FileMode.Open, System.IO.FileAccess.Read))
+                    using (FileStream FfuFile = new(FFU.Path, System.IO.FileMode.Open, System.IO.FileAccess.Read))
                     {
                         // On every flashing phase we need to send the full header again to reset all the counters.
                         FfuFile.Read(FfuHeader, 0, (int)CombinedFFUHeaderSize);
@@ -971,7 +1072,7 @@ namespace WPinternals
                     // Always flash one extra chunk on the GPT (for purpose of testing and for making sure that first chunk does not contain all zero's).
                     UInt32 SecurityHeaderSize = FlashInProgress ? 0 : 0x20u;
                     UInt32 StoreHeaderSize = FlashInProgress ? 0 : 0x10u;
-                    for (UInt32 i = FlashingPhaseStartPayloadIndex; i < payloads.Count(); i++)
+                    for (UInt32 i = FlashingPhaseStartPayloadIndex; i < payloads.Length; i++)
                     {
                         UInt32 NewSecurityHeaderSize = SecurityHeaderSize + payloads[i].GetSecurityHeaderSize();
                         UInt32 NewStoreHeaderSize = StoreHeaderSize + payloads[i].GetStoreHeaderSize();
@@ -982,17 +1083,19 @@ namespace WPinternals
                             break;
                         }
 
-                        FlashingPhasePayloadCount += 1;
+                        FlashingPhasePayloadCount++;
                         SecurityHeaderSize = NewSecurityHeaderSize;
                         StoreHeaderSize = NewStoreHeaderSize;
                     }
 
                     HashTableSize += SecurityHeaderSize;
-                    WriteDescriptorCount += (UInt32)FlashingPhasePayloadCount + (FlashInProgress ? 0 : 1u);
+                    WriteDescriptorCount += FlashingPhasePayloadCount + (FlashInProgress ? 0 : 1u);
                     WriteDescriptorLength += StoreHeaderSize;
 
                     if (!ClearFlashingStatusAtEnd || HeadersFull)
+                    {
                         WriteDescriptorCount++;
+                    }
 
                     // Write back new header values.
                     ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + 0xD4, WriteDescriptorLength);
@@ -1019,7 +1122,7 @@ namespace WPinternals
                     {
                         FlashingPayload payload = payloads[FlashingPhaseStartPayloadIndex + i];
 
-                        ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + NewWriteDescriptorOffset + 0x00, (UInt32)payload.TargetLocations.Count()); // Location count
+                        ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + NewWriteDescriptorOffset + 0x00, (UInt32)payload.TargetLocations.Length); // Location count
                         ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + NewWriteDescriptorOffset + 0x04, payload.ChunkCount);                      // Chunk count
                         NewWriteDescriptorOffset += 0x08;
 
@@ -1060,7 +1163,10 @@ namespace WPinternals
                         {
                             UInt32 CurrentFill = ExploitHeaderRemaining;
                             if (CurrentFill > Info.WriteBufferSize)
+                            {
                                 CurrentFill = Info.WriteBufferSize;
+                            }
+
                             PartialHeader = new byte[CurrentFill];
                             PartialHeaderAllocation.CopyFromThisAllocation(HeaderOffset, CurrentFill, PartialHeader, 0);
                             Model.SendFfuHeaderV2(HeaderOffset + CurrentFill + 1, HeaderOffset, PartialHeader, Options); // Phone may crash here. USB write is done. USB read might fail due to crash. Happens on my own Lumia 650.
@@ -1091,10 +1197,13 @@ namespace WPinternals
                                 {
                                     Step = 9;
                                     if (ShowProgress)
+                                    {
                                         LogFile.Log("Flashing in progress!", LogType.FileAndConsole);
+                                    }
+
                                     FlashInProgress = true;
                                     Scanning = false;
-                                    SetWorkingStatus(null, null, (UInt64?)payloads.Count(), Status: WPinternalsStatus.Flashing);
+                                    SetWorkingStatus(null, null, (UInt64?)payloads.Length, Status: WPinternalsStatus.Flashing);
                                 }
                             }
                             else
@@ -1103,7 +1212,7 @@ namespace WPinternals
 
                                 FlashingPayload payload = payloads[FlashingPhaseStartPayloadIndex + i];
 
-                                if (payloadCount == (Info.WriteBufferSize / FFU.ChunkSize - 1))
+                                if (payloadCount == ((Info.WriteBufferSize / FFU.ChunkSize) - 1))
                                 {
                                     sendPayload = true;
                                 }
@@ -1117,7 +1226,7 @@ namespace WPinternals
                                 }
 
                                 // Check if the next payload contains more than one chunk
-                                if (!sendPayload && FlashingPhaseStartPayloadIndex + i + 1 < FlashingPhasePayloadCount && (payloads[FlashingPhaseStartPayloadIndex + i + 1].ChunkCount != 1 || payloads[FlashingPhaseStartPayloadIndex + i + 1].TargetLocations.Count() != 1))
+                                if (!sendPayload && FlashingPhaseStartPayloadIndex + i + 1 < FlashingPhasePayloadCount && (payloads[FlashingPhaseStartPayloadIndex + i + 1].ChunkCount != 1 || payloads[FlashingPhaseStartPayloadIndex + i + 1].TargetLocations.Length != 1))
                                 {
                                     sendPayload = true;
                                     byte[] tmpBuffer = new byte[(payloadCount + 1) * FFU.ChunkSize];
@@ -1146,7 +1255,7 @@ namespace WPinternals
                                     }
                                 }
 
-                                if (payload.TargetLocations.Count() != 1)
+                                if (payload.TargetLocations.Length != 1)
                                 {
                                     NewProgressText = "Flashing common resources...";
                                     payloadBuffer = new byte[FFU.ChunkSize];
@@ -1159,10 +1268,12 @@ namespace WPinternals
                                     CurrentStream = flashPart.Stream;
                                     CurrentStream.Seek(payload.StreamLocations[0], SeekOrigin.Begin);
 
-                                    if (payload.TargetLocations.Count() == 1 && !string.IsNullOrEmpty(flashPart.ProgressText))
+                                    if (payload.TargetLocations.Length == 1 && !string.IsNullOrEmpty(flashPart.ProgressText))
+                                    {
                                         NewProgressText = flashPart.ProgressText;
+                                    }
 
-                                    CurrentStream.Read(payloadBuffer, (Int32)(FFU.ChunkSize * payloadCount), FFU.ChunkSize);
+                                    CurrentStream.Read(payloadBuffer, FFU.ChunkSize * payloadCount, FFU.ChunkSize);
                                 }
 
                                 Step = 8;
@@ -1177,7 +1288,7 @@ namespace WPinternals
                             if (i != -1 && sendPayload)
                             {
                                 // This fails when sending multiple chunks per payload with 0x1003: Hash mismatch
-                                Model.SendFfuPayloadV2(payloadBuffer, ShowProgress ? (Int32)((FlashingPhaseStartPayloadIndex + i + 1) * 100 / payloads.Count()) : 0);
+                                Model.SendFfuPayloadV2(payloadBuffer, ShowProgress ? (Int32)((FlashingPhaseStartPayloadIndex + i + 1) * 100 / payloads.Length) : 0);
                                 sendPayload = false;
                                 payloadCount = 0;
                                 payloadBuffer = new byte[Info.WriteBufferSize];
@@ -1195,7 +1306,10 @@ namespace WPinternals
                             Step = 12;
                             App.Config.SetProfile(Info.Type, Info.PlatformID, Info.ProductCode, Info.Firmware, FFU.GetFirmwareVersion(), CurrentGapFill, ExploitHeaderAllocationSize, AssumeImageHeaderFallsInGap, AllocateAsyncBuffersOnPhone);
                             if (ShowProgress)
+                            {
                                 LogFile.Log("Custom flash succeeded!", LogType.FileAndConsole);
+                            }
+
                             Success = true;
                         }
                         else
@@ -1250,7 +1364,9 @@ namespace WPinternals
                     }
 
                     if (FlashInProgress)
+                    {
                         FlashingPhase++;
+                    }
                 }
                 while (HeadersFull && FlashInProgress && !Abort);
 
@@ -1276,7 +1392,7 @@ namespace WPinternals
                         Timeout = false;
                         try
                         {
-                            await Notifier.WaitForArrival().TimeoutAfter<IDisposable>(TimeSpan.FromSeconds(40));
+                            await Notifier.WaitForArrival().TimeoutAfter(TimeSpan.FromSeconds(40));
                         }
                         catch (TimeoutException)
                         {
@@ -1310,7 +1426,7 @@ namespace WPinternals
                             bool FailedToStartProgrammer = false;
                             if (ProgrammerPath != null)
                             {
-                                QualcommSahara Sahara = new QualcommSahara((QualcommSerial)Notifier.CurrentModel);
+                                QualcommSahara Sahara = new((QualcommSerial)Notifier.CurrentModel);
                                 try
                                 {
                                     await Sahara.Reset(ProgrammerPath);
@@ -1331,7 +1447,7 @@ namespace WPinternals
                                 {
                                     try
                                     {
-                                        await Notifier.WaitForArrival().TimeoutAfter<IDisposable>(TimeSpan.FromSeconds(40));
+                                        await Notifier.WaitForArrival().TimeoutAfter(TimeSpan.FromSeconds(40));
                                     }
                                     catch (TimeoutException)
                                     {
@@ -1394,7 +1510,9 @@ namespace WPinternals
 
                         // Sanity check: must be in flash mode
                         if ((Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash) && (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader))
+                        {
                             break;
+                        }
 
                         Model = (NokiaFlashModel)Notifier.CurrentModel;
 
@@ -1424,7 +1542,9 @@ namespace WPinternals
                     {
                         AllocateBackupBuffersOnPhone = false;
                         if (AllocateAsyncBuffersOnPhone)
+                        {
                             AllocateAsyncBuffersOnPhone = false;
+                        }
                         else
                         {
                             AllocateAsyncBuffersOnPhone = true;
@@ -1495,7 +1615,7 @@ namespace WPinternals
                     PartialHeader = new byte[UefiMemorySim.PageSize];
                     Model.SendFfuHeaderV2(CurrentGapFill, 0, PartialHeader, Options); // Fill memory gap
                 }
-                using (System.IO.FileStream FfuFile = new System.IO.FileStream(FFU.Path, System.IO.FileMode.Open, System.IO.FileAccess.Read))
+                using (FileStream FfuFile = new(FFU.Path, System.IO.FileMode.Open, System.IO.FileAccess.Read))
                 {
                     // On every flashing phase we need to send the full header again, because this triggers ffu_import_invalidate(), which is necessary to reset all the counters.
                     FfuFile.Read(FfuHeader, 0, (int)CombinedFFUHeaderSize);
@@ -1509,7 +1629,10 @@ namespace WPinternals
                 {
                     UInt32 CurrentFill = ExploitHeaderRemaining;
                     if (CurrentFill > Info.WriteBufferSize)
+                    {
                         CurrentFill = Info.WriteBufferSize;
+                    }
+
                     PartialHeader = new byte[CurrentFill];
                     PartialHeaderAllocation.CopyFromThisAllocation(HeaderOffset, CurrentFill, PartialHeader, 0);
                     Model.SendFfuHeaderV2(HeaderOffset + CurrentFill + 1, HeaderOffset, PartialHeader, Options);
@@ -1537,7 +1660,7 @@ namespace WPinternals
                 Timeout = false;
                 try
                 {
-                    await Notifier.WaitForArrival().TimeoutAfter<IDisposable>(TimeSpan.FromSeconds(40));
+                    await Notifier.WaitForArrival().TimeoutAfter(TimeSpan.FromSeconds(40));
                 }
                 catch (TimeoutException)
                 {
@@ -1569,7 +1692,7 @@ namespace WPinternals
                     bool FailedToStartProgrammer = false;
                     if (ProgrammerPath != null)
                     {
-                        QualcommSahara Sahara = new QualcommSahara((QualcommSerial)Notifier.CurrentModel);
+                        QualcommSahara Sahara = new((QualcommSerial)Notifier.CurrentModel);
                         try
                         {
                             await Sahara.Reset(ProgrammerPath);
@@ -1590,7 +1713,7 @@ namespace WPinternals
                         {
                             try
                             {
-                                await Notifier.WaitForArrival().TimeoutAfter<IDisposable>(TimeSpan.FromSeconds(40));
+                                await Notifier.WaitForArrival().TimeoutAfter(TimeSpan.FromSeconds(40));
                             }
                             catch (TimeoutException)
                             {
@@ -1659,9 +1782,13 @@ namespace WPinternals
             }
 
             if (Success)
+            {
                 ExitSuccess("Flash succeeded!", null);
+            }
             else
+            {
                 throw new WPinternalsException("Custom flash failed");
+            }
         }
 
         internal class FlashingPayload
@@ -1683,12 +1810,12 @@ namespace WPinternals
 
             public UInt32 GetSecurityHeaderSize()
             {
-                return 0x20 * (UInt32)ChunkHashes.Count();
+                return 0x20 * (UInt32)ChunkHashes.Length;
             }
 
             public UInt32 GetStoreHeaderSize()
             {
-                return 0x08 * ((UInt32)TargetLocations.Count() + 1);
+                return 0x08 * ((UInt32)TargetLocations.Length + 1);
             }
         }
 
@@ -1709,9 +1836,12 @@ namespace WPinternals
             SetWorkingStatus("Hashing resources...", "Initializing flash...", (UInt64)TotalProcess1, Status: WPinternalsStatus.Initializing);
 
             var crypto = System.Security.Cryptography.SHA256.Create();
-            List<FlashingPayload> flashingPayloads = new List<FlashingPayload>();
+            List<FlashingPayload> flashingPayloads = new();
             if (flashParts == null)
+            {
                 return flashingPayloads.ToArray();
+            }
+
             for (UInt32 j = 0; j < flashParts.Count; j++)
             {
                 FlashPart flashPart = flashParts[(Int32)j];
@@ -1719,7 +1849,7 @@ namespace WPinternals
                 var totalChunkCount = flashPart.Stream.Length / chunkSize;
                 for (UInt32 i = 0; i < totalChunkCount; i++)
                 {
-                    UpdateWorkingStatus("Hashing resources...", "Initializing flash...", (UInt64)CurrentProcess1, WPinternalsStatus.Initializing);
+                    UpdateWorkingStatus("Hashing resources...", "Initializing flash...", CurrentProcess1, WPinternalsStatus.Initializing);
                     byte[] buffer = new byte[chunkSize];
                     Int64 position = flashPart.Stream.Position;
                     flashPart.Stream.Read(buffer, 0, chunkSize);
@@ -1737,9 +1867,11 @@ namespace WPinternals
         //
         internal static FlashingPayload[] GetOptimizedPayloads(List<FlashPart> flashParts, Int32 chunkSize, UInt32 MaximumChunkCount, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null)
         {
-            List<FlashingPayload> flashingPayloads = new List<FlashingPayload>();
+            List<FlashingPayload> flashingPayloads = new();
             if (flashParts == null)
+            {
                 return flashingPayloads.ToArray();
+            }
 
             long TotalProcess1 = 0;
             for (Int32 j = 0; j < flashParts.Count; j++)
@@ -1760,15 +1892,15 @@ namespace WPinternals
                     var totalChunkCount = flashPart.Stream.Length / chunkSize;
                     for (UInt32 i = 0; i < totalChunkCount; i++)
                     {
-                        UpdateWorkingStatus("Hashing resources...", "Initializing flash...", (UInt64)CurrentProcess1, WPinternalsStatus.Initializing);
+                        UpdateWorkingStatus("Hashing resources...", "Initializing flash...", CurrentProcess1, WPinternalsStatus.Initializing);
                         byte[] buffer = new byte[chunkSize];
                         Int64 position = flashPart.Stream.Position;
                         flashPart.Stream.Read(buffer, 0, chunkSize);
                         var hash = crypto.ComputeHash(buffer);
 
-                        if (flashingPayloads.Any(x => ByteOperations.Compare(x.ChunkHashes.First(), hash)))
+                        if (flashingPayloads.Any(x => ByteOperations.Compare(x.ChunkHashes[0], hash)))
                         {
-                            var payloadIndex = flashingPayloads.FindIndex(x => ByteOperations.Compare(x.ChunkHashes.First(), hash));
+                            var payloadIndex = flashingPayloads.FindIndex(x => ByteOperations.Compare(x.ChunkHashes[0], hash));
                             var locationList = flashingPayloads[payloadIndex].TargetLocations.ToList();
                             locationList.Add((flashPart.StartSector * 0x200 / (UInt32)chunkSize) + i);
                             flashingPayloads[payloadIndex].TargetLocations = locationList.ToArray();
@@ -1789,28 +1921,37 @@ namespace WPinternals
         internal static string GetProgrammerPath(byte[] RKH, string Type)
         {
             IEnumerable<EmergencyFileEntry> RKHEntries = App.Config.EmergencyRepository.Where(e => (StructuralComparisons.StructuralEqualityComparer.Equals(e.RKH, RKH) && e.ProgrammerExists()));
-            if (RKHEntries.Count() > 0)
+            if (RKHEntries.Any())
             {
                 if (RKHEntries.Count() == 1)
+                {
                     return RKHEntries.First().ProgrammerPath;
+                }
                 else
                 {
-                    EmergencyFileEntry RKHEntry = RKHEntries.Where(e => string.Compare(e.Type, Type, false) == 0).FirstOrDefault();
+                    EmergencyFileEntry RKHEntry = RKHEntries.FirstOrDefault(e => string.Compare(e.Type, Type, false) == 0);
                     if (RKHEntry != null)
+                    {
                         return RKHEntry.ProgrammerPath;
+                    }
                     else
+                    {
                         return RKHEntries.First().ProgrammerPath; // Cannot be sure this is the right one!!
+                    }
                 }
             }
             else
             {
-                EmergencyFileEntry TypeEntry = App.Config.EmergencyRepository.Where(e => ((string.Compare(e.Type, Type, false) == 0) && e.ProgrammerExists())).FirstOrDefault();
+                EmergencyFileEntry TypeEntry = App.Config.EmergencyRepository.Find(e => ((string.Compare(e.Type, Type, false) == 0) && e.ProgrammerExists()));
                 if (TypeEntry != null)
+                {
                     return TypeEntry.ProgrammerPath;
+                }
                 else
+                {
                     return null;
+                }
             }
-
         }
 
         // Assumes phone with Flash protocol v2
@@ -1824,11 +1965,11 @@ namespace WPinternals
             // Use GetGptChunk() here instead of ReadGPT(), because ReadGPT() skips the first sector.
             // We need the fist sector if we want to write back the GPT.
             byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(FlashModel, 0x20000);
-            GPT GPT = new GPT(GPTChunk);
+            GPT GPT = new(GPTChunk);
 
             Partition Target;
             FlashPart Part;
-            List<FlashPart> Parts = new List<FlashPart>();
+            List<FlashPart> Parts = new();
             ulong MainOSOldSectorCount = 0;
             ulong MainOSNewSectorCount = 0;
             ulong DataOldSectorCount = 0;
@@ -1841,220 +1982,235 @@ namespace WPinternals
 
             bool ClearFlashingStatus = true;
 
-            if (SetWorkingStatus == null) SetWorkingStatus = (m, s, v, a, st) => { };
-            if (UpdateWorkingStatus == null) UpdateWorkingStatus = (m, s, v, st) => { };
-            if (ExitSuccess == null) ExitSuccess = (m, s) => { };
-            if (ExitSuccess == null) ExitSuccess = (m, s) => { };
+            if (SetWorkingStatus == null)
+            {
+                SetWorkingStatus = (m, s, v, a, st) => { };
+            }
+
+            if (UpdateWorkingStatus == null)
+            {
+                UpdateWorkingStatus = (m, s, v, st) => { };
+            }
+
+            if (ExitSuccess == null)
+            {
+                ExitSuccess = (m, s) => { };
+            }
+
+            if (ExitSuccess == null)
+            {
+                ExitSuccess = (m, s) => { };
+            }
 
             SetWorkingStatus("Initializing flash...", null, null, Status: WPinternalsStatus.Initializing);
 
             try
             {
-                using (FileStream FileStream = new FileStream(ArchivePath, FileMode.Open))
+                using FileStream FileStream = new(ArchivePath, FileMode.Open);
+                using ZipArchive Archive = new(FileStream, ZipArchiveMode.Read);
+                // Determine if there is a partition layout present
+                ZipArchiveEntry PartitionEntry = Archive.GetEntry("Partitions.xml");
+                if (PartitionEntry == null)
                 {
-                    using (ZipArchive Archive = new ZipArchive(FileStream, ZipArchiveMode.Read))
+                    GPT.MergePartitions(null, true, Archive);
+                    GPTChanged |= GPT.HasChanged;
+                }
+                else
+                {
+                    using Stream ZipStream = PartitionEntry.Open();
+                    using StreamReader ZipReader = new(ZipStream);
+                    string PartitionXml = ZipReader.ReadToEnd();
+                    GPT.MergePartitions(PartitionXml, true, Archive);
+                    GPTChanged |= GPT.HasChanged;
+                }
+
+                // First determine if we need a new GPT!
+                foreach (ZipArchiveEntry Entry in Archive.Entries)
+                {
+                    if (!Entry.FullName.Contains("/")) // No subfolders
                     {
-                        // Determine if there is a partition layout present
-                        ZipArchiveEntry PartitionEntry = Archive.GetEntry("Partitions.xml");
-                        if (PartitionEntry == null)
+                        string PartitionName = Entry.Name;
+                        int Pos = PartitionName.IndexOf('.');
+                        if (Pos >= 0)
                         {
-                            GPT.MergePartitions(null, true, Archive);
-                            GPTChanged |= GPT.HasChanged;
+                            PartitionName = PartitionName.Substring(0, Pos);
                         }
-                        else
+
+                        Partition Partition = GPT.Partitions.Find(p => string.Compare(p.Name, PartitionName, true) == 0);
+                        if (Partition != null)
                         {
-                            using (Stream ZipStream = PartitionEntry.Open())
+                            using DecompressedStream DecompressedStream = new(Entry.Open());
+                            ulong StreamLengthInSectors = (ulong)Entry.Length / 0x200;
+                            try
                             {
-                                using (StreamReader ZipReader = new StreamReader(ZipStream))
-                                {
-                                    string PartitionXml = ZipReader.ReadToEnd();
-                                    GPT.MergePartitions(PartitionXml, true, Archive);
-                                    GPTChanged |= GPT.HasChanged;
-                                }
+                                StreamLengthInSectors = (ulong)DecompressedStream.Length / 0x200;
                             }
-                        }
+                            catch { }
 
-                        // First determine if we need a new GPT!
-                        foreach (ZipArchiveEntry Entry in Archive.Entries)
-                        {
-                            if (!Entry.FullName.Contains("/")) // No subfolders
+                            TotalSizeSectors += StreamLengthInSectors;
+                            PartitionCount++;
+
+                            if (string.Compare(PartitionName, "MainOS", true) == 0)
                             {
-                                string PartitionName = Entry.Name;
-                                int Pos = PartitionName.IndexOf('.');
-                                if (Pos >= 0)
-                                    PartitionName = PartitionName.Substring(0, Pos);
-
-                                Partition Partition = GPT.Partitions.Where(p => string.Compare(p.Name, PartitionName, true) == 0).FirstOrDefault();
-                                if (Partition != null)
+                                MainOSOldSectorCount = Partition.SizeInSectors;
+                                MainOSNewSectorCount = StreamLengthInSectors;
+                                FirstMainOSSector = Partition.FirstSector;
+                            }
+                            else if (string.Compare(PartitionName, "Data", true) == 0)
+                            {
+                                DataOldSectorCount = Partition.SizeInSectors;
+                                DataNewSectorCount = StreamLengthInSectors;
+                            }
+                            else if (StreamLengthInSectors > Partition.SizeInSectors)
+                            {
+                                LogFile.Log("Flash failed! Size of partition '" + PartitionName + "' is too big.", LogType.FileAndConsole);
+                                ExitFailure("Flash failed!", "Size of partition '" + PartitionName + "' is too big.");
+                                return;
+                            }
+                            else if (string.Compare(PartitionName, "EFIESP", true) == 0)
+                            {
+                                ulong EfiespLength = StreamLengthInSectors * 0x200;
+                                byte[] EfiespBinary = new byte[EfiespLength];
+                                DecompressedStream.Read(EfiespBinary, 0, (int)EfiespLength);
+                                IsUnlocked = ((ByteOperations.ReadUInt32(EfiespBinary, 0x20) == (EfiespBinary.Length / 0x200 / 2)) && (ByteOperations.ReadAsciiString(EfiespBinary, (UInt32)(EfiespBinary.Length / 2) + 3, 8)) == "MSDOS5.0");
+                                if (IsUnlocked)
                                 {
-                                    using (DecompressedStream DecompressedStream = new DecompressedStream(Entry.Open()))
+                                    Partition IsUnlockedFlag = GPT.GetPartition("IS_UNLOCKED");
+                                    if (IsUnlockedFlag == null)
                                     {
-                                        ulong StreamLengthInSectors = (ulong)Entry.Length / 0x200;
-                                        try
+                                        IsUnlockedFlag = new Partition
                                         {
-                                            StreamLengthInSectors = (ulong)DecompressedStream.Length / 0x200;
-                                        }
-                                        catch { }
-
-                                        TotalSizeSectors += StreamLengthInSectors;
-                                        PartitionCount++;
-
-                                        if (string.Compare(PartitionName, "MainOS", true) == 0)
-                                        {
-                                            MainOSOldSectorCount = Partition.SizeInSectors;
-                                            MainOSNewSectorCount = StreamLengthInSectors;
-                                            FirstMainOSSector = Partition.FirstSector;
-                                        }
-                                        else if (string.Compare(PartitionName, "Data", true) == 0)
-                                        {
-                                            DataOldSectorCount = Partition.SizeInSectors;
-                                            DataNewSectorCount = StreamLengthInSectors;
-                                        }
-                                        else if (StreamLengthInSectors > Partition.SizeInSectors)
-                                        {
-                                            LogFile.Log("Flash failed! Size of partition '" + PartitionName + "' is too big.", LogType.FileAndConsole);
-                                            ExitFailure("Flash failed!", "Size of partition '" + PartitionName + "' is too big.");
-                                            return;
-                                        }
-                                        else if (string.Compare(PartitionName, "EFIESP", true) == 0)
-                                        {
-                                            ulong EfiespLength = StreamLengthInSectors * 0x200;
-                                            byte[] EfiespBinary = new byte[EfiespLength];
-                                            DecompressedStream.Read(EfiespBinary, 0, (int)EfiespLength);
-                                            IsUnlocked = ((ByteOperations.ReadUInt32(EfiespBinary, 0x20) == (EfiespBinary.Length / 0x200 / 2)) && (ByteOperations.ReadAsciiString(EfiespBinary, (UInt32)(EfiespBinary.Length / 2) + 3, 8)) == "MSDOS5.0");
-                                            if (IsUnlocked)
-                                            {
-                                                Partition IsUnlockedFlag = GPT.GetPartition("IS_UNLOCKED");
-                                                if (IsUnlockedFlag == null)
-                                                {
-                                                    IsUnlockedFlag = new Partition();
-                                                    IsUnlockedFlag.Name = "IS_UNLOCKED";
-                                                    IsUnlockedFlag.Attributes = 0;
-                                                    IsUnlockedFlag.PartitionGuid = Guid.NewGuid();
-                                                    IsUnlockedFlag.PartitionTypeGuid = Guid.NewGuid();
-                                                    IsUnlockedFlag.FirstSector = 0x40;
-                                                    IsUnlockedFlag.LastSector = 0x40;
-                                                    GPT.Partitions.Add(IsUnlockedFlag);
-                                                    GPTChanged = true;
-                                                    ClearFlashingStatus = false;
-                                                }
-                                            }
-                                            else
-                                            {
-                                                Partition IsUnlockedFlag = GPT.GetPartition("IS_UNLOCKED");
-                                                if (IsUnlockedFlag != null)
-                                                {
-                                                    GPT.Partitions.Remove(IsUnlockedFlag);
-                                                    GPTChanged = true;
-                                                    ClearFlashingStatus = false;
-                                                }
-                                            }
-                                        }
+                                            Name = "IS_UNLOCKED",
+                                            Attributes = 0,
+                                            PartitionGuid = Guid.NewGuid(),
+                                            PartitionTypeGuid = Guid.NewGuid(),
+                                            FirstSector = 0x40,
+                                            LastSector = 0x40
+                                        };
+                                        GPT.Partitions.Add(IsUnlockedFlag);
+                                        GPTChanged = true;
+                                        ClearFlashingStatus = false;
+                                    }
+                                }
+                                else
+                                {
+                                    Partition IsUnlockedFlag = GPT.GetPartition("IS_UNLOCKED");
+                                    if (IsUnlockedFlag != null)
+                                    {
+                                        GPT.Partitions.Remove(IsUnlockedFlag);
+                                        GPTChanged = true;
+                                        ClearFlashingStatus = false;
                                     }
                                 }
                             }
                         }
+                    }
+                }
 
-                        if ((MainOSNewSectorCount > 0) && (DataNewSectorCount > 0))
+                if ((MainOSNewSectorCount > 0) && (DataNewSectorCount > 0))
+                {
+                    if ((MainOSNewSectorCount > MainOSOldSectorCount) || (DataNewSectorCount > DataOldSectorCount))
+                    {
+                        UInt64 OSSpace = GPT.LastUsableSector - FirstMainOSSector + 1;
+                        if ((MainOSNewSectorCount + DataNewSectorCount) <= OSSpace)
                         {
-                            if ((MainOSNewSectorCount > MainOSOldSectorCount) || (DataNewSectorCount > DataOldSectorCount))
+                            // MainOS and Data partitions need to be re-aligned!
+                            Partition MainOSPartition = GPT.Partitions.Single(p => string.Compare(p.Name, "MainOS", true) == 0);
+                            Partition DataPartition = GPT.Partitions.Single(p => string.Compare(p.Name, "Data", true) == 0);
+                            MainOSPartition.LastSector = MainOSPartition.FirstSector + MainOSNewSectorCount - 1;
+                            DataPartition.FirstSector = MainOSPartition.LastSector + 1;
+                            if ((DataPartition.FirstSector % 0x100) > 0)
                             {
-                                UInt64 OSSpace = GPT.LastUsableSector - FirstMainOSSector + 1;
-                                if ((MainOSNewSectorCount + DataNewSectorCount) <= OSSpace)
-                                {
-                                    // MainOS and Data partitions need to be re-aligned!
-                                    Partition MainOSPartition = GPT.Partitions.Where(p => string.Compare(p.Name, "MainOS", true) == 0).Single();
-                                    Partition DataPartition = GPT.Partitions.Where(p => string.Compare(p.Name, "Data", true) == 0).Single();
-                                    MainOSPartition.LastSector = MainOSPartition.FirstSector + MainOSNewSectorCount - 1;
-                                    DataPartition.FirstSector = MainOSPartition.LastSector + 1;
-                                    if ((DataPartition.FirstSector % 0x100) > 0)
-                                        DataPartition.FirstSector = ((UInt64)((DataPartition.FirstSector + 0x100) / 0x100)) * 0x100;
-                                    DataPartition.LastSector = DataPartition.FirstSector + DataNewSectorCount - 1;
-
-                                    GPTChanged = true;
-                                }
-                                else
-                                {
-                                    LogFile.Log("Flash failed! Sizes of partitions 'MainOS' and 'Data' together are too big.", LogType.FileAndConsole);
-                                    ExitFailure("Flash failed!", "Sizes of partitions 'MainOS' and 'Data' together are too big.");
-                                    return;
-                                }
+                                DataPartition.FirstSector = (DataPartition.FirstSector + 0x100) / 0x100 * 0x100;
                             }
+
+                            DataPartition.LastSector = DataPartition.FirstSector + DataNewSectorCount - 1;
+
+                            GPTChanged = true;
                         }
-                        else if ((MainOSNewSectorCount > 0) && (MainOSNewSectorCount > MainOSOldSectorCount))
+                        else
                         {
-                            LogFile.Log("Flash failed! Size of partition 'MainOS' is too big.", LogType.FileAndConsole);
-                            ExitFailure("Flash failed!", "Size of partition 'MainOS' is too big.");
+                            LogFile.Log("Flash failed! Sizes of partitions 'MainOS' and 'Data' together are too big.", LogType.FileAndConsole);
+                            ExitFailure("Flash failed!", "Sizes of partitions 'MainOS' and 'Data' together are too big.");
                             return;
                         }
-                        else if ((DataNewSectorCount > 0) && (DataNewSectorCount > DataOldSectorCount))
+                    }
+                }
+                else if ((MainOSNewSectorCount > 0) && (MainOSNewSectorCount > MainOSOldSectorCount))
+                {
+                    LogFile.Log("Flash failed! Size of partition 'MainOS' is too big.", LogType.FileAndConsole);
+                    ExitFailure("Flash failed!", "Size of partition 'MainOS' is too big.");
+                    return;
+                }
+                else if ((DataNewSectorCount > 0) && (DataNewSectorCount > DataOldSectorCount))
+                {
+                    LogFile.Log("Flash failed! Size of partition 'Data' is too big.", LogType.FileAndConsole);
+                    ExitFailure("Flash failed!", "Size of partition 'Data' is too big.");
+                    return;
+                }
+
+                if (!ClearFlashingStatus)
+                {
+                    if (!IsUnlocked)
+                    {
+                        // Undo secure boot exploit
+                        Partition NvBackupPartition = GPT.GetPartition("BACKUP_BS_NV");
+                        if (NvBackupPartition != null)
                         {
-                            LogFile.Log("Flash failed! Size of partition 'Data' is too big.", LogType.FileAndConsole);
-                            ExitFailure("Flash failed!", "Size of partition 'Data' is too big.");
-                            return;
+                            // This must be a left over of a half unlocked bootloader
+                            Partition NvPartition = GPT.GetPartition("UEFI_BS_NV");
+                            NvBackupPartition.Name = "UEFI_BS_NV";
+                            NvBackupPartition.PartitionGuid = NvPartition.PartitionGuid;
+                            NvBackupPartition.PartitionTypeGuid = NvPartition.PartitionTypeGuid;
+                            GPT.Partitions.Remove(NvPartition);
+                            GPTChanged = true;
                         }
 
-                        if (!ClearFlashingStatus)
+                        PhoneInfo Info = FlashModel.ReadPhoneInfo(false);
+
+                        // We should only clear NV if there was no backup NV to be restored and the current NV contains the SB unlock.
+                        if ((NvBackupPartition == null) && !Info.UefiSecureBootEnabled)
                         {
-                            if (!IsUnlocked)
+                            // ClearNV
+                            Part = new FlashPart();
+                            Partition Target2 = GPT.GetPartition("UEFI_BS_NV");
+                            Part.StartSector = (UInt32)Target2.FirstSector;
+                            Part.Stream = new MemoryStream(new byte[0x40000]);
+                            Parts.Add(Part);
+                        }
+                    }
+                    else
+                    {
+                        // Now add NV partition
+                        Partition BACKUP_BS_NV = GPT.GetPartition("BACKUP_BS_NV");
+                        Partition UEFI_BS_NV;
+                        if (BACKUP_BS_NV == null)
+                        {
+                            BACKUP_BS_NV = GPT.GetPartition("UEFI_BS_NV");
+                            Guid OriginalPartitionTypeGuid = BACKUP_BS_NV.PartitionTypeGuid;
+                            Guid OriginalPartitionGuid = BACKUP_BS_NV.PartitionGuid;
+                            BACKUP_BS_NV.Name = "BACKUP_BS_NV";
+                            BACKUP_BS_NV.PartitionGuid = Guid.NewGuid();
+                            BACKUP_BS_NV.PartitionTypeGuid = Guid.NewGuid();
+                            UEFI_BS_NV = new Partition
                             {
-                                // Undo secure boot exploit
-                                Partition NvBackupPartition = GPT.GetPartition("BACKUP_BS_NV");
-                                if (NvBackupPartition != null)
-                                {
-                                    // This must be a left over of a half unlocked bootloader
-                                    Partition NvPartition = GPT.GetPartition("UEFI_BS_NV");
-                                    NvBackupPartition.Name = "UEFI_BS_NV";
-                                    NvBackupPartition.PartitionGuid = NvPartition.PartitionGuid;
-                                    NvBackupPartition.PartitionTypeGuid = NvPartition.PartitionTypeGuid;
-                                    GPT.Partitions.Remove(NvPartition);
-                                    GPTChanged = true;
-                                }
-
-                                PhoneInfo Info = FlashModel.ReadPhoneInfo(false);
-
-                                // We should only clear NV if there was no backup NV to be restored and the current NV contains the SB unlock.
-                                if ((NvBackupPartition == null) && !Info.UefiSecureBootEnabled)
-                                {
-                                    // ClearNV
-                                    Part = new FlashPart();
-                                    Partition Target2 = GPT.GetPartition("UEFI_BS_NV");
-                                    Part.StartSector = (UInt32)Target2.FirstSector;
-                                    Part.Stream = new MemoryStream(new byte[0x40000]);
-                                    Parts.Add(Part);
-                                }
-                            }
-                            else
-                            {
-                                // Now add NV partition
-                                Partition BACKUP_BS_NV = GPT.GetPartition("BACKUP_BS_NV");
-                                Partition UEFI_BS_NV;
-                                if (BACKUP_BS_NV == null)
-                                {
-                                    BACKUP_BS_NV = GPT.GetPartition("UEFI_BS_NV");
-                                    Guid OriginalPartitionTypeGuid = BACKUP_BS_NV.PartitionTypeGuid;
-                                    Guid OriginalPartitionGuid = BACKUP_BS_NV.PartitionGuid;
-                                    BACKUP_BS_NV.Name = "BACKUP_BS_NV";
-                                    BACKUP_BS_NV.PartitionGuid = Guid.NewGuid();
-                                    BACKUP_BS_NV.PartitionTypeGuid = Guid.NewGuid();
-                                    UEFI_BS_NV = new Partition();
-                                    UEFI_BS_NV.Name = "UEFI_BS_NV";
-                                    UEFI_BS_NV.Attributes = BACKUP_BS_NV.Attributes;
-                                    UEFI_BS_NV.PartitionGuid = OriginalPartitionGuid;
-                                    UEFI_BS_NV.PartitionTypeGuid = OriginalPartitionTypeGuid;
-                                    UEFI_BS_NV.FirstSector = BACKUP_BS_NV.LastSector + 1;
-                                    UEFI_BS_NV.LastSector = UEFI_BS_NV.FirstSector + BACKUP_BS_NV.LastSector - BACKUP_BS_NV.FirstSector;
-                                    GPT.Partitions.Add(UEFI_BS_NV);
-                                    GPTChanged = true;
-                                }
-
-                                Part = new FlashPart();
-                                Target = GPT.GetPartition("UEFI_BS_NV");
-                                Part.StartSector = (UInt32)Target.FirstSector; // GPT is prepared for 64-bit sector-offset, but flash app isn't.
-                                Part.Stream = new SeekableStream(() =>
-                                {
-                                    var assembly = System.Reflection.Assembly.GetExecutingAssembly();
+                                Name = "UEFI_BS_NV",
+                                Attributes = BACKUP_BS_NV.Attributes,
+                                PartitionGuid = OriginalPartitionGuid,
+                                PartitionTypeGuid = OriginalPartitionTypeGuid,
+                                FirstSector = BACKUP_BS_NV.LastSector + 1
+                            };
+                            UEFI_BS_NV.LastSector = UEFI_BS_NV.FirstSector + BACKUP_BS_NV.LastSector - BACKUP_BS_NV.FirstSector;
+                            GPT.Partitions.Add(UEFI_BS_NV);
+                            GPTChanged = true;
+                        }
 
+                        Part = new FlashPart();
+                        Target = GPT.GetPartition("UEFI_BS_NV");
+                        Part.StartSector = (UInt32)Target.FirstSector; // GPT is prepared for 64-bit sector-offset, but flash app isn't.
+                        Part.Stream = new SeekableStream(() =>
+                        {
+                            var assembly = System.Reflection.Assembly.GetExecutingAssembly();
 
                                     // Magic!
                                     // The SB resource is a compressed version of a raw NV-variable-partition.
@@ -2064,65 +2220,69 @@ namespace WPinternals
                                     // But the partition contains an extra hack to break out the endless loops.
                                     var stream = assembly.GetManifestResourceStream("WPinternals.SB");
 
-                                    return new DecompressedStream(stream);
-                                });
-                                Parts.Add(Part);
-                            }
-                        }
+                            return new DecompressedStream(stream);
+                        });
+                        Parts.Add(Part);
+                    }
+                }
 
-                        if (GPTChanged)
-                        {
-                            GPT.Rebuild();
-                            Part = new FlashPart();
-                            Part.StartSector = 0;
-                            Part.Stream = new MemoryStream(GPTChunk);
-                            Parts.Add(Part);
-                        }
+                if (GPTChanged)
+                {
+                    GPT.Rebuild();
+                    Part = new FlashPart
+                    {
+                        StartSector = 0,
+                        Stream = new MemoryStream(GPTChunk)
+                    };
+                    Parts.Add(Part);
+                }
 
-                        // And then add the partitions from the archive
-                        if (PartitionCount > 0)
+                // And then add the partitions from the archive
+                if (PartitionCount > 0)
+                {
+                    foreach (ZipArchiveEntry Entry in Archive.Entries)
+                    {
+                        if (!Entry.FullName.Contains("/")) // No subfolders
                         {
-                            foreach (ZipArchiveEntry Entry in Archive.Entries)
+                            // "MainOS.bin.gz" => "MainOS"
+                            string PartitionName = Entry.Name;
+                            int Pos = PartitionName.IndexOf('.');
+                            if (Pos >= 0)
                             {
-                                if (!Entry.FullName.Contains("/")) // No subfolders
+                                PartitionName = PartitionName.Substring(0, Pos);
+                            }
+
+                            Target = GPT.Partitions.Find(p => string.Compare(p.Name, PartitionName, true) == 0);
+                            if (Target != null)
+                            {
+                                Part = new FlashPart
                                 {
-                                    // "MainOS.bin.gz" => "MainOS"
-                                    string PartitionName = Entry.Name;
-                                    int Pos = PartitionName.IndexOf('.');
-                                    if (Pos >= 0)
-                                        PartitionName = PartitionName.Substring(0, Pos);
-
-                                    Target = GPT.Partitions.Where(p => string.Compare(p.Name, PartitionName, true) == 0).FirstOrDefault();
-                                    if (Target != null)
-                                    {
-                                        Part = new FlashPart();
-                                        Part.StartSector = (UInt32)Target.FirstSector;
-                                        Part.Stream = new SeekableStream(() => new DecompressedStream(Entry.Open()), Entry.Length);
-                                        Part.ProgressText = "Flashing partition " + Target.Name;
-                                        Parts.Add(Part);
-                                        LogFile.Log("Partition name=" + PartitionName + ", startsector=0x" + Target.FirstSector.ToString("X8") + ", sectorcount = 0x" + (Entry.Length / 0x200).ToString("X8"), LogType.FileOnly);
-                                    }
-                                }
+                                    StartSector = (UInt32)Target.FirstSector,
+                                    Stream = new SeekableStream(() => new DecompressedStream(Entry.Open()), Entry.Length),
+                                    ProgressText = "Flashing partition " + Target.Name
+                                };
+                                Parts.Add(Part);
+                                LogFile.Log("Partition name=" + PartitionName + ", startsector=0x" + Target.FirstSector.ToString("X8") + ", sectorcount = 0x" + (Entry.Length / 0x200).ToString("X8"), LogType.FileOnly);
                             }
-
-                            Parts = Parts.OrderBy(p => p.StartSector).ToList();
-                            int Count = 1;
-                            Parts.Where(p => ((p.ProgressText != null) && p.ProgressText.StartsWith("Flashing partition "))).ToList().ForEach((p) =>
-                            {
-                                p.ProgressText += " (" + Count.ToString() + "/" + PartitionCount.ToString() + ")";
-                                Count++;
-                            });
-
-                            // Do actual flashing!
-                            await LumiaV2CustomFlash(Notifier, null, false, false, Parts, true, ClearFlashingStatus, false, true, false, SetWorkingStatus, UpdateWorkingStatus, ExitSuccess, ExitFailure);
-                        }
-                        else
-                        {
-                            LogFile.Log("Flash failed! No valid partitions found in the archive.", LogType.FileAndConsole);
-                            ExitFailure("Flash failed!", "No valid partitions found in the archive");
-                            return;
                         }
                     }
+
+                    Parts = Parts.OrderBy(p => p.StartSector).ToList();
+                    int Count = 1;
+                    Parts.Where(p => (p.ProgressText?.StartsWith("Flashing partition ") == true)).ToList().ForEach((p) =>
+                    {
+                        p.ProgressText += " (" + Count.ToString() + "/" + PartitionCount.ToString() + ")";
+                        Count++;
+                    });
+
+                    // Do actual flashing!
+                    await LumiaV2CustomFlash(Notifier, null, false, false, Parts, true, ClearFlashingStatus, false, true, false, SetWorkingStatus, UpdateWorkingStatus, ExitSuccess, ExitFailure);
+                }
+                else
+                {
+                    LogFile.Log("Flash failed! No valid partitions found in the archive.", LogType.FileAndConsole);
+                    ExitFailure("Flash failed!", "No valid partitions found in the archive");
+                    return;
                 }
             }
             catch (Exception Ex)
@@ -2141,10 +2301,25 @@ namespace WPinternals
             LogFile.Log("Command: Fix boot after unlocking bootloader", LogType.FileAndConsole);
             NokiaFlashModel FlashModel = (NokiaFlashModel)Notifier.CurrentModel;
 
-            if (SetWorkingStatus == null) SetWorkingStatus = (m, s, v, a, st) => { };
-            if (UpdateWorkingStatus == null) UpdateWorkingStatus = (m, s, v, st) => { };
-            if (ExitSuccess == null) ExitSuccess = (m, s) => { };
-            if (ExitFailure == null) ExitFailure = (m, s) => { };
+            if (SetWorkingStatus == null)
+            {
+                SetWorkingStatus = (m, s, v, a, st) => { };
+            }
+
+            if (UpdateWorkingStatus == null)
+            {
+                UpdateWorkingStatus = (m, s, v, st) => { };
+            }
+
+            if (ExitSuccess == null)
+            {
+                ExitSuccess = (m, s) => { };
+            }
+
+            if (ExitFailure == null)
+            {
+                ExitFailure = (m, s) => { };
+            }
 
             try
             {
@@ -2153,7 +2328,10 @@ namespace WPinternals
                 App.PatchEngine.TargetPath = ((MassStorage)Notifier.CurrentModel).Drive + "\\";
                 bool PatchResult = App.PatchEngine.Patch("SecureBootHack-MainOS");
                 if (!PatchResult)
+                {
                     throw new WPinternalsException("Patch failed", "An error occured while patching Operating System files on the MainOS partition of your phone. Make sure your phone runs a supported Operating System version.");
+                }
+
                 LogFile.Log("Fixed bootloader", LogType.FileAndConsole);
                 LogFile.Log("The phone is left in Mass Storage mode", LogType.FileAndConsole);
                 LogFile.Log("Press and hold the power-button of the phone for at least 10 seconds to reset the phone", LogType.FileAndConsole);
@@ -2177,11 +2355,11 @@ namespace WPinternals
             // Use GetGptChunk() here instead of ReadGPT(), because ReadGPT() skips the first sector.
             // We need the fist sector if we want to write back the GPT.
             byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(FlashModel, 0x20000);
-            GPT GPT = new GPT(GPTChunk);
+            GPT GPT = new(GPTChunk);
 
             Partition Target;
             FlashPart Part;
-            List<FlashPart> Parts = new List<FlashPart>();
+            List<FlashPart> Parts = new();
             ulong MainOSOldSectorCount = 0;
             ulong MainOSNewSectorCount = 0;
             ulong DataOldSectorCount = 0;
@@ -2195,10 +2373,25 @@ namespace WPinternals
             bool GPTChanged = false;
             bool ClearFlashingStatus = true;
 
-            if (SetWorkingStatus == null) SetWorkingStatus = (m, s, v, a, st) => { };
-            if (UpdateWorkingStatus == null) UpdateWorkingStatus = (m, s, v, st) => { };
-            if (ExitSuccess == null) ExitSuccess = (m, s) => { };
-            if (ExitFailure == null) ExitFailure = (m, s) => { };
+            if (SetWorkingStatus == null)
+            {
+                SetWorkingStatus = (m, s, v, a, st) => { };
+            }
+
+            if (UpdateWorkingStatus == null)
+            {
+                UpdateWorkingStatus = (m, s, v, st) => { };
+            }
+
+            if (ExitSuccess == null)
+            {
+                ExitSuccess = (m, s) => { };
+            }
+
+            if (ExitFailure == null)
+            {
+                ExitFailure = (m, s) => { };
+            }
 
             SetWorkingStatus("Initializing flash...", null, null, Status: WPinternalsStatus.Initializing);
 
@@ -2224,13 +2417,15 @@ namespace WPinternals
                         Partition IsUnlockedFlag = GPT.GetPartition("IS_UNLOCKED");
                         if (IsUnlockedFlag == null)
                         {
-                            IsUnlockedFlag = new Partition();
-                            IsUnlockedFlag.Name = "IS_UNLOCKED";
-                            IsUnlockedFlag.Attributes = 0;
-                            IsUnlockedFlag.PartitionGuid = Guid.NewGuid();
-                            IsUnlockedFlag.PartitionTypeGuid = Guid.NewGuid();
-                            IsUnlockedFlag.FirstSector = 0x40;
-                            IsUnlockedFlag.LastSector = 0x40;
+                            IsUnlockedFlag = new Partition
+                            {
+                                Name = "IS_UNLOCKED",
+                                Attributes = 0,
+                                PartitionGuid = Guid.NewGuid(),
+                                PartitionTypeGuid = Guid.NewGuid(),
+                                FirstSector = 0x40,
+                                LastSector = 0x40
+                            };
                             GPT.Partitions.Add(IsUnlockedFlag);
                             GPTChanged = true;
                             ClearFlashingStatus = false;
@@ -2279,12 +2474,15 @@ namespace WPinternals
                             if ((MainOSNewSectorCount + DataNewSectorCount) <= OSSpace)
                             {
                                 // MainOS and Data partitions need to be re-aligned!
-                                Partition MainOSPartition = GPT.Partitions.Where(p => string.Compare(p.Name, "MainOS", true) == 0).Single();
-                                Partition DataPartition = GPT.Partitions.Where(p => string.Compare(p.Name, "Data", true) == 0).Single();
+                                Partition MainOSPartition = GPT.Partitions.Single(p => string.Compare(p.Name, "MainOS", true) == 0);
+                                Partition DataPartition = GPT.Partitions.Single(p => string.Compare(p.Name, "Data", true) == 0);
                                 MainOSPartition.LastSector = MainOSPartition.FirstSector + MainOSNewSectorCount - 1;
                                 DataPartition.FirstSector = MainOSPartition.LastSector + 1;
                                 if ((DataPartition.FirstSector % 0x100) > 0)
-                                    DataPartition.FirstSector = ((UInt64)((DataPartition.FirstSector + 0x100) / 0x100)) * 0x100;
+                                {
+                                    DataPartition.FirstSector = (DataPartition.FirstSector + 0x100) / 0x100 * 0x100;
+                                }
+
                                 DataPartition.LastSector = DataPartition.FirstSector + DataNewSectorCount - 1;
 
                                 GPTChanged = true;
@@ -2353,12 +2551,14 @@ namespace WPinternals
                                 BACKUP_BS_NV.Name = "BACKUP_BS_NV";
                                 BACKUP_BS_NV.PartitionGuid = Guid.NewGuid();
                                 BACKUP_BS_NV.PartitionTypeGuid = Guid.NewGuid();
-                                UEFI_BS_NV = new Partition();
-                                UEFI_BS_NV.Name = "UEFI_BS_NV";
-                                UEFI_BS_NV.Attributes = BACKUP_BS_NV.Attributes;
-                                UEFI_BS_NV.PartitionGuid = OriginalPartitionGuid;
-                                UEFI_BS_NV.PartitionTypeGuid = OriginalPartitionTypeGuid;
-                                UEFI_BS_NV.FirstSector = BACKUP_BS_NV.LastSector + 1;
+                                UEFI_BS_NV = new Partition
+                                {
+                                    Name = "UEFI_BS_NV",
+                                    Attributes = BACKUP_BS_NV.Attributes,
+                                    PartitionGuid = OriginalPartitionGuid,
+                                    PartitionTypeGuid = OriginalPartitionTypeGuid,
+                                    FirstSector = BACKUP_BS_NV.LastSector + 1
+                                };
                                 UEFI_BS_NV.LastSector = UEFI_BS_NV.FirstSector + BACKUP_BS_NV.LastSector - BACKUP_BS_NV.FirstSector;
                                 GPT.Partitions.Add(UEFI_BS_NV);
                                 GPTChanged = true;
@@ -2371,7 +2571,6 @@ namespace WPinternals
                             {
                                 var assembly = System.Reflection.Assembly.GetExecutingAssembly();
 
-
                                 // Magic!
                                 // The SB resource is a compressed version of a raw NV-variable-partition.
                                 // In this partition the SecureBoot variable is disabled.
@@ -2389,46 +2588,54 @@ namespace WPinternals
                     if (GPTChanged)
                     {
                         GPT.Rebuild();
-                        Part = new FlashPart();
-                        Part.StartSector = 0;
-                        Part.Stream = new MemoryStream(GPTChunk);
+                        Part = new FlashPart
+                        {
+                            StartSector = 0,
+                            Stream = new MemoryStream(GPTChunk)
+                        };
                         Parts.Add(Part);
                     }
 
                     int Count = 0;
 
-                    Target = GPT.Partitions.Where(p => string.Compare(p.Name, "EFIESP", true) == 0).FirstOrDefault();
+                    Target = GPT.Partitions.Find(p => string.Compare(p.Name, "EFIESP", true) == 0);
                     if ((EFIESPPath != null) && (Target != null))
                     {
                         Count++;
-                        Part = new FlashPart();
-                        Part.StartSector = (UInt32)Target.FirstSector;
-                        Part.Stream = new FileStream(EFIESPPath, FileMode.Open);
-                        Part.ProgressText = "Flashing partition EFIESP (" + Count.ToString() + " / " + PartitionCount.ToString() + ")";
+                        Part = new FlashPart
+                        {
+                            StartSector = (UInt32)Target.FirstSector,
+                            Stream = new FileStream(EFIESPPath, FileMode.Open),
+                            ProgressText = "Flashing partition EFIESP (" + Count.ToString() + " / " + PartitionCount.ToString() + ")"
+                        };
                         Parts.Add(Part);
                         LogFile.Log("Partition name=EFIESP, startsector=0x" + Target.FirstSector.ToString("X8") + ", sectorcount = 0x" + (Part.Stream.Length / 0x200).ToString("X8"), LogType.FileOnly);
                     }
 
-                    Target = GPT.Partitions.Where(p => string.Compare(p.Name, "MainOS", true) == 0).FirstOrDefault();
+                    Target = GPT.Partitions.Find(p => string.Compare(p.Name, "MainOS", true) == 0);
                     if ((MainOSPath != null) && (Target != null))
                     {
                         Count++;
-                        Part = new FlashPart();
-                        Part.StartSector = (UInt32)Target.FirstSector;
-                        Part.Stream = new FileStream(MainOSPath, FileMode.Open);
-                        Part.ProgressText = "Flashing partition MainOS (" + Count.ToString() + " / " + PartitionCount.ToString() + ")";
+                        Part = new FlashPart
+                        {
+                            StartSector = (UInt32)Target.FirstSector,
+                            Stream = new FileStream(MainOSPath, FileMode.Open),
+                            ProgressText = "Flashing partition MainOS (" + Count.ToString() + " / " + PartitionCount.ToString() + ")"
+                        };
                         Parts.Add(Part);
                         LogFile.Log("Partition name=MainOS, startsector=0x" + Target.FirstSector.ToString("X8") + ", sectorcount = 0x" + (Part.Stream.Length / 0x200).ToString("X8"), LogType.FileOnly);
                     }
 
-                    Target = GPT.Partitions.Where(p => string.Compare(p.Name, "Data", true) == 0).FirstOrDefault();
+                    Target = GPT.Partitions.Find(p => string.Compare(p.Name, "Data", true) == 0);
                     if ((DataPath != null) && (Target != null))
                     {
                         Count++;
-                        Part = new FlashPart();
-                        Part.StartSector = (UInt32)Target.FirstSector;
-                        Part.Stream = new FileStream(DataPath, FileMode.Open);
-                        Part.ProgressText = "Flashing partition Data (" + Count.ToString() + " / " + PartitionCount.ToString() + ")";
+                        Part = new FlashPart
+                        {
+                            StartSector = (UInt32)Target.FirstSector,
+                            Stream = new FileStream(DataPath, FileMode.Open),
+                            ProgressText = "Flashing partition Data (" + Count.ToString() + " / " + PartitionCount.ToString() + ")"
+                        };
                         Parts.Add(Part);
                         LogFile.Log("Partition name=Data, startsector=0x" + Target.FirstSector.ToString("X8") + ", sectorcount = 0x" + (Part.Stream.Length / 0x200).ToString("X8"), LogType.FileOnly);
                     }
@@ -2458,14 +2665,17 @@ namespace WPinternals
 
         private static UInt32 CurrentBufferSize = 0;
         public static byte[] Buffer;
-        private static List<Allocation> Allocations = new List<Allocation>();
-        private static List<FreeMemRange> FreeMemRanges = new List<FreeMemRange>();
+        private static readonly List<Allocation> Allocations = new();
+        private static readonly List<FreeMemRange> FreeMemRanges = new();
 
         public static UInt32 RoundUpToPages(UInt32 Size)
         {
             UInt32 Result = Size + 0x18;
             if ((Size % PageSize) != 0)
+            {
                 Size = ((Size / PageSize) + 1) * PageSize;
+            }
+
             return Result;
         }
 
@@ -2481,7 +2691,10 @@ namespace WPinternals
         {
             byte[] NewBuffer = new byte[CurrentBufferSize + Size];
             if (CurrentBufferSize > 0)
+            {
                 System.Buffer.BlockCopy(Buffer, 0, NewBuffer, (int)Size, (int)CurrentBufferSize);
+            }
+
             foreach (Allocation CurrentAllocation in Allocations)
             {
                 CurrentAllocation.TotalStart += Size;
@@ -2514,17 +2727,23 @@ namespace WPinternals
             }
             else
             {
-                for (int i = FreeMemRanges.Count() - 1; i >= 0; i--)
+                for (int i = FreeMemRanges.Count - 1; i >= 0; i--)
                 {
                     if (FreeMemRanges[i].Size >= TotalSize)
                     {
-                        NewAllocation = new Allocation();
-                        NewAllocation.TotalStart = FreeMemRanges[i].End - TotalSize + 1;
+                        NewAllocation = new Allocation
+                        {
+                            TotalStart = FreeMemRanges[i].End - TotalSize + 1
+                        };
 
                         if (FreeMemRanges[i].Size == TotalSize)
+                        {
                             FreeMemRanges.RemoveAt(i);
+                        }
                         else
+                        {
                             FreeMemRanges[i].End -= TotalSize;
+                        }
 
                         break;
                     }
@@ -2532,26 +2751,26 @@ namespace WPinternals
 
                 if (NewAllocation == null)
                 {
-                    UInt32 FreeBuffer;
-
-                    if (Allocations.Count() > 0)
-                        FreeBuffer = Allocations[0].TotalStart;
-                    else
-                        FreeBuffer = CurrentBufferSize;
-
+                    uint FreeBuffer = Allocations.Count > 0 ? Allocations[0].TotalStart : CurrentBufferSize;
                     if (FreeBuffer < TotalSize)
+                    {
                         ExtendBuffer(TotalSize - FreeBuffer);
+                    }
 
                     NewAllocation = new Allocation();
 
-                    if (Allocations.Count() > 0)
+                    if (Allocations.Count > 0)
+                    {
                         NewAllocation.TotalStart = Allocations[0].TotalStart - TotalSize;
+                    }
                     else
+                    {
                         FreeBuffer = CurrentBufferSize - TotalSize;
+                    }
                 }
 
                 bool Added = false;
-                for (int i = 0; i < Allocations.Count(); i++)
+                for (int i = 0; i < Allocations.Count; i++)
                 {
                     if (NewAllocation.TotalStart < Allocations[i].TotalStart)
                     {
@@ -2561,7 +2780,9 @@ namespace WPinternals
                     }
                 }
                 if (!Added)
+                {
                     Allocations.Add(NewAllocation);
+                }
             }
 
             return NewAllocation;
@@ -2580,19 +2801,27 @@ namespace WPinternals
             else
             {
                 if ((TotalSize % PageSize) != 0)
+                {
                     TotalSize = ((TotalSize / PageSize) + 1) * PageSize;
+                }
 
-                for (int i = FreeMemRanges.Count() - 1; i >= 0; i--)
+                for (int i = FreeMemRanges.Count - 1; i >= 0; i--)
                 {
                     if (FreeMemRanges[i].Size >= TotalSize)
                     {
-                        NewAllocation = new Allocation();
-                        NewAllocation.TotalStart = FreeMemRanges[i].End - TotalSize + 1;
+                        NewAllocation = new Allocation
+                        {
+                            TotalStart = FreeMemRanges[i].End - TotalSize + 1
+                        };
 
                         if (FreeMemRanges[i].Size == TotalSize)
+                        {
                             FreeMemRanges.RemoveAt(i);
+                        }
                         else
+                        {
                             FreeMemRanges[i].End -= TotalSize;
+                        }
 
                         break;
                     }
@@ -2600,22 +2829,22 @@ namespace WPinternals
 
                 if (NewAllocation == null)
                 {
-                    UInt32 FreeBuffer;
-
-                    if (Allocations.Count() > 0)
-                        FreeBuffer = Allocations[0].TotalStart;
-                    else
-                        FreeBuffer = CurrentBufferSize;
-
+                    uint FreeBuffer = Allocations.Count > 0 ? Allocations[0].TotalStart : CurrentBufferSize;
                     if (FreeBuffer < TotalSize)
+                    {
                         ExtendBuffer(TotalSize - FreeBuffer);
+                    }
 
                     NewAllocation = new Allocation();
 
-                    if (Allocations.Count() > 0)
+                    if (Allocations.Count > 0)
+                    {
                         NewAllocation.TotalStart = Allocations[0].TotalStart - TotalSize;
+                    }
                     else
+                    {
                         FreeBuffer = CurrentBufferSize - TotalSize;
+                    }
                 }
 
                 NewAllocation.TotalEnd = NewAllocation.TotalStart + TotalSize - 1;
@@ -2646,7 +2875,7 @@ namespace WPinternals
                 ByteOperations.WriteUInt32(Buffer, NewAllocation.TailStart + 0x04, Size + 24);
 
                 bool Added = false;
-                for (int i = 0; i < Allocations.Count(); i++)
+                for (int i = 0; i < Allocations.Count; i++)
                 {
                     if (NewAllocation.TotalStart < Allocations[i].TotalStart)
                     {
@@ -2656,7 +2885,9 @@ namespace WPinternals
                     }
                 }
                 if (!Added)
+                {
                     Allocations.Add(NewAllocation);
+                }
             }
 
             return NewAllocation;
@@ -2668,19 +2899,19 @@ namespace WPinternals
             {
                 Allocations.Remove(Allocation);
 
-                if (Allocations.Count() == 0)
+                if (Allocations.Count == 0)
                 {
                     FreeMemRanges.Clear();
                 }
                 else
                 {
-                    FreeMemRange NewFreeRange = new FreeMemRange();
+                    FreeMemRange NewFreeRange = new();
                     NewFreeRange.Start = Allocation.TotalStart;
                     NewFreeRange.End = Allocation.TotalEnd;
 
                     bool Added = false;
                     int i;
-                    for (i = 0; i < FreeMemRanges.Count(); i++)
+                    for (i = 0; i < FreeMemRanges.Count; i++)
                     {
                         if (NewFreeRange.Start < FreeMemRanges[i].Start)
                         {
@@ -2692,7 +2923,7 @@ namespace WPinternals
                     if (!Added)
                     {
                         FreeMemRanges.Add(NewFreeRange);
-                        i = FreeMemRanges.Count();
+                        i = FreeMemRanges.Count;
                     }
 
                     if ((i > 0) && (FreeMemRanges[i].Start == (FreeMemRanges[i - 1].End + 1)))
@@ -2702,14 +2933,16 @@ namespace WPinternals
                         i--;
                     }
 
-                    if ((i < (FreeMemRanges.Count() - 1)) && (FreeMemRanges[i].End == (FreeMemRanges[i - 1].Start - 1)))
+                    if ((i < (FreeMemRanges.Count - 1)) && (FreeMemRanges[i].End == (FreeMemRanges[i - 1].Start - 1)))
                     {
                         FreeMemRanges[i].End = FreeMemRanges[i + 1].End;
                         FreeMemRanges.RemoveAt(i + 1);
                     }
 
-                    if ((Allocations.Count() > 0) && (FreeMemRanges[i].Start < Allocations[0].TotalStart))
+                    if ((Allocations.Count > 0) && (FreeMemRanges[i].Start < Allocations[0].TotalStart))
+                    {
                         FreeMemRanges.RemoveAt(i);
+                    }
                 }
             }
         }
diff --git a/ViewModels/LumiaV3FlashRomViewModel.cs b/ViewModels/LumiaV3FlashRomViewModel.cs
index 5bdaaad..36cdf02 100644
--- a/ViewModels/LumiaV3FlashRomViewModel.cs
+++ b/ViewModels/LumiaV3FlashRomViewModel.cs
@@ -70,15 +70,29 @@ namespace WPinternals
             {
                 string Manifest = "[FullFlash]\r\n";
                 if (!string.IsNullOrEmpty(fullFlash.AntiTheftVersion))
+                {
                     Manifest += "AntiTheftVersion  = " + fullFlash.AntiTheftVersion + "\r\n";
+                }
+
                 if (!string.IsNullOrEmpty(fullFlash.OSVersion))
+                {
                     Manifest += "OSVersion         = " + fullFlash.OSVersion + "\r\n";
+                }
+
                 if (!string.IsNullOrEmpty(fullFlash.Description))
+                {
                     Manifest += "Description       = " + fullFlash.Description + "\r\n";
+                }
+
                 if (!string.IsNullOrEmpty(fullFlash.Version))
+                {
                     Manifest += "Version           = " + fullFlash.Version + "\r\n";
+                }
+
                 if (!string.IsNullOrEmpty(fullFlash.DevicePlatformId0))
+                {
                     Manifest += "DevicePlatformId0 = " + fullFlash.DevicePlatformId0 + "\r\n";
+                }
 
                 Manifest += "\r\n[Store]\r\n";
                 Manifest += "SectorSize     = " + store.SectorSize + "\r\n";
@@ -127,28 +141,54 @@ namespace WPinternals
         //
         internal async static Task LumiaV3CustomFlash(PhoneNotifierViewModel Notifier, List<FlashPart> FlashParts, bool CheckSectorAlignment = true, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null, ExitSuccess ExitSuccess = null, ExitFailure ExitFailure = null)
         {
-            if (SetWorkingStatus == null) SetWorkingStatus = (m, s, v, a, st) => { };
-            if (UpdateWorkingStatus == null) UpdateWorkingStatus = (m, s, v, st) => { };
-            if (ExitSuccess == null) ExitSuccess = (m, s) => { };
-            if (ExitFailure == null) ExitFailure = (m, s) => { };
+            if (SetWorkingStatus == null)
+            {
+                SetWorkingStatus = (m, s, v, a, st) => { };
+            }
 
-            uint chunkSize = 131072u;
-            int chunkSizes = 131072;
+            if (UpdateWorkingStatus == null)
+            {
+                UpdateWorkingStatus = (m, s, v, st) => { };
+            }
+
+            if (ExitSuccess == null)
+            {
+                ExitSuccess = (m, s) => { };
+            }
+
+            if (ExitFailure == null)
+            {
+                ExitFailure = (m, s) => { };
+            }
+
+            const uint chunkSize = 131072u;
+            const int chunkSizes = 131072;
 
             if (FlashParts != null)
             {
                 foreach (FlashPart Part in FlashParts)
                 {
                     if (Part.Stream == null)
+                    {
                         throw new ArgumentException("Stream is null");
+                    }
+
                     if (!Part.Stream.CanSeek)
+                    {
                         throw new ArgumentException("Streams must be seekable");
+                    }
+
                     if (((Part.StartSector * 0x200) % chunkSize) != 0)
+                    {
                         throw new ArgumentException("Invalid StartSector alignment");
+                    }
+
                     if (CheckSectorAlignment)
                     {
                         if ((Part.Stream.Length % chunkSize) != 0)
+                        {
                             throw new ArgumentException("Invalid Data length");
+                        }
                     }
                 }
             }
@@ -159,12 +199,19 @@ namespace WPinternals
                 PhoneInfo Info = Model.ReadPhoneInfo();
 
                 if ((Info.SecureFfuSupportedProtocolMask & ((ushort)FfuProtocol.ProtocolSyncV2)) == 0) // Exploit needs protocol v2 -> This check is not conclusive, because old phones also report support for this protocol, although it is really not supported.
+                {
                     throw new WPinternalsException("Flash failed!", "Protocols not supported. The phone reports that it does not support the Protocol Sync V2.");
+                }
+
                 if (Info.FlashAppProtocolVersionMajor < 2) // Old phones do not support the hack. These phones have Flash protocol 1.x.
+                {
                     throw new WPinternalsException("Flash failed!", "Protocols not supported. The phone reports that Flash App communication protocol is lower than 2. Reported version by the phone: " + Info.FlashAppProtocolVersionMajor + ".");
+                }
 
                 if (Info.UefiSecureBootEnabled)
+                {
                     throw new WPinternalsException("Flash failed!", "UEFI Secureboot must be disabled for the Flash V3 exploit to work.");
+                }
 
                 // The payloads must be ordered by the number of locations
                 //
@@ -174,20 +221,20 @@ namespace WPinternals
                 //
                 // If you do not order payloads like this, you will get an error, most likely hash mismatch
                 //
-                LumiaV2UnlockBootViewModel.FlashingPayload[] payloads = new LumiaV2UnlockBootViewModel.FlashingPayload[0];
+                LumiaV2UnlockBootViewModel.FlashingPayload[] payloads = Array.Empty<LumiaV2UnlockBootViewModel.FlashingPayload>();
                 if (FlashParts != null)
                 {
-                    payloads = LumiaV2UnlockBootViewModel.GetNonOptimizedPayloads(FlashParts, chunkSizes, (uint)(Info.WriteBufferSize / chunkSize), SetWorkingStatus, UpdateWorkingStatus).OrderBy(x => x.TargetLocations.Count()).ToArray();
+                    payloads = LumiaV2UnlockBootViewModel.GetNonOptimizedPayloads(FlashParts, chunkSizes, Info.WriteBufferSize / chunkSize, SetWorkingStatus, UpdateWorkingStatus).OrderBy(x => x.TargetLocations.Length).ToArray();
                 }
 
-                MemoryStream Headerstream1 = new MemoryStream();
+                MemoryStream Headerstream1 = new();
 
                 // ==============================
                 // Header 1 start
 
-                ImageHeader image = new ImageHeader();
-                FullFlash ffimage = new FullFlash();
-                Store simage = new Store();
+                ImageHeader image = new();
+                FullFlash ffimage = new();
+                Store simage = new();
 
                 // Todo make this read the image itself
                 ffimage.OSVersion = "10.0.11111.0";
@@ -219,15 +266,15 @@ namespace WPinternals
                 // Header 1 stop + round
                 // ==============================
 
-                MemoryStream Headerstream2 = new MemoryStream();
+                MemoryStream Headerstream2 = new();
 
                 // ==============================
                 // Header 2 start
 
-                StoreHeader store = new StoreHeader();
+                StoreHeader store = new();
 
-                store.WriteDescriptorCount = (UInt32)payloads.Count();
-                store.FinalTableIndex = (UInt32)payloads.Count() - store.FinalTableCount;
+                store.WriteDescriptorCount = (UInt32)payloads.Length;
+                store.FinalTableIndex = (UInt32)payloads.Length - store.FinalTableCount;
                 store.PlatformId = Info.PlatformID;
 
                 foreach (LumiaV2UnlockBootViewModel.FlashingPayload payload in payloads)
@@ -236,7 +283,7 @@ namespace WPinternals
                 }
 
                 byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(Model, 0x20000);
-                GPT GPT = new GPT(GPTChunk);
+                GPT GPT = new(GPTChunk);
                 UInt64 PlatEnd = 0;
                 if (GPT.Partitions.Any(x => x.Name == "PLAT"))
                 {
@@ -245,9 +292,12 @@ namespace WPinternals
 
                 foreach (LumiaV2UnlockBootViewModel.FlashingPayload payload in payloads)
                 {
-                    if (payload.TargetLocations.First() > PlatEnd)
+                    if (payload.TargetLocations[0] > PlatEnd)
+                    {
                         break;
-                    store.FlashOnlyTableIndex += 1;
+                    }
+
+                    store.FlashOnlyTableIndex++;
                 }
 
                 byte[] StoreHeaderBuffer = new byte[0xF8];
@@ -275,7 +325,7 @@ namespace WPinternals
                 UInt32 NewWriteDescriptorOffset = 0;
                 foreach (LumiaV2UnlockBootViewModel.FlashingPayload payload in payloads)
                 {
-                    ByteOperations.WriteUInt32(descriptorsBuffer, NewWriteDescriptorOffset + 0x00, (UInt32)payload.TargetLocations.Count()); // Location count
+                    ByteOperations.WriteUInt32(descriptorsBuffer, NewWriteDescriptorOffset + 0x00, (UInt32)payload.TargetLocations.Length); // Location count
                     ByteOperations.WriteUInt32(descriptorsBuffer, NewWriteDescriptorOffset + 0x04, payload.ChunkCount);                      // Chunk count
                     NewWriteDescriptorOffset += 0x08;
 
@@ -294,7 +344,7 @@ namespace WPinternals
                 // Header 2 stop + round
                 // ==============================
 
-                SecurityHeader security = new SecurityHeader();
+                SecurityHeader security = new();
 
                 Headerstream1.Seek(0, SeekOrigin.Begin);
                 Headerstream2.Seek(0, SeekOrigin.Begin);
@@ -307,7 +357,7 @@ namespace WPinternals
                 }
 
                 byte[] HashTable = new byte[security.HashTableSize];
-                BinaryWriter bw = new BinaryWriter(new MemoryStream(HashTable));
+                BinaryWriter bw = new(new MemoryStream(HashTable));
 
                 SHA256 crypto = SHA256.Create();
                 for (Int32 i = 0; i < Headerstream1.Length / chunkSize; i++)
@@ -347,7 +397,7 @@ namespace WPinternals
                 ByteOperations.WriteUInt32(SecurityHeaderBuffer, 0x18, security.CatalogSize);
                 ByteOperations.WriteUInt32(SecurityHeaderBuffer, 0x1C, security.HashTableSize);
 
-                MemoryStream retstream = new MemoryStream();
+                MemoryStream retstream = new();
 
                 retstream.Write(SecurityHeaderBuffer, 0, 0x20);
 
@@ -384,10 +434,12 @@ namespace WPinternals
 
                 Byte Options = 0;
                 if (!Info.IsBootloaderSecure)
+                {
                     Options = (Byte)((FlashOptions)Options | FlashOptions.SkipSignatureCheck);
+                }
 
                 LogFile.Log("Flash in progress...", LogType.ConsoleOnly);
-                SetWorkingStatus("Flashing...", null, (UInt64?)payloads.Count(), Status: WPinternalsStatus.Flashing);
+                SetWorkingStatus("Flashing...", null, (UInt64?)payloads.Length, Status: WPinternalsStatus.Flashing);
 
                 Model.SendFfuHeaderV1(FfuHeader, Options);
 
@@ -400,11 +452,11 @@ namespace WPinternals
 
                 byte[] payloadBuffer;
 
-                for (Int32 i = 0; i < payloads.Count(); i+= numberOfPayloadsToSendAtOnce)
+                for (Int32 i = 0; i < payloads.Length; i+= numberOfPayloadsToSendAtOnce)
                 {
-                    if (i + numberOfPayloadsToSendAtOnce - 1 >= payloads.Count())
+                    if (i + numberOfPayloadsToSendAtOnce - 1 >= payloads.Length)
                     {
-                        numberOfPayloadsToSendAtOnce = payloads.Count() - i;
+                        numberOfPayloadsToSendAtOnce = payloads.Length - i;
                     }
 
                     payloadBuffer = new byte[numberOfPayloadsToSendAtOnce * chunkSizes];
@@ -415,25 +467,27 @@ namespace WPinternals
                     {
                         LumiaV2UnlockBootViewModel.FlashingPayload payload = payloads[i + j];
 
-                        UInt32 StreamIndex = payload.StreamIndexes.First();
+                        UInt32 StreamIndex = payload.StreamIndexes[0];
                         FlashPart flashPart = FlashParts[(Int32)StreamIndex];
 
                         if (flashPart.ProgressText != null)
+                        {
                             ProgressText = flashPart.ProgressText;
+                        }
 
                         Stream Stream = flashPart.Stream;
-                        Stream.Seek(payload.StreamLocations.First(), SeekOrigin.Begin);
+                        Stream.Seek(payload.StreamLocations[0], SeekOrigin.Begin);
                         Stream.Read(payloadBuffer, j * chunkSizes, chunkSizes);
                         counter++;
                     }
 
                     if ((Info.SecureFfuSupportedProtocolMask & (ushort)FfuProtocol.ProtocolSyncV2) != 0)
                     {
-                        Model.SendFfuPayloadV2(payloadBuffer, Int32.Parse((counter * 100 / (UInt64)payloads.Count()).ToString()));
+                        Model.SendFfuPayloadV2(payloadBuffer, Int32.Parse((counter * 100 / (UInt64)payloads.Length).ToString()));
                     }
                     else
                     {
-                        Model.SendFfuPayloadV1(payloadBuffer, Int32.Parse((counter * 100 / (UInt64)payloads.Count()).ToString()));
+                        Model.SendFfuPayloadV1(payloadBuffer, Int32.Parse((counter * 100 / (UInt64)payloads.Length).ToString()));
                     }
 
                     UpdateWorkingStatus(ProgressText, null, counter, WPinternalsStatus.Flashing);
diff --git a/ViewModels/MainViewModel.cs b/ViewModels/MainViewModel.cs
index 272dc6c..556f5c9 100644
--- a/ViewModels/MainViewModel.cs
+++ b/ViewModels/MainViewModel.cs
@@ -77,9 +77,13 @@ namespace WPinternals
             if (this.PropertyChanged != null)
             {
                 if (MainSyncContext == SynchronizationContext.Current)
+                {
                     PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+                }
                 else
+                {
                     MainSyncContext.Post(s => PropertyChanged(this, new PropertyChangedEventArgs(propertyName)), null);
+                }
             }
         }
 
@@ -94,19 +98,19 @@ namespace WPinternals
             {
                 if (_ContextViewModel != value)
                 {
-                    if (_ContextViewModel != null)
-                        _ContextViewModel.IsActive = false;
-                    _ContextViewModel = value;
                     if (_ContextViewModel != null)
                     {
-                        _ContextViewModel.Activate();
+                        _ContextViewModel.IsActive = false;
                     }
-                    OnPropertyChanged("ContextViewModel");
+
+                    _ContextViewModel = value;
+                    _ContextViewModel?.Activate();
+                    OnPropertyChanged(nameof(ContextViewModel));
                 }
             }
         }
 
-        private SynchronizationContext MainSyncContext;
+        private readonly SynchronizationContext MainSyncContext;
 
         public MainViewModel()
         {
@@ -115,11 +119,13 @@ namespace WPinternals
             LogFile.LogApplicationVersion();
 
             // Set global callback for cases where Dependency Injection is not possible.
-            App.NavigateToGettingStarted = () => { GettingStartedCommand.Execute(null); };
-            App.NavigateToUnlockBoot = () => { BootUnlockCommand.Execute(null); };
+            App.NavigateToGettingStarted = () => GettingStartedCommand.Execute(null);
+            App.NavigateToUnlockBoot = () => BootUnlockCommand.Execute(null);
 
             if (Registry.CurrentUser.OpenSubKey("Software\\WPInternals") == null)
+            {
                 Registry.CurrentUser.OpenSubKey("Software", true).CreateSubKey("WPInternals");
+            }
 
             if ((Registration.IsPrerelease) && (Registry.CurrentUser.OpenSubKey("Software\\WPInternals").GetValue("NdaAccepted") == null))
             {
@@ -134,10 +140,12 @@ namespace WPinternals
                 ContextViewModel = new RegistrationViewModel(Registration_Completed, Registration_Failed);
             }
             else
+            {
                 StartOperation();
+            }
         }
 
-        void Disclaimer_Accepted()
+        private void Disclaimer_Accepted()
         {
             ContextViewModel = null;
 
@@ -146,16 +154,18 @@ namespace WPinternals
                 ContextViewModel = new RegistrationViewModel(Registration_Completed, Registration_Failed);
             }
             else
+            {
                 StartOperation();
+            }
         }
 
-        void Registration_Completed()
+        private void Registration_Completed()
         {
             ContextViewModel = null;
             StartOperation();
         }
 
-        void Registration_Failed()
+        private void Registration_Failed()
         {
             ContextViewModel = new MessageViewModel("Registration failed", () => Environment.Exit(0));
             ((MessageViewModel)ContextViewModel).SubMessage = "Check your filewall settings";
@@ -190,10 +200,7 @@ namespace WPinternals
                 ModeViewModel.OnModeSwitchRequested(TargetInterface);
                 ContextViewModel = ModeViewModel;
             },
-            () =>
-            {
-                ContextViewModel = _GettingStartedViewModel;
-            });
+            () => ContextViewModel = _GettingStartedViewModel);
             InfoViewModel.ActivateSubContext(null);
 
             ModeViewModel = new LumiaModeViewModel(PhoneNotifier, SwitchToInfoViewModel);
@@ -280,12 +287,12 @@ namespace WPinternals
             ContextViewModel = ModeViewModel;
         }
 
-        void PhoneNotifier_DeviceRemoved()
+        private void PhoneNotifier_DeviceRemoved()
         {
             InfoViewModel.ActivateSubContext(null);
         }
 
-        void PhoneNotifier_NewDeviceArrived(ArrivalEventArgs Args)
+        private void PhoneNotifier_NewDeviceArrived(ArrivalEventArgs Args)
         {
             PhoneInterfaces? PreviousInterface = LastInterface;
             LastInterface = Args.NewInterface;
@@ -299,10 +306,14 @@ namespace WPinternals
             else
             {
                 if (Args.NewInterface != PhoneInterfaces.Qualcomm_Download)
+                {
                     App.InterruptBoot = false;
+                }
 
                 if (ContextViewModel == null)
+                {
                     ContextViewModel = InfoViewModel;
+                }
                 else if (ContextViewModel.IsFlashModeOperation)
                 {
                     if ((!ContextViewModel.IsSwitchingInterface) && (Args.NewInterface == PhoneInterfaces.Lumia_Bootloader))
@@ -318,7 +329,9 @@ namespace WPinternals
                 else
                 {
                     if ((!ContextViewModel.IsSwitchingInterface) && (Args.NewInterface != PhoneInterfaces.Lumia_Bootloader))
+                    {
                         ContextViewModel = InfoViewModel;
+                    }
                 }
             }
         }
@@ -328,14 +341,7 @@ namespace WPinternals
         {
             get
             {
-                if (_InfoCommand == null)
-                {
-                    _InfoCommand = new DelegateCommand(() =>
-                    {
-                        ContextViewModel = InfoViewModel;
-                    });
-                }
-                return _InfoCommand;
+                return _InfoCommand ??= new DelegateCommand(() => ContextViewModel = InfoViewModel);
             }
         }
 
@@ -344,14 +350,7 @@ namespace WPinternals
         {
             get
             {
-                if (_ModeCommand == null)
-                {
-                    _ModeCommand = new DelegateCommand(() =>
-                    {
-                        ContextViewModel = ModeViewModel;
-                    });
-                }
-                return _ModeCommand;
+                return _ModeCommand ??= new DelegateCommand(() => ContextViewModel = ModeViewModel);
             }
         }
 
@@ -360,14 +359,7 @@ namespace WPinternals
         {
             get
             {
-                if (_BootUnlockCommand == null)
-                {
-                    _BootUnlockCommand = new DelegateCommand(() =>
-                    {
-                        ContextViewModel = BootUnlockViewModel;
-                    });
-                }
-                return _BootUnlockCommand;
+                return _BootUnlockCommand ??= new DelegateCommand(() => ContextViewModel = BootUnlockViewModel);
             }
         }
 
@@ -376,14 +368,7 @@ namespace WPinternals
         {
             get
             {
-                if (_BootRestoreCommand == null)
-                {
-                    _BootRestoreCommand = new DelegateCommand(() =>
-                    {
-                        ContextViewModel = BootRestoreViewModel;
-                    });
-                }
-                return _BootRestoreCommand;
+                return _BootRestoreCommand ??= new DelegateCommand(() => ContextViewModel = BootRestoreViewModel);
             }
         }
 
@@ -392,14 +377,7 @@ namespace WPinternals
         {
             get
             {
-                if (_RootUnlockCommand == null)
-                {
-                    _RootUnlockCommand = new DelegateCommand(() =>
-                    {
-                        ContextViewModel = RootUnlockViewModel;
-                    });
-                }
-                return _RootUnlockCommand;
+                return _RootUnlockCommand ??= new DelegateCommand(() => ContextViewModel = RootUnlockViewModel);
             }
         }
 
@@ -408,14 +386,7 @@ namespace WPinternals
         {
             get
             {
-                if (_RootUndoCommand == null)
-                {
-                    _RootUndoCommand = new DelegateCommand(() =>
-                    {
-                        ContextViewModel = RootRestoreViewModel;
-                    });
-                }
-                return _RootUndoCommand;
+                return _RootUndoCommand ??= new DelegateCommand(() => ContextViewModel = RootRestoreViewModel);
             }
         }
 
@@ -424,14 +395,7 @@ namespace WPinternals
         {
             get
             {
-                if (_BackupCommand == null)
-                {
-                    _BackupCommand = new DelegateCommand(() =>
-                    {
-                        ContextViewModel = BackupViewModel;
-                    });
-                }
-                return _BackupCommand;
+                return _BackupCommand ??= new DelegateCommand(() => ContextViewModel = BackupViewModel);
             }
         }
 
@@ -440,14 +404,7 @@ namespace WPinternals
         {
             get
             {
-                if (_RestoreCommand == null)
-                {
-                    _RestoreCommand = new DelegateCommand(() =>
-                    {
-                        ContextViewModel = RestoreViewModel;
-                    });
-                }
-                return _RestoreCommand;
+                return _RestoreCommand ??= new DelegateCommand(() => ContextViewModel = RestoreViewModel);
             }
         }
 
@@ -456,14 +413,7 @@ namespace WPinternals
         {
             get
             {
-                if (_LumiaFlashRomCommand == null)
-                {
-                    _LumiaFlashRomCommand = new DelegateCommand(() =>
-                    {
-                        ContextViewModel = LumiaFlashRomViewModel;
-                    });
-                }
-                return _LumiaFlashRomCommand;
+                return _LumiaFlashRomCommand ??= new DelegateCommand(() => ContextViewModel = LumiaFlashRomViewModel);
             }
         }
 
@@ -472,14 +422,7 @@ namespace WPinternals
         {
             get
             {
-                if (_DumpRomCommand == null)
-                {
-                    _DumpRomCommand = new DelegateCommand(() =>
-                    {
-                        ContextViewModel = DumpRomViewModel;
-                    });
-                }
-                return _DumpRomCommand;
+                return _DumpRomCommand ??= new DelegateCommand(() => ContextViewModel = DumpRomViewModel);
             }
         }
 
@@ -488,14 +431,7 @@ namespace WPinternals
         {
             get
             {
-                if (_AboutCommand == null)
-                {
-                    _AboutCommand = new DelegateCommand(() =>
-                    {
-                        ContextViewModel = new AboutViewModel();
-                    });
-                }
-                return _AboutCommand;
+                return _AboutCommand ??= new DelegateCommand(() => ContextViewModel = new AboutViewModel());
             }
         }
 
@@ -504,14 +440,7 @@ namespace WPinternals
         {
             get
             {
-                if (_OpenWebSiteCommand == null)
-                {
-                    _OpenWebSiteCommand = new DelegateCommand(() =>
-                    {
-                        Process.Start("www.wpinternals.net");
-                    });
-                }
-                return _OpenWebSiteCommand;
+                return _OpenWebSiteCommand ??= new DelegateCommand(() => Process.Start("www.wpinternals.net"));
             }
         }
 
@@ -520,14 +449,7 @@ namespace WPinternals
         {
             get
             {
-                if (_DonateCommand == null)
-                {
-                    _DonateCommand = new DelegateCommand(() =>
-                    {
-                        Process.Start("https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=VY8N7BCBT9CS4");
-                    });
-                }
-                return _DonateCommand;
+                return _DonateCommand ??= new DelegateCommand(() => Process.Start("https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=VY8N7BCBT9CS4"));
             }
         }
 
@@ -536,14 +458,7 @@ namespace WPinternals
         {
             get
             {
-                if (_GettingStartedCommand == null)
-                {
-                    _GettingStartedCommand = new DelegateCommand(() =>
-                    {
-                        ContextViewModel = _GettingStartedViewModel;
-                    });
-                }
-                return _GettingStartedCommand;
+                return _GettingStartedCommand ??= new DelegateCommand(() => ContextViewModel = _GettingStartedViewModel);
             }
         }
 
@@ -552,14 +467,7 @@ namespace WPinternals
         {
             get
             {
-                if (_DownloadCommand == null)
-                {
-                    _DownloadCommand = new DelegateCommand(() =>
-                    {
-                        ContextViewModel = DownloadsViewModel;
-                    });
-                }
-                return _DownloadCommand;
+                return _DownloadCommand ??= new DelegateCommand(() => ContextViewModel = DownloadsViewModel);
             }
         }
 
@@ -573,7 +481,7 @@ namespace WPinternals
             set
             {
                 _IsMenuEnabled = value;
-                OnPropertyChanged("IsMenuEnabled");
+                OnPropertyChanged(nameof(IsMenuEnabled));
             }
         }
     }
diff --git a/ViewModels/MessageViewModel.cs b/ViewModels/MessageViewModel.cs
index 8bc0c46..d201f35 100644
--- a/ViewModels/MessageViewModel.cs
+++ b/ViewModels/MessageViewModel.cs
@@ -30,9 +30,15 @@ namespace WPinternals
             LogFile.Log(Message);
 
             if (OkAction != null)
+            {
                 this.OkCommand = new DelegateCommand(OkAction);
+            }
+
             if (CancelAction != null)
+            {
                 this.CancelCommand = new DelegateCommand(CancelAction);
+            }
+
             this.Message = Message;
         }
 
@@ -46,7 +52,7 @@ namespace WPinternals
             set
             {
                 _Message = value;
-                OnPropertyChanged("Message");
+                OnPropertyChanged(nameof(Message));
             }
         }
 
@@ -60,34 +66,10 @@ namespace WPinternals
             set
             {
                 _SubMessage = value;
-                OnPropertyChanged("SubMessage");
-            }
-        }
-
-        private DelegateCommand _OkCommand = null;
-        public DelegateCommand OkCommand
-        {
-            get
-            {
-                return _OkCommand;
-            }
-            private set
-            {
-                _OkCommand = value;
-            }
-        }
-
-        private DelegateCommand _CancelCommand = null;
-        public DelegateCommand CancelCommand
-        {
-            get
-            {
-                return _CancelCommand;
-            }
-            private set
-            {
-                _CancelCommand = value;
+                OnPropertyChanged(nameof(SubMessage));
             }
         }
+        public DelegateCommand OkCommand { get; } = null;
+        public DelegateCommand CancelCommand { get; } = null;
     }
 }
diff --git a/ViewModels/NokiaBootloaderViewModel.cs b/ViewModels/NokiaBootloaderViewModel.cs
index 3dd8d06..579e3e0 100644
--- a/ViewModels/NokiaBootloaderViewModel.cs
+++ b/ViewModels/NokiaBootloaderViewModel.cs
@@ -30,10 +30,10 @@ namespace WPinternals
 
     internal class NokiaBootloaderViewModel : ContextViewModel
     {
-        private NokiaFlashModel CurrentModel;
-        private Action<PhoneInterfaces> RequestModeSwitch;
+        private readonly NokiaFlashModel CurrentModel;
+        private readonly Action<PhoneInterfaces> RequestModeSwitch;
         internal Action SwitchToGettingStarted;
-        private object LockDeviceInfo = new object();
+        private readonly object LockDeviceInfo = new();
 
         internal NokiaBootloaderViewModel(NokiaPhoneModel CurrentModel, Action<PhoneInterfaces> RequestModeSwitch, Action SwitchToGettingStarted)
             : base()
@@ -47,12 +47,13 @@ namespace WPinternals
         internal override void EvaluateViewState()
         {
             if (IsActive)
+            {
                 new Thread(() => StartLoadDeviceInfo()).Start();
+            }
         }
 
         private void StartLoadDeviceInfo()
         {
-             
         }
 
         internal void RebootTo(string Mode)
diff --git a/ViewModels/NokiaFlashViewModel.cs b/ViewModels/NokiaFlashViewModel.cs
index 4976017..24aa9ee 100644
--- a/ViewModels/NokiaFlashViewModel.cs
+++ b/ViewModels/NokiaFlashViewModel.cs
@@ -30,11 +30,11 @@ namespace WPinternals
 
     internal class NokiaFlashViewModel : ContextViewModel
     {
-        private NokiaFlashModel CurrentModel;
-        private Action<PhoneInterfaces> RequestModeSwitch;
+        private readonly NokiaFlashModel CurrentModel;
+        private readonly Action<PhoneInterfaces> RequestModeSwitch;
         internal Action SwitchToGettingStarted;
-        private object LockDeviceInfo = new object();
-        bool DeviceInfoLoaded = false;
+        private readonly object LockDeviceInfo = new();
+        private bool DeviceInfoLoaded = false;
 
         internal NokiaFlashViewModel(NokiaPhoneModel CurrentModel, Action<PhoneInterfaces> RequestModeSwitch, Action SwitchToGettingStarted)
             : base()
@@ -48,7 +48,9 @@ namespace WPinternals
         internal override void EvaluateViewState()
         {
             if (IsActive)
+            {
                 new Thread(() => StartLoadDeviceInfo()).Start();
+            }
         }
 
         private void StartLoadDeviceInfo()
@@ -110,7 +112,9 @@ namespace WPinternals
                             FinalConfigSsmStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.Ssm);
                         }
                         else
+                        {
                             LogFile.Log("Security flags could not be read");
+                        }
 
                         PlatformName = CurrentModel.ReadStringParam("DPI");
                         LogFile.Log("Platform Name: " + PlatformName);
@@ -119,7 +123,7 @@ namespace WPinternals
                         // Instead read param RRKH to get the RKH.
                         PublicID = null;
                         byte[] RawPublicID = CurrentModel.ReadParam("PID");
-                        if ((RawPublicID != null) && (RawPublicID.Length > 4))
+                        if (RawPublicID?.Length > 4)
                         {
                             PublicID = new byte[RawPublicID.Length - 4];
                             Array.Copy(RawPublicID, 4, PublicID, 0, RawPublicID.Length - 4);
@@ -132,7 +136,9 @@ namespace WPinternals
                         }
                         RootKeyHash = CurrentModel.ReadParam("RRKH");
                         if (RootKeyHash != null)
+                        {
                             LogFile.Log("Root Key Hash: " + Converter.ConvertHexToString(RootKeyHash, " "));
+                        }
 
                         if (SecurityStatus != null)
                         {
@@ -160,7 +166,7 @@ namespace WPinternals
                         byte[] EMS = CurrentModel.ReadParam("EMS");
                         if (CID != null && EMS != null)
                         {
-                            UInt16 MID = (UInt16)(((UInt16)CID[0] << 8) + CID[1]);
+                            UInt16 MID = (UInt16)((CID[0] << 8) + CID[1]);
                             UInt64 MemSize = (UInt64)(((UInt32)EMS[0] << 24) + ((UInt32)EMS[1] << 16) + ((UInt32)EMS[2] << 8) + EMS[3]) * 0x200;
                             double MemSizeDouble = (double)MemSize / 1024 / 1024 / 1024;
                             MemSizeDouble = (double)(int)(MemSizeDouble * 10) / 10;
@@ -190,10 +196,8 @@ namespace WPinternals
                                     Manufacturer = "GigaDevice";
                                     break;
                             }
-                            if (Manufacturer == null)
-                                eMMC = MemSizeDouble.ToString() + " GB";
-                            else
-                                eMMC = Manufacturer + " " + MemSizeDouble.ToString() + " GB";
+                            eMMC = Manufacturer == null ? MemSizeDouble.ToString() + " GB" : Manufacturer + " " + MemSizeDouble.ToString() + " GB";
+
                             SamsungWarningVisible = (MID == 0x0015);
                         }
                         else
@@ -206,10 +210,9 @@ namespace WPinternals
 
                         if (chargecurrent.HasValue)
                         {
-                            if (chargecurrent < 0)
-                                ChargingStatus = CurrentModel.ReadCurrentChargeLevel() + "% - " + ((-1) * CurrentModel.ReadCurrentChargeCurrent()) + " mA (discharging)";
-                            else
-                                ChargingStatus = CurrentModel.ReadCurrentChargeLevel() + "% - " + CurrentModel.ReadCurrentChargeCurrent() + " mA (charging)";
+                            ChargingStatus = chargecurrent < 0
+                                ? CurrentModel.ReadCurrentChargeLevel() + "% - " + ((-1) * CurrentModel.ReadCurrentChargeCurrent()) + " mA (discharging)"
+                                : CurrentModel.ReadCurrentChargeLevel() + "% - " + CurrentModel.ReadCurrentChargeCurrent() + " mA (charging)";
 
                             LogFile.Log("Charging status: " + ChargingStatus);
                         }
@@ -220,10 +223,8 @@ namespace WPinternals
                         }
 
                         PhoneInfo Info = CurrentModel.ReadPhoneInfo(true);
-                        if (Info.FlashAppProtocolVersionMajor < 2)
-                            BootloaderDescription = "Lumia Bootloader Spec A";
-                        else
-                            BootloaderDescription = "Lumia Bootloader Spec B";
+                        BootloaderDescription = Info.FlashAppProtocolVersionMajor < 2 ? "Lumia Bootloader Spec A" : "Lumia Bootloader Spec B";
+
                         LogFile.Log("Bootloader: " + BootloaderDescription);
 
                         ProductCode = Info.ProductCode;
@@ -239,7 +240,9 @@ namespace WPinternals
                             RootKeyHash = Info.RKH;
 
                             if (RootKeyHash != null)
+                            {
                                 LogFile.Log("Root Key Hash: " + Converter.ConvertHexToString(RootKeyHash, " "));
+                            }
                             else
                             {
                                 RootKeyHash = new byte[32];
@@ -298,7 +301,7 @@ namespace WPinternals
             set
             {
                 _PublicID = value;
-                OnPropertyChanged("PublicID");
+                OnPropertyChanged(nameof(PublicID));
             }
         }
 
@@ -312,7 +315,7 @@ namespace WPinternals
             set
             {
                 _RootKeyHash = value;
-                OnPropertyChanged("RootKeyHash");
+                OnPropertyChanged(nameof(RootKeyHash));
             }
         }
 
@@ -326,7 +329,7 @@ namespace WPinternals
             set
             {
                 _PlatformName = value;
-                OnPropertyChanged("PlatformName");
+                OnPropertyChanged(nameof(PlatformName));
             }
         }
 
@@ -340,7 +343,7 @@ namespace WPinternals
             set
             {
                 _ProductType = value;
-                OnPropertyChanged("ProductType");
+                OnPropertyChanged(nameof(ProductType));
             }
         }
 
@@ -354,7 +357,7 @@ namespace WPinternals
             set
             {
                 _ProductCode = value;
-                OnPropertyChanged("ProductCode");
+                OnPropertyChanged(nameof(ProductCode));
             }
         }
 
@@ -368,7 +371,7 @@ namespace WPinternals
             set
             {
                 _eMMC = value;
-                OnPropertyChanged("eMMC");
+                OnPropertyChanged(nameof(eMMC));
             }
         }
 
@@ -382,7 +385,7 @@ namespace WPinternals
             set
             {
                 _BootloaderDescription = value;
-                OnPropertyChanged("BootloaderDescription");
+                OnPropertyChanged(nameof(BootloaderDescription));
             }
         }
 
@@ -396,7 +399,7 @@ namespace WPinternals
             set
             {
                 _ChargingStatus = value;
-                OnPropertyChanged("ChargingStatus");
+                OnPropertyChanged(nameof(ChargingStatus));
             }
         }
 
@@ -410,7 +413,7 @@ namespace WPinternals
             set
             {
                 _SamsungWarningVisible = value;
-                OnPropertyChanged("SamsungWarningVisible");
+                OnPropertyChanged(nameof(SamsungWarningVisible));
             }
         }
 
@@ -424,7 +427,7 @@ namespace WPinternals
             set
             {
                 _PlatformSecureBootStatus = value;
-                OnPropertyChanged("PlatformSecureBootStatus");
+                OnPropertyChanged(nameof(PlatformSecureBootStatus));
             }
         }
 
@@ -438,7 +441,7 @@ namespace WPinternals
             set
             {
                 _BootloaderSecurityQfuseStatus = value;
-                OnPropertyChanged("BootloaderSecurityQfuseStatus");
+                OnPropertyChanged(nameof(BootloaderSecurityQfuseStatus));
             }
         }
 
@@ -452,7 +455,7 @@ namespace WPinternals
             set
             {
                 _BootloaderSecurityRdcStatus = value;
-                OnPropertyChanged("BootloaderSecurityRdcStatus");
+                OnPropertyChanged(nameof(BootloaderSecurityRdcStatus));
             }
         }
 
@@ -466,7 +469,7 @@ namespace WPinternals
             set
             {
                 _BootloaderSecurityAuthenticationStatus = value;
-                OnPropertyChanged("BootloaderSecurityAuthenticationStatus");
+                OnPropertyChanged(nameof(BootloaderSecurityAuthenticationStatus));
             }
         }
 
@@ -480,7 +483,7 @@ namespace WPinternals
             set
             {
                 _UefiSecureBootStatus = value;
-                OnPropertyChanged("UefiSecureBootStatus");
+                OnPropertyChanged(nameof(UefiSecureBootStatus));
             }
         }
 
@@ -494,7 +497,7 @@ namespace WPinternals
             set
             {
                 _EffectiveSecureBootStatus = value;
-                OnPropertyChanged("EffectiveSecureBootStatus");
+                OnPropertyChanged(nameof(EffectiveSecureBootStatus));
             }
         }
 
@@ -508,7 +511,7 @@ namespace WPinternals
             set
             {
                 _EffectiveBootloaderSecurityStatus = value;
-                OnPropertyChanged("EffectiveBootloaderSecurityStatus");
+                OnPropertyChanged(nameof(EffectiveBootloaderSecurityStatus));
             }
         }
 
@@ -522,7 +525,7 @@ namespace WPinternals
             set
             {
                 _NativeDebugStatus = value;
-                OnPropertyChanged("NativeDebugStatus");
+                OnPropertyChanged(nameof(NativeDebugStatus));
             }
         }
 
@@ -537,7 +540,7 @@ namespace WPinternals
             set
             {
                 _FinalConfigSecureBootStatus = value;
-                OnPropertyChanged("FinalConfigSecureBootStatus");
+                OnPropertyChanged(nameof(FinalConfigSecureBootStatus));
             }
         }
 
@@ -551,7 +554,7 @@ namespace WPinternals
             set
             {
                 _FinalConfigFfuVerifyStatus = value;
-                OnPropertyChanged("FinalConfigFfuVerifyStatus");
+                OnPropertyChanged(nameof(FinalConfigFfuVerifyStatus));
             }
         }
 
@@ -565,7 +568,7 @@ namespace WPinternals
             set
             {
                 _FinalConfigJtagStatus = value;
-                OnPropertyChanged("FinalConfigJtagStatus");
+                OnPropertyChanged(nameof(FinalConfigJtagStatus));
             }
         }
 
@@ -579,7 +582,7 @@ namespace WPinternals
             set
             {
                 _FinalConfigShkStatus = value;
-                OnPropertyChanged("FinalConfigShkStatus");
+                OnPropertyChanged(nameof(FinalConfigShkStatus));
             }
         }
 
@@ -593,7 +596,7 @@ namespace WPinternals
             set
             {
                 _FinalConfigSimlockStatus = value;
-                OnPropertyChanged("FinalConfigSimlockStatus");
+                OnPropertyChanged(nameof(FinalConfigSimlockStatus));
             }
         }
 
@@ -607,7 +610,7 @@ namespace WPinternals
             set
             {
                 _FinalConfigProductionDoneStatus = value;
-                OnPropertyChanged("FinalConfigProductionDoneStatus");
+                OnPropertyChanged(nameof(FinalConfigProductionDoneStatus));
             }
         }
 
@@ -621,7 +624,7 @@ namespace WPinternals
             set
             {
                 _FinalConfigRkhStatus = value;
-                OnPropertyChanged("FinalConfigRkhStatus");
+                OnPropertyChanged(nameof(FinalConfigRkhStatus));
             }
         }
 
@@ -635,7 +638,7 @@ namespace WPinternals
             set
             {
                 _FinalConfigPublicIdStatus = value;
-                OnPropertyChanged("FinalConfigPublicIdStatus");
+                OnPropertyChanged(nameof(FinalConfigPublicIdStatus));
             }
         }
 
@@ -649,7 +652,7 @@ namespace WPinternals
             set
             {
                 _FinalConfigDakStatus = value;
-                OnPropertyChanged("FinalConfigDakStatus");
+                OnPropertyChanged(nameof(FinalConfigDakStatus));
             }
         }
 
@@ -663,7 +666,7 @@ namespace WPinternals
             set
             {
                 _FinalConfigSecGenStatus = value;
-                OnPropertyChanged("FinalConfigSecGenStatus");
+                OnPropertyChanged(nameof(FinalConfigSecGenStatus));
             }
         }
 
@@ -677,7 +680,7 @@ namespace WPinternals
             set
             {
                 _FinalConfigOemIdStatus = value;
-                OnPropertyChanged("FinalConfigOemIdStatus");
+                OnPropertyChanged(nameof(FinalConfigOemIdStatus));
             }
         }
 
@@ -691,7 +694,7 @@ namespace WPinternals
             set
             {
                 _FinalConfigFastBootStatus = value;
-                OnPropertyChanged("FinalConfigFastBootStatus");
+                OnPropertyChanged(nameof(FinalConfigFastBootStatus));
             }
         }
 
@@ -705,7 +708,7 @@ namespace WPinternals
             set
             {
                 _FinalConfigSpdmSecModeStatus = value;
-                OnPropertyChanged("FinalConfigSpdmSecModeStatus");
+                OnPropertyChanged(nameof(FinalConfigSpdmSecModeStatus));
             }
         }
 
@@ -719,7 +722,7 @@ namespace WPinternals
             set
             {
                 _FinalConfigRpmWdogStatus = value;
-                OnPropertyChanged("FinalConfigRpmWdogStatus");
+                OnPropertyChanged(nameof(FinalConfigRpmWdogStatus));
             }
         }
 
@@ -733,7 +736,7 @@ namespace WPinternals
             set
             {
                 _FinalConfigSsmStatus = value;
-                OnPropertyChanged("FinalConfigSsmStatus");
+                OnPropertyChanged(nameof(FinalConfigSsmStatus));
             }
         }
         #endregion
diff --git a/ViewModels/NokiaLabelViewModel.cs b/ViewModels/NokiaLabelViewModel.cs
index 342fff7..28c63f0 100644
--- a/ViewModels/NokiaLabelViewModel.cs
+++ b/ViewModels/NokiaLabelViewModel.cs
@@ -31,8 +31,8 @@ namespace WPinternals
 
     internal class NokiaLabelViewModel : ContextViewModel
     {
-        private NokiaPhoneModel CurrentModel;
-        private Action<PhoneInterfaces> RequestModeSwitch;
+        private readonly NokiaPhoneModel CurrentModel;
+        private readonly Action<PhoneInterfaces> RequestModeSwitch;
 
         internal NokiaLabelViewModel(NokiaPhoneModel CurrentModel, Action<PhoneInterfaces> RequestModeSwitch)
             : base()
@@ -74,7 +74,7 @@ namespace WPinternals
 
             byte[] AsskMask = new byte[0x10] { 1, 0, 16, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64 };
             byte[] Challenge = new byte[0x88];
-            Dictionary<string, object> Params = new Dictionary<string, object>();
+            Dictionary<string, object> Params = new();
             Params.Add("AsskMask", AsskMask);
             Params.Add("Challenge", Challenge);
             Params.Add("AsicIndex", 0);
@@ -108,13 +108,17 @@ namespace WPinternals
             IsBootloaderSecurityEnabled = (bool)CurrentModel.ExecuteJsonMethodAsBoolean("ReadProductionDoneState", "ProductionDone");
             LogFile.Log("Bootloader Security: " + ((bool)IsBootloaderSecurityEnabled ? "Enabled" : "Disabled"));
 
-            Params = new Dictionary<string, object>();
-            Params.Add("ID", 3534);
-            Params.Add("NVData", new byte[] { 0 });
+            Params = new Dictionary<string, object>
+            {
+                { "ID", 3534 },
+                { "NVData", new byte[] { 0 } }
+            };
             CurrentModel.ExecuteJsonMethod("WriteNVData", Params); // Error: 150
 
-            Params = new Dictionary<string, object>();
-            Params.Add("ID", 3534);
+            Params = new Dictionary<string, object>
+            {
+                { "ID", 3534 }
+            };
             byte[] NV3534 = CurrentModel.ExecuteJsonMethodAsBytes("ReadNVData", Params, "NVData"); // Error: value not written
         }
 
@@ -128,7 +132,7 @@ namespace WPinternals
             set
             {
                 _ProductCode = value;
-                OnPropertyChanged("ProductCode");
+                OnPropertyChanged(nameof(ProductCode));
             }
         }
 
@@ -142,7 +146,7 @@ namespace WPinternals
             set
             {
                 _ManufacturerModelName = value;
-                OnPropertyChanged("ManufacturerModelName");
+                OnPropertyChanged(nameof(ManufacturerModelName));
             }
         }
 
@@ -156,7 +160,7 @@ namespace WPinternals
             set
             {
                 _Operator = value;
-                OnPropertyChanged("Operator");
+                OnPropertyChanged(nameof(Operator));
             }
         }
 
@@ -170,7 +174,7 @@ namespace WPinternals
             set
             {
                 _Firmware = value;
-                OnPropertyChanged("Firmware");
+                OnPropertyChanged(nameof(Firmware));
             }
         }
 
@@ -184,7 +188,7 @@ namespace WPinternals
             set
             {
                 _IMEI = value;
-                OnPropertyChanged("IMEI");
+                OnPropertyChanged(nameof(IMEI));
             }
         }
 
@@ -198,7 +202,7 @@ namespace WPinternals
             set
             {
                 _PublicID = value;
-                OnPropertyChanged("PublicID");
+                OnPropertyChanged(nameof(PublicID));
             }
         }
 
@@ -212,7 +216,7 @@ namespace WPinternals
             set
             {
                 _RootKeyHash = value;
-                OnPropertyChanged("RootKeyHash");
+                OnPropertyChanged(nameof(RootKeyHash));
             }
         }
 
@@ -226,7 +230,7 @@ namespace WPinternals
             set
             {
                 _WlanMac = value;
-                OnPropertyChanged("WlanMac");
+                OnPropertyChanged(nameof(WlanMac));
             }
         }
 
@@ -240,7 +244,7 @@ namespace WPinternals
             set
             {
                 _BluetoothMac = value;
-                OnPropertyChanged("BluetoothMac");
+                OnPropertyChanged(nameof(BluetoothMac));
             }
         }
 
@@ -254,7 +258,7 @@ namespace WPinternals
             set
             {
                 _IsBootloaderSecurityEnabled = value;
-                OnPropertyChanged("IsBootloaderSecurityEnabled");
+                OnPropertyChanged(nameof(IsBootloaderSecurityEnabled));
             }
         }
 
@@ -268,7 +272,7 @@ namespace WPinternals
             set
             {
                 _IsSimLocked = value;
-                OnPropertyChanged("IsSimLocked");
+                OnPropertyChanged(nameof(IsSimLocked));
             }
         }
 
diff --git a/ViewModels/NokiaMassStorageViewModel.cs b/ViewModels/NokiaMassStorageViewModel.cs
index f098e79..9d478ea 100644
--- a/ViewModels/NokiaMassStorageViewModel.cs
+++ b/ViewModels/NokiaMassStorageViewModel.cs
@@ -22,22 +22,14 @@ namespace WPinternals
 {
     internal class NokiaMassStorageViewModel : ContextViewModel
     {
-        private MassStorage CurrentModel;
+        private readonly MassStorage CurrentModel;
 
         internal NokiaMassStorageViewModel(MassStorage CurrentModel)
             : base()
         {
             this.CurrentModel = CurrentModel;
-            _Drive = CurrentModel.Drive;
-        }
-
-        private string _Drive = null;
-        public string Drive
-        {
-            get
-            {
-                return _Drive;
-            }
+            Drive = CurrentModel.Drive;
         }
+        public string Drive { get; } = null;
     }
 }
diff --git a/ViewModels/NokiaModeBootloaderViewModel.cs b/ViewModels/NokiaModeBootloaderViewModel.cs
index cff353f..7694765 100644
--- a/ViewModels/NokiaModeBootloaderViewModel.cs
+++ b/ViewModels/NokiaModeBootloaderViewModel.cs
@@ -25,10 +25,10 @@ namespace WPinternals
 {
     internal class NokiaModeBootloaderViewModel : ContextViewModel
     {
-        private NokiaFlashModel CurrentModel;
-        Action<PhoneInterfaces?> RequestModeSwitch;
-        private object LockDeviceInfo = new object();
-        bool DeviceInfoLoaded = false;
+        private readonly NokiaFlashModel CurrentModel;
+        private readonly Action<PhoneInterfaces?> RequestModeSwitch;
+        private readonly object LockDeviceInfo = new();
+        private bool DeviceInfoLoaded = false;
 
         internal NokiaModeBootloaderViewModel(NokiaPhoneModel CurrentModel, Action<PhoneInterfaces?> RequestModeSwitch)
             : base()
@@ -40,7 +40,9 @@ namespace WPinternals
         internal override void EvaluateViewState()
         {
             if (IsActive)
+            {
                 new Thread(() => StartLoadDeviceInfo()).Start();
+            }
         }
 
         private bool? _EffectiveBootloaderSecurityStatus = null;
@@ -53,7 +55,7 @@ namespace WPinternals
             set
             {
                 _EffectiveBootloaderSecurityStatus = value;
-                OnPropertyChanged("EffectiveBootloaderSecurityStatus");
+                OnPropertyChanged(nameof(EffectiveBootloaderSecurityStatus));
             }
         }
 
diff --git a/ViewModels/NokiaModeFlashViewModel.cs b/ViewModels/NokiaModeFlashViewModel.cs
index 592db30..d39918b 100644
--- a/ViewModels/NokiaModeFlashViewModel.cs
+++ b/ViewModels/NokiaModeFlashViewModel.cs
@@ -25,10 +25,10 @@ namespace WPinternals
 {
     internal class NokiaModeFlashViewModel : ContextViewModel
     {
-        private NokiaFlashModel CurrentModel;
-        Action<PhoneInterfaces?> RequestModeSwitch;
-        private object LockDeviceInfo = new object();
-        bool DeviceInfoLoaded = false;
+        private readonly NokiaFlashModel CurrentModel;
+        private readonly Action<PhoneInterfaces?> RequestModeSwitch;
+        private readonly object LockDeviceInfo = new();
+        private bool DeviceInfoLoaded = false;
 
         internal NokiaModeFlashViewModel(NokiaPhoneModel CurrentModel, Action<PhoneInterfaces?> RequestModeSwitch)
             : base()
@@ -40,7 +40,9 @@ namespace WPinternals
         internal override void EvaluateViewState()
         {
             if (IsActive)
+            {
                 new Thread(() => StartLoadDeviceInfo()).Start();
+            }
         }
 
         private bool? _EffectiveBootloaderSecurityStatus = null;
@@ -53,7 +55,7 @@ namespace WPinternals
             set
             {
                 _EffectiveBootloaderSecurityStatus = value;
-                OnPropertyChanged("EffectiveBootloaderSecurityStatus");
+                OnPropertyChanged(nameof(EffectiveBootloaderSecurityStatus));
             }
         }
 
@@ -71,14 +73,9 @@ namespace WPinternals
                         {
                             UefiSecurityStatusResponse SecurityStatus = CurrentModel.ReadSecurityStatus();
 
-                            if (SecurityStatus != null)
-                            {
-                                EffectiveBootloaderSecurityStatus = SecurityStatus.SecureFfuEfuseStatus && !SecurityStatus.AuthenticationStatus && !SecurityStatus.RdcStatus;
-                            }
-                            else
-                            {
-                                EffectiveBootloaderSecurityStatus = !Info.IsBootloaderSecure;
-                            }
+                            EffectiveBootloaderSecurityStatus = SecurityStatus != null
+                                ? SecurityStatus.SecureFfuEfuseStatus && !SecurityStatus.AuthenticationStatus && !SecurityStatus.RdcStatus
+                                : !Info.IsBootloaderSecure;
                         }
                         else
                         {
diff --git a/ViewModels/NokiaModeLabelViewModel.cs b/ViewModels/NokiaModeLabelViewModel.cs
index 7ee9a7f..c4f21ca 100644
--- a/ViewModels/NokiaModeLabelViewModel.cs
+++ b/ViewModels/NokiaModeLabelViewModel.cs
@@ -24,8 +24,8 @@ namespace WPinternals
 {
     internal class NokiaModeLabelViewModel : ContextViewModel
     {
-        private NokiaPhoneModel CurrentModel;
-        private Action<PhoneInterfaces?> RequestModeSwitch;
+        private readonly NokiaPhoneModel CurrentModel;
+        private readonly Action<PhoneInterfaces?> RequestModeSwitch;
 
         internal NokiaModeLabelViewModel(NokiaPhoneModel CurrentModel, Action<PhoneInterfaces?> RequestModeSwitch)
             : base()
diff --git a/ViewModels/NokiaModeMassStorageViewModel.cs b/ViewModels/NokiaModeMassStorageViewModel.cs
index 114f88b..d977b2c 100644
--- a/ViewModels/NokiaModeMassStorageViewModel.cs
+++ b/ViewModels/NokiaModeMassStorageViewModel.cs
@@ -24,8 +24,8 @@ namespace WPinternals
 {
     internal class NokiaModeMassStorageViewModel : ContextViewModel
     {
-        private MassStorage CurrentModel;
-        private Action<PhoneInterfaces?> RequestModeSwitch;
+        private readonly MassStorage CurrentModel;
+        private readonly Action<PhoneInterfaces?> RequestModeSwitch;
 
         internal NokiaModeMassStorageViewModel(NokiaPhoneModel CurrentModel, Action<PhoneInterfaces?> RequestModeSwitch)
             : base()
@@ -44,14 +44,16 @@ namespace WPinternals
             set
             {
                 _SupportsReboot = value;
-                OnPropertyChanged("SupportsReboot");
+                OnPropertyChanged(nameof(SupportsReboot));
             }
         }
 
         internal override void EvaluateViewState()
         {
             if (IsActive)
+            {
                 SupportsReboot = CurrentModel.DoesDeviceSupportReboot();
+            }
         }
 
         public void RebootTo(string Mode)
diff --git a/ViewModels/NokiaModeNormalViewModel.cs b/ViewModels/NokiaModeNormalViewModel.cs
index 4217afc..67fe3b6 100644
--- a/ViewModels/NokiaModeNormalViewModel.cs
+++ b/ViewModels/NokiaModeNormalViewModel.cs
@@ -24,8 +24,8 @@ namespace WPinternals
 {
     internal class NokiaModeNormalViewModel : ContextViewModel
     {
-        private NokiaPhoneModel CurrentModel;
-        private Action<PhoneInterfaces?> RequestModeSwitch;
+        private readonly NokiaPhoneModel CurrentModel;
+        private readonly Action<PhoneInterfaces?> RequestModeSwitch;
 
         internal NokiaModeNormalViewModel(NokiaPhoneModel CurrentModel, Action<PhoneInterfaces?> RequestModeSwitch)
             : base()
diff --git a/ViewModels/NokiaNormalViewModel.cs b/ViewModels/NokiaNormalViewModel.cs
index f5ae454..bc94d45 100644
--- a/ViewModels/NokiaNormalViewModel.cs
+++ b/ViewModels/NokiaNormalViewModel.cs
@@ -30,8 +30,8 @@ namespace WPinternals
 
     internal class NokiaNormalViewModel : ContextViewModel
     {
-        private NokiaPhoneModel CurrentModel;
-        private Action<PhoneInterfaces> RequestModeSwitch;
+        private readonly NokiaPhoneModel CurrentModel;
+        private readonly Action<PhoneInterfaces> RequestModeSwitch;
 
         internal NokiaNormalViewModel(NokiaPhoneModel CurrentModel, Action<PhoneInterfaces> RequestModeSwitch)
             : base()
@@ -61,7 +61,9 @@ namespace WPinternals
                 string IMEI2 = CurrentModel.ExecuteJsonMethodAsString("ReadSerialNumber", new System.Collections.Generic.Dictionary<string, object>() { { "SubscriptionId", 1 } }, "SerialNumber"); // IMEI 2
 
                 if (!string.IsNullOrEmpty(IMEI2))
+                {
                     IMEI += "\n" + IMEI2;
+                }
 
                 LogFile.Log("IMEI: " + IMEI);
                 PublicID = CurrentModel.ExecuteJsonMethodAsBytes("ReadPublicId", "PublicId"); // 0x14 bytes: a5 e5 ...
@@ -78,10 +80,10 @@ namespace WPinternals
                 LogFile.Log("WLAN MAC 4: " + Converter.ConvertHexToString(WlanMac4, " "));
 
                 bool? ProductionDone = CurrentModel.ExecuteJsonMethodAsBoolean("ReadProductionDoneState", "ProductionDone");
-                if (ProductionDone == null)
-                    IsBootloaderSecurityEnabled = (CurrentModel.ExecuteJsonMethodAsString("GetSecurityMode", "SecMode").IndexOf("Restricted", StringComparison.OrdinalIgnoreCase) >= 0);
-                else
-                    IsBootloaderSecurityEnabled = ((CurrentModel.ExecuteJsonMethodAsString("GetSecurityMode", "SecMode").IndexOf("Restricted", StringComparison.OrdinalIgnoreCase) >= 0) && (bool)CurrentModel.ExecuteJsonMethodAsBoolean("ReadProductionDoneState", "ProductionDone"));
+                IsBootloaderSecurityEnabled = ProductionDone == null
+                    ? CurrentModel.ExecuteJsonMethodAsString("GetSecurityMode", "SecMode").Contains("Restricted", StringComparison.OrdinalIgnoreCase)
+                    : (CurrentModel.ExecuteJsonMethodAsString("GetSecurityMode", "SecMode").Contains("Restricted", StringComparison.OrdinalIgnoreCase)) && (bool)CurrentModel.ExecuteJsonMethodAsBoolean("ReadProductionDoneState", "ProductionDone");
+
                 LogFile.Log("Bootloader Security: " + ((bool)IsBootloaderSecurityEnabled ? "Enabled" : "Disabled"));
                 IsSimLocked = CurrentModel.ExecuteJsonMethodAsBoolean("ReadSimlockActive", "SimLockActive");
                 LogFile.Log("Simlock: " + ((bool)IsSimLocked ? "Active" : "Unlocked"));
@@ -116,7 +118,7 @@ namespace WPinternals
             set
             {
                 _ProductCode = value;
-                OnPropertyChanged("ProductCode");
+                OnPropertyChanged(nameof(ProductCode));
             }
         }
 
@@ -130,7 +132,7 @@ namespace WPinternals
             set
             {
                 _ManufacturerModelName = value;
-                OnPropertyChanged("ManufacturerModelName");
+                OnPropertyChanged(nameof(ManufacturerModelName));
             }
         }
 
@@ -144,7 +146,7 @@ namespace WPinternals
             set
             {
                 _Operator = value;
-                OnPropertyChanged("Operator");
+                OnPropertyChanged(nameof(Operator));
             }
         }
 
@@ -158,7 +160,7 @@ namespace WPinternals
             set
             {
                 _Firmware = value;
-                OnPropertyChanged("Firmware");
+                OnPropertyChanged(nameof(Firmware));
             }
         }
 
@@ -172,7 +174,7 @@ namespace WPinternals
             set
             {
                 _HWID = value;
-                OnPropertyChanged("HWID");
+                OnPropertyChanged(nameof(HWID));
             }
         }
 
@@ -186,7 +188,7 @@ namespace WPinternals
             set
             {
                 _IMEI = value;
-                OnPropertyChanged("IMEI");
+                OnPropertyChanged(nameof(IMEI));
             }
         }
 
@@ -200,11 +202,10 @@ namespace WPinternals
             set
             {
                 _BootPolicy = value;
-                OnPropertyChanged("BootPolicy");
+                OnPropertyChanged(nameof(BootPolicy));
             }
         }
 
-
         private string _Db = null;
         public string Db
         {
@@ -215,11 +216,10 @@ namespace WPinternals
             set
             {
                 _Db = value;
-                OnPropertyChanged("Db");
+                OnPropertyChanged(nameof(Db));
             }
         }
 
-
         private string _Dbx = null;
         public string Dbx
         {
@@ -230,11 +230,10 @@ namespace WPinternals
             set
             {
                 _Dbx = value;
-                OnPropertyChanged("Dbx");
+                OnPropertyChanged(nameof(Dbx));
             }
         }
 
-
         private string _Kek = null;
         public string Kek
         {
@@ -245,11 +244,10 @@ namespace WPinternals
             set
             {
                 _Kek = value;
-                OnPropertyChanged("Kek");
+                OnPropertyChanged(nameof(Kek));
             }
         }
 
-
         private string _Pk = null;
         public string Pk
         {
@@ -260,7 +258,7 @@ namespace WPinternals
             set
             {
                 _Pk = value;
-                OnPropertyChanged("Pk");
+                OnPropertyChanged(nameof(Pk));
             }
         }
 
@@ -274,7 +272,7 @@ namespace WPinternals
             set
             {
                 _PublicID = value;
-                OnPropertyChanged("PublicID");
+                OnPropertyChanged(nameof(PublicID));
             }
         }
 
@@ -288,7 +286,7 @@ namespace WPinternals
             set
             {
                 _WlanMac1 = value;
-                OnPropertyChanged("WlanMac1");
+                OnPropertyChanged(nameof(WlanMac1));
             }
         }
 
@@ -302,7 +300,7 @@ namespace WPinternals
             set
             {
                 _WlanMac2 = value;
-                OnPropertyChanged("WlanMac2");
+                OnPropertyChanged(nameof(WlanMac2));
             }
         }
 
@@ -316,7 +314,7 @@ namespace WPinternals
             set
             {
                 _WlanMac3 = value;
-                OnPropertyChanged("WlanMac3");
+                OnPropertyChanged(nameof(WlanMac3));
             }
         }
 
@@ -330,7 +328,7 @@ namespace WPinternals
             set
             {
                 _WlanMac4 = value;
-                OnPropertyChanged("WlanMac4");
+                OnPropertyChanged(nameof(WlanMac4));
             }
         }
 
@@ -344,7 +342,7 @@ namespace WPinternals
             set
             {
                 _BluetoothMac = value;
-                OnPropertyChanged("BluetoothMac");
+                OnPropertyChanged(nameof(BluetoothMac));
             }
         }
 
@@ -358,7 +356,7 @@ namespace WPinternals
             set
             {
                 _IsBootloaderSecurityEnabled = value;
-                OnPropertyChanged("IsBootloaderSecurityEnabled");
+                OnPropertyChanged(nameof(IsBootloaderSecurityEnabled));
             }
         }
 
@@ -372,7 +370,7 @@ namespace WPinternals
             set
             {
                 _IsSimLocked = value;
-                OnPropertyChanged("IsSimLocked");
+                OnPropertyChanged(nameof(IsSimLocked));
             }
         }
 
diff --git a/ViewModels/PhoneNotifierViewModel.cs b/ViewModels/PhoneNotifierViewModel.cs
index db11064..fefce02 100644
--- a/ViewModels/PhoneNotifierViewModel.cs
+++ b/ViewModels/PhoneNotifierViewModel.cs
@@ -49,23 +49,21 @@ namespace WPinternals
         public event NewDeviceArrivedEvent NewDeviceArrived = delegate { };
         public event DeviceRemovedEvent DeviceRemoved = delegate { };
 
+        private Guid OldCombiInterfaceGuid = new("{0FD3B15C-D457-45d8-A779-C2B2C9F9D0FD}");
+        private Guid NewCombiInterfaceGuid = new("{7eaff726-34cc-4204-b09d-f95471b873cf}");
 
-        private Guid OldCombiInterfaceGuid = new Guid("{0FD3B15C-D457-45d8-A779-C2B2C9F9D0FD}");
-        private Guid NewCombiInterfaceGuid = new Guid("{7eaff726-34cc-4204-b09d-f95471b873cf}");
+        private Guid MassStorageInterfaceGuid = new("{53F56307-B6BF-11D0-94F2-00A0C91EFB8B}");
+        private Guid ComPortInterfaceGuid = new("{86E0D1E0-8089-11D0-9CE4-08003E301F73}");
+        private Guid HidInterfaceGuid = new("{4D1E55B2-F16F-11CF-88CB-001111000030}");
 
-        private Guid MassStorageInterfaceGuid = new Guid("{53F56307-B6BF-11D0-94F2-00A0C91EFB8B}");
-        private Guid ComPortInterfaceGuid = new Guid("{86E0D1E0-8089-11D0-9CE4-08003E301F73}");
-        private Guid HidInterfaceGuid = new Guid("{4D1E55B2-F16F-11CF-88CB-001111000030}");
+        private Guid LumiaNormalInterfaceGuid = new("{08324F9C-B621-435C-859B-AE4652481B7C}");
+        private Guid LumiaLabelInterfaceGuid = new("{F4FE0C27-7304-4ED7-AAB5-130893B84B6F}");
+        private Guid LumiaFlashInterfaceGuid = new("{9e3bd5f7-9690-4fcc-8810-3e2650cd6ecc}");
+        private Guid LumiaEmergencyInterfaceGuid = new("{71DE994D-8B7C-43DB-A27E-2AE7CD579A0C}");
 
-        private Guid LumiaNormalInterfaceGuid = new Guid("{08324F9C-B621-435C-859B-AE4652481B7C}");
-        private Guid LumiaLabelInterfaceGuid = new Guid("{F4FE0C27-7304-4ED7-AAB5-130893B84B6F}");
-        private Guid LumiaFlashInterfaceGuid = new Guid("{9e3bd5f7-9690-4fcc-8810-3e2650cd6ecc}");
-        private Guid LumiaEmergencyInterfaceGuid = new Guid("{71DE994D-8B7C-43DB-A27E-2AE7CD579A0C}");
+        private readonly object ModelLock = new();
 
-
-        private object ModelLock = new object();
-
-        private EventWaitHandle NewInterfaceWaitHandle = new EventWaitHandle(false, EventResetMode.AutoReset);
+        private readonly EventWaitHandle NewInterfaceWaitHandle = new(false, EventResetMode.AutoReset);
 
         private EventLogWatcher LogWatcher;
 
@@ -111,9 +109,9 @@ namespace WPinternals
 
             try
             {
-                EventLogQuery LogQuery = new EventLogQuery("Microsoft-Windows-Kernel-PnP/Configuration", PathType.LogName, "*[System[(EventID = 411)]]");
+                EventLogQuery LogQuery = new("Microsoft-Windows-Kernel-PnP/Configuration", PathType.LogName, "*[System[(EventID = 411)]]");
                 LogWatcher = new EventLogWatcher(LogQuery);
-                LogWatcher.EventRecordWritten += new EventHandler<EventRecordWrittenEventArgs>(PnPEventWritten);
+                LogWatcher.EventRecordWritten += PnPEventWritten;
                 LogWatcher.Enabled = true;
                 App.IsPnPEventLogMissing = false;
             }
@@ -155,19 +153,21 @@ namespace WPinternals
         internal void NotifyArrival()
         {
             if (CurrentInterface != null)
+            {
                 NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
+            }
         }
 
-        void LumiaNotifier_Arrival(object sender, USBEvent e)
+        private void LumiaNotifier_Arrival(object sender, USBEvent e)
         {
             try
             {
-                if ((e.DevicePath.IndexOf("VID_0421&", StringComparison.OrdinalIgnoreCase) >= 0) ||
-                    (e.DevicePath.IndexOf("VID_045E&", StringComparison.OrdinalIgnoreCase) >= 0))
+                if ((e.DevicePath.Contains("VID_0421&", StringComparison.OrdinalIgnoreCase)) ||
+                    (e.DevicePath.Contains("VID_045E&", StringComparison.OrdinalIgnoreCase)))
                 {
-                    if ((e.DevicePath.IndexOf("&PID_0660&MI_04", StringComparison.OrdinalIgnoreCase) >= 0) ||
-                        (e.DevicePath.IndexOf("&PID_0713&MI_04", StringComparison.OrdinalIgnoreCase) >= 0) || // for Spec B
-                        (e.DevicePath.IndexOf("&PID_0A01&MI_04", StringComparison.OrdinalIgnoreCase) >= 0)) // for Spec B (650)
+                    if ((e.DevicePath.Contains("&PID_0660&MI_04", StringComparison.OrdinalIgnoreCase)) ||
+                        (e.DevicePath.Contains("&PID_0713&MI_04", StringComparison.OrdinalIgnoreCase)) || // for Spec B
+                        (e.DevicePath.Contains("&PID_0A01&MI_04", StringComparison.OrdinalIgnoreCase))) // for Spec B (650)
                     {
                         CurrentInterface = PhoneInterfaces.Lumia_Label;
                         CurrentModel = new NokiaPhoneModel(e.DevicePath);
@@ -177,15 +177,17 @@ namespace WPinternals
                         LogFile.Log("Mode: Label", LogType.FileAndConsole);
                         NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
                     }
-                    else if ((e.DevicePath.IndexOf("&PID_0661", StringComparison.OrdinalIgnoreCase) >= 0) ||
-                             (e.DevicePath.IndexOf("&PID_06FC", StringComparison.OrdinalIgnoreCase) >= 0) || // VID_0421&PID_06FC is for Lumia 930
-                             (e.DevicePath.IndexOf("&PID_0A00", StringComparison.OrdinalIgnoreCase) >= 0))   // vid_045e & pid_0a00 & mi_03 = Lumia 950 XL normal mode
+                    else if ((e.DevicePath.Contains("&PID_0661", StringComparison.OrdinalIgnoreCase)) ||
+                             (e.DevicePath.Contains("&PID_06FC", StringComparison.OrdinalIgnoreCase)) || // VID_0421&PID_06FC is for Lumia 930
+                             (e.DevicePath.Contains("&PID_0A00", StringComparison.OrdinalIgnoreCase)))   // vid_045e & pid_0a00 & mi_03 = Lumia 950 XL normal mode
                     {
                         if (((USBNotifier)sender).Guid == OldCombiInterfaceGuid)
                         {
                             NewInterfaceWaitHandle.Reset();
-                            if (USBDevice.GetDevices(NewCombiInterfaceGuid).Count() > 0)
+                            if (USBDevice.GetDevices(NewCombiInterfaceGuid).Length > 0)
+                            {
                                 return;
+                            }
                             else
                             {
                                 // Old combi-interface was detected, but new combi-interface was not detected.
@@ -227,10 +229,10 @@ namespace WPinternals
                             NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
                         }
                     }
-                    else if ((e.DevicePath.IndexOf("&PID_066E", StringComparison.OrdinalIgnoreCase) >= 0) ||
-                             (e.DevicePath.IndexOf("&PID_0714", StringComparison.OrdinalIgnoreCase) >= 0) || // VID_0421&PID_0714 is for Lumia 930
-                             (e.DevicePath.IndexOf("&PID_0A02", StringComparison.OrdinalIgnoreCase) >= 0) || // VID_045E&PID_0A02 is for Lumia 950
-                             (e.DevicePath.IndexOf("&PID_05EE", StringComparison.OrdinalIgnoreCase) >= 0))   // VID_0421&PID_05EE is for early RX100
+                    else if ((e.DevicePath.Contains("&PID_066E", StringComparison.OrdinalIgnoreCase)) ||
+                             (e.DevicePath.Contains("&PID_0714", StringComparison.OrdinalIgnoreCase)) || // VID_0421&PID_0714 is for Lumia 930
+                             (e.DevicePath.Contains("&PID_0A02", StringComparison.OrdinalIgnoreCase)) || // VID_045E&PID_0A02 is for Lumia 950
+                             (e.DevicePath.Contains("&PID_05EE", StringComparison.OrdinalIgnoreCase)))   // VID_0421&PID_05EE is for early RX100
                     {
                         CurrentModel = new NokiaFlashModel(e.DevicePath);
                         ((NokiaFlashModel)CurrentModel).InterfaceChanged += InterfaceChanged;
@@ -282,8 +284,8 @@ namespace WPinternals
                         }
                     }
                 }
-                else if ((e.DevicePath.IndexOf(@"DISK&VEN_QUALCOMM&PROD_MMC_STORAGE", StringComparison.OrdinalIgnoreCase) >= 0) ||
-                         (e.DevicePath.IndexOf(@"DISK&VEN_MSFT&PROD_PHONE_MMC_STOR", StringComparison.OrdinalIgnoreCase) >= 0) ||
+                else if ((e.DevicePath.Contains("DISK&VEN_QUALCOMM&PROD_MMC_STORAGE", StringComparison.OrdinalIgnoreCase)) ||
+                         (e.DevicePath.Contains("DISK&VEN_MSFT&PROD_PHONE_MMC_STOR", StringComparison.OrdinalIgnoreCase)) ||
                          ((e.DevicePath.Length == @"\\.\E:".Length) && (e.DevicePath.StartsWith(@"\\.\")) && (e.DevicePath.EndsWith(":"))))
                 {
 #if DEBUG
@@ -307,7 +309,7 @@ namespace WPinternals
                                 // not for MainOS.
                                 Task.Delay(1000).Wait();
 
-                                MassStorage NewModel = new MassStorage(e.DevicePath);
+                                MassStorage NewModel = new(e.DevicePath);
 
                                 if (NewModel.Drive != null) // When logical drive is already known, we use this model. Or else we wait for the logical drive to arrive.
                                 {
@@ -329,13 +331,13 @@ namespace WPinternals
                         }
                     });
                 }
-                else if (e.DevicePath.IndexOf("VID_05C6&", StringComparison.OrdinalIgnoreCase) >= 0) // Qualcomm device
+                else if (e.DevicePath.Contains("VID_05C6&", StringComparison.OrdinalIgnoreCase)) // Qualcomm device
                 {
-                    if (e.DevicePath.IndexOf("&PID_9008", StringComparison.OrdinalIgnoreCase) >= 0)
+                    if (e.DevicePath.Contains("&PID_9008", StringComparison.OrdinalIgnoreCase))
                     {
-                        USBDeviceInfo DeviceInfo = USBDevice.GetDevices(((USBNotifier)sender).Guid).Where((d) => string.Compare(d.DevicePath, e.DevicePath, true) == 0).FirstOrDefault();
+                        USBDeviceInfo DeviceInfo = Array.Find(USBDevice.GetDevices(((USBNotifier)sender).Guid), (d) => string.Compare(d.DevicePath, e.DevicePath, true) == 0);
 
-                        if ((DeviceInfo.BusName == "QHSUSB_DLOAD") || (DeviceInfo.BusName == "QHSUSB__BULK") || ((DeviceInfo.BusName == "") && (LastInterface != PhoneInterfaces.Qualcomm_Download))) // TODO: Separate for Sahara!
+                        if ((DeviceInfo.BusName == "QHSUSB_DLOAD") || (DeviceInfo.BusName == "QHSUSB__BULK") || ((DeviceInfo.BusName?.Length == 0) && (LastInterface != PhoneInterfaces.Qualcomm_Download))) // TODO: Separate for Sahara!
                         {
                             CurrentInterface = PhoneInterfaces.Qualcomm_Download;
                             CurrentModel = new QualcommSerial(e.DevicePath);
@@ -343,12 +345,16 @@ namespace WPinternals
                             LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
                             LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly);
                             LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
-                            if (DeviceInfo.BusName == "")
+                            if (DeviceInfo.BusName?.Length == 0)
+                            {
                                 LogFile.Log("Driver does not show busname, assume mode: Qualcomm Emergency Download 9008", LogType.FileAndConsole);
+                            }
                             else
+                            {
                                 LogFile.Log("Mode: Qualcomm Emergency Download 9008", LogType.FileAndConsole);
+                            }
                         }
-                        else if ((DeviceInfo.BusName == "QHSUSB_ARMPRG") || ((DeviceInfo.BusName == "") && (LastInterface == PhoneInterfaces.Qualcomm_Download)))
+                        else if ((DeviceInfo.BusName == "QHSUSB_ARMPRG") || ((DeviceInfo.BusName?.Length == 0) && (LastInterface == PhoneInterfaces.Qualcomm_Download)))
                         {
                             CurrentInterface = PhoneInterfaces.Qualcomm_Flash;
                             CurrentModel = new QualcommSerial(e.DevicePath);
@@ -356,13 +362,17 @@ namespace WPinternals
                             LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
                             LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly);
                             LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
-                            if (DeviceInfo.BusName == "")
+                            if (DeviceInfo.BusName?.Length == 0)
+                            {
                                 LogFile.Log("Driver does not show busname, assume mode: Qualcomm Emergency Flash 9008", LogType.FileAndConsole);
+                            }
                             else
+                            {
                                 LogFile.Log("Mode: Qualcomm Emergency Flash 9008", LogType.FileAndConsole);
+                            }
                         }
                     }
-                    else if (e.DevicePath.IndexOf("&PID_9006", StringComparison.OrdinalIgnoreCase) >= 0)
+                    else if (e.DevicePath.Contains("&PID_9006", StringComparison.OrdinalIgnoreCase))
                     {
                         // This is part of the Mass Storage inteface.
                         // It is a slightly different version of the Qualcomm Emergency interface, which is implemented in SBL3.
@@ -382,7 +392,7 @@ namespace WPinternals
                             ((MassStorage)CurrentModel).AttachQualcommSerial(Qcom9006DevicePath);
                         }
                     }
-                    else if (e.DevicePath.IndexOf("&PID_F006", StringComparison.OrdinalIgnoreCase) >= 0)
+                    else if (e.DevicePath.Contains("&PID_F006", StringComparison.OrdinalIgnoreCase))
                     {
                         // This is part of the charging inteface.
 
@@ -406,31 +416,34 @@ namespace WPinternals
             CurrentInterface = NewInterface;
         }
 
-        void LumiaNotifier_Removal(object sender, USBEvent e)
+        private void LumiaNotifier_Removal(object sender, USBEvent e)
         {
-            if (e.DevicePath.IndexOf("VID_05C6&PID_9006", StringComparison.OrdinalIgnoreCase) >= 0)
+            if (e.DevicePath.Contains("VID_05C6&PID_9006", StringComparison.OrdinalIgnoreCase))
             {
                 Qcom9006DevicePath = null;
             }
 
             if (
-                (e.DevicePath.IndexOf("VID_0421&PID_0660&MI_04", StringComparison.OrdinalIgnoreCase) >= 0) ||
-                (e.DevicePath.IndexOf("VID_0421&PID_0713&MI_04", StringComparison.OrdinalIgnoreCase) >= 0) ||
-                (e.DevicePath.IndexOf("VID_045E&PID_0A01&MI_04", StringComparison.OrdinalIgnoreCase) >= 0) ||
-                (e.DevicePath.IndexOf("VID_0421&PID_0661", StringComparison.OrdinalIgnoreCase) >= 0) ||
-                (e.DevicePath.IndexOf("VID_0421&PID_06FC", StringComparison.OrdinalIgnoreCase) >= 0) ||
-                (e.DevicePath.IndexOf("VID_0421&PID_066E", StringComparison.OrdinalIgnoreCase) >= 0) ||
-                (e.DevicePath.IndexOf("VID_0421&PID_0714", StringComparison.OrdinalIgnoreCase) >= 0) ||
-                (e.DevicePath.IndexOf("VID_0421&PID_05EE", StringComparison.OrdinalIgnoreCase) >= 0) ||
-                (e.DevicePath.IndexOf("VID_045E&PID_0A00", StringComparison.OrdinalIgnoreCase) >= 0) ||
-                (e.DevicePath.IndexOf("VID_045E&PID_0A02", StringComparison.OrdinalIgnoreCase) >= 0) ||
-                (e.DevicePath.IndexOf("VID_05C6&PID_9008", StringComparison.OrdinalIgnoreCase) >= 0) ||
-                (e.DevicePath.IndexOf(@"DISK&VEN_QUALCOMM&PROD_MMC_STORAGE", StringComparison.OrdinalIgnoreCase) >= 0) ||
-                (e.DevicePath.IndexOf(@"DISK&VEN_MSFT&PROD_PHONE_MMC_STOR", StringComparison.OrdinalIgnoreCase) >= 0)
+                (e.DevicePath.Contains("VID_0421&PID_0660&MI_04", StringComparison.OrdinalIgnoreCase)) ||
+                (e.DevicePath.Contains("VID_0421&PID_0713&MI_04", StringComparison.OrdinalIgnoreCase)) ||
+                (e.DevicePath.Contains("VID_045E&PID_0A01&MI_04", StringComparison.OrdinalIgnoreCase)) ||
+                (e.DevicePath.Contains("VID_0421&PID_0661", StringComparison.OrdinalIgnoreCase)) ||
+                (e.DevicePath.Contains("VID_0421&PID_06FC", StringComparison.OrdinalIgnoreCase)) ||
+                (e.DevicePath.Contains("VID_0421&PID_066E", StringComparison.OrdinalIgnoreCase)) ||
+                (e.DevicePath.Contains("VID_0421&PID_0714", StringComparison.OrdinalIgnoreCase)) ||
+                (e.DevicePath.Contains("VID_0421&PID_05EE", StringComparison.OrdinalIgnoreCase)) ||
+                (e.DevicePath.Contains("VID_045E&PID_0A00", StringComparison.OrdinalIgnoreCase)) ||
+                (e.DevicePath.Contains("VID_045E&PID_0A02", StringComparison.OrdinalIgnoreCase)) ||
+                (e.DevicePath.Contains("VID_05C6&PID_9008", StringComparison.OrdinalIgnoreCase)) ||
+                (e.DevicePath.Contains("DISK&VEN_QUALCOMM&PROD_MMC_STORAGE", StringComparison.OrdinalIgnoreCase)) ||
+                (e.DevicePath.Contains("DISK&VEN_MSFT&PROD_PHONE_MMC_STOR", StringComparison.OrdinalIgnoreCase))
             )
             {
                 if (CurrentInterface != null)
+                {
                     LastInterface = CurrentInterface;
+                }
+
                 CurrentInterface = null;
                 if (CurrentModel != null)
                 {
@@ -447,16 +460,18 @@ namespace WPinternals
             IDisposable Result = null;
 
             if (CurrentInterface == null)
+            {
                 LogFile.Log("Waiting for phone to connect...", LogType.FileOnly);
+            }
 
             await Task.Run(() =>
             {
-                System.Threading.AutoResetEvent e = new System.Threading.AutoResetEvent(false);
-                NewDeviceArrivedEvent Arrived = (a) =>
-                    {
-                        e.Set();
-                        Result = a.NewModel;
-                    };
+                AutoResetEvent e = new(false);
+                void Arrived(ArrivalEventArgs a)
+                {
+                    e.Set();
+                    Result = a.NewModel;
+                }
                 NewDeviceArrived += Arrived;
                 e.WaitOne();
                 NewDeviceArrived -= Arrived;
@@ -471,11 +486,8 @@ namespace WPinternals
 
             await Task.Run(() =>
             {
-                System.Threading.AutoResetEvent e = new System.Threading.AutoResetEvent(false);
-                DeviceRemovedEvent Removed = () =>
-                {
-                    e.Set();
-                };
+                AutoResetEvent e = new(false);
+                void Removed() => e.Set();
                 DeviceRemoved += Removed;
                 e.WaitOne();
                 DeviceRemoved -= Removed;
diff --git a/ViewModels/RegistrationViewModel.cs b/ViewModels/RegistrationViewModel.cs
index 1d1859f..1e095e7 100644
--- a/ViewModels/RegistrationViewModel.cs
+++ b/ViewModels/RegistrationViewModel.cs
@@ -25,8 +25,8 @@ namespace WPinternals
 {
     internal class RegistrationViewModel : ContextViewModel
     {
-        Action Completed;
-        Action Failed;
+        private readonly Action Completed;
+        private readonly Action Failed;
 
         internal RegistrationViewModel(Action Completed, Action Failed)
             : base()
@@ -40,14 +40,7 @@ namespace WPinternals
         {
             get
             {
-                if (_ExitCommand == null)
-                {
-                    _ExitCommand = new DelegateCommand(() =>
-                    {
-                        Application.Current.Shutdown();
-                    });
-                }
-                return _ExitCommand;
+                return _ExitCommand ??= new DelegateCommand(() => Application.Current.Shutdown());
             }
         }
 
@@ -56,9 +49,7 @@ namespace WPinternals
         {
             get
             {
-                if (_ContinueCommand == null)
-                {
-                    _ContinueCommand = new DelegateCommand(() =>
+                return _ContinueCommand ??= new DelegateCommand(() =>
                     {
                         try
                         {
@@ -80,8 +71,6 @@ namespace WPinternals
                             Failed();
                         }
                     });
-                }
-                return _ContinueCommand;
             }
         }
 
@@ -89,7 +78,7 @@ namespace WPinternals
         {
             get
             {
-                return ((_Name != null) && (_Name.Length >= 2) && (_Email != null) && (_Email.Length >= 5));
+                return (_Name?.Length >= 2) && (_Email?.Length >= 5);
             }
         }
 
@@ -103,8 +92,8 @@ namespace WPinternals
             set
             {
                 _Name = value;
-                OnPropertyChanged("Name");
-                OnPropertyChanged("IsRegistrationComplete");
+                OnPropertyChanged(nameof(Name));
+                OnPropertyChanged(nameof(IsRegistrationComplete));
             }
         }
 
@@ -118,8 +107,8 @@ namespace WPinternals
             set
             {
                 _Email = value;
-                OnPropertyChanged("Email");
-                OnPropertyChanged("IsRegistrationComplete");
+                OnPropertyChanged(nameof(Email));
+                OnPropertyChanged(nameof(IsRegistrationComplete));
             }
         }
 
@@ -133,7 +122,7 @@ namespace WPinternals
             set
             {
                 _SkypeID = value;
-                OnPropertyChanged("SkypeID");
+                OnPropertyChanged(nameof(SkypeID));
             }
         }
 
@@ -147,7 +136,7 @@ namespace WPinternals
             set
             {
                 _TelegramID = value;
-                OnPropertyChanged("TelegramID");
+                OnPropertyChanged(nameof(TelegramID));
             }
         }
     }
diff --git a/ViewModels/RestoreSourceSelectionViewModel.cs b/ViewModels/RestoreSourceSelectionViewModel.cs
index 9b8833a..6a6599b 100644
--- a/ViewModels/RestoreSourceSelectionViewModel.cs
+++ b/ViewModels/RestoreSourceSelectionViewModel.cs
@@ -25,9 +25,9 @@ namespace WPinternals
 {
     internal class RestoreSourceSelectionViewModel : ContextViewModel
     {
-        private PhoneNotifierViewModel PhoneNotifier;
-        private Action<string, string, string> RestoreCallback;
-        private Action<PhoneInterfaces> RequestModeSwitch;
+        private readonly PhoneNotifierViewModel PhoneNotifier;
+        private readonly Action<string, string, string> RestoreCallback;
+        private readonly Action<PhoneInterfaces> RequestModeSwitch;
         internal Action SwitchToUnlockBoot;
         internal Action SwitchToFlashRom;
 
@@ -58,7 +58,7 @@ namespace WPinternals
                 if (value != _EFIESPPath)
                 {
                     _EFIESPPath = value;
-                    OnPropertyChanged("EFIESPPath");
+                    OnPropertyChanged(nameof(EFIESPPath));
                 }
             }
         }
@@ -75,7 +75,7 @@ namespace WPinternals
                 if (value != _MainOSPath)
                 {
                     _MainOSPath = value;
-                    OnPropertyChanged("MainOSPath");
+                    OnPropertyChanged(nameof(MainOSPath));
                 }
             }
         }
@@ -92,7 +92,7 @@ namespace WPinternals
                 if (value != _DataPath)
                 {
                     _DataPath = value;
-                    OnPropertyChanged("DataPath");
+                    OnPropertyChanged(nameof(DataPath));
                 }
             }
         }
@@ -109,7 +109,7 @@ namespace WPinternals
                 if (value != _IsPhoneDisconnected)
                 {
                     _IsPhoneDisconnected = value;
-                    OnPropertyChanged("IsPhoneDisconnected");
+                    OnPropertyChanged(nameof(IsPhoneDisconnected));
                 }
             }
         }
@@ -126,7 +126,7 @@ namespace WPinternals
                 if (value != _IsPhoneInFlashMode)
                 {
                     _IsPhoneInFlashMode = value;
-                    OnPropertyChanged("IsPhoneInFlashMode");
+                    OnPropertyChanged(nameof(IsPhoneInFlashMode));
                 }
             }
         }
@@ -143,7 +143,7 @@ namespace WPinternals
                 if (value != _IsPhoneInOtherMode)
                 {
                     _IsPhoneInOtherMode = value;
-                    OnPropertyChanged("IsPhoneInOtherMode");
+                    OnPropertyChanged(nameof(IsPhoneInOtherMode));
                 }
             }
         }
@@ -153,11 +153,7 @@ namespace WPinternals
         {
             get
             {
-                if (_RestoreCommand == null)
-                {
-                    _RestoreCommand = new DelegateCommand(() => { RestoreCallback(EFIESPPath, MainOSPath, DataPath); }, () => (((EFIESPPath != null) || (MainOSPath != null) || (DataPath != null)) && (PhoneNotifier.CurrentInterface != null)));
-                }
-                return _RestoreCommand;
+                return _RestoreCommand ??= new DelegateCommand(() => RestoreCallback(EFIESPPath, MainOSPath, DataPath), () => (((EFIESPPath != null) || (MainOSPath != null) || (DataPath != null)) && (PhoneNotifier.CurrentInterface != null)));
             }
         }
 
@@ -166,12 +162,12 @@ namespace WPinternals
             PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
         }
 
-        void NewDeviceArrived(ArrivalEventArgs Args)
+        private void NewDeviceArrived(ArrivalEventArgs Args)
         {
             new Thread(() => EvaluateViewState()).Start();
         }
 
-        void DeviceRemoved()
+        private void DeviceRemoved()
         {
             new Thread(() => EvaluateViewState()).Start();
         }
diff --git a/ViewModels/RestoreViewModel.cs b/ViewModels/RestoreViewModel.cs
index eec82fc..4ec8506 100644
--- a/ViewModels/RestoreViewModel.cs
+++ b/ViewModels/RestoreViewModel.cs
@@ -26,11 +26,11 @@ namespace WPinternals
 {
     internal class RestoreViewModel : ContextViewModel
     {
-        private PhoneNotifierViewModel PhoneNotifier;
-        private Action Callback;
-        private Action<PhoneInterfaces> RequestModeSwitch;
-        private Action SwitchToUnlockBoot;
-        private Action SwitchToFlashRom;
+        private readonly PhoneNotifierViewModel PhoneNotifier;
+        private readonly Action Callback;
+        private readonly Action<PhoneInterfaces> RequestModeSwitch;
+        private readonly Action SwitchToUnlockBoot;
+        private readonly Action SwitchToFlashRom;
 
         internal RestoreViewModel(PhoneNotifierViewModel PhoneNotifier, Action<PhoneInterfaces> RequestModeSwitch, Action SwitchToUnlockBoot, Action SwitchToFlashRom, Action Callback)
             : base()
@@ -47,13 +47,19 @@ namespace WPinternals
         internal override void EvaluateViewState()
         {
             if (!IsActive)
+            {
                 return;
+            }
 
             if (SubContextViewModel == null)
+            {
                 ActivateSubContext(new RestoreSourceSelectionViewModel(PhoneNotifier, RequestModeSwitch, SwitchToUnlockBoot, SwitchToFlashRom, DoRestore));
+            }
 
             if (SubContextViewModel is RestoreSourceSelectionViewModel)
+            {
                 ((RestoreSourceSelectionViewModel)SubContextViewModel).EvaluateViewState();
+            }
         }
 
         internal async void DoRestore(string EFIESPPath, string MainOSPath, string DataPath)
@@ -109,7 +115,7 @@ namespace WPinternals
 
                     NokiaFlashModel Phone = (NokiaFlashModel)PhoneNotifier.CurrentModel;
 
-                    BusyViewModel Busy = new BusyViewModel("Restoring...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
+                    BusyViewModel Busy = new("Restoring...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
                     ProgressUpdater Updater = Busy.ProgressUpdater;
                     ActivateSubContext(Busy);
 
@@ -121,7 +127,7 @@ namespace WPinternals
                             if (EFIESPPath != null)
                             {
                                 i++;
-                                Busy.Message = "Restoring partition EFIESP (" + i.ToString() + @"/" + PartitionCount.ToString() + ")";
+                                Busy.Message = "Restoring partition EFIESP (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
                                 Phone.FlashRawPartition(EFIESPPath, "EFIESP", Updater);
                             }
                         }
@@ -139,7 +145,7 @@ namespace WPinternals
                             if (MainOSPath != null)
                             {
                                 i++;
-                                Busy.Message = "Restoring partition MainOS (" + i.ToString() + @"/" + PartitionCount.ToString() + ")";
+                                Busy.Message = "Restoring partition MainOS (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
                                 Phone.FlashRawPartition(EFIESPPath, "MainOS", Updater);
                             }
                         }
@@ -157,7 +163,7 @@ namespace WPinternals
                             if (DataPath != null)
                             {
                                 i++;
-                                Busy.Message = "Restoring partition Data (" + i.ToString() + @"/" + PartitionCount.ToString() + ")";
+                                Busy.Message = "Restoring partition Data (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
                                 Phone.FlashRawPartition(EFIESPPath, "Data", Updater);
                             }
                         }
diff --git a/ViewModels/SwitchModeViewModel.cs b/ViewModels/SwitchModeViewModel.cs
index a862f15..5fd844a 100644
--- a/ViewModels/SwitchModeViewModel.cs
+++ b/ViewModels/SwitchModeViewModel.cs
@@ -48,7 +48,9 @@ namespace WPinternals
             : base()
         {
             if ((PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_Flash) && (PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader) && (PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_Label) && (PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_Normal))
+            {
                 throw new ArgumentException();
+            }
 
             this.PhoneNotifier = PhoneNotifier;
             this.CurrentModel = (NokiaPhoneModel)PhoneNotifier.CurrentModel;
@@ -65,13 +67,12 @@ namespace WPinternals
                 // Make sure this ViewModel has its View loaded before we continue,
                 // or else loading of Views can get mixed up.
                 if (SynchronizationContext.Current == null)
+                {
                     StartSwitch();
+                }
                 else
                 {
-                    SynchronizationContext.Current.Post((s) =>
-                    {
-                        ((SwitchModeViewModel)s).StartSwitch();
-                    }, this);
+                    SynchronizationContext.Current.Post((s) => ((SwitchModeViewModel)s).StartSwitch(), this);
                 }
             }
         }
@@ -105,18 +106,39 @@ namespace WPinternals
             }
 
             if (PhoneNotifier.CurrentInterface == TargetMode)
+            {
                 ModeSwitchSuccess(PhoneNotifier.CurrentModel, (PhoneInterfaces)PhoneNotifier.CurrentInterface);
+            }
             else
             {
                 this.PhoneNotifier = PhoneNotifier;
                 this.CurrentModel = (NokiaPhoneModel)PhoneNotifier.CurrentModel;
                 this.CurrentMode = PhoneNotifier.CurrentInterface;
                 this.TargetMode = TargetMode;
-                if (ModeSwitchProgress != null) this.ModeSwitchProgress += ModeSwitchProgress;
-                if (ModeSwitchError != null) this.ModeSwitchError += ModeSwitchError;
-                if (ModeSwitchSuccess != null) this.ModeSwitchSuccess += ModeSwitchSuccess;
-                if (SetWorkingStatus != null) this.SetWorkingStatus = SetWorkingStatus;
-                if (UpdateWorkingStatus != null) this.UpdateWorkingStatus = UpdateWorkingStatus;
+                if (ModeSwitchProgress != null)
+                {
+                    this.ModeSwitchProgress += ModeSwitchProgress;
+                }
+
+                if (ModeSwitchError != null)
+                {
+                    this.ModeSwitchError += ModeSwitchError;
+                }
+
+                if (ModeSwitchSuccess != null)
+                {
+                    this.ModeSwitchSuccess += ModeSwitchSuccess;
+                }
+
+                if (SetWorkingStatus != null)
+                {
+                    this.SetWorkingStatus = SetWorkingStatus;
+                }
+
+                if (UpdateWorkingStatus != null)
+                {
+                    this.UpdateWorkingStatus = UpdateWorkingStatus;
+                }
 
                 if (this.CurrentMode == null)
                 {
@@ -128,13 +150,12 @@ namespace WPinternals
                     // Make sure this ViewModel has its View loaded before we continue,
                     // or else loading of Views can get mixed up.
                     if (SynchronizationContext.Current == null)
+                    {
                         StartSwitch();
+                    }
                     else
                     {
-                        SynchronizationContext.Current.Post((s) =>
-                        {
-                            ((SwitchModeViewModel)s).StartSwitch();
-                        }, this);
+                        SynchronizationContext.Current.Post((s) => ((SwitchModeViewModel)s).StartSwitch(), this);
                     }
                 }
             }
@@ -161,9 +182,13 @@ namespace WPinternals
         {
             IsSwitching = false;
             if ((UIContext == null) || (SynchronizationContext.Current == UIContext))
+            {
                 ModeSwitchError(Message);
+            }
             else
-                UIContext.Post(s => { ModeSwitchError(Message); }, null);
+            {
+                UIContext.Post(s => ModeSwitchError(Message), null);
+            }
         }
 
         private void ModeSwitchSuccessWrapper()
@@ -176,23 +201,29 @@ namespace WPinternals
                     ModeSwitchErrorWrapper("Phone disconnected");
                 }
                 else
-                    ModeSwitchSuccess((IDisposable)PhoneNotifier.CurrentModel, (PhoneInterfaces)PhoneNotifier.CurrentInterface);
-            } 
+                {
+                    ModeSwitchSuccess(PhoneNotifier.CurrentModel, (PhoneInterfaces)PhoneNotifier.CurrentInterface);
+                }
+            }
             else
             {
                 if (PhoneNotifier.CurrentInterface == null)
                 {
-                    UIContext.Post(s => { ModeSwitchErrorWrapper("Phone disconnected"); }, null);
+                    UIContext.Post(s => ModeSwitchErrorWrapper("Phone disconnected"), null);
                 }
                 else
-                    UIContext.Post(s => { ModeSwitchSuccess((IDisposable)PhoneNotifier.CurrentModel, (PhoneInterfaces)PhoneNotifier.CurrentInterface); }, null);
+                {
+                    UIContext.Post(s => ModeSwitchSuccess(PhoneNotifier.CurrentModel, (PhoneInterfaces)PhoneNotifier.CurrentInterface), null);
+                }
             }
         }
 
         ~SwitchModeViewModel()
         {
             if (PhoneNotifier != null)
+            {
                 PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
+            }
         }
 
         internal void StartSwitch()
@@ -248,7 +279,7 @@ namespace WPinternals
                             return;
                     }
 
-                    Dictionary<string, object> Params = new Dictionary<string, object>();
+                    Dictionary<string, object> Params = new();
                     Params.Add("DeviceMode", DeviceMode);
                     Params.Add("ResetMethod", "HwReset");
                     try
@@ -309,7 +340,7 @@ namespace WPinternals
                         case PhoneInterfaces.Qualcomm_Download:
                             byte[] RebootToQualcommDownloadCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x58, 0x43, 0x42, 0x45 }; // NOKXCBE
                             RebootCommandResult = ((NokiaPhoneModel)CurrentModel).ExecuteRawMethod(RebootToQualcommDownloadCommand);
-                            if ((RebootCommandResult != null) && (RebootCommandResult.Length == 4)) // This means fail: NOKU (unknow command)
+                            if (RebootCommandResult?.Length == 4) // This means fail: NOKU (unknow command)
                             {
                                 IsSwitchingInterface = false;
                                 ModeSwitchErrorWrapper("Failed to switch to Qualcomm Download mode");
@@ -367,7 +398,7 @@ namespace WPinternals
         {
             PhoneNotifier.NewDeviceArrived -= NewDeviceArrivedFromMassStorageMode;
 
-            CurrentModel = (IDisposable)Args.NewModel;
+            CurrentModel = Args.NewModel;
             CurrentMode = Args.NewInterface;
 
             // After the mass storage mode reboot command, the phone must be in Bootloader mode.
@@ -426,7 +457,7 @@ namespace WPinternals
         {
             PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
 
-            CurrentModel = (IDisposable)Args.NewModel;
+            CurrentModel = Args.NewModel;
             CurrentMode = Args.NewInterface;
 
             if ((CurrentMode == PhoneInterfaces.Lumia_Bootloader) && (TargetMode == PhoneInterfaces.Lumia_Flash))
@@ -447,7 +478,9 @@ namespace WPinternals
             if (CurrentMode == TargetMode)
             {
                 if (TargetMode == PhoneInterfaces.Lumia_Bootloader)
+                {
                     ((NokiaFlashModel)CurrentModel).DisableRebootTimeOut();
+                }
 
                 ModeSwitchSuccessWrapper();
             }
@@ -476,12 +509,12 @@ namespace WPinternals
                 IsSwitchingInterface = true;
                 LogFile.Log("Sending command for rebooting to Emergency Download mode");
                 byte[] RebootCommandResult = ((NokiaPhoneModel)CurrentModel).ExecuteRawMethod(RebootToQualcommDownloadCommand);
-                if ((RebootCommandResult != null) && (RebootCommandResult.Length >= 8))
+                if (RebootCommandResult?.Length >= 8)
                 {
                     int ResultCode = (RebootCommandResult[6] << 8) + RebootCommandResult[7];
                     LogFile.Log("Resultcode: 0x" + ResultCode.ToString("X4"));
                 }
-                if ((RebootCommandResult != null) && (RebootCommandResult.Length == 4)) // This means fail: NOKU (unknow command)
+                if (RebootCommandResult?.Length == 4) // This means fail: NOKU (unknow command)
                 {
                     ModeSwitchErrorWrapper("Failed to switch to Qualcomm Download mode");
                     IsSwitchingInterface = false;
@@ -515,12 +548,7 @@ namespace WPinternals
 
         private void SwitchFromFlashToLabelMode(bool Continuation = false)
         {
-            string ProgressText;
-            if (Continuation)
-                ProgressText = "And now preparing to boot the phone to Label mode...";
-            else
-                ProgressText = "Preparing to boot the phone to Label mode...";
-
+            string ProgressText = Continuation ? "And now preparing to boot the phone to Label mode..." : "Preparing to boot the phone to Label mode...";
             NokiaFlashModel FlashModel = (NokiaFlashModel)CurrentModel;
             if (CurrentMode == PhoneInterfaces.Lumia_Bootloader)
             {
@@ -548,32 +576,31 @@ namespace WPinternals
                         }
                         string ENOSWPackage = LumiaDownloadModel.SearchENOSW(Info.Type, Info.Firmware);
                         SetWorkingStatus("Downloading " + Info.Type + " Test Mode package...", MaxProgressValue: 100);
-                        DownloadEntry downloadEntry = new DownloadEntry(ENOSWPackage, TempFolder, null, null, null);
+                        DownloadEntry downloadEntry = new(ENOSWPackage, TempFolder, null, null, null);
 
                         downloadEntry.PropertyChanged += (object sender, System.ComponentModel.PropertyChangedEventArgs e) =>
                         {
                             if (e.PropertyName == "Progress")
                             {
-                                int progress = (sender as DownloadEntry).Progress;
-                                ulong progressret;
-                                ulong.TryParse(progress.ToString(), out progressret);
+                                int progress = (sender as DownloadEntry)?.Progress ?? 0;
+                                ulong.TryParse(progress.ToString(), out ulong progressret);
                                 UpdateWorkingStatus(null, CurrentProgressValue: progressret);
 
                                 if (progress == 100)
                                 {
                                     ModeSwitchProgressWrapper("Initializing Flash...", null);
 
-                                    string MMOSPath = TempFolder + "\\" + (sender as DownloadEntry).Name;
+                                    string MMOSPath = TempFolder + "\\" + (sender as DownloadEntry)?.Name;
 
                                     PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
-                                    FileInfo info = new FileInfo(MMOSPath);
+                                    FileInfo info = new(MMOSPath);
                                     uint length = uint.Parse(info.Length.ToString());
-                                    int maximumbuffersize = 0x00240000;
+                                    const int maximumbuffersize = 0x00240000;
                                     uint totalcounts = (uint)Math.Truncate((decimal)length / maximumbuffersize);
 
                                     SetWorkingStatus("Flashing Test Mode package...", MaxProgressValue: 100);
 
-                                    ProgressUpdater progressUpdater = new ProgressUpdater(totalcounts + 1, (int i, TimeSpan? time) => UpdateWorkingStatus(null, CurrentProgressValue: (ulong)i));
+                                    ProgressUpdater progressUpdater = new(totalcounts + 1, (int i, TimeSpan? time) => UpdateWorkingStatus(null, CurrentProgressValue: (ulong)i));
                                     FlashModel.FlashMMOS(MMOSPath, progressUpdater);
 
                                     SetWorkingStatus("And now booting phone to MMOS...", "If the phone stays on the lightning cog screen for a while, you may need to unplug and replug the phone to continue the boot process.");
@@ -606,12 +633,7 @@ namespace WPinternals
 
         private void SwitchFromFlashToMassStorageMode(bool Continuation = false)
         {
-            string ProgressText;
-            if (Continuation)
-                ProgressText = "And now rebooting phone to Mass Storage mode...";
-            else
-                ProgressText = "Rebooting phone to Mass Storage mode...";
-
+            string ProgressText = Continuation ? "And now rebooting phone to Mass Storage mode..." : "Rebooting phone to Mass Storage mode...";
             NokiaFlashModel FlashModel = (NokiaFlashModel)CurrentModel;
             if (CurrentMode == PhoneInterfaces.Lumia_Bootloader)
             {
@@ -625,12 +647,16 @@ namespace WPinternals
 
             MassStorageWarning = null;
             if (Info.FlashAppProtocolVersionMajor < 2)
+            {
                 MassStorageWarning = "Switching to Mass Storage mode should take about 10 seconds. The phone should be unlocked using an Engineering SBL3 to enable Mass Storage mode. When you unlocked the bootloader, but you did not use an Engineering SBL3, an attempt to boot to Mass Storage mode may result in an unresponsive state. Installing drivers for this interface may also cause to hang the PC. So when this switch is taking too long, you should reboot both the PC and the phone. To reboot the phone, you have to perform a soft-reset. Press and hold the volume-down-button and the power-button at the same time for at least 10 seconds. This will trigger a power-cycle and the phone will reboot. Once fully booted, the phone may show strange behavior, like complaining about mail-accounts, showing old text-messages, inability to load https-websites, etc. This is expected behavior, because the time-settings of the phone are incorrect. Just wait a few seconds for the phone to get a data-connection and have the date/time synced. After that the strange behavior will stop automatically and normal operation is resumed.";
+            }
             else
             {
                 MassStorageWarning = "When the screen of the phone is black for a while, it could be that the phone is already in Mass Storage Mode, but there is no drive-letter assigned. To resolve this issue, open Device Manager and manually assign a drive-letter to the MainOS partition of your phone, or open a command-prompt and type: diskpart automount enable.";
                 if (App.IsPnPEventLogMissing)
+                {
                     MassStorageWarning += " It is also possible that the phone is in Mass Storage mode, but the Mass Storage driver on this PC failed. Your PC does not have an eventlog to detect this misbehaviour. But in this case you will see a device with an exclamation mark in Device Manager and then you need to manually reset the phone by pressing and holding the power-button for at least 10 seconds until it vibrates and reboots. After that Windows Phone Internals will revert the changes. After the phone has rebooted to the OS, you can retry to unlock the bootloader.";
+                }
             }
 
             bool IsOldLumia = (Info.FlashAppProtocolVersionMajor < 2);
@@ -650,7 +676,7 @@ namespace WPinternals
                 byte[] RebootToMassStorageCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x4D }; // NOKM
                 IsSwitchingInterface = true;
                 byte[] RebootCommandResult = ((NokiaPhoneModel)CurrentModel).ExecuteRawMethod(RebootToMassStorageCommand);
-                if ((RebootCommandResult != null) && (RebootCommandResult.Length == 4)) // This means fail: NOKU (unknown command)
+                if (RebootCommandResult?.Length == 4) // This means fail: NOKU (unknown command)
                 {
                     BootModeFlagCommand[0x0F] = 0x4D;
                     byte[] BootFlagResult = ((NokiaPhoneModel)CurrentModel).ExecuteRawMethod(BootModeFlagCommand);
@@ -696,55 +722,63 @@ namespace WPinternals
                         // But the partition contains an extra hack to break out the endless loops.
                         using (var stream = assembly.GetManifestResourceStream("WPinternals.SBMSM"))
                         {
-                            using (DecompressedStream dec = new DecompressedStream(stream))
-                            {
-                                using (System.IO.MemoryStream SB = new System.IO.MemoryStream()) // Must be a seekable stream!
+                            using DecompressedStream dec = new(stream);
+                            using MemoryStream SB = new(); // Must be a seekable stream!
+                            dec.CopyTo(SB);
+
+                            // We don't need to check for the BACKUP_BS_NV partition here,
+                            // because the SecureBoot flag is disabled here.
+                            // So either the NV was already backupped or already overwritten.
+
+                            GPT GPT = FlashModel.ReadGPT();
+                            Partition Target = GPT.GetPartition("UEFI_BS_NV");
+
+                            // We've been reading the GPT, so we let the phone reset once more to be sure that memory maps are the same
+                            WPinternalsStatus LastStatus = WPinternalsStatus.Undefined;
+                            List<FlashPart> Parts = new();
+                            FlashPart Part = new();
+                            Part.StartSector = (uint)Target.FirstSector;
+                            Part.Stream = SB;
+                            Parts.Add(Part);
+                            await LumiaV2UnlockBootViewModel.LumiaV2CustomFlash(PhoneNotifier, null, false, false, Parts, DoResetFirst: true, ClearFlashingStatusAtEnd: false, ShowProgress: false,
+                                SetWorkingStatus: (m, s, v, a, st) =>
                                 {
-                                    dec.CopyTo(SB);
-
-                                    // We don't need to check for the BACKUP_BS_NV partition here,
-                                    // because the SecureBoot flag is disabled here.
-                                    // So either the NV was already backupped or already overwritten.
-
-                                    GPT GPT = FlashModel.ReadGPT();
-                                    Partition Target = GPT.GetPartition("UEFI_BS_NV");
-
-                                    // We've been reading the GPT, so we let the phone reset once more to be sure that memory maps are the same
-                                    WPinternalsStatus LastStatus = WPinternalsStatus.Undefined;
-                                    List<FlashPart> Parts = new List<FlashPart>();
-                                    FlashPart Part = new FlashPart();
-                                    Part.StartSector = (uint)Target.FirstSector;
-                                    Part.Stream = SB;
-                                    Parts.Add(Part);
-                                    await LumiaV2UnlockBootViewModel.LumiaV2CustomFlash(PhoneNotifier, null, false, false, Parts, DoResetFirst: true, ClearFlashingStatusAtEnd: false, ShowProgress: false,
-                                        SetWorkingStatus: (m, s, v, a, st) =>
+                                    if (SetWorkingStatus != null)
+                                    {
+                                        if ((st == WPinternalsStatus.Scanning) || (st == WPinternalsStatus.WaitingForManualReset))
                                         {
-                                            if (SetWorkingStatus != null)
-                                            {
-                                                if ((st == WPinternalsStatus.Scanning) || (st == WPinternalsStatus.WaitingForManualReset))
-                                                    SetWorkingStatus(m, s, v, a, st);
-                                                else if ((LastStatus == WPinternalsStatus.Scanning) || (LastStatus == WPinternalsStatus.WaitingForManualReset))
-                                                    SetWorkingStatus(ProgressText, MassStorageWarning);
-                                                LastStatus = st;
-                                            }
-                                        },
-                                        UpdateWorkingStatus: (m, s, v, st) =>
+                                            SetWorkingStatus(m, s, v, a, st);
+                                        }
+                                        else if ((LastStatus == WPinternalsStatus.Scanning) || (LastStatus == WPinternalsStatus.WaitingForManualReset))
                                         {
-                                            if (UpdateWorkingStatus != null)
-                                            {
-                                                if ((st == WPinternalsStatus.Scanning) || (st == WPinternalsStatus.WaitingForManualReset))
-                                                    UpdateWorkingStatus(m, s, v, st);
-                                                else if ((LastStatus == WPinternalsStatus.Scanning) || (LastStatus == WPinternalsStatus.WaitingForManualReset))
-                                                    SetWorkingStatus(ProgressText, MassStorageWarning);
-                                                LastStatus = st;
-                                            }
-                                        });
-                                }
-                            }
+                                            SetWorkingStatus(ProgressText, MassStorageWarning);
+                                        }
+
+                                        LastStatus = st;
+                                    }
+                                },
+                                UpdateWorkingStatus: (m, s, v, st) =>
+                                {
+                                    if (UpdateWorkingStatus != null)
+                                    {
+                                        if ((st == WPinternalsStatus.Scanning) || (st == WPinternalsStatus.WaitingForManualReset))
+                                        {
+                                            UpdateWorkingStatus(m, s, v, st);
+                                        }
+                                        else if ((LastStatus == WPinternalsStatus.Scanning) || (LastStatus == WPinternalsStatus.WaitingForManualReset))
+                                        {
+                                            SetWorkingStatus(ProgressText, MassStorageWarning);
+                                        }
+
+                                        LastStatus = st;
+                                    }
+                                });
                         }
 
                         if (PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_BadMassStorage)
+                        {
                             throw new WPinternalsException("Phone is in Mass Storage mode, but the driver on PC failed to start");
+                        }
 
                         // Wait for bootloader
                         if (PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_MassStorage)
@@ -754,7 +788,9 @@ namespace WPinternals
                         }
 
                         if (PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_BadMassStorage)
+                        {
                             throw new WPinternalsException("Phone is in Mass Storage mode, but the driver on PC failed to start");
+                        }
 
                         // Wait for mass storage mode
                         if (PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_MassStorage)
@@ -764,16 +800,24 @@ namespace WPinternals
                         }
 
                         if (PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_BadMassStorage)
+                        {
                             throw new WPinternalsException("Phone is in Mass Storage mode, but the driver on PC failed to start");
+                        }
 
                         MassStorage Storage = null;
                         if (PhoneNotifier.CurrentModel is MassStorage)
+                        {
                             Storage = (MassStorage)PhoneNotifier.CurrentModel;
+                        }
 
                         if (Storage == null)
+                        {
                             ModeSwitchErrorWrapper("Failed to switch to Mass Storage Mode");
+                        }
                         else
+                        {
                             ModeSwitchSuccessWrapper();
+                        }
                     }
                     catch (Exception Ex)
                     {
@@ -798,14 +842,16 @@ namespace WPinternals
         internal async static Task<IDisposable> SwitchToWithProgress(PhoneNotifierViewModel Notifier, PhoneInterfaces? TargetMode, ModeSwitchProgressHandler ModeSwitchProgress, string RequestedVolumeForMassStorage = "MainOS")
         {
             if (Notifier.CurrentInterface == TargetMode)
+            {
                 return Notifier.CurrentModel;
+            }
 
             IDisposable Result = null;
             string LocalErrorMessage = null;
 
-            AsyncAutoResetEvent Event = new AsyncAutoResetEvent(false);
+            AsyncAutoResetEvent Event = new(false);
 
-            SwitchModeViewModel Switch = new SwitchModeViewModel(
+            SwitchModeViewModel Switch = new(
                 Notifier,
                 TargetMode,
                 ModeSwitchProgress,
@@ -824,7 +870,9 @@ namespace WPinternals
             await Event.WaitAsync(Timeout.InfiniteTimeSpan);
 
             if (LocalErrorMessage != null)
+            {
                 throw new WPinternalsException(LocalErrorMessage);
+            }
 
             return Result;
         }
@@ -832,14 +880,16 @@ namespace WPinternals
         internal async static Task<IDisposable> SwitchToWithStatus(PhoneNotifierViewModel Notifier, PhoneInterfaces? TargetMode, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null, string RequestedVolumeForMassStorage = "MainOS")
         {
             if (Notifier.CurrentInterface == TargetMode)
+            {
                 return Notifier.CurrentModel;
+            }
 
             IDisposable Result = null;
             string LocalErrorMessage = null;
 
-            AsyncAutoResetEvent Event = new AsyncAutoResetEvent(false);
+            AsyncAutoResetEvent Event = new(false);
 
-            SwitchModeViewModel Switch = new SwitchModeViewModel(
+            SwitchModeViewModel Switch = new(
                 Notifier,
                 TargetMode,
                 null,
@@ -858,7 +908,9 @@ namespace WPinternals
             await Event.WaitAsync(Timeout.InfiniteTimeSpan);
 
             if (LocalErrorMessage != null)
+            {
                 throw new WPinternalsException(LocalErrorMessage);
+            }
 
             return Result;
         }
diff --git a/Views/About.xaml.cs b/Views/About.xaml.cs
index bd04205..6420756 100644
--- a/Views/About.xaml.cs
+++ b/Views/About.xaml.cs
@@ -37,8 +37,7 @@ namespace WPinternals
 
         private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
         {
-            Hyperlink link = args.Source as Hyperlink;
-            if (link != null)
+            if (args.Source is Hyperlink link)
             {
                 Process.Start(link.NavigateUri.ToString());
             }
@@ -46,7 +45,7 @@ namespace WPinternals
 
         private void Document_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as FlowDocument).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
     }
 }
diff --git a/Views/BackupView.xaml.cs b/Views/BackupView.xaml.cs
index cc65334..69a4216 100644
--- a/Views/BackupView.xaml.cs
+++ b/Views/BackupView.xaml.cs
@@ -36,17 +36,18 @@ namespace WPinternals
 
         private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
         {
-            Hyperlink link = args.Source as Hyperlink;
-            if (link != null)
+            if (args.Source is Hyperlink link)
             {
                 if (link.NavigateUri.ToString() == "UnlockBoot")
+                {
                     ((BackupTargetSelectionViewModel)DataContext).SwitchToUnlockBoot();
+                }
             }
         }
 
         private void Document_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as FlowDocument).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
 
         private void FilePicker_PathChanged(object sender, PathChangedEventArgs e)
diff --git a/Views/BootRestoreResourcesView.xaml.cs b/Views/BootRestoreResourcesView.xaml.cs
index 975b88b..b115da0 100644
--- a/Views/BootRestoreResourcesView.xaml.cs
+++ b/Views/BootRestoreResourcesView.xaml.cs
@@ -36,23 +36,32 @@ namespace WPinternals
 
         private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
         {
-            Hyperlink link = args.Source as Hyperlink;
-            if (link != null)
+            if (args.Source is Hyperlink link)
             {
                 if (link.NavigateUri.ToString() == "Flash")
+                {
                     ((FlashResourcesViewModel)DataContext).SwitchToFlashRom();
+                }
+
                 if (link.NavigateUri.ToString() == "UndoRoot")
+                {
                     ((FlashResourcesViewModel)DataContext).SwitchToUndoRoot();
+                }
+
                 if (link.NavigateUri.ToString() == "Download")
+                {
                     ((FlashResourcesViewModel)DataContext).SwitchToDownload();
+                }
                 else
+                {
                     System.Diagnostics.Process.Start(link.NavigateUri.ToString());
+                }
             }
         }
 
         private void Document_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as FlowDocument).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
 
         private void FolderPicker_PathChanged(object sender, PathChangedEventArgs e)
diff --git a/Views/BusyView.xaml.cs b/Views/BusyView.xaml.cs
index f49cb08..34e9236 100644
--- a/Views/BusyView.xaml.cs
+++ b/Views/BusyView.xaml.cs
@@ -32,7 +32,7 @@ namespace WPinternals
             InitializeComponent();
 
             // Setting these properties in XAML results in an error. Why?
-            GifImage.GifSource = @"/aerobusy.gif";
+            GifImage.GifSource = "/aerobusy.gif";
             GifImage.AutoStart = true;
         }
     }
diff --git a/Views/DumpRomView.xaml.cs b/Views/DumpRomView.xaml.cs
index a5b8090..93fd5e6 100644
--- a/Views/DumpRomView.xaml.cs
+++ b/Views/DumpRomView.xaml.cs
@@ -36,21 +36,26 @@ namespace WPinternals
 
         private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
         {
-            Hyperlink link = args.Source as Hyperlink;
-            if (link != null)
+            if (args.Source is Hyperlink link)
             {
                 if (link.NavigateUri.ToString() == "UnlockBoot")
-                    (this.DataContext as DumpRomTargetSelectionViewModel).SwitchToUnlockBoot();
+                {
+                    (this.DataContext as DumpRomTargetSelectionViewModel)?.SwitchToUnlockBoot();
+                }
                 else if (link.NavigateUri.ToString() == "UnlockRoot")
-                    (this.DataContext as DumpRomTargetSelectionViewModel).SwitchToUnlockRoot();
+                {
+                    (this.DataContext as DumpRomTargetSelectionViewModel)?.SwitchToUnlockRoot();
+                }
                 else if (link.NavigateUri.ToString() == "FlashRom")
-                    (this.DataContext as DumpRomTargetSelectionViewModel).SwitchToFlashRom();
+                {
+                    (this.DataContext as DumpRomTargetSelectionViewModel)?.SwitchToFlashRom();
+                }
             }
         }
 
         private void Document_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as FlowDocument).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
 
         private void FilePicker_PathChanged(object sender, PathChangedEventArgs e)
diff --git a/Views/Empty.xaml.cs b/Views/Empty.xaml.cs
index 43954df..614a72d 100644
--- a/Views/Empty.xaml.cs
+++ b/Views/Empty.xaml.cs
@@ -33,8 +33,8 @@ namespace WPinternals
     /// </summary>
     public partial class Empty : UserControl
     {
-        static PhoneNotifierViewModel PhoneNotifier;
-        static SynchronizationContext UIContext;
+        private static PhoneNotifierViewModel PhoneNotifier;
+        private static SynchronizationContext UIContext;
 
         // Dependency injection is not possible here, because this ViewModel is used in a Style.
         public Empty()
@@ -45,7 +45,7 @@ namespace WPinternals
             UIContext = SynchronizationContext.Current;
 
             // Setting these properties in XAML results in an error. Why?
-            GifImage.GifSource = @"/aerobusy.gif";
+            GifImage.GifSource = "/aerobusy.gif";
             GifImage.AutoStart = true;
 
             Loaded += Empty_Loaded;
@@ -62,7 +62,10 @@ namespace WPinternals
             // Find the phone notifier
             DependencyObject obj = (DependencyObject)sender;
             while (!(obj is MainWindow))
+            {
                 obj = VisualTreeHelper.GetParent(obj);
+            }
+
             PhoneNotifier = ((MainViewModel)(((MainWindow)obj).DataContext)).PhoneNotifier;
 
             PhoneNotifier.NewDeviceArrived += PhoneNotifier_NewDeviceArrived;
@@ -70,23 +73,30 @@ namespace WPinternals
 
         private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
         {
-            Hyperlink link = args.Source as Hyperlink;
-            if (link != null)
+            if (args.Source is Hyperlink link)
             {
                 if (link.NavigateUri.ToString() == "Getting started")
+                {
                     App.NavigateToGettingStarted();
+                }
                 else if (link.NavigateUri.ToString() == "Unlock boot")
+                {
                     App.NavigateToUnlockBoot();
+                }
                 else if (link.NavigateUri.ToString() == "Interrupt boot")
+                {
                     InterruptBoot = true;
+                }
                 else if (link.NavigateUri.ToString() == "Normal boot")
+                {
                     InterruptBoot = false;
+                }
             }
         }
 
         private void Document_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as FlowDocument).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
 
         public static readonly DependencyProperty InterruptBootProperty =
diff --git a/Views/FlashResourcesView.xaml.cs b/Views/FlashResourcesView.xaml.cs
index 09386d3..df7bb90 100644
--- a/Views/FlashResourcesView.xaml.cs
+++ b/Views/FlashResourcesView.xaml.cs
@@ -36,21 +36,26 @@ namespace WPinternals
 
         private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
         {
-            Hyperlink link = args.Source as Hyperlink;
-            if (link != null)
+            if (args.Source is Hyperlink link)
             {
                 if (link.NavigateUri.ToString() == "Flash")
+                {
                     ((FlashResourcesViewModel)DataContext).SwitchToFlashRom();
+                }
                 else if (link.NavigateUri.ToString() == "Download")
+                {
                     ((FlashResourcesViewModel)DataContext).SwitchToDownload();
+                }
                 else
+                {
                     System.Diagnostics.Process.Start(link.NavigateUri.ToString());
+                }
             }
         }
 
         private void Document_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as FlowDocument).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
     }
 }
diff --git a/Views/FlashRomView.xaml.cs b/Views/FlashRomView.xaml.cs
index 97c2847..eff88e0 100644
--- a/Views/FlashRomView.xaml.cs
+++ b/Views/FlashRomView.xaml.cs
@@ -36,23 +36,30 @@ namespace WPinternals
 
         private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
         {
-            Hyperlink link = args.Source as Hyperlink;
-            if (link != null)
+            if (args.Source is Hyperlink link)
             {
                 if (link.NavigateUri.ToString() == "UnlockBoot")
-                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel).SwitchToUnlockBoot();
+                {
+                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel)?.SwitchToUnlockBoot();
+                }
                 else if (link.NavigateUri.ToString() == "UnlockRoot")
-                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel).SwitchToUnlockRoot();
+                {
+                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel)?.SwitchToUnlockRoot();
+                }
                 else if (link.NavigateUri.ToString() == "Dump")
-                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel).SwitchToDumpFFU();
+                {
+                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel)?.SwitchToDumpFFU();
+                }
                 else if (link.NavigateUri.ToString() == "Backup")
-                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel).SwitchToBackup();
+                {
+                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel)?.SwitchToBackup();
+                }
             }
         }
 
         private void Document_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as FlowDocument).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
 
         private void FilePicker_PathChanged(object sender, PathChangedEventArgs e)
diff --git a/Views/GettingStartedView.xaml.cs b/Views/GettingStartedView.xaml.cs
index 959e6e3..49e5abc 100644
--- a/Views/GettingStartedView.xaml.cs
+++ b/Views/GettingStartedView.xaml.cs
@@ -37,31 +37,30 @@ namespace WPinternals
 
         private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
         {
-            Hyperlink link = args.Source as Hyperlink;
-            if (link != null)
+            if (args.Source is Hyperlink link)
             {
                 switch (link.NavigateUri.ToString())
                 {
                     case "Disclaimer":
-                        (this.DataContext as GettingStartedViewModel).ShowDisclaimer();
+                        (this.DataContext as GettingStartedViewModel)?.ShowDisclaimer();
                         break;
                     case "UnlockBoot":
-                        (this.DataContext as GettingStartedViewModel).SwitchToUnlockBoot();
+                        (this.DataContext as GettingStartedViewModel)?.SwitchToUnlockBoot();
                         break;
                     case "UnlockRoot":
-                        (this.DataContext as GettingStartedViewModel).SwitchToUnlockRoot();
+                        (this.DataContext as GettingStartedViewModel)?.SwitchToUnlockRoot();
                         break;
                     case "Backup":
-                        (this.DataContext as GettingStartedViewModel).SwitchToBackup();
+                        (this.DataContext as GettingStartedViewModel)?.SwitchToBackup();
                         break;
                     case "Flash":
-                        (this.DataContext as GettingStartedViewModel).SwitchToFlashRom();
+                        (this.DataContext as GettingStartedViewModel)?.SwitchToFlashRom();
                         break;
                     case "Dump":
-                        (this.DataContext as GettingStartedViewModel).SwitchToDumpRom();
+                        (this.DataContext as GettingStartedViewModel)?.SwitchToDumpRom();
                         break;
                     case "Download":
-                        (this.DataContext as GettingStartedViewModel).SwitchToDownload();
+                        (this.DataContext as GettingStartedViewModel)?.SwitchToDownload();
                         break;
                     default:
                         Process.Start(link.NavigateUri.AbsoluteUri);
@@ -72,17 +71,17 @@ namespace WPinternals
 
         private void Document_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as FlowDocument).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
 
         private void TextBlock_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as TextBlock).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as TextBlock)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
 
         private void BulletDecorator_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as System.Windows.Controls.Primitives.BulletDecorator).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as System.Windows.Controls.Primitives.BulletDecorator)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
     }
 }
diff --git a/Views/LumiaDownloadView.xaml.cs b/Views/LumiaDownloadView.xaml.cs
index d9e9371..e785178 100644
--- a/Views/LumiaDownloadView.xaml.cs
+++ b/Views/LumiaDownloadView.xaml.cs
@@ -37,23 +37,30 @@ namespace WPinternals
 
         private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
         {
-            Hyperlink link = args.Source as Hyperlink;
-            if (link != null)
+            if (args.Source is Hyperlink link)
             {
                 if (link.NavigateUri.ToString() == "UnlockBoot")
-                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel).SwitchToUnlockBoot();
+                {
+                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel)?.SwitchToUnlockBoot();
+                }
                 else if (link.NavigateUri.ToString() == "UnlockRoot")
-                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel).SwitchToUnlockRoot();
+                {
+                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel)?.SwitchToUnlockRoot();
+                }
                 else if (link.NavigateUri.ToString() == "Dump")
-                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel).SwitchToDumpFFU();
+                {
+                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel)?.SwitchToDumpFFU();
+                }
                 else
+                {
                     Process.Start(link.NavigateUri.AbsoluteUri);
+                }
             }
         }
 
         private void Document_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as FlowDocument).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
     }
 }
diff --git a/Views/LumiaUndoRootTargetSelectionView.xaml.cs b/Views/LumiaUndoRootTargetSelectionView.xaml.cs
index 6f38365..a870410 100644
--- a/Views/LumiaUndoRootTargetSelectionView.xaml.cs
+++ b/Views/LumiaUndoRootTargetSelectionView.xaml.cs
@@ -36,17 +36,18 @@ namespace WPinternals
 
         private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
         {
-            Hyperlink link = args.Source as Hyperlink;
-            if (link != null)
+            if (args.Source is Hyperlink link)
             {
                 if (link.NavigateUri.ToString() == "UnlockBoot")
+                {
                     ((LumiaUndoRootTargetSelectionViewModel)DataContext).SwitchToUnlockBoot();
+                }
             }
         }
 
         private void Document_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as FlowDocument).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
     }
 }
diff --git a/Views/LumiaUnlockRootTargetSelectionView.xaml.cs b/Views/LumiaUnlockRootTargetSelectionView.xaml.cs
index dc19273..bce3299 100644
--- a/Views/LumiaUnlockRootTargetSelectionView.xaml.cs
+++ b/Views/LumiaUnlockRootTargetSelectionView.xaml.cs
@@ -37,25 +37,34 @@ namespace WPinternals
 
         private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
         {
-            Hyperlink link = args.Source as Hyperlink;
-            if (link != null)
+            if (args.Source is Hyperlink link)
             {
                 if (link.NavigateUri.ToString() == "Dump")
+                {
                     ((LumiaUnlockRootTargetSelectionViewModel)DataContext).SwitchToDumpRom();
+                }
                 else if (link.NavigateUri.ToString() == "Flash")
+                {
                     ((LumiaUnlockRootTargetSelectionViewModel)DataContext).SwitchToFlashRom();
+                }
                 else if (link.NavigateUri.ToString() == "UnlockBoot")
+                {
                     ((LumiaUnlockRootTargetSelectionViewModel)DataContext).SwitchToUnlockBoot();
+                }
                 else if (link.NavigateUri.ToString() == "GettingStarted")
+                {
                     App.NavigateToGettingStarted();
+                }
                 else
+                {
                     Process.Start(link.NavigateUri.ToString());
+                }
             }
         }
 
         private void Document_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as FlowDocument).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
 
         private void FolderPicker_PathChanged(object sender, PathChangedEventArgs e)
diff --git a/Views/MainWindow.xaml.cs b/Views/MainWindow.xaml.cs
index c1ef1b8..a24bc57 100644
--- a/Views/MainWindow.xaml.cs
+++ b/Views/MainWindow.xaml.cs
@@ -46,7 +46,9 @@ namespace WPinternals
         private void MainViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
             if (e.PropertyName == "ContextViewModel")
+            {
                 MainContentScrollViewer.ScrollToTop();
+            }
         }
 
         private void ScrollViewer_SizeChanged(object sender, SizeChangedEventArgs e)
@@ -58,11 +60,13 @@ namespace WPinternals
             if (e.WidthChanged)
             {
                 if (e.NewSize.Width >= (MaxChildWidth + (2 * MarginTarget)))
+                {
                     ChildFrame.Width = MaxChildWidth;
-                else if ((e.NewSize.Width - (2 * MarginTarget)) < MinChildWidth)
-                    ChildFrame.Width = MinChildWidth;
+                }
                 else
-                    ChildFrame.Width = e.NewSize.Width - (2 * MarginTarget);
+                {
+                    ChildFrame.Width = (e.NewSize.Width - (2 * MarginTarget)) < MinChildWidth ? MinChildWidth : e.NewSize.Width - (2 * MarginTarget);
+                }
             }
             ChildFrame.Margin = new Thickness(0, 20, 0, 20);
         }
@@ -70,7 +74,9 @@ namespace WPinternals
         private void Window_Closed(object sender, EventArgs e)
         {
             if ((Application.Current.MainWindow != this) && (Application.Current.MainWindow != null))
+            {
                 Application.Current.MainWindow.Close(); // This one holds the hWnd for handling USB events and it must be closed too.
+            }
         }
     }
 }
diff --git a/Views/NokiaBootloaderView.xaml.cs b/Views/NokiaBootloaderView.xaml.cs
index 270c949..80624aa 100644
--- a/Views/NokiaBootloaderView.xaml.cs
+++ b/Views/NokiaBootloaderView.xaml.cs
@@ -34,25 +34,25 @@ namespace WPinternals
             InitializeComponent();
 
             // Setting these properties in XAML results in an error. Why?
-            GifImage.GifSource = @"/aerobusy.gif";
+            GifImage.GifSource = "/aerobusy.gif";
             GifImage.AutoStart = true;
         }
 
         private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
         {
             Hyperlink link = args.Source as Hyperlink;
-            if ((link != null) && (link.NavigateUri != null))
+            if (link?.NavigateUri != null)
             {
                 if (link.NavigateUri.ToString() == "GettingStarted")
-                    (this.DataContext as NokiaBootloaderViewModel).SwitchToGettingStarted();
-
-                (this.DataContext as NokiaBootloaderViewModel).RebootTo(link.NavigateUri.ToString());
+                {
+                    (this.DataContext as NokiaBootloaderViewModel)?.SwitchToGettingStarted();
+                } (this.DataContext as NokiaBootloaderViewModel)?.RebootTo(link.NavigateUri.ToString());
             }
         }
 
         private void Document_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as FlowDocument).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
     }
 }
diff --git a/Views/NokiaFlashView.xaml.cs b/Views/NokiaFlashView.xaml.cs
index cbf5fb8..4745048 100644
--- a/Views/NokiaFlashView.xaml.cs
+++ b/Views/NokiaFlashView.xaml.cs
@@ -37,18 +37,18 @@ namespace WPinternals
         private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
         {
             Hyperlink link = args.Source as Hyperlink;
-            if ((link != null) && (link.NavigateUri != null))
+            if (link?.NavigateUri != null)
             {
                 if (link.NavigateUri.ToString() == "GettingStarted")
-                    (this.DataContext as NokiaFlashViewModel).SwitchToGettingStarted();
-
-                (this.DataContext as NokiaFlashViewModel).RebootTo(link.NavigateUri.ToString());
+                {
+                    (this.DataContext as NokiaFlashViewModel)?.SwitchToGettingStarted();
+                } (this.DataContext as NokiaFlashViewModel)?.RebootTo(link.NavigateUri.ToString());
             }
         }
 
         private void Document_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as FlowDocument).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
     }
 }
diff --git a/Views/NokiaLabelView.xaml.cs b/Views/NokiaLabelView.xaml.cs
index 9d093dd..6373dee 100644
--- a/Views/NokiaLabelView.xaml.cs
+++ b/Views/NokiaLabelView.xaml.cs
@@ -41,7 +41,7 @@ namespace WPinternals
 
         private void Document_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as FlowDocument).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
     }
 }
diff --git a/Views/NokiaMassStorageView.xaml.cs b/Views/NokiaMassStorageView.xaml.cs
index 9c43312..8f70f8a 100644
--- a/Views/NokiaMassStorageView.xaml.cs
+++ b/Views/NokiaMassStorageView.xaml.cs
@@ -41,7 +41,7 @@ namespace WPinternals
 
         private void Document_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as FlowDocument).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
     }
 }
diff --git a/Views/NokiaModeBootloaderView.xaml.cs b/Views/NokiaModeBootloaderView.xaml.cs
index 0bd5d25..a32a153 100644
--- a/Views/NokiaModeBootloaderView.xaml.cs
+++ b/Views/NokiaModeBootloaderView.xaml.cs
@@ -36,16 +36,15 @@ namespace WPinternals
 
         private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
         {
-            Hyperlink link = args.Source as Hyperlink;
-            if (link != null)
+            if (args.Source is Hyperlink link)
             {
-                (this.DataContext as NokiaModeBootloaderViewModel).RebootTo(link.NavigateUri.ToString());
+                (this.DataContext as NokiaModeBootloaderViewModel)?.RebootTo(link.NavigateUri.ToString());
             }
         }
 
         private void Document_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as FlowDocument).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
     }
 }
diff --git a/Views/NokiaModeFlashView.xaml.cs b/Views/NokiaModeFlashView.xaml.cs
index 36e7aaf..bfedfb1 100644
--- a/Views/NokiaModeFlashView.xaml.cs
+++ b/Views/NokiaModeFlashView.xaml.cs
@@ -36,16 +36,15 @@ namespace WPinternals
 
         private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
         {
-            Hyperlink link = args.Source as Hyperlink;
-            if (link != null)
+            if (args.Source is Hyperlink link)
             {
-                (this.DataContext as NokiaModeFlashViewModel).RebootTo(link.NavigateUri.ToString());
+                (this.DataContext as NokiaModeFlashViewModel)?.RebootTo(link.NavigateUri.ToString());
             }
         }
 
         private void Document_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as FlowDocument).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
     }
 }
diff --git a/Views/NokiaModeLabelView.xaml.cs b/Views/NokiaModeLabelView.xaml.cs
index 3506062..fb8b96a 100644
--- a/Views/NokiaModeLabelView.xaml.cs
+++ b/Views/NokiaModeLabelView.xaml.cs
@@ -36,16 +36,15 @@ namespace WPinternals
 
         private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
         {
-            Hyperlink link = args.Source as Hyperlink;
-            if (link != null)
+            if (args.Source is Hyperlink link)
             {
-                (this.DataContext as NokiaModeLabelViewModel).RebootTo(link.NavigateUri.ToString());
+                (this.DataContext as NokiaModeLabelViewModel)?.RebootTo(link.NavigateUri.ToString());
             }
         }
 
         private void Document_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as FlowDocument).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
     }
 }
diff --git a/Views/NokiaModeMassStorageView.xaml.cs b/Views/NokiaModeMassStorageView.xaml.cs
index 5f49edc..33338bf 100644
--- a/Views/NokiaModeMassStorageView.xaml.cs
+++ b/Views/NokiaModeMassStorageView.xaml.cs
@@ -36,16 +36,15 @@ namespace WPinternals
 
         private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
         {
-            Hyperlink link = args.Source as Hyperlink;
-            if (link != null)
+            if (args.Source is Hyperlink link)
             {
-                (this.DataContext as NokiaModeMassStorageViewModel).RebootTo(link.NavigateUri.ToString());
+                (this.DataContext as NokiaModeMassStorageViewModel)?.RebootTo(link.NavigateUri.ToString());
             }
         }
 
         private void Document_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as FlowDocument).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
     }
 }
diff --git a/Views/NokiaModeNormalView.xaml.cs b/Views/NokiaModeNormalView.xaml.cs
index a0c4940..d18a235 100644
--- a/Views/NokiaModeNormalView.xaml.cs
+++ b/Views/NokiaModeNormalView.xaml.cs
@@ -36,16 +36,15 @@ namespace WPinternals
 
         private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
         {
-            Hyperlink link = args.Source as Hyperlink;
-            if (link != null)
+            if (args.Source is Hyperlink link)
             {
-                (this.DataContext as NokiaModeNormalViewModel).RebootTo(link.NavigateUri.ToString());
+                (this.DataContext as NokiaModeNormalViewModel)?.RebootTo(link.NavigateUri.ToString());
             }
         }
 
         private void Document_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as FlowDocument).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
     }
 }
diff --git a/Views/NokiaNormalView.xaml.cs b/Views/NokiaNormalView.xaml.cs
index ba0e0d9..9144c06 100644
--- a/Views/NokiaNormalView.xaml.cs
+++ b/Views/NokiaNormalView.xaml.cs
@@ -36,17 +36,15 @@ namespace WPinternals
 
         private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
         {
-            Hyperlink link = args.Source as Hyperlink;
-            if (link != null)
+            if (args.Source is Hyperlink link)
             {
-                (this.DataContext as NokiaNormalViewModel).RebootTo(link.NavigateUri.ToString());
+                (this.DataContext as NokiaNormalViewModel)?.RebootTo(link.NavigateUri.ToString());
             }
         }
 
         private void Document_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as FlowDocument).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
-
     }
 }
diff --git a/Views/RestoreView.xaml.cs b/Views/RestoreView.xaml.cs
index 069362a..3fe6f0b 100644
--- a/Views/RestoreView.xaml.cs
+++ b/Views/RestoreView.xaml.cs
@@ -36,19 +36,22 @@ namespace WPinternals
 
         private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
         {
-            Hyperlink link = args.Source as Hyperlink;
-            if (link != null)
+            if (args.Source is Hyperlink link)
             {
                 if (link.NavigateUri.ToString() == "UnlockBoot")
-                    (this.DataContext as RestoreSourceSelectionViewModel).SwitchToUnlockBoot();
+                {
+                    (this.DataContext as RestoreSourceSelectionViewModel)?.SwitchToUnlockBoot();
+                }
                 else if (link.NavigateUri.ToString() == "Flash")
-                    (this.DataContext as RestoreSourceSelectionViewModel).SwitchToFlashRom();
+                {
+                    (this.DataContext as RestoreSourceSelectionViewModel)?.SwitchToFlashRom();
+                }
             }
         }
 
         private void Document_Loaded(object sender, RoutedEventArgs e)
         {
-            (sender as FlowDocument).AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
         }
 
         private void FilePicker_PathChanged(object sender, PathChangedEventArgs e)
diff --git a/Views/StartupWindow.xaml.cs b/Views/StartupWindow.xaml.cs
index 2048c51..af2bd0f 100644
--- a/Views/StartupWindow.xaml.cs
+++ b/Views/StartupWindow.xaml.cs
@@ -41,11 +41,18 @@ namespace WPinternals
 
             bool NeedLicenseAgrement = false;
             if (Registry.CurrentUser.OpenSubKey("Software\\WPInternals") == null)
+            {
                 Registry.CurrentUser.OpenSubKey("Software", true).CreateSubKey("WPInternals");
+            }
+
             if ((Registration.IsPrerelease) && (Registry.CurrentUser.OpenSubKey("Software\\WPInternals").GetValue("NdaAccepted") == null))
+            {
                 NeedLicenseAgrement = true;
+            }
             else if (Registry.CurrentUser.OpenSubKey("Software\\WPInternals").GetValue("DisclaimerAccepted") == null)
+            {
                 NeedLicenseAgrement = true;
+            }
 
             if ((!Registration.IsPrerelease || Registration.IsRegistered()) && !NeedLicenseAgrement)
             {
@@ -54,7 +61,7 @@ namespace WPinternals
                 System.Threading.SynchronizationContext UIContext = System.Threading.SynchronizationContext.Current;
                 await CommandLine.ParseCommandLine(UIContext);
             }
-            else if (Environment.GetCommandLineArgs().Count() > 1)
+            else if (Environment.GetCommandLineArgs().Length > 1)
             {
                 Console.WriteLine("First time use");
                 Console.WriteLine("Switching to graphic user interface for license and registration");
diff --git a/WPinternals.csproj b/WPinternals.csproj
index 4a16548..af9823b 100644
--- a/WPinternals.csproj
+++ b/WPinternals.csproj
@@ -353,6 +353,10 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="DiscUtils.BootConfig" Version="0.16.4" />
+    <PackageReference Include="DiscUtils.Fat" Version="0.16.4" />
+    <PackageReference Include="DiscUtils.Ntfs" Version="0.16.4" />
+    <PackageReference Include="DiscUtils.Streams" Version="0.16.4" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
     <PackageReference Include="System.IO.Compression" Version="4.3.0" />
diff --git a/WPinternalsConfig.cs b/WPinternalsConfig.cs
index aeca917..30c3da9 100644
--- a/WPinternalsConfig.cs
+++ b/WPinternalsConfig.cs
@@ -35,7 +35,7 @@ namespace WPinternals
         internal const bool IsPrerelease = false;
 #endif
 
-        internal static readonly DateTime ExpirationDate = new DateTime(2019, 01, 06);
+        internal static readonly DateTime ExpirationDate = new(2019, 01, 06);
 
         internal static void CheckExpiration()
         {
@@ -69,11 +69,16 @@ namespace WPinternals
         {
             string KeyBase = App.Config.RegistrationName;
             if (Environment.MachineName == null)
+            {
                 KeyBase += "-Unknown";
+            }
             else
+            {
                 KeyBase += "-" + Environment.MachineName;
+            }
+
             byte[] KeyBytes = System.Text.Encoding.UTF8.GetBytes(KeyBase);
-            SHA1Managed sha = new SHA1Managed();
+            SHA1Managed sha = new();
             byte[] Key = sha.ComputeHash(KeyBytes);
             return System.Convert.ToBase64String(Key);
         }
@@ -89,27 +94,31 @@ namespace WPinternals
             if (File.Exists(FilePath))
             {
                 string XmlString = File.ReadAllText(FilePath);
-                XmlSerializer x = new XmlSerializer(typeof(WPinternalsConfig), "");
-                MemoryStream s = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(XmlString));
-                Result = (WPinternalsConfig)x.Deserialize(s);
-                return Result;
+                XmlSerializer x = new(typeof(WPinternalsConfig), "");
+                MemoryStream s = new(System.Text.Encoding.UTF8.GetBytes(XmlString));
+                return (WPinternalsConfig)x.Deserialize(s);
             }
             else
+            {
                 return new WPinternalsConfig();
+            }
         }
 
         internal void WriteConfig()
         {
             string DirPath = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals");
             if (!Directory.Exists(DirPath))
+            {
                 Directory.CreateDirectory(DirPath);
+            }
+
             string FilePath = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\WPInternals.config");
 
-            XmlSerializer x = new XmlSerializer(typeof(WPinternalsConfig), "");
+            XmlSerializer x = new(typeof(WPinternalsConfig), "");
 
-            XmlSerializerNamespaces ns = new XmlSerializerNamespaces();
+            XmlSerializerNamespaces ns = new();
             ns.Add("", "");
-            System.IO.StreamWriter FileWriter = new System.IO.StreamWriter(FilePath);
+            StreamWriter FileWriter = new(FilePath);
             x.Serialize(FileWriter, this, ns);
             FileWriter.Close();
         }
@@ -119,12 +128,14 @@ namespace WPinternals
             FlashProfile Profile = GetProfile(PlatformID, PhoneFirmware, FfuFirmware);
             if (Profile == null)
             {
-                Profile = new FlashProfile();
-                Profile.Type = Type;
-                Profile.PlatformID = PlatformID;
-                Profile.ProductCode = ProductCode;
-                Profile.PhoneFirmware = PhoneFirmware;
-                Profile.FfuFirmware = FfuFirmware;
+                Profile = new FlashProfile
+                {
+                    Type = Type,
+                    PlatformID = PlatformID,
+                    ProductCode = ProductCode,
+                    PhoneFirmware = PhoneFirmware,
+                    FfuFirmware = FfuFirmware
+                };
                 FlashProfiles.Add(Profile);
             }
 
@@ -138,16 +149,16 @@ namespace WPinternals
 
         internal FlashProfile GetProfile(string PlatformID, string PhoneFirmware, string FfuFirmware = null)
         {
-            return FlashProfiles.Where(p => ((string.Compare(p.PlatformID, PlatformID, true) == 0) && (string.Compare(p.PhoneFirmware, PhoneFirmware, true) == 0) && ((FfuFirmware == null) || (string.Compare(p.FfuFirmware, FfuFirmware, true) == 0)))).FirstOrDefault();
+            return FlashProfiles.Find(p => ((string.Compare(p.PlatformID, PlatformID, true) == 0) && (string.Compare(p.PhoneFirmware, PhoneFirmware, true) == 0) && ((FfuFirmware == null) || (string.Compare(p.FfuFirmware, FfuFirmware, true) == 0))));
         }
 
-        public List<FlashProfile> FlashProfiles = new List<FlashProfile>();
+        public List<FlashProfile> FlashProfiles = new();
 
         internal void AddFfuToRepository(string FFUPath)
         {
             try
             {
-                FFU NewFFU = new FFU(FFUPath);
+                FFU NewFFU = new(FFUPath);
                 AddFfuToRepository(FFUPath, NewFFU.PlatformID, NewFFU.GetFirmwareVersion(), NewFFU.GetOSVersion());
             }
             catch (Exception Ex)
@@ -158,26 +169,35 @@ namespace WPinternals
 
         internal void AddFfuToRepository(string FFUPath, string PlatformID, string FirmwareVersion, string OSVersion)
         {
-            FFUEntry Entry = FFURepository.Where(e => ((e.PlatformID == PlatformID) && (e.FirmwareVersion == FirmwareVersion) && (string.Compare(e.Path, FFUPath, true) == 0))).FirstOrDefault();
+            FFUEntry Entry = FFURepository.Find(e => ((e.PlatformID == PlatformID) && (e.FirmwareVersion == FirmwareVersion) && (string.Compare(e.Path, FFUPath, true) == 0)));
             if (Entry == null)
             {
                 LogFile.Log("Adding FFU to repository: " + FFUPath, LogType.FileAndConsole);
                 LogFile.Log("Platform ID: " + PlatformID, LogType.FileAndConsole);
                 if (FirmwareVersion != null)
+                {
                     LogFile.Log("Firmware version: " + FirmwareVersion, LogType.FileAndConsole);
-                if (OSVersion != null)
-                    LogFile.Log("OS version: " + OSVersion, LogType.FileAndConsole);
+                }
 
-                Entry = new FFUEntry();
-                Entry.Path = FFUPath;
-                Entry.PlatformID = PlatformID;
-                Entry.FirmwareVersion = FirmwareVersion;
-                Entry.OSVersion = OSVersion;
+                if (OSVersion != null)
+                {
+                    LogFile.Log("OS version: " + OSVersion, LogType.FileAndConsole);
+                }
+
+                Entry = new FFUEntry
+                {
+                    Path = FFUPath,
+                    PlatformID = PlatformID,
+                    FirmwareVersion = FirmwareVersion,
+                    OSVersion = OSVersion
+                };
                 FFURepository.Add(Entry);
                 WriteConfig();
             }
             else
+            {
                 LogFile.Log("FFU not added, because it was already present in the repository.", LogType.FileAndConsole);
+            }
         }
 
         internal void RemoveFfuFromRepository(string FFUPath)
@@ -189,7 +209,9 @@ namespace WPinternals
                     FFURepository.Remove(e);
                 });
             if (Count == 0)
+            {
                 LogFile.Log("FFU was not removed from repository because it was not present.", LogType.FileAndConsole);
+            }
             else
             {
                 LogFile.Log("Removed FFU from repository: " + FFUPath, LogType.FileAndConsole);
@@ -197,13 +219,13 @@ namespace WPinternals
             }
         }
 
-        public List<FFUEntry> FFURepository = new List<FFUEntry>();
+        public List<FFUEntry> FFURepository = new();
 
-        public List<EmergencyFileEntry> EmergencyRepository = new List<EmergencyFileEntry>();
+        public List<EmergencyFileEntry> EmergencyRepository = new();
 
         internal void AddEmergencyToRepository(string Type, string ProgrammerPath, string PayloadPath)
         {
-            EmergencyFileEntry Entry = EmergencyRepository.Where(e => ((e.Type == Type) && (string.Compare(e.ProgrammerPath, ProgrammerPath, true) == 0))).FirstOrDefault();
+            EmergencyFileEntry Entry = EmergencyRepository.Find(e => ((e.Type == Type) && (string.Compare(e.ProgrammerPath, ProgrammerPath, true) == 0)));
             if ((Entry != null) && (PayloadPath != null) && (string.Compare(Entry.PayloadPath, PayloadPath, true) != 0))
             {
                 LogFile.Log("Updating emergency payload path in repository: " + PayloadPath, LogType.FileAndConsole);
@@ -215,19 +237,23 @@ namespace WPinternals
                 LogFile.Log("Adding emergency files to repository: " + ProgrammerPath, LogType.FileAndConsole);
                 LogFile.Log("Type: " + Type, LogType.FileAndConsole);
 
-                Entry = new EmergencyFileEntry();
-                Entry.Type = Type;
-                Entry.ProgrammerPath = ProgrammerPath;
-                Entry.PayloadPath = PayloadPath;
+                Entry = new EmergencyFileEntry
+                {
+                    Type = Type,
+                    ProgrammerPath = ProgrammerPath,
+                    PayloadPath = PayloadPath
+                };
 
-                QualcommPartition Programmer = new QualcommPartition(ProgrammerPath);
+                QualcommPartition Programmer = new(ProgrammerPath);
                 Entry.RKH = Programmer.RootKeyHash;
 
                 EmergencyRepository.Add(Entry);
                 WriteConfig();
             }
             else
+            {
                 LogFile.Log("Emergency files not added, because they were already present in the repository.", LogType.FileAndConsole);
+            }
         }
 
         internal void RemoveEmergencyFromRepository(string ProgrammerPath)
@@ -239,13 +265,14 @@ namespace WPinternals
                 EmergencyRepository.Remove(e);
             });
             if (Count == 0)
+            {
                 LogFile.Log("Emergency file was not removed from repository because it was not present.", LogType.FileAndConsole);
+            }
             else
             {
                 LogFile.Log("Removed Emergency file from repository: " + ProgrammerPath, LogType.FileAndConsole);
                 WriteConfig();
             }
-
         }
 
         public string RegistrationName;
@@ -281,8 +308,16 @@ namespace WPinternals
                 ValueBuffer[0] = 1; // Profile version
                 ByteOperations.WriteUInt32(ValueBuffer, 1, FillSize);
                 ByteOperations.WriteUInt32(ValueBuffer, 5, HeaderSize);
-                if (AssumeImageHeaderFallsInGap) ValueBuffer[9] |= 1;
-                if (AllocateAsyncBuffersOnPhone) ValueBuffer[9] |= 2;
+                if (AssumeImageHeaderFallsInGap)
+                {
+                    ValueBuffer[9] |= 1;
+                }
+
+                if (AllocateAsyncBuffersOnPhone)
+                {
+                    ValueBuffer[9] |= 2;
+                }
+
                 return System.Convert.ToBase64String(ValueBuffer);
             }
             set
@@ -291,8 +326,8 @@ namespace WPinternals
                 byte Version = ValueBuffer[0];
                 FillSize = ByteOperations.ReadUInt32(ValueBuffer, 1);
                 HeaderSize = ByteOperations.ReadUInt32(ValueBuffer, 5);
-                AssumeImageHeaderFallsInGap = (bool)((ValueBuffer[9] & 1) != 0);
-                AllocateAsyncBuffersOnPhone = (bool)((ValueBuffer[9] & 2) != 0);
+                AssumeImageHeaderFallsInGap = (ValueBuffer[9] & 1) != 0;
+                AllocateAsyncBuffersOnPhone = (ValueBuffer[9] & 2) != 0;
             }
         }
     }
diff --git a/WinUSBNet/API/APIException.cs b/WinUSBNet/API/APIException.cs
index 300589f..b9d0e67 100644
--- a/WinUSBNet/API/APIException.cs
+++ b/WinUSBNet/API/APIException.cs
@@ -9,7 +9,6 @@ using System;
 using System.ComponentModel;
 using System.Runtime.InteropServices;
 
-
 namespace MadWizard.WinUSBNet.API
 {
     /// <summary>
@@ -21,7 +20,6 @@ namespace MadWizard.WinUSBNet.API
         public APIException(string message) :
             base(message)
         {
-
         }
         public APIException(string message, Exception innerException) : base(message, innerException)
         {
@@ -41,8 +39,6 @@ namespace MadWizard.WinUSBNet.API
         public static APIException Win32(string message, int errorCode)
         {
             return new APIException(message, new Win32Exception(errorCode));
-
         }
-
     }
 }
diff --git a/WinUSBNet/API/DeviceManagement.cs b/WinUSBNet/API/DeviceManagement.cs
index 9e9ec0b..d1b9fe9 100644
--- a/WinUSBNet/API/DeviceManagement.cs
+++ b/WinUSBNet/API/DeviceManagement.cs
@@ -21,7 +21,6 @@ namespace MadWizard.WinUSBNet.API
     ///  </summary>
     internal static partial class DeviceManagement
     {
-
         // Get device name from notification message.
         // Also checks checkGuid with the GUID from the message to check the notification
         // is for a relevant device. Other messages might be received.
@@ -29,14 +28,14 @@ namespace MadWizard.WinUSBNet.API
         {
             int stringSize;
 
-            DEV_BROADCAST_DEVICEINTERFACE_1 devBroadcastDeviceInterface = new DEV_BROADCAST_DEVICEINTERFACE_1();
-            DEV_BROADCAST_HDR devBroadcastHeader = new DEV_BROADCAST_HDR();
+            DEV_BROADCAST_DEVICEINTERFACE_1 devBroadcastDeviceInterface = new();
+            DEV_BROADCAST_HDR devBroadcastHeader = new();
 
             // The LParam parameter of Message is a pointer to a DEV_BROADCAST_HDR structure.
 
             Marshal.PtrToStructure(pDevBroadcastHeader, devBroadcastHeader);
 
-            if ((devBroadcastHeader.dbch_devicetype == DBT_DEVTYP_DEVICEINTERFACE))
+            if (devBroadcastHeader.dbch_devicetype == DBT_DEVTYP_DEVICEINTERFACE)
             {
                 // The dbch_devicetype parameter indicates that the event applies to a device interface.
                 // So the structure in LParam is actually a DEV_BROADCAST_INTERFACE structure, 
@@ -60,16 +59,18 @@ namespace MadWizard.WinUSBNet.API
 
                 // Check if message is for the GUID
                 if (devBroadcastDeviceInterface.dbcc_classguid != checkGuid)
+                {
                     return null;
+                }
 
                 // Store the device name in a String.
-                string deviceNameString = new String(devBroadcastDeviceInterface.dbcc_name, 0, stringSize);
+                string deviceNameString = new(devBroadcastDeviceInterface.dbcc_name, 0, stringSize);
 
                 return deviceNameString;
             }
-            else if ((devBroadcastHeader.dbch_devicetype == DBT_DEVTYP_VOLUME))
+            else if (devBroadcastHeader.dbch_devicetype == DBT_DEVTYP_VOLUME)
             {
-                DEV_BROADCAST_VOLUME vol = new DEV_BROADCAST_VOLUME();
+                DEV_BROADCAST_VOLUME vol = new();
                 Marshal.PtrToStructure(pDevBroadcastHeader, vol);
                 Int32 Mask = vol.dbcv_unitmask;
                 Int32 DriveInt = Convert.ToInt32('A') - 1;
@@ -86,18 +87,20 @@ namespace MadWizard.WinUSBNet.API
 
         private static byte[] GetProperty(IntPtr deviceInfoSet, SP_DEVINFO_DATA deviceInfoData, SPDRP property, out int regType)
         {
-            uint requiredSize;
-
-            if (!SetupDiGetDeviceRegistryProperty(deviceInfoSet, ref deviceInfoData, property, IntPtr.Zero, IntPtr.Zero, 0, out requiredSize))
+            if (!SetupDiGetDeviceRegistryProperty(deviceInfoSet, ref deviceInfoData, property, IntPtr.Zero, IntPtr.Zero, 0, out uint requiredSize))
             {
                 if (Marshal.GetLastWin32Error() != ERROR_INSUFFICIENT_BUFFER)
+                {
                     throw APIException.Win32("Failed to get buffer size for device registry property.");
+                }
             }
 
             byte[] buffer = new byte[requiredSize];
 
             if (!SetupDiGetDeviceRegistryProperty(deviceInfoSet, ref deviceInfoData, property, out regType, buffer, (uint)buffer.Length, out requiredSize))
+            {
                 throw APIException.Win32("Failed to get device registry property.");
+            }
 
             return buffer;
         }
@@ -113,18 +116,20 @@ namespace MadWizard.WinUSBNet.API
         // Heathcliff74
         private static byte[] GetProperty(IntPtr deviceInfoSet, SP_DEVINFO_DATA deviceInfoData, DEVPROPKEY property, out uint propertyType)
         {
-            int requiredSize;
-
-            if (!SetupDiGetDeviceProperty(deviceInfoSet, ref deviceInfoData, ref property, out propertyType, null, 0, out requiredSize, 0))
+            if (!SetupDiGetDeviceProperty(deviceInfoSet, ref deviceInfoData, ref property, out propertyType, null, 0, out int requiredSize, 0))
             {
                 if (Marshal.GetLastWin32Error() != ERROR_INSUFFICIENT_BUFFER)
+                {
                     throw APIException.Win32("Failed to get buffer size for device registry property.");
+                }
             }
 
             byte[] buffer = new byte[requiredSize];
 
             if (!SetupDiGetDeviceProperty(deviceInfoSet, ref deviceInfoData, ref property, out propertyType, buffer, buffer.Length, out requiredSize, 0))
+            {
                 throw APIException.Win32("Failed to get device registry property.");
+            }
 
             return buffer;
         }
@@ -132,10 +137,11 @@ namespace MadWizard.WinUSBNet.API
         // todo: is the queried data always available, or should we check ERROR_INVALID_DATA?
         private static string GetStringProperty(IntPtr deviceInfoSet, SP_DEVINFO_DATA deviceInfoData, SPDRP property)
         {
-            int regType;
-            byte[] buffer = GetProperty(deviceInfoSet, deviceInfoData, property, out regType);
+            byte[] buffer = GetProperty(deviceInfoSet, deviceInfoData, property, out int regType);
             if (regType != (int)RegTypes.REG_SZ)
+            {
                 throw new APIException("Invalid registry type returned for device property.");
+            }
 
             // sizof(char), 2 bytes, are removed to leave out the string terminator
             return System.Text.Encoding.Unicode.GetString(buffer, 0, buffer.Length - sizeof(char));
@@ -145,10 +151,11 @@ namespace MadWizard.WinUSBNet.API
         // todo: is the queried data always available, or should we check ERROR_INVALID_DATA?
         private static string GetStringProperty(IntPtr deviceInfoSet, SP_DEVINFO_DATA deviceInfoData, DEVPROPKEY property)
         {
-            uint propertyType;
-            byte[] buffer = GetProperty(deviceInfoSet, deviceInfoData, property, out propertyType);
+            byte[] buffer = GetProperty(deviceInfoSet, deviceInfoData, property, out uint propertyType);
             if (propertyType != 0x00000012) // DEVPROP_TYPE_STRING
+            {
                 throw new APIException("Invalid registry type returned for device property.");
+            }
 
             // sizof(char), 2 bytes, are removed to leave out the string terminator
             return System.Text.Encoding.Unicode.GetString(buffer, 0, buffer.Length - sizeof(char));
@@ -156,19 +163,19 @@ namespace MadWizard.WinUSBNet.API
 
         private static string[] GetMultiStringProperty(IntPtr deviceInfoSet, SP_DEVINFO_DATA deviceInfoData, SPDRP property)
         {
-            int regType;
-            byte[] buffer = GetProperty(deviceInfoSet, deviceInfoData, property, out regType);
+            byte[] buffer = GetProperty(deviceInfoSet, deviceInfoData, property, out int regType);
             if (regType != (int)RegTypes.REG_MULTI_SZ)
+            {
                 throw new APIException("Invalid registry type returned for device property.");
+            }
 
             string fullString = System.Text.Encoding.Unicode.GetString(buffer);
 
             return fullString.Split(new char[] { '\0' }, StringSplitOptions.RemoveEmptyEntries);
-
         }
         private static DeviceDetails GetDeviceDetails(string devicePath, IntPtr deviceInfoSet, SP_DEVINFO_DATA deviceInfoData)
         {
-            DeviceDetails details = new DeviceDetails();
+            DeviceDetails details = new();
             details.DevicePath = devicePath;
             details.DeviceDescription = GetStringProperty(deviceInfoSet, deviceInfoData, SPDRP.SPDRP_DEVICEDESC);
             details.Manufacturer = GetStringProperty(deviceInfoSet, deviceInfoData, SPDRP.SPDRP_MFG);
@@ -183,7 +190,7 @@ namespace MadWizard.WinUSBNet.API
 
             string[] hardwareIDs = GetMultiStringProperty(deviceInfoSet, deviceInfoData, SPDRP.SPDRP_HARDWAREID);
 
-            Regex regex = new Regex("^USB\\\\VID_([0-9A-F]{4})&PID_([0-9A-F]{4})", RegexOptions.IgnoreCase);
+            Regex regex = new("^USB\\\\VID_([0-9A-F]{4})&PID_([0-9A-F]{4})", RegexOptions.IgnoreCase);
             foreach (string hardwareID in hardwareIDs)
             {
                 Match match = regex.Match(hardwareID);
@@ -204,39 +211,41 @@ namespace MadWizard.WinUSBNet.API
             return details;
         }
 
-
         public static DeviceDetails[] FindDevicesFromGuid(Guid guid)
         {
             IntPtr deviceInfoSet = IntPtr.Zero;
-            List<DeviceDetails> deviceList = new List<DeviceDetails>();
+            List<DeviceDetails> deviceList = new();
             try
             {
                 deviceInfoSet = SetupDiGetClassDevs(ref guid, IntPtr.Zero, IntPtr.Zero,
                     DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
                 if (deviceInfoSet == FileIO.INVALID_HANDLE_VALUE)
+                {
                     throw APIException.Win32("Failed to enumerate devices.");
+                }
+
                 int memberIndex = 0;
                 while (true)
                 {
                     // Begin with 0 and increment through the device information set until
                     // no more devices are available.					
-                    SP_DEVICE_INTERFACE_DATA deviceInterfaceData = new SP_DEVICE_INTERFACE_DATA();
+                    SP_DEVICE_INTERFACE_DATA deviceInterfaceData = new();
 
                     // The cbSize element of the deviceInterfaceData structure must be set to
                     // the structure's size in bytes. 
                     // The size is 28 bytes for 32-bit code and 32 bytes for 64-bit code.
                     deviceInterfaceData.cbSize = Marshal.SizeOf(deviceInterfaceData);
 
-                    bool success;
-
-                    success = SetupDiEnumDeviceInterfaces(deviceInfoSet, IntPtr.Zero, ref guid, memberIndex, ref deviceInterfaceData);
+                    bool success = SetupDiEnumDeviceInterfaces(deviceInfoSet, IntPtr.Zero, ref guid, memberIndex, ref deviceInterfaceData);
 
                     // Find out if a device information set was retrieved.
                     if (!success)
                     {
                         int lastError = Marshal.GetLastWin32Error();
                         if (lastError == ERROR_NO_MORE_ITEMS)
+                        {
                             break;
+                        }
 
                         throw APIException.Win32("Failed to get device interface.");
                     }
@@ -255,13 +264,14 @@ namespace MadWizard.WinUSBNet.API
                     if (!success)
                     {
                         if (Marshal.GetLastWin32Error() != ERROR_INSUFFICIENT_BUFFER)
+                        {
                             throw APIException.Win32("Failed to get interface details buffer size.");
+                        }
                     }
 
                     IntPtr detailDataBuffer = IntPtr.Zero;
                     try
                     {
-
                         // Allocate memory for the SP_DEVICE_INTERFACE_DETAIL_DATA structure using the returned buffer size.
                         detailDataBuffer = Marshal.AllocHGlobal(bufferSize);
 
@@ -274,10 +284,9 @@ namespace MadWizard.WinUSBNet.API
                         // and the returned required buffer size.
 
                         // build a DevInfo Data structure
-                        SP_DEVINFO_DATA da = new SP_DEVINFO_DATA();
+                        SP_DEVINFO_DATA da = new();
                         da.cbSize = Marshal.SizeOf(da);
 
-
                         success = SetupDiGetDeviceInterfaceDetail
                             (deviceInfoSet,
                             ref deviceInterfaceData,
@@ -287,19 +296,19 @@ namespace MadWizard.WinUSBNet.API
                             ref da);
 
                         if (!success)
+                        {
                             throw APIException.Win32("Failed to get device interface details.");
-
+                        }
 
                         // Skip over cbsize (4 bytes) to get the address of the devicePathName.
 
-                        IntPtr pDevicePathName = new IntPtr(detailDataBuffer.ToInt64() + 4);
+                        IntPtr pDevicePathName = new(detailDataBuffer.ToInt64() + 4);
                         string pathName = Marshal.PtrToStringUni(pDevicePathName);
 
                         // Get the String containing the devicePathName.
 
                         DeviceDetails details = GetDeviceDetails(pathName, deviceInfoSet, da);
 
-
                         deviceList.Add(details);
                     }
                     finally
@@ -323,11 +332,9 @@ namespace MadWizard.WinUSBNet.API
             return deviceList.ToArray();
         }
 
-
         public static void RegisterForDeviceNotifications(IntPtr controlHandle, Guid classGuid, ref IntPtr deviceNotificationHandle)
         {
-
-            DEV_BROADCAST_DEVICEINTERFACE devBroadcastDeviceInterface = new DEV_BROADCAST_DEVICEINTERFACE();
+            DEV_BROADCAST_DEVICEINTERFACE devBroadcastDeviceInterface = new();
             IntPtr devBroadcastDeviceInterfaceBuffer = IntPtr.Zero;
             try
             {
@@ -345,7 +352,9 @@ namespace MadWizard.WinUSBNet.API
 
                 deviceNotificationHandle = RegisterDeviceNotification(controlHandle, devBroadcastDeviceInterfaceBuffer, DEVICE_NOTIFY_WINDOW_HANDLE);
                 if (deviceNotificationHandle == IntPtr.Zero)
+                {
                     throw APIException.Win32("Failed to register device notification");
+                }
 
                 // Marshal data from the unmanaged block devBroadcastDeviceInterfaceBuffer to
                 // the managed object devBroadcastDeviceInterface
@@ -355,14 +364,18 @@ namespace MadWizard.WinUSBNet.API
             {
                 // Free the memory allocated previously by AllocHGlobal.
                 if (devBroadcastDeviceInterfaceBuffer != IntPtr.Zero)
+                {
                     Marshal.FreeHGlobal(devBroadcastDeviceInterfaceBuffer);
+                }
             }
         }
 
         public static void StopDeviceDeviceNotifications(IntPtr deviceNotificationHandle)
         {
             if (!DeviceManagement.UnregisterDeviceNotification(deviceNotificationHandle))
+            {
                 throw APIException.Win32("Failed to unregister device notification");
+            }
         }
     }
 }
diff --git a/WinUSBNet/API/DeviceManagementAPI.cs b/WinUSBNet/API/DeviceManagementAPI.cs
index be9791d..09fb1f2 100644
--- a/WinUSBNet/API/DeviceManagementAPI.cs
+++ b/WinUSBNet/API/DeviceManagementAPI.cs
@@ -15,10 +15,9 @@ using System.Runtime.InteropServices;
 namespace MadWizard.WinUSBNet.API
 {
     /// <summary>
-    /// API declarations relating to device management (SetupDixxx and 
-    /// RegisterDeviceNotification functions).   
+    /// API declarations relating to device management (SetupDixxx and
+    /// RegisterDeviceNotification functions).
     /// </summary>
-
     internal static partial class DeviceManagement
     {
         // from dbt.h
@@ -86,14 +85,14 @@ namespace MadWizard.WinUSBNet.API
         private struct SP_DEVICE_INTERFACE_DATA
         {
             internal Int32 cbSize;
-            internal System.Guid InterfaceClassGuid;
+            internal Guid InterfaceClassGuid;
             internal Int32 Flags;
             internal IntPtr Reserved;
         }
         private struct SP_DEVINFO_DATA
         {
             internal Int32 cbSize;
-            internal System.Guid ClassGuid;
+            internal Guid ClassGuid;
             internal Int32 DevInst;
             internal IntPtr Reserved;
         }
@@ -152,7 +151,7 @@ namespace MadWizard.WinUSBNet.API
         private static extern Int32 SetupDiDestroyDeviceInfoList(IntPtr DeviceInfoSet);
 
         [DllImport("setupapi.dll", SetLastError = true)]
-        private static extern bool SetupDiEnumDeviceInterfaces(IntPtr DeviceInfoSet, IntPtr DeviceInfoData, ref System.Guid InterfaceClassGuid, Int32 MemberIndex, ref SP_DEVICE_INTERFACE_DATA DeviceInterfaceData);
+        private static extern bool SetupDiEnumDeviceInterfaces(IntPtr DeviceInfoSet, IntPtr DeviceInfoData, ref Guid InterfaceClassGuid, Int32 MemberIndex, ref SP_DEVICE_INTERFACE_DATA DeviceInterfaceData);
 
         [DllImport("setupapi.dll", CharSet = CharSet.Unicode, SetLastError = true)]
         private static extern bool SetupDiGetDeviceRegistryProperty(IntPtr DeviceInfoSet, ref SP_DEVINFO_DATA DeviceInfoData, SPDRP Property, out int PropertyRegDataType, byte[] PropertyBuffer, uint PropertyBufferSize, out UInt32 RequiredSize);
@@ -161,10 +160,10 @@ namespace MadWizard.WinUSBNet.API
         private static extern bool SetupDiGetDeviceRegistryProperty(IntPtr DeviceInfoSet, ref SP_DEVINFO_DATA DeviceInfoData, SPDRP Property, IntPtr PropertyRegDataType, IntPtr PropertyBuffer, uint PropertyBufferSize, out UInt32 RequiredSize);
 
         [DllImport("setupapi.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-        static extern unsafe bool SetupDiGetDeviceProperty(IntPtr deviceInfoSet, ref SP_DEVINFO_DATA DeviceInfoData, ref DEVPROPKEY propertyKey, out UInt32 propertyType, byte[] propertyBuffer, Int32 propertyBufferSize, out int requiredSize, UInt32 flags);
+        private static extern unsafe bool SetupDiGetDeviceProperty(IntPtr deviceInfoSet, ref SP_DEVINFO_DATA DeviceInfoData, ref DEVPROPKEY propertyKey, out UInt32 propertyType, byte[] propertyBuffer, Int32 propertyBufferSize, out int requiredSize, UInt32 flags);
 
         [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        private static extern IntPtr SetupDiGetClassDevs(ref System.Guid ClassGuid, IntPtr Enumerator, IntPtr hwndParent, Int32 Flags);
+        private static extern IntPtr SetupDiGetClassDevs(ref Guid ClassGuid, IntPtr Enumerator, IntPtr hwndParent, Int32 Flags);
 
         [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         private static extern bool SetupDiGetDeviceInterfaceDetail(IntPtr DeviceInfoSet, ref SP_DEVICE_INTERFACE_DATA DeviceInterfaceData, IntPtr DeviceInterfaceDetailData, Int32 DeviceInterfaceDetailDataSize, ref Int32 RequiredSize, ref SP_DEVINFO_DATA DeviceInfoData);
diff --git a/WinUSBNet/API/FileAPI.cs b/WinUSBNet/API/FileAPI.cs
index 296b5b2..e264df8 100644
--- a/WinUSBNet/API/FileAPI.cs
+++ b/WinUSBNet/API/FileAPI.cs
@@ -18,7 +18,6 @@ namespace MadWizard.WinUSBNet.API
     ///  <summary>
     ///  API declarations relating to file I/O (and used by WinUsb).
     ///  </summary>
-
     sealed internal class FileIO
     {
         public const Int32 FILE_ATTRIBUTE_NORMAL = 0X80;
@@ -27,7 +26,7 @@ namespace MadWizard.WinUSBNet.API
         public const Int32 FILE_SHARE_WRITE = 2;
         public const UInt32 GENERIC_READ = 0X80000000;
         public const UInt32 GENERIC_WRITE = 0X40000000;
-        public static readonly IntPtr INVALID_HANDLE_VALUE = new IntPtr(-1);
+        public static readonly IntPtr INVALID_HANDLE_VALUE = new(-1);
         public const Int32 OPEN_EXISTING = 3;
 
         public const Int32 ERROR_IO_PENDING = 997;
@@ -35,5 +34,4 @@ namespace MadWizard.WinUSBNet.API
         [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         public static extern SafeFileHandle CreateFile(String lpFileName, UInt32 dwDesiredAccess, Int32 dwShareMode, IntPtr lpSecurityAttributes, Int32 dwCreationDisposition, Int32 dwFlagsAndAttributes, Int32 hTemplateFile);
     }
-
 }
diff --git a/WinUSBNet/API/WinUSBDevice.cs b/WinUSBNet/API/WinUSBDevice.cs
index 7f0df6c..120399a 100644
--- a/WinUSBNet/API/WinUSBDevice.cs
+++ b/WinUSBNet/API/WinUSBDevice.cs
@@ -20,7 +20,7 @@ namespace MadWizard.WinUSBNet.API
     /// <summary>
     ///  Wrapper for a WinUSB device dealing with the WinUSB and additional interface handles
     /// </summary>
-    partial class WinUSBDevice : IDisposable
+    internal partial class WinUSBDevice : IDisposable
     {
         private bool _disposed = false;
         private SafeFileHandle _deviceHandle;
@@ -44,7 +44,9 @@ namespace MadWizard.WinUSBNet.API
         private void CheckNotDisposed()
         {
             if (_disposed)
+            {
                 throw new ObjectDisposedException("USB device object has been disposed.");
+            }
         }
 
         // TODO: check if not disposed on methods (although this is already checked by USBDevice)
@@ -52,13 +54,18 @@ namespace MadWizard.WinUSBNet.API
         protected virtual void Dispose(bool disposing)
         {
             if (_disposed)
+            {
                 return;
+            }
 
             if (disposing)
             {
                 // Dispose managed resources
-                if (_deviceHandle != null && !_deviceHandle.IsInvalid)
+                if (_deviceHandle?.IsInvalid == false)
+                {
                     _deviceHandle.Dispose();
+                }
+
                 _deviceHandle = null;
             }
 
@@ -77,40 +84,51 @@ namespace MadWizard.WinUSBNet.API
                 _addInterfaces = null;
             }
             if (_winUsbHandle != IntPtr.Zero)
+            {
                 WinUsb_Free(_winUsbHandle);
+            }
+
             _winUsbHandle = IntPtr.Zero;
         }
 
         public USB_DEVICE_DESCRIPTOR GetDeviceDescriptor()
         {
-            USB_DEVICE_DESCRIPTOR deviceDesc;
-            uint transfered;
             uint size = (uint)Marshal.SizeOf(typeof(USB_DEVICE_DESCRIPTOR));
             bool success = WinUsb_GetDescriptor(_winUsbHandle, USB_DEVICE_DESCRIPTOR_TYPE,
-                        0, 0, out deviceDesc, size, out transfered);
+                        0, 0, out USB_DEVICE_DESCRIPTOR deviceDesc, size, out uint transfered);
             if (!success)
+            {
                 throw APIException.Win32("Failed to get USB device descriptor.");
+            }
 
             if (transfered != size)
+            {
                 throw APIException.Win32("Incomplete USB device descriptor.");
+            }
 
             return deviceDesc;
         }
 
         private int ReadStringDescriptor(byte index, ushort languageID, byte[] buffer)
         {
-            uint transfered;
             bool success = WinUsb_GetDescriptor(_winUsbHandle, USB_STRING_DESCRIPTOR_TYPE,
-                        index, languageID, buffer, (uint)buffer.Length, out transfered);
+                        index, languageID, buffer, (uint)buffer.Length, out uint transfered);
             if (!success)
+            {
                 throw APIException.Win32("Failed to get USB string descriptor (" + index + ").");
+            }
 
             if (transfered == 0)
+            {
                 throw new APIException("No data returned when reading USB descriptor.");
+            }
 
             int length = buffer[0];
             if (length != transfered)
+            {
                 throw new APIException("Unexpected length when reading USB descriptor.");
+            }
+
             return length;
         }
 
@@ -120,7 +138,9 @@ namespace MadWizard.WinUSBNet.API
             int length = ReadStringDescriptor(0, 0, buffer);
             length -= 2; // Skip length byte and descriptor type
             if (length < 0 || (length % 2) != 0)
+            {
                 throw new APIException("Unexpected length when reading supported languages.");
+            }
 
             ushort[] langIDs = new ushort[length / 2];
             Buffer.BlockCopy(buffer, 2, langIDs, 0, length);
@@ -133,7 +153,10 @@ namespace MadWizard.WinUSBNet.API
             int length = ReadStringDescriptor(index, languageID, buffer);
             length -= 2; // Skip length byte and descriptor type
             if (length < 0)
+            {
                 return null;
+            }
+
             char[] chars = System.Text.Encoding.Unicode.GetChars(buffer, 2, length);
             return new string(chars);
         }
@@ -151,26 +174,30 @@ namespace MadWizard.WinUSBNet.API
 
             bool success = WinUsb_ControlTransfer(_winUsbHandle, setupPacket, data, length, ref bytesReturned, IntPtr.Zero);
             if (!success) // todo check bytes returned?
+            {
                 throw APIException.Win32("Control transfer on WinUSB device failed.");
+            }
+
             return (int)bytesReturned;
         }
 
-
         public void OpenDevice(string devicePathName)
         {
             try
             {
                 _deviceHandle = FileIO.CreateFile(devicePathName,
-                        (FileIO.GENERIC_WRITE | FileIO.GENERIC_READ),
+                        FileIO.GENERIC_WRITE | FileIO.GENERIC_READ,
                         FileIO.FILE_SHARE_READ | FileIO.FILE_SHARE_WRITE,
                         IntPtr.Zero,
                         FileIO.OPEN_EXISTING,
                         FileIO.FILE_ATTRIBUTE_NORMAL | FileIO.FILE_FLAG_OVERLAPPED,
                         0);
                 if (_deviceHandle.IsInvalid)
+                {
                     throw APIException.Win32("Failed to open WinUSB device handle.");
-                InitializeDevice();
+                }
 
+                InitializeDevice();
             }
             catch (Exception)
             {
@@ -187,7 +214,10 @@ namespace MadWizard.WinUSBNet.API
         private IntPtr InterfaceHandle(int index)
         {
             if (index == 0)
+            {
                 return _winUsbHandle;
+            }
+
             return _addInterfaces[index - 1];
         }
 
@@ -195,7 +225,7 @@ namespace MadWizard.WinUSBNet.API
         {
             get
             {
-                return 1 + (_addInterfaces == null ? 0 : _addInterfaces.Length);
+                return 1 + ((_addInterfaces?.Length) ?? 0);
             }
         }
 
@@ -204,31 +234,33 @@ namespace MadWizard.WinUSBNet.API
             var pipeList = new List<WINUSB_PIPE_INFORMATION>();
             bool success = WinUsb_QueryInterfaceSettings(InterfaceHandle(interfaceIndex), 0, out descriptor);
             if (!success)
+            {
                 throw APIException.Win32("Failed to get WinUSB device interface descriptor.");
+            }
 
             IntPtr interfaceHandle = InterfaceHandle(interfaceIndex);
             for (byte pipeIdx = 0; pipeIdx < descriptor.bNumEndpoints; pipeIdx++)
             {
-                WINUSB_PIPE_INFORMATION pipeInfo;
-                success = WinUsb_QueryPipe(interfaceHandle, 0, pipeIdx, out pipeInfo);
+                success = WinUsb_QueryPipe(interfaceHandle, 0, pipeIdx, out WINUSB_PIPE_INFORMATION pipeInfo);
 
                 pipeList.Add(pipeInfo);
                 if (!success)
+                {
                     throw APIException.Win32("Failed to get WinUSB device pipe information.");
+                }
             }
             pipes = pipeList.ToArray();
-
         }
         private void InitializeDevice()
         {
-            bool success;
-
-            success = WinUsb_Initialize(_deviceHandle, ref _winUsbHandle);
+            bool success = WinUsb_Initialize(_deviceHandle, ref _winUsbHandle);
 
             if (!success)
+            {
                 throw APIException.Win32("Failed to initialize WinUSB handle. Device might not be connected.");
+            }
 
-            List<IntPtr> interfaces = new List<IntPtr>();
+            List<IntPtr> interfaces = new();
             byte numAddInterfaces = 0;
             byte idx = 0;
 
@@ -241,7 +273,9 @@ namespace MadWizard.WinUSBNet.API
                     if (!success)
                     {
                         if (Marshal.GetLastWin32Error() == ERROR_NO_MORE_ITEMS)
+                        {
                             break;
+                        }
 
                         throw APIException.Win32("Failed to enumerate interfaces for WinUSB device.");
                     }
@@ -278,7 +312,9 @@ namespace MadWizard.WinUSBNet.API
                 }
             }
             if (!success)
+            {
                 throw APIException.Win32("Failed to read pipe on WinUSB device.");
+            }
         }
 
         private unsafe void HandleOverlappedAPI(bool success, string errorMessage, NativeOverlapped* pOverlapped, USBAsyncResult result, int bytesTransfered)
@@ -301,12 +337,11 @@ namespace MadWizard.WinUSBNet.API
                 result.OnCompletion(true, null, bytesTransfered, false);
                 // is the callback still called in this case?? todo
             }
-
         }
 
         public void ReadPipeOverlapped(int ifaceIndex, byte pipeID, byte[] buffer, int offset, int bytesToRead, USBAsyncResult result)
         {
-            Overlapped overlapped = new Overlapped();
+            Overlapped overlapped = new();
 
             overlapped.AsyncResult = result;
 
@@ -329,7 +364,7 @@ namespace MadWizard.WinUSBNet.API
 
         public void WriteOverlapped(int ifaceIndex, byte pipeID, byte[] buffer, int offset, int bytesToWrite, USBAsyncResult result)
         {
-            Overlapped overlapped = new Overlapped();
+            Overlapped overlapped = new();
             overlapped.AsyncResult = result;
 
             unsafe
@@ -347,12 +382,9 @@ namespace MadWizard.WinUSBNet.API
                             out bytesWritten, pOverlapped);
                 }
                 HandleOverlappedAPI(success, "Failed to asynchronously write pipe on WinUSB device.", pOverlapped, result, (int)bytesWritten);
-
             }
         }
 
-
-
         public void ControlTransferOverlapped(byte requestType, byte request, ushort value, ushort index, ushort length, byte[] data, USBAsyncResult result)
         {
             uint bytesReturned = 0;
@@ -364,7 +396,7 @@ namespace MadWizard.WinUSBNet.API
             setupPacket.Index = index;
             setupPacket.Length = length;
 
-            Overlapped overlapped = new Overlapped();
+            Overlapped overlapped = new();
             overlapped.AsyncResult = result;
 
             unsafe
@@ -405,16 +437,18 @@ namespace MadWizard.WinUSBNet.API
         {
             bool success = WinUsb_AbortPipe(InterfaceHandle(ifaceIndex), pipeID);
             if (!success)
+            {
                 throw APIException.Win32("Failed to abort pipe on WinUSB device.");
-
+            }
         }
 
         public void ResetPipe(int ifaceIndex, byte pipeID)
         {
             bool success = WinUsb_ResetPipe(InterfaceHandle(ifaceIndex), pipeID);
             if (!success)
+            {
                 throw APIException.Win32("Failed to reset pipe on WinUSB device.");
-
+            }
         }
 
         public void WritePipe(int ifaceIndex, byte pipeID, byte[] buffer, int offset, int length)
@@ -432,15 +466,18 @@ namespace MadWizard.WinUSBNet.API
                 }
             }
             if (!success || (bytesWritten != length))
+            {
                 throw APIException.Win32("Failed to write pipe on WinUSB device.");
-
+            }
         }
 
         public void FlushPipe(int ifaceIndex, byte pipeID)
         {
             bool success = WinUsb_FlushPipe(InterfaceHandle(ifaceIndex), pipeID);
             if (!success)
+            {
                 throw APIException.Win32("Failed to flush pipe on WinUSB device.");
+            }
         }
 
         public void SetPipePolicy(int ifaceIndex, byte pipeID, POLICY_TYPE policyType, bool value)
@@ -448,41 +485,44 @@ namespace MadWizard.WinUSBNet.API
             byte byteVal = (byte)(value ? 1 : 0);
             bool success = WinUsb_SetPipePolicy(InterfaceHandle(ifaceIndex), pipeID, (uint)policyType, 1, ref byteVal);
             if (!success)
+            {
                 throw APIException.Win32("Failed to set WinUSB pipe policy.");
+            }
         }
 
-
         public void SetPipePolicy(int ifaceIndex, byte pipeID, POLICY_TYPE policyType, uint value)
         {
-
             bool success = WinUsb_SetPipePolicy(InterfaceHandle(ifaceIndex), pipeID, (uint)policyType, 4, ref value);
 
             if (!success)
+            {
                 throw APIException.Win32("Failed to set WinUSB pipe policy.");
+            }
         }
 
-
         public bool GetPipePolicyBool(int ifaceIndex, byte pipeID, POLICY_TYPE policyType)
         {
-            byte result;
             uint length = 1;
 
-            bool success = WinUsb_GetPipePolicy(InterfaceHandle(ifaceIndex), pipeID, (uint)policyType, ref length, out result);
+            bool success = WinUsb_GetPipePolicy(InterfaceHandle(ifaceIndex), pipeID, (uint)policyType, ref length, out byte result);
             if (!success || length != 1)
+            {
                 throw APIException.Win32("Failed to get WinUSB pipe policy.");
+            }
+
             return result != 0;
         }
 
-
         public uint GetPipePolicyUInt(int ifaceIndex, byte pipeID, POLICY_TYPE policyType)
         {
-
-            uint result;
             uint length = 4;
-            bool success = WinUsb_GetPipePolicy(InterfaceHandle(ifaceIndex), pipeID, (uint)policyType, ref length, out result);
+            bool success = WinUsb_GetPipePolicy(InterfaceHandle(ifaceIndex), pipeID, (uint)policyType, ref length, out uint result);
 
             if (!success || length != 4)
+            {
                 throw APIException.Win32("Failed to get WinUSB pipe policy.");
+            }
+
             return result;
         }
     }
diff --git a/WinUSBNet/API/WinUSBDeviceAPI.cs b/WinUSBNet/API/WinUSBDeviceAPI.cs
index 4f097dd..ea09740 100644
--- a/WinUSBNet/API/WinUSBDeviceAPI.cs
+++ b/WinUSBNet/API/WinUSBDeviceAPI.cs
@@ -17,7 +17,7 @@ using System.Threading;
 namespace MadWizard.WinUSBNet.API
 {
     [StructLayout(LayoutKind.Sequential)]
-    struct USB_DEVICE_DESCRIPTOR
+    internal struct USB_DEVICE_DESCRIPTOR
     {
         public byte bLength;
         public byte bDescriptorType;
@@ -36,7 +36,7 @@ namespace MadWizard.WinUSBNet.API
     };
 
     [StructLayout(LayoutKind.Sequential)]
-    struct USB_CONFIGURATION_DESCRIPTOR
+    internal struct USB_CONFIGURATION_DESCRIPTOR
     {
         public byte bLength;
         public byte bDescriptorType;
@@ -49,7 +49,7 @@ namespace MadWizard.WinUSBNet.API
     }
 
     [StructLayout(LayoutKind.Sequential)]
-    struct USB_INTERFACE_DESCRIPTOR
+    internal struct USB_INTERFACE_DESCRIPTOR
     {
         public byte bLength;
         public byte bDescriptorType;
@@ -61,7 +61,7 @@ namespace MadWizard.WinUSBNet.API
         public byte bInterfaceProtocol;
         public byte iInterface;
     };
-    enum USBD_PIPE_TYPE : int
+    internal enum USBD_PIPE_TYPE : int
     {
         UsbdPipeTypeControl,
         UsbdPipeTypeIsochronous,
@@ -69,7 +69,7 @@ namespace MadWizard.WinUSBNet.API
         UsbdPipeTypeInterrupt,
     }
     [StructLayout(LayoutKind.Sequential)]
-    struct WINUSB_PIPE_INFORMATION
+    internal struct WINUSB_PIPE_INFORMATION
     {
         public USBD_PIPE_TYPE PipeType;
         public byte PipeId;
@@ -77,7 +77,7 @@ namespace MadWizard.WinUSBNet.API
         public byte Interval;
     }
 
-    enum POLICY_TYPE : int
+    internal enum POLICY_TYPE : int
     {
         SHORT_PACKET_TERMINATE = 1,
         AUTO_CLEAR_STALL,
@@ -88,10 +88,9 @@ namespace MadWizard.WinUSBNet.API
         RAW_IO,
     }
 
-
-    partial class WinUSBDevice
+    internal partial class WinUSBDevice
     {
-        private const UInt32 DEVICE_SPEED = ((UInt32)(1));
+        private const UInt32 DEVICE_SPEED = 1;
 
         private enum USB_DEVICE_SPEED : int
         {
@@ -163,19 +162,15 @@ namespace MadWizard.WinUSBNet.API
         [DllImport("winusb.dll", SetLastError = true)]
         private static unsafe extern bool WinUsb_WritePipe(IntPtr InterfaceHandle, byte PipeID, byte* pBuffer, uint BufferLength, out uint LengthTransferred, NativeOverlapped* pOverlapped);
 
-
         [DllImport("kernel32.dll", SetLastError = true)]
         private static unsafe extern bool CancelIo(IntPtr hFile);
 
         [DllImport("kernel32.dll", SetLastError = true)]
         private static unsafe extern bool CancelIoEx(IntPtr hFile, NativeOverlapped* pOverlapped);
 
-
         [DllImport("winusb.dll", SetLastError = true)]
         private static unsafe extern bool WinUsb_ResetPipe(IntPtr InterfaceHandle, byte PipeID);
 
-
-
         [DllImport("winusb.dll", SetLastError = true)]
         private static extern bool WinUsb_FlushPipe(IntPtr InterfaceHandle, byte PipeID);
 
@@ -200,6 +195,5 @@ namespace MadWizard.WinUSBNet.API
         private const int USB_STRING_DESCRIPTOR_TYPE = 0x03;
 
         private const int ERROR_NO_MORE_ITEMS = 259;
-
     }
 }
diff --git a/WinUSBNet/DeviceNotifyHook.cs b/WinUSBNet/DeviceNotifyHook.cs
index 551c5f0..fcb6467 100644
--- a/WinUSBNet/DeviceNotifyHook.cs
+++ b/WinUSBNet/DeviceNotifyHook.cs
@@ -17,9 +17,9 @@ namespace MadWizard.WinUSBNet
 
         // TODO: disposed exception when disposed
 
-        private USBNotifier _notifier;
+        private readonly USBNotifier _notifier;
         private Guid _guid;
-        private IntPtr _notifyHandle;
+        private readonly IntPtr _notifyHandle;
 
         public DeviceNotifyHook(USBNotifier notifier, Guid guid)
         {
@@ -31,8 +31,14 @@ namespace MadWizard.WinUSBNet
 
             IntPtr hWnd = IntPtr.Zero;
             if (Application.Current.MainWindow != null)
+            {
                 hWnd = new WindowInteropHelper(Application.Current.MainWindow).Handle;
-            if (hWnd == IntPtr.Zero) throw new USBException("Main window not loaded yet. Cannot connect with USB yet.");
+            }
+
+            if (hWnd == IntPtr.Zero)
+            {
+                throw new USBException("Main window not loaded yet. Cannot connect with USB yet.");
+            }
 
             API.DeviceManagement.RegisterForDeviceNotifications(hWnd, _guid, ref _notifyHandle);
 
@@ -125,13 +131,11 @@ namespace MadWizard.WinUSBNet
         {
             // Listen for operating system messages
 
-            switch (msg)
+            return msg switch
             {
-                case API.DeviceManagement.WM_DEVICECHANGE:
-                    return (IntPtr)_notifier.HandleDeviceChange(msg, wParam, lParam);
-                    //break;
-            }
-            return IntPtr.Zero;
+                API.DeviceManagement.WM_DEVICECHANGE => (IntPtr)_notifier.HandleDeviceChange(msg, wParam, lParam),
+                _ => IntPtr.Zero,
+            };
         }
 
         public void Dispose()
@@ -162,26 +166,29 @@ namespace MadWizard.WinUSBNet
                     }
                     */
 
-                    Action RemoveHookAction = () =>
+                    void RemoveHookAction()
                     {
                         if (Application.Current.MainWindow != null)
                         {
                             HwndSource source = PresentationSource.FromVisual(Application.Current.MainWindow) as HwndSource;
                             source.RemoveHook(WndProc);
                         }
-                    };
+                    }
 
                     if (Application.Current != null)
                     {
                         if (Application.Current.Dispatcher.Thread.ManagedThreadId == System.Threading.Thread.CurrentThread.ManagedThreadId)
+                        {
                             RemoveHookAction();
+                        }
                         else
+                        {
                             Application.Current.Dispatcher.Invoke(RemoveHookAction);
+                        }
                     }
                 }
                 catch { }
             }
         }
-
     }
 }
diff --git a/WinUSBNet/USB.cs b/WinUSBNet/USB.cs
index 9bd1785..9d77632 100644
--- a/WinUSBNet/USB.cs
+++ b/WinUSBNet/USB.cs
@@ -73,5 +73,4 @@ namespace MadWizard.WinUSBNet
         /// <summary>Vendor specific base class (0xFF)</summary>
         VendorSpecific = 0xFF,
     };
-
 }
\ No newline at end of file
diff --git a/WinUSBNet/USBAsyncResult.cs b/WinUSBNet/USBAsyncResult.cs
index e33b3f3..7eff4a2 100644
--- a/WinUSBNet/USBAsyncResult.cs
+++ b/WinUSBNet/USBAsyncResult.cs
@@ -11,8 +11,7 @@ namespace MadWizard.WinUSBNet
 {
     internal class USBAsyncResult : IAsyncResult, IDisposable
     {
-        private object _stateObject;
-        private AsyncCallback _userCallback;
+        private readonly AsyncCallback _userCallback;
         private bool _completed;
         private bool _completedSynchronously;
         private ManualResetEvent _waitEvent;
@@ -21,20 +20,14 @@ namespace MadWizard.WinUSBNet
 
         public USBAsyncResult(AsyncCallback userCallback, object stateObject)
         {
-            _stateObject = stateObject;
+            AsyncState = stateObject;
             _userCallback = userCallback;
             _completedSynchronously = false;
             _completed = false;
             _waitEvent = null;
         }
 
-        public object AsyncState
-        {
-            get
-            {
-                return _stateObject;
-            }
-        }
+        public object AsyncState { get; }
 
         public Exception Error
         {
@@ -57,7 +50,9 @@ namespace MadWizard.WinUSBNet
                 lock (this)
                 {
                     if (_waitEvent == null)
+                    {
                         _waitEvent = new ManualResetEvent(_completed);
+                    }
                 }
                 return _waitEvent;
             }
@@ -99,17 +94,19 @@ namespace MadWizard.WinUSBNet
                 _completed = true;
                 _error = error;
                 _bytesTransfered = bytesTransfered;
-                if (_waitEvent != null)
-                    _waitEvent.Set();
+                _waitEvent?.Set();
             }
             if (_userCallback != null)
             {
                 if (synchronousCallback)
+                {
                     RunCallback(null);
+                }
                 else
+                {
                     ThreadPool.QueueUserWorkItem(RunCallback);
+                }
             }
-
         }
         private void RunCallback(object state)
         {
@@ -122,12 +119,9 @@ namespace MadWizard.WinUSBNet
                 // Cleanup managed resources
                 lock (this)
                 {
-                    if (_waitEvent != null)
-                        _waitEvent.Close();
+                    _waitEvent?.Close();
                 }
             }
         }
-
-
     }
 }
diff --git a/WinUSBNet/USBDevice.cs b/WinUSBNet/USBDevice.cs
index b075a64..eca544a 100644
--- a/WinUSBNet/USBDevice.cs
+++ b/WinUSBNet/USBDevice.cs
@@ -15,7 +15,6 @@ namespace MadWizard.WinUSBNet
     /// </summary>
     public class USBDevice : IDisposable
     {
-        private API.WinUSBDevice _wuDevice = null;
         private bool _disposed = false;
 
         /// <summary>
@@ -60,7 +59,6 @@ namespace MadWizard.WinUSBNet
         public USBDeviceDescriptor Descriptor
         {
             get;
-            private set;
         }
 
         /// <summary>
@@ -101,12 +99,13 @@ namespace MadWizard.WinUSBNet
         protected virtual void Dispose(bool disposing)
         {
             if (_disposed)
+            {
                 return;
+            }
 
             if (disposing)
             {
-                if (_wuDevice != null)
-                    _wuDevice.Dispose();
+                InternalDevice?.Dispose();
             }
 
             // Clean unmanaged resources here.
@@ -129,32 +128,26 @@ namespace MadWizard.WinUSBNet
             {
                 //WPinternals.LogFile.LogException(Ex);
             }
-            _wuDevice = new API.WinUSBDevice();
+            InternalDevice = new API.WinUSBDevice();
             try
             {
-                _wuDevice.OpenDevice(devicePathName);
+                InternalDevice.OpenDevice(devicePathName);
                 InitializeInterfaces();
             }
             catch (API.APIException e)
             {
-                _wuDevice.Dispose();
+                InternalDevice.Dispose();
                 throw new USBException("Failed to open device.", e);
             }
         }
 
-        internal API.WinUSBDevice InternalDevice
-        {
-            get
-            {
-                return _wuDevice;
-            }
-        }
+        internal API.WinUSBDevice InternalDevice { get; } = null;
 
         private void InitializeInterfaces()
         {
-            int numInterfaces = _wuDevice.InterfaceCount;
+            int numInterfaces = InternalDevice.InterfaceCount;
 
-            List<USBPipe> allPipes = new List<USBPipe>();
+            List<USBPipe> allPipes = new();
             InputPipe = null;
             OutputPipe = null;
 
@@ -162,22 +155,27 @@ namespace MadWizard.WinUSBNet
             // UsbEndpoint
             for (int i = 0; i < numInterfaces; i++)
             {
-                API.USB_INTERFACE_DESCRIPTOR descriptor;
-                API.WINUSB_PIPE_INFORMATION[] pipesInfo;
-                _wuDevice.GetInterfaceInfo(i, out descriptor, out pipesInfo);
+                InternalDevice.GetInterfaceInfo(i, out API.USB_INTERFACE_DESCRIPTOR descriptor, out API.WINUSB_PIPE_INFORMATION[] pipesInfo);
                 USBPipe[] interfacePipes = new USBPipe[pipesInfo.Length];
                 for(int k=0;k<pipesInfo.Length;k++)
                 {
-                    USBPipe pipe = new USBPipe(this, pipesInfo[k]);
+                    USBPipe pipe = new(this, pipesInfo[k]);
                     interfacePipes[k] = pipe;
                     allPipes.Add(pipe);
-                    if (Convert.ToBoolean((pipesInfo[k].PipeId & 0x80)) && (InputPipe == null)) InputPipe = pipe;
-                    if (!Convert.ToBoolean((pipesInfo[k].PipeId & 0x80)) && (OutputPipe == null)) OutputPipe = pipe;
+                    if (Convert.ToBoolean(pipesInfo[k].PipeId & 0x80) && (InputPipe == null))
+                    {
+                        InputPipe = pipe;
+                    }
+
+                    if (!Convert.ToBoolean(pipesInfo[k].PipeId & 0x80) && (OutputPipe == null))
+                    {
+                        OutputPipe = pipe;
+                    }
                 }
                 // TODO:
                 //if (descriptor.iInterface != 0)
                 //    _wuDevice.GetStringDescriptor(descriptor.iInterface);
-                USBPipeCollection pipeCollection = new USBPipeCollection(interfacePipes);
+                USBPipeCollection pipeCollection = new(interfacePipes);
                 interfaces[i] = new USBInterface(this, i, descriptor, pipeCollection);
             }
             Pipes = new USBPipeCollection(allPipes.ToArray());
@@ -187,13 +185,24 @@ namespace MadWizard.WinUSBNet
         private void CheckControlParams(int value, int index, byte[] buffer, int length)
         {
             if (value < ushort.MinValue || value > ushort.MaxValue)
+            {
                 throw new ArgumentOutOfRangeException(nameof(value), "Value parameter out of range.");
+            }
+
             if (index < ushort.MinValue || index > ushort.MaxValue)
+            {
                 throw new ArgumentOutOfRangeException(nameof(index), "Index parameter out of range.");
+            }
+
             if (length > buffer.Length)
+            {
                 throw new ArgumentOutOfRangeException(nameof(length), "Length parameter is larger than the size of the buffer.");
+            }
+
             if (length > ushort.MaxValue)
+            {
                 throw new ArgumentOutOfRangeException(nameof(length), "Length too large");
+            }
         }
 
         /// <summary>
@@ -207,22 +216,31 @@ namespace MadWizard.WinUSBNet
             {
                 byte PipeID = 0;
                 if (InputPipe != null)
+                {
                     PipeID = InputPipe.Address;
-                return (int)_wuDevice.GetPipePolicyUInt(0, 0x00, API.POLICY_TYPE.PIPE_TRANSFER_TIMEOUT);
+                }
+
+                return (int)InternalDevice.GetPipePolicyUInt(0, 0x00, API.POLICY_TYPE.PIPE_TRANSFER_TIMEOUT);
             }
             set
             {
                 if (value < 0)
+                {
                     throw new ArgumentOutOfRangeException(nameof(value), "Control pipe timeout cannot be negative.");
+                }
                 //_wuDevice.SetPipePolicy(0, 0x00, API.POLICY_TYPE.PIPE_TRANSFER_TIMEOUT, (uint)value);
                 if (InputPipe != null)
-                    _wuDevice.SetPipePolicy(0, InputPipe.Address, API.POLICY_TYPE.PIPE_TRANSFER_TIMEOUT, (uint)value);
+                {
+                    InternalDevice.SetPipePolicy(0, InputPipe.Address, API.POLICY_TYPE.PIPE_TRANSFER_TIMEOUT, (uint)value);
+                }
+
                 if (OutputPipe != null)
-                    _wuDevice.SetPipePolicy(0, OutputPipe.Address, API.POLICY_TYPE.PIPE_TRANSFER_TIMEOUT, (uint)value);
+                {
+                    InternalDevice.SetPipePolicy(0, OutputPipe.Address, API.POLICY_TYPE.PIPE_TRANSFER_TIMEOUT, (uint)value);
+                }
             }
         }
 
-
         /// <summary>
         /// Initiates a control transfer over the default control endpoint. This method allows both IN and OUT direction transfers, depending
         /// on the highest bit of the <paramref name="requestType"/> parameter. Alternatively, <see cref="ControlIn(byte,byte,int,int,byte[],int)"/> and
@@ -246,7 +264,7 @@ namespace MadWizard.WinUSBNet
 
             try
             {
-                return _wuDevice.ControlTransfer(requestType, request, (ushort)value, (ushort)index, (ushort)length, buffer);
+                return InternalDevice.ControlTransfer(requestType, request, (ushort)value, (ushort)index, (ushort)length, buffer);
             }
             catch (API.APIException e)
             {
@@ -283,22 +301,20 @@ namespace MadWizard.WinUSBNet
             CheckNotDisposed();
             CheckControlParams(value, index, buffer, length);
 
-            USBAsyncResult result = new USBAsyncResult(userCallback, stateObject);
+            USBAsyncResult result = new(userCallback, stateObject);
 
             try
             {
-                _wuDevice.ControlTransferOverlapped(requestType, request, (ushort)value, (ushort)index, (ushort)length, buffer, result);
+                InternalDevice.ControlTransferOverlapped(requestType, request, (ushort)value, (ushort)index, (ushort)length, buffer, result);
             }
             catch (API.APIException e)
             {
-                if (result != null)
-                    result.Dispose();
+                result?.Dispose();
                 throw new USBException("Asynchronous control transfer failed", e);
             }
             catch (Exception)
             {
-                if (result != null)
-                    result.Dispose();
+                result?.Dispose();
                 throw;
             }
             return result;
@@ -331,7 +347,6 @@ namespace MadWizard.WinUSBNet
             return BeginControlTransfer(requestType, request, value, index, buffer, buffer.Length, userCallback, stateObject);
         }
 
-
         /// <summary>
         /// Waits for a pending asynchronous control transfer to complete.
         /// </summary>
@@ -346,19 +361,28 @@ namespace MadWizard.WinUSBNet
         public int EndControlTransfer(IAsyncResult asyncResult)
         {
             if (asyncResult == null)
+            {
                 throw new NullReferenceException("asyncResult cannot be null");
+            }
+
             if (!(asyncResult is USBAsyncResult))
+            {
                 throw new ArgumentException("AsyncResult object was not created by calling one of the BeginControl* methods on this class.");
+            }
 
             // todo: check duplicate end control
             USBAsyncResult result = (USBAsyncResult)asyncResult;
             try
             {
                 if (!result.IsCompleted)
+                {
                     result.AsyncWaitHandle.WaitOne();
+                }
 
                 if (result.Error != null)
+                {
                     throw new USBException("Asynchronous control transfer from pipe has failed.", result.Error);
+                }
 
                 return result.BytesTransfered;
             }
@@ -366,10 +390,8 @@ namespace MadWizard.WinUSBNet
             {
                 result.Dispose();
             }
-
         }
 
-
         /// <summary>
         /// Initiates a control transfer over the default control endpoint. This method allows both IN and OUT direction transfers, depending
         /// on the highest bit of the <paramref name="requestType"/> parameter). Alternatively, <see cref="ControlIn(byte,byte,int,int,byte[])"/> and
@@ -402,19 +424,23 @@ namespace MadWizard.WinUSBNet
         public void ControlTransfer(byte requestType, byte request, int value, int index)
         {
             // TODO: null instead of empty buffer. But overlapped code would have to be fixed for this (no buffer to pin)
-            ControlTransfer(requestType, request, value, index, new byte[0], 0);
+            ControlTransfer(requestType, request, value, index, Array.Empty<byte>(), 0);
         }
 
         private void CheckIn(byte requestType)
         {
             if ((requestType & 0x80) == 0) // Host to device?
+            {
                 throw new ArgumentException("Request type is not IN.");
+            }
         }
 
         private void CheckOut(byte requestType)
         {
             if ((requestType & 0x80) == 0x80) // Device to host?
+            {
                 throw new ArgumentException("Request type is not OUT.");
+            }
         }
 
         /// <summary>
@@ -445,7 +471,6 @@ namespace MadWizard.WinUSBNet
             return buffer;
         }
 
-
         /// <summary>
         /// Initiates a control transfer over the default control endpoint. The request should have an IN direction (specified by the highest bit
         /// of the <paramref name="requestType"/> parameter).
@@ -493,7 +518,7 @@ namespace MadWizard.WinUSBNet
         {
             CheckIn(requestType);
             // TODO: null instead of empty buffer. But overlapped code would have to be fixed for this (no buffer to pin)
-            ControlTransfer(requestType, request, value, index, new byte[0]);
+            ControlTransfer(requestType, request, value, index, Array.Empty<byte>());
         }
 
         /// <summary>
@@ -541,11 +566,9 @@ namespace MadWizard.WinUSBNet
         {
             CheckOut(requestType);
             // TODO: null instead of empty buffer. But overlapped code would have to be fixed for this (no buffer to pin)
-            ControlTransfer(requestType, request, value, index, new byte[0]);
+            ControlTransfer(requestType, request, value, index, Array.Empty<byte>());
         }
 
-
-
         /// <summary>
         /// Initiates an asynchronous control transfer without a data stage over the default control endpoint. This method allows both IN and OUT direction transfers, depending
         /// on the highest bit of the <paramref name="requestType"/> parameter. Alternatively, <see cref="BeginControlIn(byte,byte,int,int,byte[],int,AsyncCallback,object)"/> and
@@ -568,11 +591,9 @@ namespace MadWizard.WinUSBNet
         public IAsyncResult BeginControlTransfer(byte requestType, byte request, int value, int index, AsyncCallback userCallback, object stateObject)
         {
             // TODO: null instead of empty buffer. But overlapped code would have to be fixed for this (no buffer to pin)
-            return BeginControlTransfer(requestType, request, value, index, new byte[0], 0, userCallback, stateObject);
+            return BeginControlTransfer(requestType, request, value, index, Array.Empty<byte>(), 0, userCallback, stateObject);
         }
 
-
-
         /// <summary>
         /// Initiates an asynchronous control transfer over the default control endpoint.  The request should have an IN direction (specified by the highest bit
         /// of the <paramref name="requestType"/> parameter).</summary>
@@ -711,14 +732,15 @@ namespace MadWizard.WinUSBNet
         {
             CheckOut(requestType);
             // TODO: null instead of empty buffer. But overlapped code would have to be fixed for this (no buffer to pin)
-            return BeginControlTransfer(requestType, request, value, index, new byte[0], userCallback, stateObject);
+            return BeginControlTransfer(requestType, request, value, index, Array.Empty<byte>(), userCallback, stateObject);
         }
 
-
         private void CheckNotDisposed()
         {
             if (_disposed)
+            {
                 throw new ObjectDisposedException("USB device object has been disposed.");
+            }
         }
 
         /// <summary>
@@ -766,8 +788,9 @@ namespace MadWizard.WinUSBNet
         {
             API.DeviceDetails[] detailList = API.DeviceManagement.FindDevicesFromGuid(guid);
             if (detailList.Length == 0)
+            {
                 return null;
-
+            }
 
             return new USBDevice(detailList[0].DevicePath);
         }
@@ -781,7 +804,6 @@ namespace MadWizard.WinUSBNet
         /// no device with the given GUID could be found null is returned.</returns>
         public static USBDevice GetSingleDevice(string guidString)
         {
-
             return USBDevice.GetSingleDevice(new Guid(guidString));
         }
 
@@ -790,7 +812,7 @@ namespace MadWizard.WinUSBNet
             try
             {
                 USBDeviceDescriptor descriptor;
-                using (API.WinUSBDevice wuDevice = new API.WinUSBDevice())
+                using (API.WinUSBDevice wuDevice = new())
                 {
                     wuDevice.OpenDevice(devicePath);
                     API.USB_DEVICE_DESCRIPTOR deviceDesc = wuDevice.GetDeviceDescriptor();
@@ -799,7 +821,9 @@ namespace MadWizard.WinUSBNet
                     ushort[] langIDs = wuDevice.GetSupportedLanguageIDs();
                     ushort langID = 0;
                     if (langIDs.Length > 0)
+                    {
                         langID = langIDs[0];
+                    }
 
                     string manufacturer = null, product = null, serialNumber = null;
                     byte idx = 0;
@@ -808,7 +832,9 @@ namespace MadWizard.WinUSBNet
                     {
                         idx = deviceDesc.iManufacturer;
                         if (idx > 0)
+                        {
                             manufacturer = wuDevice.GetStringDescriptor(idx, langID);
+                        }
                     }
                     catch { }
 
@@ -816,7 +842,9 @@ namespace MadWizard.WinUSBNet
                     {
                         idx = deviceDesc.iProduct;
                         if (idx > 0)
+                        {
                             product = wuDevice.GetStringDescriptor(idx, langID);
+                        }
                     }
                     catch { }
 
@@ -824,20 +852,20 @@ namespace MadWizard.WinUSBNet
                     {
                         idx = deviceDesc.iSerialNumber;
                         if (idx > 0)
+                        {
                             serialNumber = wuDevice.GetStringDescriptor(idx, langID);
+                        }
                     }
                     catch { }
 
                     descriptor = new USBDeviceDescriptor(devicePath, deviceDesc, manufacturer, product, serialNumber);
                 }
                 return descriptor;
-
             }
             catch (API.APIException e)
             {
                 throw new USBException("Failed to retrieve device descriptor.", e);
             }
         }
-
     }
 }
diff --git a/WinUSBNet/USBDeviceDescriptor.cs b/WinUSBNet/USBDeviceDescriptor.cs
index 94c87ab..99998f2 100644
--- a/WinUSBNet/USBDeviceDescriptor.cs
+++ b/WinUSBNet/USBDeviceDescriptor.cs
@@ -17,33 +17,32 @@ namespace MadWizard.WinUSBNet
         /// <summary>
         /// Windows path name for the USB device
         /// </summary>
-        public string PathName { get; private set; }
+        public string PathName { get; }
 
         /// <summary>
         /// USB vendor ID (VID) of the device
         /// </summary>
-        public int VID { get; private set; }
+        public int VID { get; }
 
         /// <summary>
         /// USB product ID (PID) of the device
         /// </summary>
-        public int PID { get; private set; }
+        public int PID { get; }
 
         /// <summary>
         /// Manufacturer name, or null if not available
         /// </summary>
-        public string Manufacturer { get; private set; }
+        public string Manufacturer { get; }
 
         /// <summary>
         /// Product name, or null if not available
         /// </summary>
-        public string Product { get; private set; }
+        public string Product { get; }
 
         /// <summary>
         /// Device serial number, or null if not available
         /// </summary>
-        public string SerialNumber { get; private set; }
-
+        public string SerialNumber { get; }
 
         /// <summary>
         /// Friendly device name, or path name when no
@@ -54,13 +53,21 @@ namespace MadWizard.WinUSBNet
             get
             {
                 if (Manufacturer != null && Product != null)
+                {
                     return Product + " - " + Manufacturer;
+                }
                 else if (Product != null)
+                {
                     return Product;
+                }
                 else if (SerialNumber != null)
+                {
                     return SerialNumber;
+                }
                 else
+                {
                     return PathName;
+                }
             }
         }
 
@@ -72,7 +79,6 @@ namespace MadWizard.WinUSBNet
         public byte ClassValue
         {
             get;
-            private set;
         }
 
         /// <summary>
@@ -81,7 +87,6 @@ namespace MadWizard.WinUSBNet
         public byte SubClass
         {
             get;
-            private set;
         }
 
         /// <summary>
@@ -90,7 +95,6 @@ namespace MadWizard.WinUSBNet
         public byte Protocol
         {
             get;
-            private set;
         }
 
         /// <summary>
@@ -101,7 +105,6 @@ namespace MadWizard.WinUSBNet
         public USBBaseClass BaseClass
         {
             get;
-            private set;
         }
 
         internal USBDeviceDescriptor(string path, API.USB_DEVICE_DESCRIPTOR deviceDesc, string manufacturer, string product, string serialNumber)
@@ -113,7 +116,6 @@ namespace MadWizard.WinUSBNet
             Product = product;
             SerialNumber = serialNumber;
 
-
             ClassValue = deviceDesc.bDeviceClass;
             SubClass = deviceDesc.bDeviceSubClass;
             Protocol = deviceDesc.bDeviceProtocol;
@@ -123,11 +125,8 @@ namespace MadWizard.WinUSBNet
             BaseClass = USBBaseClass.Unknown;
             if (Enum.IsDefined(typeof(USBBaseClass), (int)deviceDesc.bDeviceClass))
             {
-                BaseClass = (USBBaseClass)(int)deviceDesc.bDeviceClass;
+                BaseClass = (USBBaseClass)deviceDesc.bDeviceClass;
             }
-
-
-
         }
     }
 }
diff --git a/WinUSBNet/USBDeviceInfo.cs b/WinUSBNet/USBDeviceInfo.cs
index 4733461..42fe250 100644
--- a/WinUSBNet/USBDeviceInfo.cs
+++ b/WinUSBNet/USBDeviceInfo.cs
@@ -87,6 +87,5 @@ namespace MadWizard.WinUSBNet
         {
             _details = details;
         }
-
     }
 }
diff --git a/WinUSBNet/USBInterface.cs b/WinUSBNet/USBInterface.cs
index 8a208ea..c9c9e5b 100644
--- a/WinUSBNet/USBInterface.cs
+++ b/WinUSBNet/USBInterface.cs
@@ -20,7 +20,6 @@ namespace MadWizard.WinUSBNet
         public USBPipeCollection Pipes
         {
             get;
-            private set;
         }
 
         /// <summary>
@@ -29,7 +28,6 @@ namespace MadWizard.WinUSBNet
         public int Number
         {
             get;
-            private set;
         }
 
         /// <summary>
@@ -38,7 +36,6 @@ namespace MadWizard.WinUSBNet
         public USBDevice Device
         {
             get;
-            private set;
         }
 
         /// <summary>
@@ -47,7 +44,6 @@ namespace MadWizard.WinUSBNet
         public USBPipe InPipe
         {
             get;
-            private set;
         }
 
         /// <summary>
@@ -56,7 +52,6 @@ namespace MadWizard.WinUSBNet
         public USBPipe OutPipe
         {
             get;
-            private set;
         }
 
         /// <summary>
@@ -67,7 +62,6 @@ namespace MadWizard.WinUSBNet
         public USBBaseClass BaseClass
         {
             get;
-            private set;
         }
 
         /// <summary>
@@ -78,7 +72,6 @@ namespace MadWizard.WinUSBNet
         public byte ClassValue
         {
             get;
-            private set;
         }
 
         /// <summary>
@@ -87,7 +80,6 @@ namespace MadWizard.WinUSBNet
         public byte SubClass
         {
             get;
-            private set;
         }
 
         /// <summary>
@@ -96,7 +88,6 @@ namespace MadWizard.WinUSBNet
         public byte Protocol
         {
             get;
-            private set;
         }
 
         /// Zero based interface index in WinUSB.
@@ -106,7 +97,6 @@ namespace MadWizard.WinUSBNet
         internal int InterfaceIndex
         {
             get;
-            private set;
         }
 
         internal USBInterface(USBDevice device, int interfaceIndex, API.USB_INTERFACE_DESCRIPTOR rawDesc, USBPipeCollection pipes)
@@ -124,10 +114,9 @@ namespace MadWizard.WinUSBNet
             BaseClass = USBBaseClass.Unknown;
             if (Enum.IsDefined(typeof(USBBaseClass), (int)rawDesc.bInterfaceClass))
             {
-                BaseClass = (USBBaseClass)(int)rawDesc.bInterfaceClass;
+                BaseClass = (USBBaseClass)rawDesc.bInterfaceClass;
             }
 
-
             Device = device;
             Pipes = pipes;
 
@@ -139,12 +128,15 @@ namespace MadWizard.WinUSBNet
 
                 // If first in or out pipe, set InPipe and OutPipe
                 if (pipe.IsIn && InPipe == null)
+                {
                     InPipe = pipe;
+                }
+
                 if (pipe.IsOut && OutPipe == null)
+                {
                     OutPipe = pipe;
-
+                }
             }
-
         }
     }
 }
diff --git a/WinUSBNet/USBInterfaceCollection.cs b/WinUSBNet/USBInterfaceCollection.cs
index 9d6533f..356d071 100644
--- a/WinUSBNet/USBInterfaceCollection.cs
+++ b/WinUSBNet/USBInterfaceCollection.cs
@@ -16,7 +16,7 @@ namespace MadWizard.WinUSBNet
     /// </summary>
     public class USBInterfaceCollection : IEnumerable<USBInterface>
     {
-        private USBInterface[] _interfaces;
+        private readonly USBInterface[] _interfaces;
 
         internal USBInterfaceCollection(USBInterface[] interfaces)
         {
@@ -26,7 +26,7 @@ namespace MadWizard.WinUSBNet
         private class USBInterfaceEnumerator : IEnumerator<USBInterface>
         {
             private int _index;
-            private USBInterface[] _interfaces;
+            private readonly USBInterface[] _interfaces;
 
             public USBInterfaceEnumerator(USBInterface[] interfaces)
             {
@@ -44,7 +44,6 @@ namespace MadWizard.WinUSBNet
                 {
                     return _interfaces[_index];
                 }
-
                 catch (IndexOutOfRangeException)
                 {
                     throw new InvalidOperationException();
@@ -59,7 +58,6 @@ namespace MadWizard.WinUSBNet
                 }
             }
 
-
             object IEnumerator.Current
             {
                 get
@@ -81,7 +79,7 @@ namespace MadWizard.WinUSBNet
         }
 
         /// <summary>
-        /// Finds the first interface with that matches the device class 
+        /// Finds the first interface with that matches the device class
         /// given by the <paramref name="interfaceClass"/> parameter.
         /// </summary>
         /// <param name="interfaceClass">The device class the interface should match</param>
@@ -93,26 +91,30 @@ namespace MadWizard.WinUSBNet
             {
                 USBInterface iface = _interfaces[i];
                 if (iface.BaseClass == interfaceClass)
+                {
                     return iface;
+                }
             }
             return null;
         }
 
         /// <summary>
-        /// Finds all interfaces matching the device class given by the 
+        /// Finds all interfaces matching the device class given by the
         /// <paramref name="interfaceClass"/> parameter.
         /// </summary>
         /// <param name="interfaceClass">The device class the interface should match</param>
-        /// <returns>An array of USBInterface objects matching the device class, or an empty 
+        /// <returns>An array of USBInterface objects matching the device class, or an empty
         /// array if no interface matches.</returns>
         public USBInterface[] FindAll(USBBaseClass interfaceClass)
         {
-            List<USBInterface> matchingInterfaces = new List<USBInterface>();
+            List<USBInterface> matchingInterfaces = new();
             for (int i = 0; i < _interfaces.Length; i++)
             {
                 USBInterface iface = _interfaces[i];
                 if (iface.BaseClass == interfaceClass)
+                {
                     matchingInterfaces.Add(iface);
+                }
             }
             return matchingInterfaces.ToArray();
         }
@@ -141,7 +143,9 @@ namespace MadWizard.WinUSBNet
                 {
                     USBInterface iface = _interfaces[i];
                     if (iface.Number == interfaceNumber)
+                    {
                         return iface;
+                    }
                 }
                 throw new IndexOutOfRangeException(string.Format("No interface with number {0} exists.", interfaceNumber));
             }
diff --git a/WinUSBNet/USBNotifier.cs b/WinUSBNet/USBNotifier.cs
index d6d7e78..c2ff07d 100644
--- a/WinUSBNet/USBNotifier.cs
+++ b/WinUSBNet/USBNotifier.cs
@@ -66,15 +66,15 @@ namespace MadWizard.WinUSBNet
     /// </summary>
     public class USBNotifier : IDisposable
     {
-        private DeviceNotifyHook _hook;
+        private readonly DeviceNotifyHook _hook;
         private Guid _guid;
-        private WPinternals.AsyncAutoResetEvent NodeChangeEvent = new WPinternals.AsyncAutoResetEvent(false);
+        private readonly WPinternals.AsyncAutoResetEvent NodeChangeEvent = new(false);
 
         /// <summary>
         /// Event triggered when a new USB device that matches the USBNotifier's GUID is connected
         /// </summary>
-        private event USBEventHandler _Arrival;
-        public event USBEventHandler Arrival
+        private event EventHandler<USBEvent> _Arrival;
+        public event EventHandler<USBEvent> Arrival
         {
             // Heathcliff74 - Also notify currently connected USB devices
             add
@@ -83,7 +83,9 @@ namespace MadWizard.WinUSBNet
                 _Arrival += value;
                 USBDeviceInfo[] Devices = USBDevice.GetDevices(Guid);
                 foreach (USBDeviceInfo Device in Devices)
+                {
                     _Arrival(this, new USBEvent(USBEventType.DeviceArrival, Guid, Device.DevicePath));
+                }
             }
             remove
             {
@@ -94,7 +96,7 @@ namespace MadWizard.WinUSBNet
         /// <summary>
         /// Event triggered when a new USB device that matches the USBNotifier's GUID  is disconnected
         /// </summary>
-        public event USBEventHandler Removal;
+        public event EventHandler<USBEvent> Removal;
 
         /// <summary>
         /// The interface GUID of devices this USBNotifier will watch
@@ -121,7 +123,6 @@ namespace MadWizard.WinUSBNet
             // Handled in other constructor
         }
 
-
         /// <summary>
         /// Constructs a new USBNotifier that will watch for events on
         /// devices matching the given interface GUID. A Windows Forms control
@@ -142,8 +143,7 @@ namespace MadWizard.WinUSBNet
         /// <param name="devicePath">Device pathname of the device that has been connected</param>
         protected void OnArrival(string devicePath)
         {
-            if (_Arrival != null)
-                _Arrival(this, new USBEvent(USBEventType.DeviceArrival, _guid, devicePath));
+            _Arrival?.Invoke(this, new USBEvent(USBEventType.DeviceArrival, _guid, devicePath));
         }
         /// <summary>
         /// Triggers the removal event
@@ -151,14 +151,15 @@ namespace MadWizard.WinUSBNet
         /// <param name="devicePath">Device pathname of the device that has been connected</param>
         protected void OnRemoval(string devicePath)
         {
-            if (Removal != null)
-                Removal(this, new USBEvent(USBEventType.DeviceRemoval, _guid, devicePath));
+            Removal?.Invoke(this, new USBEvent(USBEventType.DeviceRemoval, _guid, devicePath));
         }
 
         internal int HandleDeviceChange(int msg, IntPtr wParam, IntPtr lParam)
         {
             if (msg != API.DeviceManagement.WM_DEVICECHANGE)
+            {
                 throw new USBException("Invalid device change message."); // should not happen
+            }
 
             //switch ((int)wParam)
             //{
@@ -183,14 +184,18 @@ namespace MadWizard.WinUSBNet
             {
                 string devName = API.DeviceManagement.GetNotifyMessageDeviceName(lParam, _guid);
                 if (devName != null)
+                {
                     OnArrival(devName);
+                }
             }
 
             if ((int)wParam == API.DeviceManagement.DBT_DEVICEREMOVECOMPLETE)
             {
                 string devName = API.DeviceManagement.GetNotifyMessageDeviceName(lParam, _guid);
                 if (devName != null)
+                {
                     OnRemoval(devName);
+                }
             }
 
             if ((int)wParam == API.DeviceManagement.DBT_DEVNODES_CHANGED)
@@ -232,6 +237,5 @@ namespace MadWizard.WinUSBNet
                 _hook.Dispose();
             }
         }
-
     }
 }
diff --git a/WinUSBNet/USBPipe.cs b/WinUSBNet/USBPipe.cs
index f59e09d..2911f12 100644
--- a/WinUSBNet/USBPipe.cs
+++ b/WinUSBNet/USBPipe.cs
@@ -17,7 +17,6 @@ namespace MadWizard.WinUSBNet
     {
         private API.WINUSB_PIPE_INFORMATION _pipeInfo;
         private USBInterface _interface = null;
-        private USBDevice _device;
         private USBPipePolicy _policy;
 
         private byte[] LastWritten = null;
@@ -36,13 +35,7 @@ namespace MadWizard.WinUSBNet
         /// <summary>
         /// The USBDevice this pipe is associated with
         /// </summary>
-        public USBDevice Device
-        {
-            get
-            {
-                return _device;
-            }
-        }
+        public USBDevice Device { get; }
 
         /// <summary>
         /// Maximum packet size for transfers on this endpoint
@@ -122,9 +115,7 @@ namespace MadWizard.WinUSBNet
 
             try
             {
-                uint bytesRead;
-
-                _device.InternalDevice.ReadPipe(Interface.InterfaceIndex, _pipeInfo.PipeId, buffer, offset, length, out bytesRead);
+                Device.InternalDevice.ReadPipe(Interface.InterfaceIndex, _pipeInfo.PipeId, buffer, offset, length, out uint bytesRead);
 
                 return (int)bytesRead;
             }
@@ -139,30 +130,44 @@ namespace MadWizard.WinUSBNet
         private void CheckReadParams(byte[] buffer, int offset, int length)
         {
             if (!IsIn)
+            {
                 // throw new ArgumentOutOfRangeException("Offset of data to read is outside the buffer boundaries.");
                 LogAndThrowException(new ArgumentOutOfRangeException("Offset of data to read is outside the buffer boundaries."));
+            }
 
             int bufferLength = buffer.Length;
             if (offset < 0 || offset >= bufferLength)
+            {
                 // throw new ArgumentOutOfRangeException(nameof(offset), "Offset of data to read is outside the buffer boundaries.");
                 LogAndThrowException(new ArgumentOutOfRangeException("Offset of data to read is outside the buffer boundaries."));
+            }
+
             if (length < 0 || (offset + length) > bufferLength)
+            {
                 // throw new ArgumentOutOfRangeException(nameof(length), "Length of data to read is outside the buffer boundaries.");
                 LogAndThrowException(new ArgumentOutOfRangeException("Length of data to read is outside the buffer boundaries."));
+            }
         }
         private void CheckWriteParams(byte[] buffer, int offset, int length)
         {
             if (!IsOut)
+            {
                 //throw new NotSupportedException("Cannot write to a pipe with IN direction.");
                 LogAndThrowException(new NotSupportedException("Cannot write to a pipe with IN direction."));
+            }
 
             int bufferLength = buffer.Length;
             if (offset < 0 || offset >= bufferLength)
+            {
                 // throw new ArgumentOutOfRangeException(nameof(offset), "Offset of data to write is outside the buffer boundaries.");
                 LogAndThrowException(new ArgumentOutOfRangeException("Offset of data to write is outside the buffer boundaries."));
+            }
+
             if (length < 0 || (offset + length) > bufferLength)
+            {
                 // throw new ArgumentOutOfRangeException(nameof(length), "Length of data to write is outside the buffer boundaries.");
                 LogAndThrowException(new ArgumentOutOfRangeException("Length of data to write is outside the buffer boundaries."));
+            }
         }
 
         /// <summary>Initiates an asynchronous read operation on the pipe. </summary>
@@ -182,10 +187,10 @@ namespace MadWizard.WinUSBNet
         {
             CheckReadParams(buffer, offset, length);
 
-            USBAsyncResult result = new USBAsyncResult(userCallback, stateObject);
+            USBAsyncResult result = new(userCallback, stateObject);
             try
             {
-                _device.InternalDevice.ReadPipeOverlapped(Interface.InterfaceIndex, _pipeInfo.PipeId, buffer, offset, length, result);
+                Device.InternalDevice.ReadPipeOverlapped(Interface.InterfaceIndex, _pipeInfo.PipeId, buffer, offset, length, result);
             }
             catch (API.APIException e)
             {
@@ -195,8 +200,7 @@ namespace MadWizard.WinUSBNet
             }
             catch (Exception e)
             {
-                if (result != null)
-                    result.Dispose();
+                result?.Dispose();
                 // throw;
                 LogException(e);
                 throw;
@@ -218,22 +222,31 @@ namespace MadWizard.WinUSBNet
         public int EndRead(IAsyncResult asyncResult)
         {
             if (asyncResult == null)
+            {
                 // throw new NullReferenceException("asyncResult cannot be null");
                 LogAndThrowException(new NullReferenceException("asyncResult cannot be null"));
+            }
+
             if (!(asyncResult is USBAsyncResult))
+            {
                 // throw new ArgumentException("AsyncResult object was not created by calling BeginRead on this class.");
                 LogAndThrowException(new ArgumentException("AsyncResult object was not created by calling BeginRead on this class."));
+            }
 
             // todo: check duplicate end reads?
             USBAsyncResult result = (USBAsyncResult)asyncResult;
             try
             {
                 if (!result.IsCompleted)
+                {
                     result.AsyncWaitHandle.WaitOne();
+                }
 
                 if (result.Error != null)
+                {
                     // throw new USBException("Asynchronous read from pipe has failed.", result.Error);
                     LogAndThrowException(new USBException("Asynchronous read from pipe has failed.", result.Error));
+                }
 
                 return result.BytesTransfered;
             }
@@ -241,7 +254,6 @@ namespace MadWizard.WinUSBNet
             {
                 result.Dispose();
             }
-
         }
 
         /// <summary>
@@ -267,12 +279,12 @@ namespace MadWizard.WinUSBNet
 
             try
             {
-                _device.InternalDevice.WritePipe(Interface.InterfaceIndex, _pipeInfo.PipeId, buffer, offset, length);
+                Device.InternalDevice.WritePipe(Interface.InterfaceIndex, _pipeInfo.PipeId, buffer, offset, length);
             }
             catch (API.APIException e)
             {
-                byte[] SubBuffer = new byte[(length < 16 ? length : 16)];
-                Array.Copy(buffer, offset, SubBuffer, 0, (length < 16 ? length : 16));
+                byte[] SubBuffer = new byte[length < 16 ? length : 16];
+                Array.Copy(buffer, offset, SubBuffer, 0, length < 16 ? length : 16);
                 // throw new USBException("Failed to write to pipe: " + WPinternals.Converter.ConvertHexToString(SubBuffer, ""), e);
                 LogAndThrowException(new USBException("Failed to write to pipe: " + WPinternals.Converter.ConvertHexToString(SubBuffer, ""), e));
             }
@@ -297,25 +309,23 @@ namespace MadWizard.WinUSBNet
 
             LogLastWrite(buffer, offset, length);
 
-            USBAsyncResult result = new USBAsyncResult(userCallback, stateObject);
+            USBAsyncResult result = new(userCallback, stateObject);
             try
             {
-                _device.InternalDevice.WriteOverlapped(Interface.InterfaceIndex, _pipeInfo.PipeId, buffer, offset, length, result);
+                Device.InternalDevice.WriteOverlapped(Interface.InterfaceIndex, _pipeInfo.PipeId, buffer, offset, length, result);
             }
             catch (API.APIException e)
             {
-                if (result != null)
-                    result.Dispose();
+                result?.Dispose();
 
-                byte[] SubBuffer = new byte[(length < 16 ? length : 16)];
-                Array.Copy(buffer, offset, SubBuffer, 0, (length < 16 ? length : 16));
+                byte[] SubBuffer = new byte[length < 16 ? length : 16];
+                Array.Copy(buffer, offset, SubBuffer, 0, length < 16 ? length : 16);
                 // throw new USBException("Failed to write to pipe: " + WPinternals.Converter.ConvertHexToString(SubBuffer, ""), e);
                 LogAndThrowException(new USBException("Failed to write to pipe: " + WPinternals.Converter.ConvertHexToString(SubBuffer, ""), e));
             }
             catch (Exception e)
             {
-                if (result != null)
-                    result.Dispose();
+                result?.Dispose();
                 // throw;
                 LogException(e);
                 throw;
@@ -337,11 +347,16 @@ namespace MadWizard.WinUSBNet
         public void EndWrite(IAsyncResult asyncResult)
         {
             if (asyncResult == null)
+            {
                 // throw new NullReferenceException("asyncResult cannot be null");
                 LogAndThrowException(new NullReferenceException("asyncResult cannot be null"));
+            }
+
             if (!(asyncResult is USBAsyncResult))
+            {
                 // throw new ArgumentException("AsyncResult object was not created by calling BeginWrite on this class.");
                 LogAndThrowException(new ArgumentException("AsyncResult object was not created by calling BeginWrite on this class."));
+            }
 
             USBAsyncResult result = (USBAsyncResult)asyncResult;
             try
@@ -349,11 +364,15 @@ namespace MadWizard.WinUSBNet
                 // todo: check duplicate end writes?
 
                 if (!result.IsCompleted)
+                {
                     result.AsyncWaitHandle.WaitOne();
+                }
 
                 if (result.Error != null)
+                {
                     // throw new USBException("Asynchronous write to pipe has failed.", result.Error);
                     LogAndThrowException(new USBException("Asynchronous write to pipe has failed.", result.Error));
+                }
             }
             finally
             {
@@ -368,7 +387,7 @@ namespace MadWizard.WinUSBNet
         {
             try
             {
-                _device.InternalDevice.AbortPipe(Interface.InterfaceIndex, _pipeInfo.PipeId);
+                Device.InternalDevice.AbortPipe(Interface.InterfaceIndex, _pipeInfo.PipeId);
             }
             catch (API.APIException e)
             {
@@ -384,7 +403,7 @@ namespace MadWizard.WinUSBNet
         {
             try
             {
-                _device.InternalDevice.ResetPipe(Interface.InterfaceIndex, _pipeInfo.PipeId);
+                Device.InternalDevice.ResetPipe(Interface.InterfaceIndex, _pipeInfo.PipeId);
             }
             catch (API.APIException e)
             {
@@ -399,10 +418,13 @@ namespace MadWizard.WinUSBNet
         public void Flush()
         {
             if (!IsIn)
+            {
                 throw new NotSupportedException("Flush is only supported on IN direction pipes");
+            }
+
             try
             {
-                _device.InternalDevice.FlushPipe(Interface.InterfaceIndex, _pipeInfo.PipeId);
+                Device.InternalDevice.FlushPipe(Interface.InterfaceIndex, _pipeInfo.PipeId);
             }
             catch (API.APIException e)
             {
@@ -414,7 +436,7 @@ namespace MadWizard.WinUSBNet
         internal USBPipe(USBDevice device, API.WINUSB_PIPE_INFORMATION pipeInfo)
         {
             _pipeInfo = pipeInfo;
-            _device = device;
+            Device = device;
 
             // Policy is not set until interface is attached
             _policy = null;
@@ -425,24 +447,31 @@ namespace MadWizard.WinUSBNet
             _interface = usbInterface;
 
             // Initialize policy now that interface is set (policy requires interface)
-            _policy = new USBPipePolicy(_device, _interface.InterfaceIndex, _pipeInfo.PipeId);
+            _policy = new USBPipePolicy(Device, _interface.InterfaceIndex, _pipeInfo.PipeId);
         }
 
         private void LogException(Exception Ex)
         {
             WPinternals.LogFile.Log("Error on USB port!", WPinternals.LogType.FileOnly);
-            WPinternals.LogFile.Log("Device: " + _device.Descriptor.FullName, WPinternals.LogType.FileOnly);
+            WPinternals.LogFile.Log("Device: " + Device.Descriptor.FullName, WPinternals.LogType.FileOnly);
 
             if (IsIn)
-                LastWritten = _device.OutputPipe.LastWritten;
+            {
+                LastWritten = Device.OutputPipe.LastWritten;
+            }
 
-            if ((LastWritten == null) && (Ex is USBException) && (Ex.InnerException is MadWizard.WinUSBNet.API.APIException) &&
-                (((MadWizard.WinUSBNet.API.APIException)Ex.InnerException).InnerException is System.ComponentModel.Win32Exception) &&
+            if ((LastWritten == null) && (Ex is USBException) && (Ex.InnerException is API.APIException) &&
+                (((API.APIException)Ex.InnerException).InnerException is System.ComponentModel.Win32Exception) &&
                 (((System.ComponentModel.Win32Exception)Ex.InnerException.InnerException).NativeErrorCode == 0X1F))
+            {
                 WPinternals.LogFile.Log("Failed to communicate on new USB connection", WPinternals.LogType.FileAndConsole);
+            }
 
             if (LastWritten != null)
+            {
                 WPinternals.LogFile.Log("Last written: " + WPinternals.Converter.ConvertHexToString(LastWritten, ""), WPinternals.LogType.FileOnly);
+            }
+
             WPinternals.LogFile.LogException(Ex, WPinternals.LogType.FileOnly);
         }
 
@@ -457,5 +486,4 @@ namespace MadWizard.WinUSBNet
             System.Buffer.BlockCopy(Buffer, Offset, LastWritten, 0, LastWritten.Length);
         }
     }
-
 }
\ No newline at end of file
diff --git a/WinUSBNet/USBPipeCollection.cs b/WinUSBNet/USBPipeCollection.cs
index 9f9e9c4..ec5f832 100644
--- a/WinUSBNet/USBPipeCollection.cs
+++ b/WinUSBNet/USBPipeCollection.cs
@@ -16,7 +16,7 @@ namespace MadWizard.WinUSBNet
     /// </summary>
     public class USBPipeCollection : IEnumerable<USBPipe>
     {
-        private Dictionary<byte, USBPipe> _pipes;
+        private readonly Dictionary<byte, USBPipe> _pipes;
 
         internal USBPipeCollection(USBPipe[] pipes)
         {
@@ -24,13 +24,16 @@ namespace MadWizard.WinUSBNet
             foreach (USBPipe pipe in pipes)
             {
                 if (_pipes.ContainsKey(pipe.Address))
+                {
                     throw new USBException("Duplicate pipe address in endpoint.");
+                }
+
                 _pipes[pipe.Address] = pipe;
             }
         }
 
         /// <summary>
-        /// Returns the pipe from the collection with the given pipe address 
+        /// Returns the pipe from the collection with the given pipe address
         /// </summary>
         /// <param name="pipeAddress">Address of the pipe to return</param>
         /// <returns>The pipe with the given pipe address</returns>
@@ -40,9 +43,11 @@ namespace MadWizard.WinUSBNet
         {
             get
             {
-                USBPipe pipe;
-                if (!_pipes.TryGetValue(pipeAddress, out pipe))
+                if (!_pipes.TryGetValue(pipeAddress, out USBPipe pipe))
+                {
                     throw new IndexOutOfRangeException();
+                }
+
                 return pipe;
             }
         }
@@ -50,7 +55,7 @@ namespace MadWizard.WinUSBNet
         private class UsbPipeEnumerator : IEnumerator<USBPipe>
         {
             private int _index;
-            private USBPipe[] _pipes;
+            private readonly USBPipe[] _pipes;
 
             public UsbPipeEnumerator(USBPipe[] pipes)
             {
@@ -68,7 +73,6 @@ namespace MadWizard.WinUSBNet
                 {
                     return _pipes[_index];
                 }
-
                 catch (IndexOutOfRangeException)
                 {
                     throw new InvalidOperationException();
@@ -83,7 +87,6 @@ namespace MadWizard.WinUSBNet
                 }
             }
 
-
             object IEnumerator.Current
             {
                 get
@@ -102,7 +105,6 @@ namespace MadWizard.WinUSBNet
             {
                 _index = -1;
             }
-
         }
 
         private USBPipe[] GetPipeList()
diff --git a/WinUSBNet/USBPipePolicy.cs b/WinUSBNet/USBPipePolicy.cs
index 5032815..32e61d5 100644
--- a/WinUSBNet/USBPipePolicy.cs
+++ b/WinUSBNet/USBPipePolicy.cs
@@ -9,16 +9,14 @@ using System;
 
 namespace MadWizard.WinUSBNet
 {
-
     /// <summary>
     /// Describes the policy for a specific USB pipe
     /// </summary>
     public class USBPipePolicy
     {
-
-        private byte _pipeID;
-        private int _interfaceIndex;
-        private USBDevice _device;
+        private readonly byte _pipeID;
+        private readonly int _interfaceIndex;
+        private readonly USBDevice _device;
 
         internal USBPipePolicy(USBDevice device, int interfaceIndex, byte pipeID)
         {
@@ -27,13 +25,13 @@ namespace MadWizard.WinUSBNet
             _device = device;
         }
 
-
-
         private void RequireDirectionOut()
         {
             // Some policy types only apply specifically to OUT direction pipes
             if ((_pipeID & 0x80) != 0)
+            {
                 throw new NotSupportedException("This policy type is only allowed on OUT direction pipes.");
+            }
         }
 
         private void RequireDirectionIn()
@@ -41,11 +39,13 @@ namespace MadWizard.WinUSBNet
             // Some policy types only apply specifically to IN  direction pipes
             // This function checks for this.
             if ((_pipeID & 0x80) == 0)
+            {
                 throw new NotSupportedException("This policy type is only allowed on IN direction pipes.");
+            }
         }
 
         /// <summary>
-        /// When false, read requests fail when the device returns more data than requested. When true, extra data is 
+        /// When false, read requests fail when the device returns more data than requested. When true, extra data is
         /// saved and returned on the next read. Default value is true. Only available on IN direction pipes.
         /// </summary>
         /// <seealso href="http://msdn.microsoft.com/en-us/library/aa476439.aspx">WinUSB_GetPipePolicy for a more detailed description</seealso>
@@ -90,7 +90,7 @@ namespace MadWizard.WinUSBNet
             get
             {
                 RequireDirectionIn();
-                return _device.InternalDevice.GetPipePolicyBool(_interfaceIndex, _pipeID, API.POLICY_TYPE.AUTO_FLUSH); ;
+                return _device.InternalDevice.GetPipePolicyBool(_interfaceIndex, _pipeID, API.POLICY_TYPE.AUTO_FLUSH);
             }
             set
             {
@@ -108,7 +108,7 @@ namespace MadWizard.WinUSBNet
             get
             {
                 RequireDirectionIn();
-                return _device.InternalDevice.GetPipePolicyBool(_interfaceIndex, _pipeID, API.POLICY_TYPE.IGNORE_SHORT_PACKETS); ;
+                return _device.InternalDevice.GetPipePolicyBool(_interfaceIndex, _pipeID, API.POLICY_TYPE.IGNORE_SHORT_PACKETS);
             }
             set
             {
@@ -131,23 +131,26 @@ namespace MadWizard.WinUSBNet
             set
             {
                 if (value < 0)
+                {
                     throw new ArgumentOutOfRangeException("Pipe transfer timeout cannot be negative.");
+                }
+
                 _device.InternalDevice.SetPipePolicy(_interfaceIndex, _pipeID, API.POLICY_TYPE.PIPE_TRANSFER_TIMEOUT, (uint)value);
             }
         }
 
         /// <summary>
-        /// When true, read and write operations to the pipe must have a buffer length that is a multiple of the maximum endpoint packet size, 
+        /// When true, read and write operations to the pipe must have a buffer length that is a multiple of the maximum endpoint packet size,
         /// and the length must be less than the maximum transfer size. With these conditions met, data is sent directly to the USB driver stack,
-        /// bypassing the queuing and error handling of WinUSB. 
-        /// Default value is false. 
+        /// bypassing the queuing and error handling of WinUSB.
+        /// Default value is false.
         /// </summary>
         /// <seealso href="http://msdn.microsoft.com/en-us/library/aa476439.aspx">WinUSB_GetPipePolicy for a more detailed description</seealso>
         public bool RawIO
         {
             get
             {
-                return _device.InternalDevice.GetPipePolicyBool(_interfaceIndex, _pipeID, API.POLICY_TYPE.RAW_IO); ;
+                return _device.InternalDevice.GetPipePolicyBool(_interfaceIndex, _pipeID, API.POLICY_TYPE.RAW_IO);
             }
             set
             {
@@ -156,7 +159,7 @@ namespace MadWizard.WinUSBNet
         }
 
         /// <summary>
-        /// When true, every write request that is a multiple of the maximum packet size for the endpoint is terminated with a zero-length packet. 
+        /// When true, every write request that is a multiple of the maximum packet size for the endpoint is terminated with a zero-length packet.
         /// Default value is false. Only available on OUT direction pipes.
         /// </summary>
         /// <seealso href="http://msdn.microsoft.com/en-us/library/aa476439.aspx">WinUSB_GetPipePolicy for a more detailed description</seealso>
@@ -165,7 +168,7 @@ namespace MadWizard.WinUSBNet
             get
             {
                 RequireDirectionOut();
-                return _device.InternalDevice.GetPipePolicyBool(_interfaceIndex, _pipeID, API.POLICY_TYPE.SHORT_PACKET_TERMINATE); ;
+                return _device.InternalDevice.GetPipePolicyBool(_interfaceIndex, _pipeID, API.POLICY_TYPE.SHORT_PACKET_TERMINATE);
             }
             set
             {
@@ -173,6 +176,5 @@ namespace MadWizard.WinUSBNet
                 _device.InternalDevice.SetPipePolicy(_interfaceIndex, _pipeID, API.POLICY_TYPE.SHORT_PACKET_TERMINATE, value);
             }
         }
-
     }
 }