diff --git a/src/com/webcodepro/applecommander/storage/AppleWorksDataBaseFileFilter.java b/src/com/webcodepro/applecommander/storage/AppleWorksDataBaseFileFilter.java
index 06ddddf..ad4e7df 100644
--- a/src/com/webcodepro/applecommander/storage/AppleWorksDataBaseFileFilter.java
+++ b/src/com/webcodepro/applecommander/storage/AppleWorksDataBaseFileFilter.java
@@ -19,6 +19,8 @@
  */
 package com.webcodepro.applecommander.storage;
 
+import com.webcodepro.applecommander.util.*;
+
 import java.io.ByteArrayOutputStream;
 import java.io.PrintWriter;
 
diff --git a/src/com/webcodepro/applecommander/storage/AppleWorksSpreadSheetFileFilter.java b/src/com/webcodepro/applecommander/storage/AppleWorksSpreadSheetFileFilter.java
index f147e9f..525ebe7 100644
--- a/src/com/webcodepro/applecommander/storage/AppleWorksSpreadSheetFileFilter.java
+++ b/src/com/webcodepro/applecommander/storage/AppleWorksSpreadSheetFileFilter.java
@@ -19,6 +19,8 @@
  */
 package com.webcodepro.applecommander.storage;
 
+import com.webcodepro.applecommander.util.*;
+
 import java.io.ByteArrayOutputStream;
 import java.io.PrintWriter;
 import java.text.NumberFormat;
diff --git a/src/com/webcodepro/applecommander/storage/AppleWorksWordProcessorFileFilter.java b/src/com/webcodepro/applecommander/storage/AppleWorksWordProcessorFileFilter.java
index 50e3206..3c30338 100644
--- a/src/com/webcodepro/applecommander/storage/AppleWorksWordProcessorFileFilter.java
+++ b/src/com/webcodepro/applecommander/storage/AppleWorksWordProcessorFileFilter.java
@@ -20,6 +20,7 @@
 package com.webcodepro.applecommander.storage;
 
 import com.webcodepro.applecommander.ui.AppleCommander;
+import com.webcodepro.applecommander.util.*;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintWriter;
diff --git a/src/com/webcodepro/applecommander/storage/ApplesoftFileFilter.java b/src/com/webcodepro/applecommander/storage/ApplesoftFileFilter.java
index 2c64a43..073ed3b 100644
--- a/src/com/webcodepro/applecommander/storage/ApplesoftFileFilter.java
+++ b/src/com/webcodepro/applecommander/storage/ApplesoftFileFilter.java
@@ -19,6 +19,8 @@
  */
 package com.webcodepro.applecommander.storage;
 
+import com.webcodepro.applecommander.util.*;
+
 import java.io.ByteArrayOutputStream;
 import java.io.PrintWriter;
 
diff --git a/src/com/webcodepro/applecommander/storage/Disk.java b/src/com/webcodepro/applecommander/storage/Disk.java
index 8f6b2ec..0c3e3b6 100644
--- a/src/com/webcodepro/applecommander/storage/Disk.java
+++ b/src/com/webcodepro/applecommander/storage/Disk.java
@@ -19,6 +19,8 @@
  */
 package com.webcodepro.applecommander.storage;
 
+import com.webcodepro.applecommander.util.*;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/com/webcodepro/applecommander/storage/DosFileEntry.java b/src/com/webcodepro/applecommander/storage/DosFileEntry.java
index 0ef07c1..a45889b 100644
--- a/src/com/webcodepro/applecommander/storage/DosFileEntry.java
+++ b/src/com/webcodepro/applecommander/storage/DosFileEntry.java
@@ -19,6 +19,8 @@
  */
 package com.webcodepro.applecommander.storage;
 
+import com.webcodepro.applecommander.util.*;
+
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/webcodepro/applecommander/storage/DosFormatDisk.java b/src/com/webcodepro/applecommander/storage/DosFormatDisk.java
index c745d69..affaf80 100644
--- a/src/com/webcodepro/applecommander/storage/DosFormatDisk.java
+++ b/src/com/webcodepro/applecommander/storage/DosFormatDisk.java
@@ -19,6 +19,8 @@
  */
 package com.webcodepro.applecommander.storage;
 
+import com.webcodepro.applecommander.util.*;
+
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/src/com/webcodepro/applecommander/storage/GraphicsFileFilter.java b/src/com/webcodepro/applecommander/storage/GraphicsFileFilter.java
index 5320ebe..e782662 100644
--- a/src/com/webcodepro/applecommander/storage/GraphicsFileFilter.java
+++ b/src/com/webcodepro/applecommander/storage/GraphicsFileFilter.java
@@ -20,6 +20,7 @@
 package com.webcodepro.applecommander.storage;
 
 import com.webcodepro.applecommander.storage.filters.imagehandlers.AppleImage;
+import com.webcodepro.applecommander.util.*;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/src/com/webcodepro/applecommander/storage/HexDumpFileFilter.java b/src/com/webcodepro/applecommander/storage/HexDumpFileFilter.java
index c1bab95..6031feb 100644
--- a/src/com/webcodepro/applecommander/storage/HexDumpFileFilter.java
+++ b/src/com/webcodepro/applecommander/storage/HexDumpFileFilter.java
@@ -19,6 +19,8 @@
  */
 package com.webcodepro.applecommander.storage;
 
