diff --git a/dexlib/src/main/java/org/jf/dexlib/Util/DeodexUtil.java b/baksmali/src/main/java/org/jf/baksmali/Deodex/DeodexUtil.java
similarity index 99%
rename from dexlib/src/main/java/org/jf/dexlib/Util/DeodexUtil.java
rename to baksmali/src/main/java/org/jf/baksmali/Deodex/DeodexUtil.java
index 0a0528a7..70c22d48 100644
--- a/dexlib/src/main/java/org/jf/dexlib/Util/DeodexUtil.java
+++ b/baksmali/src/main/java/org/jf/baksmali/Deodex/DeodexUtil.java
@@ -26,11 +26,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.jf.dexlib.Util;
+package org.jf.baksmali.Deodex;
 
 import org.jf.dexlib.*;
 import org.jf.dexlib.Code.*;
 import org.jf.dexlib.Code.Format.*;
+import org.jf.dexlib.Util.AccessFlags;
+import org.jf.dexlib.Util.SparseArray;
 
 import java.util.*;
 
diff --git a/dexlib/src/main/java/org/jf/dexlib/Util/Deodexerant.java b/baksmali/src/main/java/org/jf/baksmali/Deodex/Deodexerant.java
similarity index 99%
rename from dexlib/src/main/java/org/jf/dexlib/Util/Deodexerant.java
rename to baksmali/src/main/java/org/jf/baksmali/Deodex/Deodexerant.java
index 9825fe8c..7d5cfe2d 100644
--- a/dexlib/src/main/java/org/jf/dexlib/Util/Deodexerant.java
+++ b/baksmali/src/main/java/org/jf/baksmali/Deodex/Deodexerant.java
@@ -26,9 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.jf.dexlib.Util;
+package org.jf.baksmali.Deodex;
 
 import org.jf.dexlib.*;
+import org.jf.dexlib.Util.SparseArray;
 
 import java.net.Socket;
 import java.io.PrintWriter;
diff --git a/baksmali/src/main/java/org/jf/baksmali/baksmali.java b/baksmali/src/main/java/org/jf/baksmali/baksmali.java
index 5242b935..af5e8822 100644
--- a/baksmali/src/main/java/org/jf/baksmali/baksmali.java
+++ b/baksmali/src/main/java/org/jf/baksmali/baksmali.java
@@ -31,12 +31,11 @@ package org.jf.baksmali;
 import org.antlr.stringtemplate.StringTemplate;
 import org.antlr.stringtemplate.StringTemplateGroup;
 import org.jf.baksmali.Adaptors.ClassDefinition;
+import org.jf.baksmali.Deodex.*;
 import org.jf.baksmali.Renderers.*;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.ClassDefItem;
 import org.jf.dexlib.StringIdItem;
-import org.jf.dexlib.Util.Deodexerant;
-import org.jf.dexlib.Util.DeodexUtil;
 
 import java.io.*;
 
diff --git a/baksmali/src/main/java/org/jf/baksmali/main.java b/baksmali/src/main/java/org/jf/baksmali/main.java
index 0dcfc971..a80db352 100644
--- a/baksmali/src/main/java/org/jf/baksmali/main.java
+++ b/baksmali/src/main/java/org/jf/baksmali/main.java
@@ -17,8 +17,8 @@
 package org.jf.baksmali;
 
 import org.apache.commons.cli.*;
+import org.jf.baksmali.Deodex.Deodexerant;
 import org.jf.dexlib.DexFile;
-import org.jf.dexlib.Util.Deodexerant;
 
 import java.io.File;
 import java.io.InputStream;