diff --git a/src/com/bytezone/diskbrowser/disk/AppleDisk.java b/src/com/bytezone/diskbrowser/disk/AppleDisk.java
index 324b7cb..481d7de 100755
--- a/src/com/bytezone/diskbrowser/disk/AppleDisk.java
+++ b/src/com/bytezone/diskbrowser/disk/AppleDisk.java
@@ -16,9 +16,9 @@ import java.util.zip.Checksum;
 import com.bytezone.diskbrowser.nib.NibFile;
 import com.bytezone.diskbrowser.nib.V2dFile;
 import com.bytezone.diskbrowser.nib.WozFile;
-import com.bytezone.diskbrowser.utilities.Binary2;
+import com.bytezone.diskbrowser.nufx.Binary2;
+import com.bytezone.diskbrowser.nufx.NuFX;
 import com.bytezone.diskbrowser.utilities.FileFormatException;
-import com.bytezone.diskbrowser.utilities.NuFX;
 import com.bytezone.diskbrowser.utilities.Utility;
 
 // -----------------------------------------------------------------------------------//
diff --git a/src/com/bytezone/diskbrowser/disk/DiskFactory.java b/src/com/bytezone/diskbrowser/disk/DiskFactory.java
index f492498..85fd096 100755
--- a/src/com/bytezone/diskbrowser/disk/DiskFactory.java
+++ b/src/com/bytezone/diskbrowser/disk/DiskFactory.java
@@ -18,11 +18,11 @@ import com.bytezone.diskbrowser.infocom.InfocomDisk;
 import com.bytezone.diskbrowser.nib.NibFile;
 import com.bytezone.diskbrowser.nib.V2dFile;
 import com.bytezone.diskbrowser.nib.WozFile;
+import com.bytezone.diskbrowser.nufx.Binary2;
+import com.bytezone.diskbrowser.nufx.NuFX;
 import com.bytezone.diskbrowser.pascal.PascalDisk;
 import com.bytezone.diskbrowser.prodos.ProdosDisk;
-import com.bytezone.diskbrowser.utilities.Binary2;
 import com.bytezone.diskbrowser.utilities.FileFormatException;
-import com.bytezone.diskbrowser.utilities.NuFX;
 import com.bytezone.diskbrowser.utilities.Utility;
 import com.bytezone.diskbrowser.wizardry.Wizardry4BootDisk;
 import com.bytezone.diskbrowser.wizardry.WizardryScenarioDisk;
diff --git a/src/com/bytezone/diskbrowser/utilities/Binary2.java b/src/com/bytezone/diskbrowser/nufx/Binary2.java
similarity index 98%
rename from src/com/bytezone/diskbrowser/utilities/Binary2.java
rename to src/com/bytezone/diskbrowser/nufx/Binary2.java
index 0a47028..4442fa8 100644
--- a/src/com/bytezone/diskbrowser/utilities/Binary2.java
+++ b/src/com/bytezone/diskbrowser/nufx/Binary2.java
@@ -1,4 +1,4 @@
-package com.bytezone.diskbrowser.utilities;
+package com.bytezone.diskbrowser.nufx;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/src/com/bytezone/diskbrowser/utilities/Binary2Header.java b/src/com/bytezone/diskbrowser/nufx/Binary2Header.java
similarity index 97%
rename from src/com/bytezone/diskbrowser/utilities/Binary2Header.java
rename to src/com/bytezone/diskbrowser/nufx/Binary2Header.java
index 2b2cc2b..ec41a5e 100644
--- a/src/com/bytezone/diskbrowser/utilities/Binary2Header.java
+++ b/src/com/bytezone/diskbrowser/nufx/Binary2Header.java
@@ -1,4 +1,4 @@
-package com.bytezone.diskbrowser.utilities;
+package com.bytezone.diskbrowser.nufx;
 
 import static com.bytezone.diskbrowser.prodos.ProdosConstants.fileTypes;
 
@@ -6,6 +6,8 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
 import com.bytezone.diskbrowser.prodos.write.ProdosDisk;
+import com.bytezone.diskbrowser.utilities.HexFormatter;
+import com.bytezone.diskbrowser.utilities.Utility;
 
 // -----------------------------------------------------------------------------------//
 public class Binary2Header
