diff --git a/baksmali/src/test/java/org/jf/baksmali/ImplicitReferenceTest.java b/brut.apktool.smali/baksmali/src/test/java/org/jf/baksmali/ImplicitReferenceTest.java
similarity index 100%
rename from baksmali/src/test/java/org/jf/baksmali/ImplicitReferenceTest.java
rename to brut.apktool.smali/baksmali/src/test/java/org/jf/baksmali/ImplicitReferenceTest.java
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/rewriter/AnnotationElementRewriter.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/AnnotationElementRewriter.java
similarity index 100%
rename from dexlib2/src/main/java/org/jf/dexlib2/rewriter/AnnotationElementRewriter.java
rename to brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/AnnotationElementRewriter.java
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/rewriter/AnnotationRewriter.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/AnnotationRewriter.java
similarity index 100%
rename from dexlib2/src/main/java/org/jf/dexlib2/rewriter/AnnotationRewriter.java
rename to brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/AnnotationRewriter.java
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/rewriter/ClassDefRewriter.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/ClassDefRewriter.java
similarity index 100%
rename from dexlib2/src/main/java/org/jf/dexlib2/rewriter/ClassDefRewriter.java
rename to brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/ClassDefRewriter.java
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/rewriter/DebugItemRewriter.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/DebugItemRewriter.java
similarity index 100%
rename from dexlib2/src/main/java/org/jf/dexlib2/rewriter/DebugItemRewriter.java
rename to brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/DebugItemRewriter.java
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/rewriter/DexRewriter.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/DexRewriter.java
similarity index 100%
rename from dexlib2/src/main/java/org/jf/dexlib2/rewriter/DexRewriter.java
rename to brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/DexRewriter.java
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/rewriter/EncodedValueRewriter.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/EncodedValueRewriter.java
similarity index 100%
rename from dexlib2/src/main/java/org/jf/dexlib2/rewriter/EncodedValueRewriter.java
rename to brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/EncodedValueRewriter.java
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/rewriter/ExceptionHandlerRewriter.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/ExceptionHandlerRewriter.java
similarity index 100%
rename from dexlib2/src/main/java/org/jf/dexlib2/rewriter/ExceptionHandlerRewriter.java
rename to brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/ExceptionHandlerRewriter.java
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/rewriter/FieldReferenceRewriter.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/FieldReferenceRewriter.java
similarity index 100%
rename from dexlib2/src/main/java/org/jf/dexlib2/rewriter/FieldReferenceRewriter.java
rename to brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/FieldReferenceRewriter.java
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/rewriter/FieldRewriter.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/FieldRewriter.java
similarity index 100%
rename from dexlib2/src/main/java/org/jf/dexlib2/rewriter/FieldRewriter.java
rename to brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/FieldRewriter.java
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/rewriter/InstructionRewriter.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/InstructionRewriter.java
similarity index 100%
rename from dexlib2/src/main/java/org/jf/dexlib2/rewriter/InstructionRewriter.java
rename to brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/InstructionRewriter.java
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/rewriter/MethodImplementationRewriter.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/MethodImplementationRewriter.java
similarity index 100%
rename from dexlib2/src/main/java/org/jf/dexlib2/rewriter/MethodImplementationRewriter.java
rename to brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/MethodImplementationRewriter.java
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/rewriter/MethodParameterRewriter.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/MethodParameterRewriter.java
similarity index 100%
rename from dexlib2/src/main/java/org/jf/dexlib2/rewriter/MethodParameterRewriter.java
rename to brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/MethodParameterRewriter.java
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/rewriter/MethodReferenceRewriter.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/MethodReferenceRewriter.java
similarity index 100%
rename from dexlib2/src/main/java/org/jf/dexlib2/rewriter/MethodReferenceRewriter.java
rename to brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/MethodReferenceRewriter.java
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/rewriter/MethodRewriter.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/MethodRewriter.java
similarity index 100%
rename from dexlib2/src/main/java/org/jf/dexlib2/rewriter/MethodRewriter.java
rename to brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/MethodRewriter.java
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/rewriter/Rewriter.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/Rewriter.java
similarity index 100%
rename from dexlib2/src/main/java/org/jf/dexlib2/rewriter/Rewriter.java
rename to brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/Rewriter.java
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/rewriter/RewriterModule.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/RewriterModule.java
similarity index 100%
rename from dexlib2/src/main/java/org/jf/dexlib2/rewriter/RewriterModule.java
rename to brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/RewriterModule.java
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/rewriter/RewriterUtils.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/RewriterUtils.java
similarity index 100%
rename from dexlib2/src/main/java/org/jf/dexlib2/rewriter/RewriterUtils.java
rename to brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/RewriterUtils.java
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/rewriter/Rewriters.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/Rewriters.java
similarity index 100%
rename from dexlib2/src/main/java/org/jf/dexlib2/rewriter/Rewriters.java
rename to brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/Rewriters.java
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/rewriter/TryBlockRewriter.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/TryBlockRewriter.java
similarity index 100%
rename from dexlib2/src/main/java/org/jf/dexlib2/rewriter/TryBlockRewriter.java
rename to brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/TryBlockRewriter.java
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/rewriter/TypeRewriter.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/TypeRewriter.java
similarity index 100%
rename from dexlib2/src/main/java/org/jf/dexlib2/rewriter/TypeRewriter.java
rename to brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/rewriter/TypeRewriter.java
diff --git a/dexlib2/src/test/java/org/jf/dexlib2/writer/DexWriterTest.java b/brut.apktool.smali/dexlib2/src/test/java/org/jf/dexlib2/writer/DexWriterTest.java
similarity index 100%
rename from dexlib2/src/test/java/org/jf/dexlib2/writer/DexWriterTest.java
rename to brut.apktool.smali/dexlib2/src/test/java/org/jf/dexlib2/writer/DexWriterTest.java
diff --git a/smali/src/main/java/org/jf/smali/SmaliTestUtils.java b/brut.apktool.smali/smali/src/main/java/org/jf/smali/SmaliTestUtils.java
similarity index 100%
rename from smali/src/main/java/org/jf/smali/SmaliTestUtils.java
rename to brut.apktool.smali/smali/src/main/java/org/jf/smali/SmaliTestUtils.java
diff --git a/smali/src/test/java/ImplicitReferenceTest.java b/brut.apktool.smali/smali/src/test/java/ImplicitReferenceTest.java
similarity index 100%
rename from smali/src/test/java/ImplicitReferenceTest.java
rename to brut.apktool.smali/smali/src/test/java/ImplicitReferenceTest.java
diff --git a/util/src/main/java/org/jf/util/TextUtils.java b/brut.apktool.smali/util/src/main/java/org/jf/util/TextUtils.java
similarity index 100%
rename from util/src/main/java/org/jf/util/TextUtils.java
rename to brut.apktool.smali/util/src/main/java/org/jf/util/TextUtils.java