diff --git a/src/java/org/apache/poi/POIDocument.java b/src/java/org/apache/poi/POIDocument.java
index f0503a1a0..e7ec12a58 100644
--- a/src/java/org/apache/poi/POIDocument.java
+++ b/src/java/org/apache/poi/POIDocument.java
@@ -21,11 +21,8 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Iterator;
 import java.util.List;
 
-import org.apache.poi.util.POIUtils;
-
 import org.apache.poi.hpsf.DocumentSummaryInformation;
 import org.apache.poi.hpsf.MutablePropertySet;
 import org.apache.poi.hpsf.PropertySet;
@@ -33,9 +30,9 @@ import org.apache.poi.hpsf.PropertySetFactory;
 import org.apache.poi.hpsf.SummaryInformation;
 import org.apache.poi.poifs.filesystem.DirectoryEntry;
 import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.poifs.filesystem.DocumentEntry;
 import org.apache.poi.poifs.filesystem.DocumentInputStream;
 import org.apache.poi.poifs.filesystem.Entry;
+import org.apache.poi.poifs.filesystem.EntryUtils;
 import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.util.Internal;
@@ -243,7 +240,7 @@ public abstract class POIDocument {
     protected void copyNodes( POIFSFileSystem source, POIFSFileSystem target,
             List<String> excepts ) throws IOException
     {
-        POIUtils.copyNodes( source, target, excepts );
+        EntryUtils.copyNodes( source, target, excepts );
     }
 
    /**
@@ -256,7 +253,7 @@ public abstract class POIDocument {
     protected void copyNodes( DirectoryNode sourceRoot,
             DirectoryNode targetRoot, List<String> excepts ) throws IOException
     {
-        POIUtils.copyNodes( sourceRoot, targetRoot, excepts );
+        EntryUtils.copyNodes( sourceRoot, targetRoot, excepts );
     }
 
 	/**
@@ -267,6 +264,6 @@ public abstract class POIDocument {
     protected void copyNodeRecursively( Entry entry, DirectoryEntry target )
             throws IOException
     {
-        POIUtils.copyNodeRecursively( entry, target );
+        EntryUtils.copyNodeRecursively( entry, target );
     }
 }
diff --git a/src/java/org/apache/poi/util/POIUtils.java b/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java
similarity index 91%
rename from src/java/org/apache/poi/util/POIUtils.java
rename to src/java/org/apache/poi/poifs/filesystem/EntryUtils.java
index 368664447..deb30dae3 100644
--- a/src/java/org/apache/poi/util/POIUtils.java
+++ b/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java
@@ -14,20 +14,16 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-package org.apache.poi.util;
+package org.apache.poi.poifs.filesystem;
 
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.poifs.filesystem.DocumentEntry;
-import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.poifs.filesystem.Entry;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.util.Internal;
 
 @Internal
-public class POIUtils
+public class EntryUtils
 {
 
     /**
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
index 99ab39c9a..8bffbb50e 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
@@ -67,9 +67,9 @@ import org.apache.poi.poifs.common.POIFSConstants;
 import org.apache.poi.poifs.filesystem.DirectoryNode;
 import org.apache.poi.poifs.filesystem.DocumentEntry;
 import org.apache.poi.poifs.filesystem.Entry;
+import org.apache.poi.poifs.filesystem.EntryUtils;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.util.Internal;
-import org.apache.poi.util.POIUtils;
 
 
 /**
@@ -1003,7 +1003,7 @@ public final class HWPFDocument extends HWPFDocumentCore
             }
             else
             {
-                POIUtils.copyNodeRecursively( entry, pfs.getRoot() );
+                EntryUtils.copyNodeRecursively( entry, pfs.getRoot() );
             }
         }
 
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java
index aa33fd504..c672134ec 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java
@@ -21,8 +21,8 @@ import java.io.IOException;
 
 import org.apache.poi.poifs.filesystem.DirectoryEntry;
 import org.apache.poi.poifs.filesystem.Entry;
+import org.apache.poi.poifs.filesystem.EntryUtils;
 import org.apache.poi.util.Internal;
-import org.apache.poi.util.POIUtils;
 
 @Internal
 public class ObjectPoolImpl implements ObjectsPool
@@ -54,6 +54,6 @@ public class ObjectPoolImpl implements ObjectsPool
     public void writeTo( DirectoryEntry directoryEntry ) throws IOException
     {
         if ( _objectPool != null )
-            POIUtils.copyNodeRecursively( _objectPool, directoryEntry );
+            EntryUtils.copyNodeRecursively( _objectPool, directoryEntry );
     }
 }