+import com.webcodepro.applecommander.util.*;
+
 import java.io.ByteArrayOutputStream;
 import java.io.PrintWriter;
 
diff --git a/src/com/webcodepro/applecommander/storage/IntegerBasicFileFilter.java b/src/com/webcodepro/applecommander/storage/IntegerBasicFileFilter.java
index fe32afe..49bf8b2 100644
--- a/src/com/webcodepro/applecommander/storage/IntegerBasicFileFilter.java
+++ b/src/com/webcodepro/applecommander/storage/IntegerBasicFileFilter.java
@@ -19,6 +19,8 @@
  */
 package com.webcodepro.applecommander.storage;
 
+import com.webcodepro.applecommander.util.*;
+
 import java.io.ByteArrayOutputStream;
 import java.io.PrintWriter;
 
diff --git a/src/com/webcodepro/applecommander/storage/PascalFileEntry.java b/src/com/webcodepro/applecommander/storage/PascalFileEntry.java
index ca6d5c4..2ae3b51 100644
--- a/src/com/webcodepro/applecommander/storage/PascalFileEntry.java
+++ b/src/com/webcodepro/applecommander/storage/PascalFileEntry.java
@@ -19,6 +19,8 @@
  */
 package com.webcodepro.applecommander.storage;
 
+import com.webcodepro.applecommander.util.*;
+
 import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
diff --git a/src/com/webcodepro/applecommander/storage/PascalFormatDisk.java b/src/com/webcodepro/applecommander/storage/PascalFormatDisk.java
index 4340c6a..166e6af 100644
--- a/src/com/webcodepro/applecommander/storage/PascalFormatDisk.java
+++ b/src/com/webcodepro/applecommander/storage/PascalFormatDisk.java
@@ -19,6 +19,8 @@
  */
 package com.webcodepro.applecommander.storage;
 
+import com.webcodepro.applecommander.util.*;
+
 import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.Date;
diff --git a/src/com/webcodepro/applecommander/storage/ProdosCommonDirectoryHeader.java b/src/com/webcodepro/applecommander/storage/ProdosCommonDirectoryHeader.java
index 67f34a9..5cd82fb 100644
--- a/src/com/webcodepro/applecommander/storage/ProdosCommonDirectoryHeader.java
+++ b/src/com/webcodepro/applecommander/storage/ProdosCommonDirectoryHeader.java
@@ -19,6 +19,8 @@
  */
 package com.webcodepro.applecommander.storage;
 
+import com.webcodepro.applecommander.util.AppleUtil;
+
 /**
  * Provide common directory header attributes.
  * <p>
diff --git a/src/com/webcodepro/applecommander/storage/ProdosCommonEntry.java b/src/com/webcodepro/applecommander/storage/ProdosCommonEntry.java
index 4b7e1cc..953ed55 100644
--- a/src/com/webcodepro/applecommander/storage/ProdosCommonEntry.java
+++ b/src/com/webcodepro/applecommander/storage/ProdosCommonEntry.java
@@ -19,6 +19,8 @@
  */
 package com.webcodepro.applecommander.storage;
 
+import com.webcodepro.applecommander.util.*;
+
 import java.util.Date;
 
 /**
diff --git a/src/com/webcodepro/applecommander/storage/ProdosFileEntry.java b/src/com/webcodepro/applecommander/storage/ProdosFileEntry.java
index 6d95c9e..75a209b 100644
--- a/src/com/webcodepro/applecommander/storage/ProdosFileEntry.java
+++ b/src/com/webcodepro/applecommander/storage/ProdosFileEntry.java
@@ -19,6 +19,8 @@
  */
 package com.webcodepro.applecommander.storage;
 
+import com.webcodepro.applecommander.util.*;
+
 import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
diff --git a/src/com/webcodepro/applecommander/storage/ProdosFormatDisk.java b/src/com/webcodepro/applecommander/storage/ProdosFormatDisk.java
index 7c743f3..40bae7b 100644
--- a/src/com/webcodepro/applecommander/storage/ProdosFormatDisk.java
+++ b/src/com/webcodepro/applecommander/storage/ProdosFormatDisk.java
@@ -19,6 +19,8 @@
  */
 package com.webcodepro.applecommander.storage;
 
+import com.webcodepro.applecommander.util.*;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
diff --git a/src/com/webcodepro/applecommander/storage/ProdosSubdirectoryHeader.java b/src/com/webcodepro/applecommander/storage/ProdosSubdirectoryHeader.java
index e82110b..c909123 100644
--- a/src/com/webcodepro/applecommander/storage/ProdosSubdirectoryHeader.java
+++ b/src/com/webcodepro/applecommander/storage/ProdosSubdirectoryHeader.java
@@ -19,6 +19,8 @@
  */
 package com.webcodepro.applecommander.storage;
 