diff --git a/src/com/bytezone/diskbrowser/utilities/LZW.java b/src/com/bytezone/diskbrowser/nufx/LZW.java
similarity index 98%
rename from src/com/bytezone/diskbrowser/utilities/LZW.java
rename to src/com/bytezone/diskbrowser/nufx/LZW.java
index dda1583..a44b1c5 100644
--- a/src/com/bytezone/diskbrowser/utilities/LZW.java
+++ b/src/com/bytezone/diskbrowser/nufx/LZW.java
@@ -1,9 +1,11 @@
-package com.bytezone.diskbrowser.utilities;
+package com.bytezone.diskbrowser.nufx;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+import com.bytezone.diskbrowser.utilities.Utility;
+
 // -----------------------------------------------------------------------------------//
 abstract class LZW
 // -----------------------------------------------------------------------------------//
diff --git a/src/com/bytezone/diskbrowser/utilities/LZW1.java b/src/com/bytezone/diskbrowser/nufx/LZW1.java
similarity index 97%
rename from src/com/bytezone/diskbrowser/utilities/LZW1.java
rename to src/com/bytezone/diskbrowser/nufx/LZW1.java
index 6421600..082c29f 100644
--- a/src/com/bytezone/diskbrowser/utilities/LZW1.java
+++ b/src/com/bytezone/diskbrowser/nufx/LZW1.java
@@ -1,4 +1,6 @@
-package com.bytezone.diskbrowser.utilities;
+package com.bytezone.diskbrowser.nufx;
+
+import com.bytezone.diskbrowser.utilities.Utility;
 
 // -----------------------------------------------------------------------------------//
 class LZW1 extends LZW
diff --git a/src/com/bytezone/diskbrowser/utilities/LZW2.java b/src/com/bytezone/diskbrowser/nufx/LZW2.java
similarity index 97%
rename from src/com/bytezone/diskbrowser/utilities/LZW2.java
rename to src/com/bytezone/diskbrowser/nufx/LZW2.java
index 6596e2d..d5f4837 100644
--- a/src/com/bytezone/diskbrowser/utilities/LZW2.java
+++ b/src/com/bytezone/diskbrowser/nufx/LZW2.java
@@ -1,4 +1,6 @@
-package com.bytezone.diskbrowser.utilities;
+package com.bytezone.diskbrowser.nufx;
+
+import com.bytezone.diskbrowser.utilities.Utility;
 
 // -----------------------------------------------------------------------------------//
 class LZW2 extends LZW
diff --git a/src/com/bytezone/diskbrowser/utilities/MasterHeader.java b/src/com/bytezone/diskbrowser/nufx/MasterHeader.java
similarity index 95%
rename from src/com/bytezone/diskbrowser/utilities/MasterHeader.java
rename to src/com/bytezone/diskbrowser/nufx/MasterHeader.java
index a8e0906..6d58633 100644
--- a/src/com/bytezone/diskbrowser/utilities/MasterHeader.java
+++ b/src/com/bytezone/diskbrowser/nufx/MasterHeader.java
@@ -1,4 +1,9 @@
-package com.bytezone.diskbrowser.utilities;
+package com.bytezone.diskbrowser.nufx;
+
+import com.bytezone.diskbrowser.utilities.DateTime;
+import com.bytezone.diskbrowser.utilities.FileFormatException;
+import com.bytezone.diskbrowser.utilities.HexFormatter;
+import com.bytezone.diskbrowser.utilities.Utility;
 
 // -----------------------------------------------------------------------------------//
 class MasterHeader
diff --git a/src/com/bytezone/diskbrowser/utilities/NuFX.java b/src/com/bytezone/diskbrowser/nufx/NuFX.java
similarity index 99%
rename from src/com/bytezone/diskbrowser/utilities/NuFX.java
rename to src/com/bytezone/diskbrowser/nufx/NuFX.java
index f7d2388..0610059 100644
--- a/src/com/bytezone/diskbrowser/utilities/NuFX.java
+++ b/src/com/bytezone/diskbrowser/nufx/NuFX.java
@@ -1,4 +1,4 @@
-package com.bytezone.diskbrowser.utilities;
+package com.bytezone.diskbrowser.nufx;
 
 import static com.bytezone.diskbrowser.prodos.ProdosConstants.BLOCK_SIZE;
 
