diff --git a/src/com/webcodepro/applecommander/storage/AppleWorksDataBaseFileFilter.java b/src/com/webcodepro/applecommander/storage/AppleWorksDataBaseFileFilter.java
index ad4e7df..7e919cf 100644
--- a/src/com/webcodepro/applecommander/storage/AppleWorksDataBaseFileFilter.java
+++ b/src/com/webcodepro/applecommander/storage/AppleWorksDataBaseFileFilter.java
@@ -19,7 +19,7 @@
  */
 package com.webcodepro.applecommander.storage;
 
-import com.webcodepro.applecommander.util.*;
+import com.webcodepro.applecommander.util.AppleUtil;
 
 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 525ebe7..6422369 100644
--- a/src/com/webcodepro/applecommander/storage/AppleWorksSpreadSheetFileFilter.java
+++ b/src/com/webcodepro/applecommander/storage/AppleWorksSpreadSheetFileFilter.java
@@ -19,7 +19,7 @@
  */
 package com.webcodepro.applecommander.storage;
 
-import com.webcodepro.applecommander.util.*;
+import com.webcodepro.applecommander.util.AppleUtil;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintWriter;
diff --git a/src/com/webcodepro/applecommander/storage/AppleWorksWordProcessorFileFilter.java b/src/com/webcodepro/applecommander/storage/AppleWorksWordProcessorFileFilter.java
index 3c30338..3abadcc 100644
--- a/src/com/webcodepro/applecommander/storage/AppleWorksWordProcessorFileFilter.java
+++ b/src/com/webcodepro/applecommander/storage/AppleWorksWordProcessorFileFilter.java
@@ -20,7 +20,7 @@
 package com.webcodepro.applecommander.storage;
 
 import com.webcodepro.applecommander.ui.AppleCommander;
-import com.webcodepro.applecommander.util.*;
+import com.webcodepro.applecommander.util.AppleUtil;
 
 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 3cbd748..0a5015c 100644
--- a/src/com/webcodepro/applecommander/storage/ApplesoftFileFilter.java
+++ b/src/com/webcodepro/applecommander/storage/ApplesoftFileFilter.java
@@ -19,7 +19,8 @@
  */
 package com.webcodepro.applecommander.storage;
 
-import com.webcodepro.applecommander.util.*;
+import com.webcodepro.applecommander.util.ApplesoftToken;
+import com.webcodepro.applecommander.util.ApplesoftTokenizer;
 
 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 0c3e3b6..9348ec2 100644
--- a/src/com/webcodepro/applecommander/storage/Disk.java
+++ b/src/com/webcodepro/applecommander/storage/Disk.java
@@ -19,7 +19,7 @@
  */
 package com.webcodepro.applecommander.storage;
 
-import com.webcodepro.applecommander.util.*;
+import com.webcodepro.applecommander.util.AppleUtil;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
diff --git a/src/com/webcodepro/applecommander/storage/DosFileEntry.java b/src/com/webcodepro/applecommander/storage/DosFileEntry.java
index a45889b..a73e958 100644
--- a/src/com/webcodepro/applecommander/storage/DosFileEntry.java
+++ b/src/com/webcodepro/applecommander/storage/DosFileEntry.java
@@ -19,7 +19,7 @@
  */
 package com.webcodepro.applecommander.storage;
 
-import com.webcodepro.applecommander.util.*;
+import com.webcodepro.applecommander.util.AppleUtil;
 
 import java.text.NumberFormat;
 import java.util.ArrayList;
diff --git a/src/com/webcodepro/applecommander/storage/DosFormatDisk.java b/src/com/webcodepro/applecommander/storage/DosFormatDisk.java
index affaf80..9b73409 100644
--- a/src/com/webcodepro/applecommander/storage/DosFormatDisk.java
+++ b/src/com/webcodepro/applecommander/storage/DosFormatDisk.java
@@ -19,7 +19,7 @@
  */
 package com.webcodepro.applecommander.storage;
 
-import com.webcodepro.applecommander.util.*;
+import com.webcodepro.applecommander.util.AppleUtil;
 
 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 e782662..b6ddddf 100644
--- a/src/com/webcodepro/applecommander/storage/GraphicsFileFilter.java
+++ b/src/com/webcodepro/applecommander/storage/GraphicsFileFilter.java
@@ -20,7 +20,7 @@
 package com.webcodepro.applecommander.storage;
 
 import com.webcodepro.applecommander.storage.filters.imagehandlers.AppleImage;
