diff --git a/apktool-cli/pom.xml b/apktool-cli/pom.xml
index ce86284d..e4be32b8 100644
--- a/apktool-cli/pom.xml
+++ b/apktool-cli/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>brut.apktool</groupId>
     <artifactId>apktool-cli</artifactId>
-    <version>1.4.4-SNAPSHOT</version>
+    <version>1.4.5-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
diff --git a/apktool-cli/src/main/assembly/jar-with-deps.xml b/apktool-cli/src/main/assembly/jar-with-deps.xml
index 67136d92..1b3d3613 100644
--- a/apktool-cli/src/main/assembly/jar-with-deps.xml
+++ b/apktool-cli/src/main/assembly/jar-with-deps.xml
@@ -30,6 +30,7 @@
       <unpack>true</unpack>
       <scope>runtime</scope>
       <includes>
+          <include>org.jf.*</include>
           <include>brut.*</include>
           <include>xpp3:xpp3</include>
           <include>org.yaml:snakeyaml</include>
diff --git a/apktool-cli/src/main/java/brut/apktool/Main.java b/apktool-cli/src/main/java/brut/apktool/Main.java
index a02e985c..94464214 100644
--- a/apktool-cli/src/main/java/brut/apktool/Main.java
+++ b/apktool-cli/src/main/java/brut/apktool/Main.java
@@ -16,9 +16,7 @@
 
 package brut.apktool;
 
-import brut.androlib.Androlib;
-import brut.androlib.AndrolibException;
-import brut.androlib.ApkDecoder;
+import brut.androlib.*;
 import brut.androlib.err.CantFindFrameworkResException;
 import brut.androlib.err.InFileNotFoundException;
 import brut.androlib.err.OutDirExistsException;
diff --git a/apktool-lib/pom.xml b/apktool-lib/pom.xml
index d0e262fd..78ebc7f1 100644
--- a/apktool-lib/pom.xml
+++ b/apktool-lib/pom.xml
@@ -16,7 +16,7 @@
     <name>apktool library</name>
 
     <properties>
-        <smaliVersion>1.3.0-brut6</smaliVersion>
+        <smaliVersion>1.3.3-ibot7</smaliVersion>
         <root.basedir>${project.parent.basedir}</root.basedir>
     </properties>
 
@@ -88,12 +88,14 @@
         <dependency>
             <groupId>brut.apktool.smali</groupId>
             <artifactId>baksmali</artifactId>
-            <version>${smaliVersion}</version>
+            <version>1.3.3-ibot7</version>
+            <type>jar</type>
         </dependency>
         <dependency>
             <groupId>brut.apktool.smali</groupId>
             <artifactId>util</artifactId>
-            <version>${smaliVersion}</version>
+            <version>1.3.3-ibot7-SNAPSHOT</version>
+            <type>jar</type>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
@@ -115,6 +117,12 @@
             <artifactId>xmlunit</artifactId>
             <version>1.3</version>
         </dependency>
+        <dependency>
+            <groupId>org.jf</groupId>
+            <artifactId>util</artifactId>
+            <version>1.3.3-dev</version>
+            <type>jar</type>
+        </dependency>
     </dependencies>
 
     <pluginRepositories>
diff --git a/apktool-lib/src/main/java/brut/androlib/mod/SmaliMod.java b/apktool-lib/src/main/java/brut/androlib/mod/SmaliMod.java
index bfc6f617..8927026c 100644
--- a/apktool-lib/src/main/java/brut/androlib/mod/SmaliMod.java
+++ b/apktool-lib/src/main/java/brut/androlib/mod/SmaliMod.java
@@ -16,9 +16,7 @@
 
 package brut.androlib.mod;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.*;
 import org.antlr.runtime.*;
 import org.antlr.runtime.tree.CommonTree;
 import org.antlr.runtime.tree.CommonTreeNodeStream;
diff --git a/apktool-lib/src/main/java/brut/androlib/res/data/ResPackage.java b/apktool-lib/src/main/java/brut/androlib/res/data/ResPackage.java
index 025a1519..ad36792c 100644
--- a/apktool-lib/src/main/java/brut/androlib/res/data/ResPackage.java
+++ b/apktool-lib/src/main/java/brut/androlib/res/data/ResPackage.java
@@ -16,8 +16,8 @@
 
 package brut.androlib.res.data;
 
