diff --git a/BurnOutSharp/IPathCheck.cs b/BurnOutSharp/IPathCheck.cs
index 461ff5b1..7638bb07 100644
--- a/BurnOutSharp/IPathCheck.cs
+++ b/BurnOutSharp/IPathCheck.cs
@@ -8,9 +8,9 @@ namespace BurnOutSharp
         /// Check a path for protections based on file and directory names
         /// </summary>
         /// <param name="path">Path to check for protection indicators</param>
-        /// <param name="files">Enumerable of strings representing files in a directory if the path is a directory, assumed null otherwise</param>
         /// <param name="isDirectory">True if the path represents a directory, false otherwise</param>
+        /// <param name="files">Enumerable of strings representing files in a directory if the path is a directory, assumed null otherwise</param>
         /// <returns>String containing any protections found in the path</returns>
-        string CheckPath(string path, IEnumerable<string> files, bool isDirectory);
+        string CheckPath(string path, bool isDirectory, IEnumerable<string> files);
     }
 }
diff --git a/BurnOutSharp/ProtectionType/AACS.cs b/BurnOutSharp/ProtectionType/AACS.cs
index 1948ba23..09feb3d6 100644
--- a/BurnOutSharp/ProtectionType/AACS.cs
+++ b/BurnOutSharp/ProtectionType/AACS.cs
@@ -8,7 +8,7 @@ namespace BurnOutSharp.ProtectionType
     public class AACS : IPathCheck
     {
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/AlphaDVD.cs b/BurnOutSharp/ProtectionType/AlphaDVD.cs
index edcc3d9d..3f4ffca0 100644
--- a/BurnOutSharp/ProtectionType/AlphaDVD.cs
+++ b/BurnOutSharp/ProtectionType/AlphaDVD.cs
@@ -8,7 +8,7 @@ namespace BurnOutSharp.ProtectionType
     public class AlphaDVD : IPathCheck
     {
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/Bitpool.cs b/BurnOutSharp/ProtectionType/Bitpool.cs
index d3c565e7..29e03bdd 100644
--- a/BurnOutSharp/ProtectionType/Bitpool.cs
+++ b/BurnOutSharp/ProtectionType/Bitpool.cs
@@ -8,7 +8,7 @@ namespace BurnOutSharp.ProtectionType
     public class Bitpool : IPathCheck
     {
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/ByteShield.cs b/BurnOutSharp/ProtectionType/ByteShield.cs
index b794d058..101aa41a 100644
--- a/BurnOutSharp/ProtectionType/ByteShield.cs
+++ b/BurnOutSharp/ProtectionType/ByteShield.cs
@@ -8,7 +8,7 @@ namespace BurnOutSharp.ProtectionType
     public class ByteShield : IPathCheck
     {
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/CDCops.cs b/BurnOutSharp/ProtectionType/CDCops.cs
index 3f30e8aa..129e0b38 100644
--- a/BurnOutSharp/ProtectionType/CDCops.cs
+++ b/BurnOutSharp/ProtectionType/CDCops.cs
@@ -24,7 +24,7 @@ namespace BurnOutSharp.ProtectionType
         }
 
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/CDLock.cs b/BurnOutSharp/ProtectionType/CDLock.cs
index c7607981..472100fc 100644
--- a/BurnOutSharp/ProtectionType/CDLock.cs
+++ b/BurnOutSharp/ProtectionType/CDLock.cs
@@ -19,7 +19,7 @@ namespace BurnOutSharp.ProtectionType
         }
 
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/CDProtector.cs b/BurnOutSharp/ProtectionType/CDProtector.cs
index 38975c6c..0357a708 100644
--- a/BurnOutSharp/ProtectionType/CDProtector.cs
+++ b/BurnOutSharp/ProtectionType/CDProtector.cs
@@ -8,7 +8,7 @@ namespace BurnOutSharp.ProtectionType
     public class CDProtector : IPathCheck
     {
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/CDX.cs b/BurnOutSharp/ProtectionType/CDX.cs
index 57315a94..8b9181f8 100644
--- a/BurnOutSharp/ProtectionType/CDX.cs
+++ b/BurnOutSharp/ProtectionType/CDX.cs
@@ -8,7 +8,7 @@ namespace BurnOutSharp.ProtectionType
     public class CDX : IPathCheck
     {
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/CactusDataShield.cs b/BurnOutSharp/ProtectionType/CactusDataShield.cs
index 39cf4fb7..bb001e49 100644
--- a/BurnOutSharp/ProtectionType/CactusDataShield.cs
+++ b/BurnOutSharp/ProtectionType/CactusDataShield.cs
@@ -30,7 +30,7 @@ namespace BurnOutSharp.ProtectionType
         }
 
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/CopyKiller.cs b/BurnOutSharp/ProtectionType/CopyKiller.cs
index cbfd574e..742ada98 100644
--- a/BurnOutSharp/ProtectionType/CopyKiller.cs
+++ b/BurnOutSharp/ProtectionType/CopyKiller.cs
@@ -19,7 +19,7 @@ namespace BurnOutSharp.ProtectionType
         }
 
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/DVDCrypt.cs b/BurnOutSharp/ProtectionType/DVDCrypt.cs
index 416298c5..7283234a 100644
--- a/BurnOutSharp/ProtectionType/DVDCrypt.cs
+++ b/BurnOutSharp/ProtectionType/DVDCrypt.cs
@@ -8,7 +8,7 @@ namespace BurnOutSharp.ProtectionType
     public class DVDCrypt : IPathCheck
     {
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/DVDMoviePROTECT.cs b/BurnOutSharp/ProtectionType/DVDMoviePROTECT.cs
index 9c8f314f..14a0fe39 100644
--- a/BurnOutSharp/ProtectionType/DVDMoviePROTECT.cs
+++ b/BurnOutSharp/ProtectionType/DVDMoviePROTECT.cs
@@ -7,7 +7,7 @@ namespace BurnOutSharp.ProtectionType
     public class DVDMoviePROTECT : IPathCheck
     {
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (!isDirectory)
                 return null;
diff --git a/BurnOutSharp/ProtectionType/DiscGuard.cs b/BurnOutSharp/ProtectionType/DiscGuard.cs
index 29643a0b..d755c783 100644
--- a/BurnOutSharp/ProtectionType/DiscGuard.cs
+++ b/BurnOutSharp/ProtectionType/DiscGuard.cs
@@ -8,7 +8,7 @@ namespace BurnOutSharp.ProtectionType
     public class DiscGuard : IPathCheck
     {
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/FreeLock.cs b/BurnOutSharp/ProtectionType/FreeLock.cs
index 24d0e072..2eac5aae 100644
--- a/BurnOutSharp/ProtectionType/FreeLock.cs
+++ b/BurnOutSharp/ProtectionType/FreeLock.cs
@@ -8,7 +8,7 @@ namespace BurnOutSharp.ProtectionType
     public class FreeLock : IPathCheck
     {
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/GFWL.cs b/BurnOutSharp/ProtectionType/GFWL.cs
index b3a14da0..db7b3164 100644
--- a/BurnOutSharp/ProtectionType/GFWL.cs
+++ b/BurnOutSharp/ProtectionType/GFWL.cs
@@ -19,7 +19,7 @@ namespace BurnOutSharp.ProtectionType
         }
 
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/HexalockAutoLock.cs b/BurnOutSharp/ProtectionType/HexalockAutoLock.cs
index e42bee8e..d11993ed 100644
--- a/BurnOutSharp/ProtectionType/HexalockAutoLock.cs
+++ b/BurnOutSharp/ProtectionType/HexalockAutoLock.cs
@@ -8,7 +8,7 @@ namespace BurnOutSharp.ProtectionType
     public class HexalockAutoLock : IPathCheck
     {
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/ImpulseReactor.cs b/BurnOutSharp/ProtectionType/ImpulseReactor.cs
index 886e4a83..1bd8ffe4 100644
--- a/BurnOutSharp/ProtectionType/ImpulseReactor.cs
+++ b/BurnOutSharp/ProtectionType/ImpulseReactor.cs
@@ -26,7 +26,7 @@ namespace BurnOutSharp.ProtectionType
         }
 
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/IndyVCD.cs b/BurnOutSharp/ProtectionType/IndyVCD.cs
index 2c5289a8..d4512218 100644
--- a/BurnOutSharp/ProtectionType/IndyVCD.cs
+++ b/BurnOutSharp/ProtectionType/IndyVCD.cs
@@ -8,7 +8,7 @@ namespace BurnOutSharp.ProtectionType
     public class IndyVCD : IPathCheck
     {
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/Key2AudioXS.cs b/BurnOutSharp/ProtectionType/Key2AudioXS.cs
index c4abc5d4..e083b387 100644
--- a/BurnOutSharp/ProtectionType/Key2AudioXS.cs
+++ b/BurnOutSharp/ProtectionType/Key2AudioXS.cs
@@ -8,7 +8,7 @@ namespace BurnOutSharp.ProtectionType
     public class Key2AudioXS : IPathCheck
     {
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/LaserLock.cs b/BurnOutSharp/ProtectionType/LaserLock.cs
index c9f73141..b86ed44e 100644
--- a/BurnOutSharp/ProtectionType/LaserLock.cs
+++ b/BurnOutSharp/ProtectionType/LaserLock.cs
@@ -42,7 +42,7 @@ namespace BurnOutSharp.ProtectionType
         }
 
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/MediaCloQ.cs b/BurnOutSharp/ProtectionType/MediaCloQ.cs
index 2d3be9c6..b9acd499 100644
--- a/BurnOutSharp/ProtectionType/MediaCloQ.cs
+++ b/BurnOutSharp/ProtectionType/MediaCloQ.cs
@@ -8,7 +8,7 @@ namespace BurnOutSharp.ProtectionType
     public class MediaCloQ : IPathCheck
     {
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/MediaMaxCD3.cs b/BurnOutSharp/ProtectionType/MediaMaxCD3.cs
index 5bcff905..3c9d1481 100644
--- a/BurnOutSharp/ProtectionType/MediaMaxCD3.cs
+++ b/BurnOutSharp/ProtectionType/MediaMaxCD3.cs
@@ -24,7 +24,7 @@ namespace BurnOutSharp.ProtectionType
         }
 
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/Origin.cs b/BurnOutSharp/ProtectionType/Origin.cs
index 80ff40b3..62befb3a 100644
--- a/BurnOutSharp/ProtectionType/Origin.cs
+++ b/BurnOutSharp/ProtectionType/Origin.cs
@@ -19,7 +19,7 @@ namespace BurnOutSharp.ProtectionType
         }
 
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/ProtectDVDVideo.cs b/BurnOutSharp/ProtectionType/ProtectDVDVideo.cs
index 75e05124..996f8c5f 100644
--- a/BurnOutSharp/ProtectionType/ProtectDVDVideo.cs
+++ b/BurnOutSharp/ProtectionType/ProtectDVDVideo.cs
@@ -7,7 +7,7 @@ namespace BurnOutSharp.ProtectionType
     public class ProtectDVDVideo : IPathCheck
     {
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (!isDirectory)
                 return null;
diff --git a/BurnOutSharp/ProtectionType/SafeCast.cs b/BurnOutSharp/ProtectionType/SafeCast.cs
index ee3d4bc6..81d2ace8 100644
--- a/BurnOutSharp/ProtectionType/SafeCast.cs
+++ b/BurnOutSharp/ProtectionType/SafeCast.cs
@@ -8,7 +8,7 @@ namespace BurnOutSharp.ProtectionType
     public class SafeCast : IPathCheck
     {
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/SafeDisc.cs b/BurnOutSharp/ProtectionType/SafeDisc.cs
index 249f0e1f..0099611a 100644
--- a/BurnOutSharp/ProtectionType/SafeDisc.cs
+++ b/BurnOutSharp/ProtectionType/SafeDisc.cs
@@ -61,7 +61,7 @@ namespace BurnOutSharp.ProtectionType
         }
 
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/SafeDiscLite.cs b/BurnOutSharp/ProtectionType/SafeDiscLite.cs
index fb0c40da..a20b7cc3 100644
--- a/BurnOutSharp/ProtectionType/SafeDiscLite.cs
+++ b/BurnOutSharp/ProtectionType/SafeDiscLite.cs
@@ -8,7 +8,7 @@ namespace BurnOutSharp.ProtectionType
     public class SafeDiscLite : IPathCheck
     {
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/SafeLock.cs b/BurnOutSharp/ProtectionType/SafeLock.cs
index 571b13a0..3b2b9750 100644
--- a/BurnOutSharp/ProtectionType/SafeLock.cs
+++ b/BurnOutSharp/ProtectionType/SafeLock.cs
@@ -19,7 +19,7 @@ namespace BurnOutSharp.ProtectionType
         }
 
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/SecuROM.cs b/BurnOutSharp/ProtectionType/SecuROM.cs
index 73e9b1eb..7d65b385 100644
--- a/BurnOutSharp/ProtectionType/SecuROM.cs
+++ b/BurnOutSharp/ProtectionType/SecuROM.cs
@@ -50,7 +50,7 @@ namespace BurnOutSharp.ProtectionType
         }
 
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/SmartE.cs b/BurnOutSharp/ProtectionType/SmartE.cs
index 7c5c44f7..1db38e7f 100644
--- a/BurnOutSharp/ProtectionType/SmartE.cs
+++ b/BurnOutSharp/ProtectionType/SmartE.cs
@@ -19,7 +19,7 @@ namespace BurnOutSharp.ProtectionType
         }
 
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/SoftLock.cs b/BurnOutSharp/ProtectionType/SoftLock.cs
index 9ac12bdf..92a1da2b 100644
--- a/BurnOutSharp/ProtectionType/SoftLock.cs
+++ b/BurnOutSharp/ProtectionType/SoftLock.cs
@@ -8,7 +8,7 @@ namespace BurnOutSharp.ProtectionType
     public class SoftLock : IPathCheck
     {
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/SolidShield.cs b/BurnOutSharp/ProtectionType/SolidShield.cs
index 6c1144bf..a3cc7787 100644
--- a/BurnOutSharp/ProtectionType/SolidShield.cs
+++ b/BurnOutSharp/ProtectionType/SolidShield.cs
@@ -114,7 +114,7 @@ namespace BurnOutSharp.ProtectionType
         }
 
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/StarForce.cs b/BurnOutSharp/ProtectionType/StarForce.cs
index 7f79a16b..e0330cad 100644
--- a/BurnOutSharp/ProtectionType/StarForce.cs
+++ b/BurnOutSharp/ProtectionType/StarForce.cs
@@ -65,7 +65,7 @@ namespace BurnOutSharp.ProtectionType
         }
 
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/Steam.cs b/BurnOutSharp/ProtectionType/Steam.cs
index 1aa295be..80be8ee8 100644
--- a/BurnOutSharp/ProtectionType/Steam.cs
+++ b/BurnOutSharp/ProtectionType/Steam.cs
@@ -5,10 +5,11 @@ using System.Linq;
 
 namespace BurnOutSharp.ProtectionType
 {
+    // TODO: Can this be split into file and directory checks separately?
     public class Steam : IPathCheck
     {
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/TZCopyProtector.cs b/BurnOutSharp/ProtectionType/TZCopyProtector.cs
index c506e0bc..fba258d2 100644
--- a/BurnOutSharp/ProtectionType/TZCopyProtector.cs
+++ b/BurnOutSharp/ProtectionType/TZCopyProtector.cs
@@ -8,7 +8,7 @@ namespace BurnOutSharp.ProtectionType
     public class TZCopyProtector : IPathCheck
     {
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/Tages.cs b/BurnOutSharp/ProtectionType/Tages.cs
index e613c5a6..319dd715 100644
--- a/BurnOutSharp/ProtectionType/Tages.cs
+++ b/BurnOutSharp/ProtectionType/Tages.cs
@@ -33,7 +33,7 @@ namespace BurnOutSharp.ProtectionType
         }
 
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/Uplay.cs b/BurnOutSharp/ProtectionType/Uplay.cs
index eec2e2d9..0acaa635 100644
--- a/BurnOutSharp/ProtectionType/Uplay.cs
+++ b/BurnOutSharp/ProtectionType/Uplay.cs
@@ -8,7 +8,7 @@ namespace BurnOutSharp.ProtectionType
     public class Uplay : IPathCheck
     {
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/VOBProtectCDDVD.cs b/BurnOutSharp/ProtectionType/VOBProtectCDDVD.cs
index 7eef2676..221bfca1 100644
--- a/BurnOutSharp/ProtectionType/VOBProtectCDDVD.cs
+++ b/BurnOutSharp/ProtectionType/VOBProtectCDDVD.cs
@@ -46,7 +46,7 @@ namespace BurnOutSharp.ProtectionType
         }
 
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/WTMCDProtect.cs b/BurnOutSharp/ProtectionType/WTMCDProtect.cs
index 8ec7ce50..18f80819 100644
--- a/BurnOutSharp/ProtectionType/WTMCDProtect.cs
+++ b/BurnOutSharp/ProtectionType/WTMCDProtect.cs
@@ -19,7 +19,7 @@ namespace BurnOutSharp.ProtectionType
         }
 
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/Winlock.cs b/BurnOutSharp/ProtectionType/Winlock.cs
index 1a27194e..05861bb4 100644
--- a/BurnOutSharp/ProtectionType/Winlock.cs
+++ b/BurnOutSharp/ProtectionType/Winlock.cs
@@ -8,7 +8,7 @@ namespace BurnOutSharp.ProtectionType
     public class Winlock : IPathCheck
     {
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/XCP.cs b/BurnOutSharp/ProtectionType/XCP.cs
index 53b7d55d..f61c2179 100644
--- a/BurnOutSharp/ProtectionType/XCP.cs
+++ b/BurnOutSharp/ProtectionType/XCP.cs
@@ -30,7 +30,7 @@ namespace BurnOutSharp.ProtectionType
         }
 
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/ProtectionType/Zzxzz.cs b/BurnOutSharp/ProtectionType/Zzxzz.cs
index 290068a2..46297d37 100644
--- a/BurnOutSharp/ProtectionType/Zzxzz.cs
+++ b/BurnOutSharp/ProtectionType/Zzxzz.cs
@@ -7,7 +7,7 @@ namespace BurnOutSharp.ProtectionType
     public class Zzxzz : IPathCheck
     {
         /// <inheritdoc/>
-        public string CheckPath(string path, IEnumerable<string> files, bool isDirectory)
+        public string CheckPath(string path, bool isDirectory, IEnumerable<string> files)
         {
             if (isDirectory)
             {
diff --git a/BurnOutSharp/Scanner.cs b/BurnOutSharp/Scanner.cs
index 093a57a8..b6db6a1c 100644
--- a/BurnOutSharp/Scanner.cs
+++ b/BurnOutSharp/Scanner.cs
@@ -81,7 +81,7 @@ namespace BurnOutSharp
                     var files = Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories).ToList();
 
                     // Scan for path-detectable protections
-                    var directoryPathProtections = GetPathProtections(path, files);
+                    var directoryPathProtections = GetPathProtections(path, true, files);
                     Utilities.AppendToDictionary(protections, directoryPathProtections);
 
                     // Scan each file in directory separately
@@ -99,7 +99,7 @@ namespace BurnOutSharp
                         FileProgress?.Report(new ProtectionProgress(reportableFileName, i / (float)files.Count(), "Checking file" + (file != reportableFileName ? " from archive" : string.Empty)));
 
                         // Scan for path-detectable protections
-                        var filePathProtections = GetPathProtections(file);
+                        var filePathProtections = GetPathProtections(file, false);
                         Utilities.AppendToDictionary(protections, filePathProtections);
 
                         // Scan for content-detectable protections
@@ -134,7 +134,7 @@ namespace BurnOutSharp
                     FileProgress?.Report(new ProtectionProgress(reportableFileName, 0, "Checking file" + (path != reportableFileName ? " from archive" : string.Empty)));
 
                     // Scan for path-detectable protections
-                    var filePathProtections = GetPathProtections(path);
+                    var filePathProtections = GetPathProtections(path, false);
                     Utilities.AppendToDictionary(protections, filePathProtections);
 
                     // Scan for content-detectable protections
@@ -174,227 +174,223 @@ namespace BurnOutSharp
         /// Get the path-detectable protections associated with a single path
         /// </summary>
         /// <param name="path">Path of the directory or file to scan</param>
+        /// <param name="isDirectory">True if the path is a directory, false otherwise</param>
         /// <param name="files">Files contained within if the path is a directory</param>
         /// <returns>Dictionary of list of strings representing the found protections</returns>
-        private Dictionary<string, List<string>> GetPathProtections(string path, List<string> files = null)
+        private Dictionary<string, List<string>> GetPathProtections(string path, bool isDirectory, List<string> files = null)
         {
             List<string> protections = new List<string>();
             string protection;
 
-            // If we have a directory, get the files in the directory for searching
-            bool isDirectory = false;
-            if (Directory.Exists(path))
-                isDirectory = true;
-
             // AACS
-            protection = new AACS().CheckPath(path, files, isDirectory);
+            protection = new AACS().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // Alpha-DVD
-            protection = new AlphaDVD().CheckPath(path, files, isDirectory);
+            protection = new AlphaDVD().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // Bitpool
-            protection = new Bitpool().CheckPath(path, files, isDirectory);
+            protection = new Bitpool().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // ByteShield
-            protection = new ByteShield().CheckPath(path, files, isDirectory);
+            protection = new ByteShield().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // Cactus Data Shield
-            protection = new CactusDataShield().CheckPath(path, files, isDirectory);
+            protection = new CactusDataShield().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // CD-Cops
-            protection = new CDCops().CheckPath(path, files, isDirectory);
+            protection = new CDCops().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // CD-Lock
-            protection = new CDLock().CheckPath(path, files, isDirectory);
+            protection = new CDLock().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // CD-Protector
-            protection = new CDProtector().CheckPath(path, files, isDirectory);
+            protection = new CDProtector().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // CD-X
-            protection = new CDX().CheckPath(path, files, isDirectory);
+            protection = new CDX().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             /*
             // CopyKiller
-            protection = new CopyKiller().CheckPath(path, files, isDirectory);
+            protection = new CopyKiller().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
             */
 
             // DiscGuard
-            protection = new DiscGuard().CheckPath(path, files, isDirectory);
+            protection = new DiscGuard().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // DVD Crypt
-            protection = new DVDCrypt().CheckPath(path, files, isDirectory);
+            protection = new DVDCrypt().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // DVD-Movie-PROTECT
-            protection = new DVDMoviePROTECT().CheckPath(path, files, isDirectory);
+            protection = new DVDMoviePROTECT().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // FreeLock
-            protection = new FreeLock().CheckPath(path, files, isDirectory);
+            protection = new FreeLock().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // Games for Windows - Live
-            protection = new GFWL().CheckPath(path, files, isDirectory);
+            protection = new GFWL().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // Hexalock AutoLock
-            protection = new HexalockAutoLock().CheckPath(path, files, isDirectory);
+            protection = new HexalockAutoLock().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // Impulse Reactor
-            protection = new ImpulseReactor().CheckPath(path, files, isDirectory);
+            protection = new ImpulseReactor().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // IndyVCD
-            protection = new IndyVCD().CheckPath(path, files, isDirectory);
+            protection = new IndyVCD().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // Key2Audio XS
-            protection = new Key2AudioXS().CheckPath(path, files, isDirectory);
+            protection = new Key2AudioXS().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // LaserLock
-            protection = new LaserLock().CheckPath(path, files, isDirectory);
+            protection = new LaserLock().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // MediaCloQ
-            protection = new MediaCloQ().CheckPath(path, files, isDirectory);
+            protection = new MediaCloQ().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // MediaMax CD3
-            protection = new MediaMaxCD3().CheckPath(path, files, isDirectory);
+            protection = new MediaMaxCD3().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // Origin
-            protection = new Origin().CheckPath(path, files, isDirectory);
+            protection = new Origin().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // Protect DVD-Video
-            protection = new ProtectDVDVideo().CheckPath(path, files, isDirectory);
+            protection = new ProtectDVDVideo().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // SafeCast
-            protection = new SafeCast().CheckPath(path, files, isDirectory);
+            protection = new SafeCast().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // SafeDisc
-            protection = new SafeDisc().CheckPath(path, files, isDirectory);
+            protection = new SafeDisc().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // SafeDisc Lite
-            protection = new SafeDiscLite().CheckPath(path, files, isDirectory);
+            protection = new SafeDiscLite().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // SafeLock
-            protection = new SafeLock().CheckPath(path, files, isDirectory);
+            protection = new SafeLock().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // SecuROM
-            protection = new SecuROM().CheckPath(path, files, isDirectory);
+            protection = new SecuROM().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // SmartE
-            protection = new SmartE().CheckPath(path, files, isDirectory);
+            protection = new SmartE().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // SoftLock
-            protection = new SoftLock().CheckPath(path, files, isDirectory);
+            protection = new SoftLock().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // SolidShield
-            protection = new SolidShield().CheckPath(path, files, isDirectory);
+            protection = new SolidShield().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // StarForce
-            protection = new StarForce().CheckPath(path, files, isDirectory);
+            protection = new StarForce().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // Steam
-            protection = new Steam().CheckPath(path, files, isDirectory);
+            protection = new Steam().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // TAGES
-            protection = new Tages().CheckPath(path, files, isDirectory);
+            protection = new Tages().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // TZCopyProtector
-            protection = new TZCopyProtector().CheckPath(path, files, isDirectory);
+            protection = new TZCopyProtector().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // Uplay
-            protection = new Uplay().CheckPath(path, files, isDirectory);
+            protection = new Uplay().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // VOB ProtectCD/DVD
-            protection = new VOBProtectCDDVD().CheckPath(path, files, isDirectory);
+            protection = new VOBProtectCDDVD().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // Winlock
-            protection = new Winlock().CheckPath(path, files, isDirectory);
+            protection = new Winlock().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // WTM CD Protect
-            protection = new WTMCDProtect().CheckPath(path, files, isDirectory);
+            protection = new WTMCDProtect().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // XCP
-            protection = new XCP().CheckPath(path, files, isDirectory);
+            protection = new XCP().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
             // Zzxzz
-            protection = new Zzxzz().CheckPath(path, files, isDirectory);
+            protection = new Zzxzz().CheckPath(path, isDirectory, files);
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);