-import com.webcodepro.applecommander.util.*;
+import com.webcodepro.applecommander.util.AppleUtil;
 
 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 6031feb..07b1ec2 100644
--- a/src/com/webcodepro/applecommander/storage/HexDumpFileFilter.java
+++ b/src/com/webcodepro/applecommander/storage/HexDumpFileFilter.java
@@ -19,7 +19,7 @@
  */
 package com.webcodepro.applecommander.storage;
 
-import com.webcodepro.applecommander.util.*;
+import com.webcodepro.applecommander.util.AppleUtil;
 
 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 49bf8b2..7f144c0 100644
--- a/src/com/webcodepro/applecommander/storage/IntegerBasicFileFilter.java
+++ b/src/com/webcodepro/applecommander/storage/IntegerBasicFileFilter.java
@@ -19,7 +19,7 @@
  */
 package com.webcodepro.applecommander.storage;
 
-import com.webcodepro.applecommander.util.*;
+import com.webcodepro.applecommander.util.AppleUtil;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintWriter;
diff --git a/src/com/webcodepro/applecommander/storage/ProdosCommonEntry.java b/src/com/webcodepro/applecommander/storage/ProdosCommonEntry.java
index 953ed55..9433687 100644
--- a/src/com/webcodepro/applecommander/storage/ProdosCommonEntry.java
+++ b/src/com/webcodepro/applecommander/storage/ProdosCommonEntry.java
@@ -19,7 +19,7 @@
  */
 package com.webcodepro.applecommander.storage;
 
-import com.webcodepro.applecommander.util.*;
+import com.webcodepro.applecommander.util.AppleUtil;
 
 import java.util.Date;
 
diff --git a/src/com/webcodepro/applecommander/storage/ProdosFileEntry.java b/src/com/webcodepro/applecommander/storage/ProdosFileEntry.java
index 75a209b..5033f60 100644
--- a/src/com/webcodepro/applecommander/storage/ProdosFileEntry.java
+++ b/src/com/webcodepro/applecommander/storage/ProdosFileEntry.java
@@ -19,7 +19,7 @@
  */
 package com.webcodepro.applecommander.storage;
 
-import com.webcodepro.applecommander.util.*;
+import com.webcodepro.applecommander.util.AppleUtil;
 
 import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
diff --git a/src/com/webcodepro/applecommander/storage/ProdosFormatDisk.java b/src/com/webcodepro/applecommander/storage/ProdosFormatDisk.java
index 40bae7b..1493fde 100644
--- a/src/com/webcodepro/applecommander/storage/ProdosFormatDisk.java
+++ b/src/com/webcodepro/applecommander/storage/ProdosFormatDisk.java
@@ -19,7 +19,7 @@
  */
 package com.webcodepro.applecommander.storage;
 
-import com.webcodepro.applecommander.util.*;
+import com.webcodepro.applecommander.util.AppleUtil;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/com/webcodepro/applecommander/storage/RdosFileEntry.java b/src/com/webcodepro/applecommander/storage/RdosFileEntry.java
index 00558b9..c27cebb 100644
--- a/src/com/webcodepro/applecommander/storage/RdosFileEntry.java
+++ b/src/com/webcodepro/applecommander/storage/RdosFileEntry.java
@@ -19,7 +19,7 @@
  */
 package com.webcodepro.applecommander.storage;
 
-import com.webcodepro.applecommander.util.*;
+import com.webcodepro.applecommander.util.AppleUtil;
 
 import java.text.NumberFormat;
 import java.util.ArrayList;
diff --git a/src/com/webcodepro/applecommander/storage/RdosFormatDisk.java b/src/com/webcodepro/applecommander/storage/RdosFormatDisk.java
index de73145..fe7f6e9 100644
--- a/src/com/webcodepro/applecommander/storage/RdosFormatDisk.java
+++ b/src/com/webcodepro/applecommander/storage/RdosFormatDisk.java
@@ -19,7 +19,7 @@
  */
 package com.webcodepro.applecommander.storage;
 
-import com.webcodepro.applecommander.util.*;
+import com.webcodepro.applecommander.util.AppleUtil;
 
 import java.util.ArrayList;
 import java.util.BitSet;