-import brut.androlib.AndrolibException;
 import brut.androlib.err.UndefinedResObject;
+import brut.androlib.AndrolibException;
 import brut.androlib.res.data.value.ResFileValue;
 import brut.androlib.res.data.value.ResValueFactory;
 import brut.androlib.res.xml.ResValuesXmlSerializable;
diff --git a/apktool-lib/src/main/java/brut/androlib/res/decoder/ResFileDecoder.java b/apktool-lib/src/main/java/brut/androlib/res/decoder/ResFileDecoder.java
index ada8b751..c5d67d52 100644
--- a/apktool-lib/src/main/java/brut/androlib/res/decoder/ResFileDecoder.java
+++ b/apktool-lib/src/main/java/brut/androlib/res/decoder/ResFileDecoder.java
@@ -23,9 +23,7 @@ import brut.androlib.res.data.value.ResBoolValue;
 import brut.androlib.res.data.value.ResFileValue;
 import brut.directory.Directory;
 import brut.directory.DirectoryException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
diff --git a/apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java b/apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java
index 83997b46..c243883f 100644
--- a/apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java
+++ b/apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java
@@ -19,7 +19,8 @@ package brut.androlib.src;
 import brut.androlib.AndrolibException;
 import java.io.File;
 import java.io.IOException;
-import org.jf.baksmali.*;
+import org.jf.baksmali.baksmali;
+import org.jf.baksmali.main;
 import org.jf.dexlib.DexFile;
 
 /**
@@ -43,7 +44,7 @@ public class SmaliDecoder {
             baksmali.disassembleDexFile(mApkFile.getAbsolutePath(),
                 new DexFile(mApkFile), false, mOutDir.getAbsolutePath(), null,
                 null, null, false, true, true, true, false, false, 
-                mDebug ? main.DIFFPRE : 0, false, false, null);
+                mDebug ? main.FULLMERGE : 0, false, false, null);
         } catch (IOException ex) {
             throw new AndrolibException(ex);
         }
diff --git a/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java b/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
index cb2f49e5..b86f0599 100644
--- a/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
+++ b/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
@@ -19,19 +19,11 @@ package brut.androlib;
 import brut.androlib.res.util.ExtFile;
 import brut.common.BrutException;
 import brut.util.OS;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
+import java.io.*;
 import java.util.logging.Logger;
-import org.custommonkey.xmlunit.DetailedDiff;
-import org.custommonkey.xmlunit.Diff;
-import org.custommonkey.xmlunit.ElementNameAndAttributeQualifier;
-import org.custommonkey.xmlunit.ElementQualifier;
-import org.junit.AfterClass;
-import static org.junit.Assert.assertTrue;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.custommonkey.xmlunit.*;
+import org.junit.*;
+import static org.junit.Assert.*;
 import org.xml.sax.SAXException;
 
 
@@ -124,7 +116,9 @@ public class BuildAndDecodeTest {
 
     @Test
     public void qualifiersTest() throws BrutException {
-        compareValuesFiles("values-mcc004/strings.xml");
+        compareValuesFiles("values-mcc004-mnc4-en-rUS-sw100dp-w200dp-h300dp" +
+                "-xlarge-long-land-television-night-xhdpi-finger-keyssoft-12key" +
+                "-navhidden-dpad/strings.xml");
     }
 
     private void compareValuesFiles(String path) throws BrutException {
diff --git a/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc004/strings.xml b/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc004-mnc4-en-rUS-sw100dp-w200dp-h300dp-xlarge-long-land-television-night-xhdpi-finger-keyssoft-12key-navhidden-dpad/strings.xml
similarity index 100%
rename from apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc004/strings.xml
rename to apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc004-mnc4-en-rUS-sw100dp-w200dp-h300dp-xlarge-long-land-television-night-xhdpi-finger-keyssoft-12key-navhidden-dpad/strings.xml
diff --git a/pom.xml b/pom.xml
index f8d95cb2..15f12b08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,10 @@
     </properties>
 
     <modules>
+        <module>../brut.apktool.smali</module>
+        <module>../brut.j.dir</module>
+        <module>../brut.j.common</module>
+        <module>../brut.j.util</module>
         <module>apktool-lib</module>
         <module>apktool-cli</module>
     </modules>