diff --git a/forge-gui/src/main/java/forge/deck/NetDeckArchiveBlock.java b/forge-gui/src/main/java/forge/deck/NetDeckArchiveBlock.java
index 762828496d1..383e77a52e3 100644
--- a/forge-gui/src/main/java/forge/deck/NetDeckArchiveBlock.java
+++ b/forge-gui/src/main/java/forge/deck/NetDeckArchiveBlock.java
@@ -1,15 +1,5 @@
 package forge.deck;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
 import forge.deck.io.DeckSerializer;
 import forge.deck.io.DeckStorage;
 import forge.game.GameType;
@@ -21,6 +11,11 @@ import forge.util.FileUtil;
 import forge.util.WaitCallback;
 import forge.util.storage.StorageBase;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
+
 public class NetDeckArchiveBlock extends StorageBase<Deck> {
     public static final String PREFIX = "NET_ARCHIVE_BLOCK_DECK";
     private static Map<String, NetDeckArchiveBlock> constructed, commander, brawl;
@@ -64,7 +59,7 @@ public class NetDeckArchiveBlock extends StorageBase<Deck> {
                 //if name passed in, try to load decks from current cached files
                 File downloadDir = new File(category.getFullPath());
                 if (downloadDir.exists()) {
-                    for (File file : downloadDir.listFiles(DeckStorage.DCK_FILE_FILTER)) {
+                    for (File file : getAllFilesList(downloadDir, DeckStorage.DCK_FILE_FILTER)) {
                         Deck deck = DeckSerializer.fromFile(file);
                         if (deck != null) {
                             category.map.put(deck.getName(), deck);
diff --git a/forge-gui/src/main/java/forge/deck/NetDeckArchiveLegacy.java b/forge-gui/src/main/java/forge/deck/NetDeckArchiveLegacy.java
index 3512655dd94..667fc26aed0 100644
--- a/forge-gui/src/main/java/forge/deck/NetDeckArchiveLegacy.java
+++ b/forge-gui/src/main/java/forge/deck/NetDeckArchiveLegacy.java
@@ -1,15 +1,5 @@
 package forge.deck;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
 import forge.deck.io.DeckSerializer;
 import forge.deck.io.DeckStorage;
 import forge.game.GameType;
@@ -21,6 +11,11 @@ import forge.util.FileUtil;
 import forge.util.WaitCallback;
 import forge.util.storage.StorageBase;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
+
 public class NetDeckArchiveLegacy extends StorageBase<Deck> {
     public static final String PREFIX = "NET_ARCHIVE_LEGACY_DECK";
     private static Map<String, NetDeckArchiveLegacy> constructed, commander, brawl;
@@ -64,7 +59,7 @@ public class NetDeckArchiveLegacy extends StorageBase<Deck> {
                 //if name passed in, try to load decks from current cached files
                 File downloadDir = new File(category.getFullPath());
                 if (downloadDir.exists()) {
-                    for (File file : downloadDir.listFiles(DeckStorage.DCK_FILE_FILTER)) {
+                    for (File file : getAllFilesList(downloadDir, DeckStorage.DCK_FILE_FILTER)) {
                         Deck deck = DeckSerializer.fromFile(file);
                         if (deck != null) {
                             category.map.put(deck.getName(), deck);
diff --git a/forge-gui/src/main/java/forge/deck/NetDeckArchiveModern.java b/forge-gui/src/main/java/forge/deck/NetDeckArchiveModern.java
index aa365a8ef27..2060490abc5 100644
--- a/forge-gui/src/main/java/forge/deck/NetDeckArchiveModern.java
+++ b/forge-gui/src/main/java/forge/deck/NetDeckArchiveModern.java
@@ -1,15 +1,5 @@
 package forge.deck;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
 import forge.deck.io.DeckSerializer;
 import forge.deck.io.DeckStorage;
 import forge.game.GameType;
@@ -21,6 +11,11 @@ import forge.util.FileUtil;
 import forge.util.WaitCallback;
 import forge.util.storage.StorageBase;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
+
 public class NetDeckArchiveModern extends StorageBase<Deck> {
     public static final String PREFIX = "NET_ARCHIVE_MODERN_DECK";
     private static Map<String, NetDeckArchiveModern> constructed, commander, brawl;
@@ -64,7 +59,7 @@ public class NetDeckArchiveModern extends StorageBase<Deck> {
                 //if name passed in, try to load decks from current cached files
                 File downloadDir = new File(category.getFullPath());
                 if (downloadDir.exists()) {
-                    for (File file : downloadDir.listFiles(DeckStorage.DCK_FILE_FILTER)) {
+                    for (File file : getAllFilesList(downloadDir, DeckStorage.DCK_FILE_FILTER)) {
                         Deck deck = DeckSerializer.fromFile(file);
                         if (deck != null) {
                             category.map.put(deck.getName(), deck);
diff --git a/forge-gui/src/main/java/forge/deck/NetDeckArchivePauper.java b/forge-gui/src/main/java/forge/deck/NetDeckArchivePauper.java
index 419096a69da..ec60dcb8658 100644
--- a/forge-gui/src/main/java/forge/deck/NetDeckArchivePauper.java
+++ b/forge-gui/src/main/java/forge/deck/NetDeckArchivePauper.java
@@ -59,7 +59,7 @@ public class NetDeckArchivePauper extends StorageBase<Deck> {
                 //if name passed in, try to load decks from current cached files
                 File downloadDir = new File(category.getFullPath());
                 if (downloadDir.exists()) {
-                    for (File file : downloadDir.listFiles(DeckStorage.DCK_FILE_FILTER)) {
+                    for (File file : getAllFilesList(downloadDir, DeckStorage.DCK_FILE_FILTER)) {
                         Deck deck = DeckSerializer.fromFile(file);
                         if (deck != null) {
                             category.map.put(deck.getName(), deck);
diff --git a/forge-gui/src/main/java/forge/deck/NetDeckArchivePioneer.java b/forge-gui/src/main/java/forge/deck/NetDeckArchivePioneer.java
index 9d5c2942c3a..903d120da1e 100644
--- a/forge-gui/src/main/java/forge/deck/NetDeckArchivePioneer.java
+++ b/forge-gui/src/main/java/forge/deck/NetDeckArchivePioneer.java
@@ -1,15 +1,5 @@
 package forge.deck;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
 import forge.deck.io.DeckSerializer;
 import forge.deck.io.DeckStorage;
 import forge.game.GameType;
@@ -21,6 +11,11 @@ import forge.util.FileUtil;
 import forge.util.WaitCallback;
 import forge.util.storage.StorageBase;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
+
 public class NetDeckArchivePioneer extends StorageBase<Deck> {
     public static final String PREFIX = "NET_ARCHIVE_PIONEER_DECK";
     private static Map<String, NetDeckArchivePioneer> constructed, commander, brawl;
@@ -64,7 +59,7 @@ public class NetDeckArchivePioneer extends StorageBase<Deck> {
                 //if name passed in, try to load decks from current cached files
                 File downloadDir = new File(category.getFullPath());
                 if (downloadDir.exists()) {
-                    for (File file : downloadDir.listFiles(DeckStorage.DCK_FILE_FILTER)) {
+                    for (File file : getAllFilesList(downloadDir, DeckStorage.DCK_FILE_FILTER)) {
                         Deck deck = DeckSerializer.fromFile(file);
                         if (deck != null) {
                             category.map.put(deck.getName(), deck);
diff --git a/forge-gui/src/main/java/forge/deck/NetDeckArchiveStandard.java b/forge-gui/src/main/java/forge/deck/NetDeckArchiveStandard.java
index 050a78cb77a..62ae7f782a0 100644
--- a/forge-gui/src/main/java/forge/deck/NetDeckArchiveStandard.java
+++ b/forge-gui/src/main/java/forge/deck/NetDeckArchiveStandard.java
@@ -1,15 +1,5 @@
 package forge.deck;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
 import forge.deck.io.DeckSerializer;
 import forge.deck.io.DeckStorage;
 import forge.game.GameType;
@@ -21,6 +11,11 @@ import forge.util.FileUtil;
 import forge.util.WaitCallback;
 import forge.util.storage.StorageBase;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
+
 public class NetDeckArchiveStandard extends StorageBase<Deck> {
     public static final String PREFIX = "NET_ARCHIVE_STANDARD_DECK";
     private static Map<String, NetDeckArchiveStandard> constructed, commander, brawl;
@@ -64,7 +59,7 @@ public class NetDeckArchiveStandard extends StorageBase<Deck> {
                 //if name passed in, try to load decks from current cached files
                 File downloadDir = new File(category.getFullPath());
                 if (downloadDir.exists()) {
-                    for (File file : downloadDir.listFiles(DeckStorage.DCK_FILE_FILTER)) {
+                    for (File file : getAllFilesList(downloadDir, DeckStorage.DCK_FILE_FILTER)) {
                         Deck deck = DeckSerializer.fromFile(file);
                         if (deck != null) {
                             category.map.put(deck.getName(), deck);
diff --git a/forge-gui/src/main/java/forge/deck/NetDeckArchiveVintage.java b/forge-gui/src/main/java/forge/deck/NetDeckArchiveVintage.java
index b0af91f5ce9..97a917362f0 100644
--- a/forge-gui/src/main/java/forge/deck/NetDeckArchiveVintage.java
+++ b/forge-gui/src/main/java/forge/deck/NetDeckArchiveVintage.java
@@ -1,15 +1,5 @@
 package forge.deck;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
 import forge.deck.io.DeckSerializer;
 import forge.deck.io.DeckStorage;
 import forge.game.GameType;
@@ -21,6 +11,11 @@ import forge.util.FileUtil;
 import forge.util.WaitCallback;
 import forge.util.storage.StorageBase;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
+
 public class NetDeckArchiveVintage extends StorageBase<Deck> {
     public static final String PREFIX = "NET_ARCHIVE_VINTAGE_DECK";
     private static Map<String, NetDeckArchiveVintage> constructed, commander, brawl;
@@ -64,7 +59,7 @@ public class NetDeckArchiveVintage extends StorageBase<Deck> {
                 //if name passed in, try to load decks from current cached files
                 File downloadDir = new File(category.getFullPath());
                 if (downloadDir.exists()) {
-                    for (File file : downloadDir.listFiles(DeckStorage.DCK_FILE_FILTER)) {
+                    for (File file : getAllFilesList(downloadDir, DeckStorage.DCK_FILE_FILTER)) {
                         Deck deck = DeckSerializer.fromFile(file);
                         if (deck != null) {
                             category.map.put(deck.getName(), deck);
diff --git a/forge-gui/src/main/java/forge/deck/NetDeckCategory.java b/forge-gui/src/main/java/forge/deck/NetDeckCategory.java
index cd465f7db7f..d455ec4442b 100644
--- a/forge-gui/src/main/java/forge/deck/NetDeckCategory.java
+++ b/forge-gui/src/main/java/forge/deck/NetDeckCategory.java
@@ -1,13 +1,5 @@
 package forge.deck;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
 import forge.deck.io.DeckSerializer;
 import forge.deck.io.DeckStorage;
 import forge.game.GameType;
@@ -19,6 +11,9 @@ import forge.util.FileUtil;
 import forge.util.WaitCallback;
 import forge.util.storage.StorageBase;
 
+import java.io.*;
+import java.util.*;
+
 public class NetDeckCategory extends StorageBase<Deck> {
     public static final String PREFIX = "NET_DECK_";
     private static Map<String, NetDeckCategory> constructed, commander, brawl, oathbreaker, tinyleaders;
@@ -86,7 +81,7 @@ public class NetDeckCategory extends StorageBase<Deck> {
                 //if name passed in, try to load decks from current cached files
                 File downloadDir = new File(category.getFullPath());
                 if (downloadDir.exists()) {
-                    for (File file : downloadDir.listFiles(DeckStorage.DCK_FILE_FILTER)) {
+                    for (File file : getAllFilesList(downloadDir, DeckStorage.DCK_FILE_FILTER)) {
                         Deck deck = DeckSerializer.fromFile(file);
                         if (deck != null) {
                             category.map.put(deck.getName(), deck);