+import com.webcodepro.applecommander.util.AppleUtil;
+
 /**
  * Provides commone subdirectory attributes.
  * <p>
diff --git a/src/com/webcodepro/applecommander/storage/ProdosVolumeDirectoryHeader.java b/src/com/webcodepro/applecommander/storage/ProdosVolumeDirectoryHeader.java
index 01e91ee..443e741 100644
--- a/src/com/webcodepro/applecommander/storage/ProdosVolumeDirectoryHeader.java
+++ b/src/com/webcodepro/applecommander/storage/ProdosVolumeDirectoryHeader.java
@@ -19,6 +19,8 @@
  */
 package com.webcodepro.applecommander.storage;
 
+import com.webcodepro.applecommander.util.AppleUtil;
+
 /**
  * Represents the ProDOS volume directory header.
  * <p>
diff --git a/src/com/webcodepro/applecommander/storage/RdosFileEntry.java b/src/com/webcodepro/applecommander/storage/RdosFileEntry.java
index a72dc85..00558b9 100644
--- a/src/com/webcodepro/applecommander/storage/RdosFileEntry.java
+++ b/src/com/webcodepro/applecommander/storage/RdosFileEntry.java
@@ -19,6 +19,8 @@
  */
 package com.webcodepro.applecommander.storage;
 
+import com.webcodepro.applecommander.util.*;
+
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/webcodepro/applecommander/storage/RdosFormatDisk.java b/src/com/webcodepro/applecommander/storage/RdosFormatDisk.java
index 8238ce8..de73145 100644
--- a/src/com/webcodepro/applecommander/storage/RdosFormatDisk.java
+++ b/src/com/webcodepro/applecommander/storage/RdosFormatDisk.java
@@ -19,6 +19,8 @@
  */
 package com.webcodepro.applecommander.storage;
 
+import com.webcodepro.applecommander.util.*;
+
 import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.Iterator;
diff --git a/src/com/webcodepro/applecommander/test/AppleUtilTest.java b/src/com/webcodepro/applecommander/test/AppleUtilTest.java
index c9c43a2..6b22c00 100644
--- a/src/com/webcodepro/applecommander/test/AppleUtilTest.java
+++ b/src/com/webcodepro/applecommander/test/AppleUtilTest.java
@@ -19,7 +19,7 @@
  */
 package com.webcodepro.applecommander.test;
 
-import com.webcodepro.applecommander.storage.AppleUtil;
+import com.webcodepro.applecommander.util.AppleUtil;
 
 import junit.framework.TestCase;
 
diff --git a/src/com/webcodepro/applecommander/ui/swt/DiskExplorerTab.java b/src/com/webcodepro/applecommander/ui/swt/DiskExplorerTab.java
index 4e9be53..b90000d 100644
--- a/src/com/webcodepro/applecommander/ui/swt/DiskExplorerTab.java
+++ b/src/com/webcodepro/applecommander/ui/swt/DiskExplorerTab.java
@@ -19,7 +19,6 @@
  */
 package com.webcodepro.applecommander.ui.swt;
 
-import com.webcodepro.applecommander.storage.AppleUtil;
 import com.webcodepro.applecommander.storage.AppleWorksWordProcessorFileFilter;
 import com.webcodepro.applecommander.storage.ApplesoftFileFilter;
 import com.webcodepro.applecommander.storage.BinaryFileFilter;
@@ -36,6 +35,7 @@ import com.webcodepro.applecommander.storage.TextFileFilter;
 import com.webcodepro.applecommander.storage.FormattedDisk.FileColumnHeader;
 import com.webcodepro.applecommander.ui.ImportSpecification;
 import com.webcodepro.applecommander.ui.UserPreferences;
+import com.webcodepro.applecommander.util.AppleUtil;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
diff --git a/src/com/webcodepro/applecommander/ui/swt/ImportSelectFilesWizardPane.java b/src/com/webcodepro/applecommander/ui/swt/ImportSelectFilesWizardPane.java
index 945d3a8..da5ad8d 100644
--- a/src/com/webcodepro/applecommander/ui/swt/ImportSelectFilesWizardPane.java
+++ b/src/com/webcodepro/applecommander/ui/swt/ImportSelectFilesWizardPane.java
@@ -1,7 +1,7 @@
 package com.webcodepro.applecommander.ui.swt;
 
-import com.webcodepro.applecommander.storage.AppleUtil;
 import com.webcodepro.applecommander.ui.ImportSpecification;
+import com.webcodepro.applecommander.util.AppleUtil;
 
 import java.io.File;
 import java.util.Iterator;
diff --git a/src/com/webcodepro/applecommander/storage/AppleUtil.java b/src/com/webcodepro/applecommander/util/AppleUtil.java
similarity index 99%
rename from src/com/webcodepro/applecommander/storage/AppleUtil.java
rename to src/com/webcodepro/applecommander/util/AppleUtil.java
index e31a2fd..f392183 100644
--- a/src/com/webcodepro/applecommander/storage/AppleUtil.java
+++ b/src/com/webcodepro/applecommander/util/AppleUtil.java
@@ -17,7 +17,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc., 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-package com.webcodepro.applecommander.storage;
+package com.webcodepro.applecommander.util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;