@@ -14,6 +14,7 @@ import com.bytezone.diskbrowser.prodos.write.FileAlreadyExistsException;
 import com.bytezone.diskbrowser.prodos.write.FileEntry;
 import com.bytezone.diskbrowser.prodos.write.ProdosDisk;
 import com.bytezone.diskbrowser.prodos.write.VolumeCatalogFullException;
+import com.bytezone.diskbrowser.utilities.FileFormatException;
 
 // -----------------------------------------------------------------------------------//
 public class NuFX
diff --git a/src/com/bytezone/diskbrowser/utilities/Record.java b/src/com/bytezone/diskbrowser/nufx/Record.java
similarity index 98%
rename from src/com/bytezone/diskbrowser/utilities/Record.java
rename to src/com/bytezone/diskbrowser/nufx/Record.java
index 1ad7e38..babebe9 100644
--- a/src/com/bytezone/diskbrowser/utilities/Record.java
+++ b/src/com/bytezone/diskbrowser/nufx/Record.java
@@ -1,4 +1,4 @@
-package com.bytezone.diskbrowser.utilities;
+package com.bytezone.diskbrowser.nufx;
 
 import static com.bytezone.diskbrowser.prodos.ProdosConstants.fileTypes;
 
@@ -6,6 +6,10 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.bytezone.diskbrowser.utilities.DateTime;
+import com.bytezone.diskbrowser.utilities.FileFormatException;
+import com.bytezone.diskbrowser.utilities.Utility;
+
 // -----------------------------------------------------------------------------------//
 class Record
 // -----------------------------------------------------------------------------------//
diff --git a/src/com/bytezone/diskbrowser/utilities/Thread.java b/src/com/bytezone/diskbrowser/nufx/Thread.java
similarity index 98%
rename from src/com/bytezone/diskbrowser/utilities/Thread.java
rename to src/com/bytezone/diskbrowser/nufx/Thread.java
index 9f972c5..7db8cda 100644
--- a/src/com/bytezone/diskbrowser/utilities/Thread.java
+++ b/src/com/bytezone/diskbrowser/nufx/Thread.java
@@ -1,4 +1,6 @@
-package com.bytezone.diskbrowser.utilities;
+package com.bytezone.diskbrowser.nufx;
+
+import com.bytezone.diskbrowser.utilities.Utility;
 
 // -----------------------------------------------------------------------------------//
 class Thread
diff --git a/src/com/bytezone/diskbrowser/utilities/compression.txt b/src/com/bytezone/diskbrowser/nufx/compression.txt
similarity index 100%
rename from src/com/bytezone/diskbrowser/utilities/compression.txt
rename to src/com/bytezone/diskbrowser/nufx/compression.txt
diff --git a/src/com/bytezone/diskbrowser/utilities/DateTime.java b/src/com/bytezone/diskbrowser/utilities/DateTime.java
index 658ec92..6142e09 100644
--- a/src/com/bytezone/diskbrowser/utilities/DateTime.java
+++ b/src/com/bytezone/diskbrowser/utilities/DateTime.java
@@ -4,7 +4,7 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
 // -----------------------------------------------------------------------------------//
-class DateTime
+public class DateTime
 // -----------------------------------------------------------------------------------//
 {
   private static String[] months = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul",
diff --git a/src/com/bytezone/diskbrowser/utilities/Utility.java b/src/com/bytezone/diskbrowser/utilities/Utility.java
index 9481b18..8020f30 100644
--- a/src/com/bytezone/diskbrowser/utilities/Utility.java
+++ b/src/com/bytezone/diskbrowser/utilities/Utility.java
@@ -479,7 +479,7 @@ public final class Utility
   }
 
   // ---------------------------------------------------------------------------------//
-  static boolean isMagic (byte[] buffer, int ptr, byte[] magic)
+  public static boolean isMagic (byte[] buffer, int ptr, byte[] magic)
   // ---------------------------------------------------------------------------------//
   {
     if (ptr + magic.length >= buffer.length)
@@ -517,7 +517,7 @@ public final class Utility
   }
 
   // ---------------------------------------------------------------------------------//
-  protected static int getCRC (final byte[] buffer, int length, int initialValue)
+  public static int getCRC (final byte[] buffer, int length, int initialValue)
   // ---------------------------------------------------------------------------------//
   {
     int crc = initialValue;