diff --git a/pom.xml b/pom.xml
index ffa41725..1be2c9b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
                             <goal>antlr</goal>
                         </goals>
                         <configuration>
-                            <includes><include>org/JesusFreke/smali/smaliLexer.g</include></includes>
+                            <includes><include>org/jf/smali/smaliLexer.g</include></includes>
                         </configuration>
                     </execution>
                     <execution>
@@ -37,7 +37,7 @@
                             <goal>antlr</goal>
                         </goals>
                         <configuration>
-                            <includes><include>org/JesusFreke/smali/smaliParser.g</include></includes>
+                            <includes><include>org/jf/smali/smaliParser.g</include></includes>
                         </configuration>
                     </execution>
                     <execution>
@@ -46,7 +46,7 @@
                             <goal>antlr</goal>
                         </goals>
                         <configuration>
-                            <includes><include>org/JesusFreke/smali/smaliTreeWalker.g</include></includes>
+                            <includes><include>org/jf/smali/smaliTreeWalker.g</include></includes>
                         </configuration>
                     </execution>
                 </executions>
@@ -60,7 +60,7 @@
                     </descriptorRefs>
                     <archive>
                         <manifest>
-                            <mainClass>org.JesusFreke.smali.main</mainClass>
+                            <mainClass>org.jf.smali.main</mainClass>
                         </manifest>
                     </archive>
                 </configuration>
diff --git a/src/main/antlr3/org/JesusFreke/smali/smaliLexer.g b/src/main/antlr3/org/jf/smali/smaliLexer.g
similarity index 99%
rename from src/main/antlr3/org/JesusFreke/smali/smaliLexer.g
rename to src/main/antlr3/org/jf/smali/smaliLexer.g
index 1fea9304..998c1ca0 100644
--- a/src/main/antlr3/org/JesusFreke/smali/smaliLexer.g
+++ b/src/main/antlr3/org/jf/smali/smaliLexer.g
@@ -103,7 +103,7 @@ tokens {
 }
 
 @lexer::header {
-package org.JesusFreke.smali;
+package org.jf.smali;
 
 import java.util.ArrayDeque;
 }
diff --git a/src/main/antlr3/org/JesusFreke/smali/smaliParser.g b/src/main/antlr3/org/jf/smali/smaliParser.g
similarity index 98%
rename from src/main/antlr3/org/JesusFreke/smali/smaliParser.g
rename to src/main/antlr3/org/jf/smali/smaliParser.g
index 74af65b7..565c3c12 100644
--- a/src/main/antlr3/org/JesusFreke/smali/smaliParser.g
+++ b/src/main/antlr3/org/jf/smali/smaliParser.g
@@ -121,9 +121,9 @@ tokens {
 }
 
 @header {
-package org.JesusFreke.smali;
+package org.jf.smali;
 
-import org.JesusFreke.dexlib.code.Format.*;
+import org.jf.dexlib.code.Format.*;
 }
 
 
@@ -346,7 +346,7 @@ instruction returns [int size]
 	|	//e.g. const-string v1 "Hello World!"
 		INSTRUCTION_FORMAT21c_STRING REGISTER STRING_LITERAL {$size = Format21c.Format.getByteCount();}
 		-> ^(I_STATEMENT_FORMAT21c_STRING[$start, "I_STATEMENT_FORMAT21c_STRING"] INSTRUCTION_FORMAT21c_STRING REGISTER STRING_LITERAL)
-	|	//e.g. const-class v2 org/JesusFreke/HelloWorld2/HelloWorld2
+	|	//e.g. const-class v2 org/jf/HelloWorld2/HelloWorld2
 		INSTRUCTION_FORMAT21c_TYPE REGISTER reference_type_descriptor {$size = Format21c.Format.getByteCount();}
 		-> ^(I_STATEMENT_FORMAT21c_TYPE[$start, "I_STATEMENT_FORMAT21c"] INSTRUCTION_FORMAT21c_TYPE REGISTER reference_type_descriptor)
 	|	//e.g. const/high16 v1, 1234
@@ -361,7 +361,7 @@ instruction returns [int size]
 	|	//e.g. add-int v0, v1, 123
 		INSTRUCTION_FORMAT22b REGISTER REGISTER integral_literal {$size = Format22b.Format.getByteCount();}
 		-> ^(I_STATEMENT_FORMAT22b[$start, "I_STATEMENT_FORMAT22b"] INSTRUCTION_FORMAT22b REGISTER REGISTER integral_literal)
-	|	//e.g. iput-object v1, v0 org/JesusFreke/HelloWorld2/HelloWorld2.helloWorld Ljava/lang/String;
+	|	//e.g. iput-object v1, v0 org/jf/HelloWorld2/HelloWorld2.helloWorld Ljava/lang/String;
 		INSTRUCTION_FORMAT22c_FIELD REGISTER REGISTER fully_qualified_field {$size = Format22c.Format.getByteCount();}
 		-> ^(I_STATEMENT_FORMAT22c_FIELD[$start, "I_STATEMENT_FORMAT22c_FIELD"] INSTRUCTION_FORMAT22c_FIELD REGISTER REGISTER fully_qualified_field)
 	|	//e.g. instance-of v0, v1, Ljava/lang/String;
diff --git a/src/main/antlr3/org/JesusFreke/smali/smaliTreeWalker.g b/src/main/antlr3/org/jf/smali/smaliTreeWalker.g
similarity index 99%
rename from src/main/antlr3/org/JesusFreke/smali/smaliTreeWalker.g
rename to src/main/antlr3/org/jf/smali/smaliTreeWalker.g
index 654f9d90..481b23c5 100644
--- a/src/main/antlr3/org/JesusFreke/smali/smaliTreeWalker.g
+++ b/src/main/antlr3/org/jf/smali/smaliTreeWalker.g
@@ -34,15 +34,15 @@ options {
 }
 
 @header {
-package org.JesusFreke.smali;
+package org.jf.smali;
 
 import java.util.HashMap;
 
-import org.JesusFreke.dexlib.*;
-import org.JesusFreke.dexlib.EncodedValue.*;
-import org.JesusFreke.dexlib.util.*;
-import org.JesusFreke.dexlib.code.*;
-import org.JesusFreke.dexlib.code.Format.*;
+import org.jf.dexlib.*;
+import org.jf.dexlib.EncodedValue.*;
+import org.jf.dexlib.util.*;
+import org.jf.dexlib.code.*;
+import org.jf.dexlib.code.Format.*;
 }
 
 @members {
@@ -770,7 +770,7 @@ instruction[int totalMethodRegisters, int methodParameterRegisters]  returns[Ins
 
 			$instruction = Format21c.Format.make(dexFile, opcode.value, regA, stringIdItem);
 		}
-	|	//e.g. const-class v2 org/JesusFreke/HelloWorld2/HelloWorld2
+	|	//e.g. const-class v2 org/jf/HelloWorld2/HelloWorld2
 		^(I_STATEMENT_FORMAT21c_TYPE INSTRUCTION_FORMAT21c_TYPE REGISTER reference_type_descriptor)
 		{
 			Opcode opcode = Opcode.getOpcodeByName($INSTRUCTION_FORMAT21c_TYPE.text);
@@ -826,7 +826,7 @@ instruction[int totalMethodRegisters, int methodParameterRegisters]  returns[Ins
 			
 			$instruction = Format22b.Format.make(dexFile, opcode.value, regA, regB, (byte)litC);
 		}
-	|	//e.g. iput-object v1 v0 org/JesusFreke/HelloWorld2/HelloWorld2.helloWorld Ljava/lang/String;
+	|	//e.g. iput-object v1 v0 org/jf/HelloWorld2/HelloWorld2.helloWorld Ljava/lang/String;
 		^(I_STATEMENT_FORMAT22c_FIELD INSTRUCTION_FORMAT22c_FIELD registerA=REGISTER registerB=REGISTER fully_qualified_field)
 		{
 			Opcode opcode = Opcode.getOpcodeByName($INSTRUCTION_FORMAT22c_FIELD.text);
diff --git a/src/main/java/org/JesusFreke/dexlib/AnnotationDirectoryItem.java b/src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java
similarity index 97%
rename from src/main/java/org/JesusFreke/dexlib/AnnotationDirectoryItem.java
rename to src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java
index 7295ea2a..fe2e5447 100644
--- a/src/main/java/org/JesusFreke/dexlib/AnnotationDirectoryItem.java
+++ b/src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java
@@ -26,9 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.ItemType;
+import org.jf.dexlib.ItemType;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/JesusFreke/dexlib/AnnotationItem.java b/src/main/java/org/jf/dexlib/AnnotationItem.java
similarity index 92%
rename from src/main/java/org/JesusFreke/dexlib/AnnotationItem.java
rename to src/main/java/org/jf/dexlib/AnnotationItem.java
index 161f8229..eb09eca7 100644
--- a/src/main/java/org/JesusFreke/dexlib/AnnotationItem.java
+++ b/src/main/java/org/jf/dexlib/AnnotationItem.java
@@ -26,10 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.EncodedValue.AnnotationEncodedValueSubField;
-import org.JesusFreke.dexlib.ItemType;
+import org.jf.dexlib.EncodedValue.AnnotationEncodedValueSubField;
+import org.jf.dexlib.ItemType;
 
 public class AnnotationItem extends OffsettedItem<AnnotationItem> {
     private final ByteField visibilityField;
diff --git a/src/main/java/org/JesusFreke/dexlib/AnnotationSetItem.java b/src/main/java/org/jf/dexlib/AnnotationSetItem.java
similarity index 95%
rename from src/main/java/org/JesusFreke/dexlib/AnnotationSetItem.java
rename to src/main/java/org/jf/dexlib/AnnotationSetItem.java
index 8157a433..6addf972 100644
--- a/src/main/java/org/JesusFreke/dexlib/AnnotationSetItem.java
+++ b/src/main/java/org/jf/dexlib/AnnotationSetItem.java
@@ -26,9 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.ItemType;
+import org.jf.dexlib.ItemType;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/JesusFreke/dexlib/AnnotationSetRefList.java b/src/main/java/org/jf/dexlib/AnnotationSetRefList.java
similarity index 95%
rename from src/main/java/org/JesusFreke/dexlib/AnnotationSetRefList.java
rename to src/main/java/org/jf/dexlib/AnnotationSetRefList.java
index c50c9ee0..18ef0af9 100644
--- a/src/main/java/org/JesusFreke/dexlib/AnnotationSetRefList.java
+++ b/src/main/java/org/jf/dexlib/AnnotationSetRefList.java
@@ -26,9 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.ItemType;
+import org.jf.dexlib.ItemType;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/JesusFreke/dexlib/AnnotationVisibility.java b/src/main/java/org/jf/dexlib/AnnotationVisibility.java
similarity index 96%
rename from src/main/java/org/JesusFreke/dexlib/AnnotationVisibility.java
rename to src/main/java/org/jf/dexlib/AnnotationVisibility.java
index 891646fd..e0a9c41c 100755
--- a/src/main/java/org/JesusFreke/dexlib/AnnotationVisibility.java
+++ b/src/main/java/org/jf/dexlib/AnnotationVisibility.java
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
 public enum AnnotationVisibility {
     BUILD((byte)0),
diff --git a/src/main/java/org/JesusFreke/dexlib/ByteField.java b/src/main/java/org/jf/dexlib/ByteField.java
similarity index 92%
rename from src/main/java/org/JesusFreke/dexlib/ByteField.java
rename to src/main/java/org/jf/dexlib/ByteField.java
index 2bea94b7..bbeefeab 100644
--- a/src/main/java/org/JesusFreke/dexlib/ByteField.java
+++ b/src/main/java/org/jf/dexlib/ByteField.java
@@ -26,10 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.Output;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.Output;
 
 public class ByteField extends CachedIntegerValueField {
     public ByteField(String fieldName) {
diff --git a/src/main/java/org/JesusFreke/dexlib/CachedIntegerValueField.java b/src/main/java/org/jf/dexlib/CachedIntegerValueField.java
similarity index 93%
rename from src/main/java/org/JesusFreke/dexlib/CachedIntegerValueField.java
rename to src/main/java/org/jf/dexlib/CachedIntegerValueField.java
index 144dc3cc..6e548b3d 100644
--- a/src/main/java/org/JesusFreke/dexlib/CachedIntegerValueField.java
+++ b/src/main/java/org/jf/dexlib/CachedIntegerValueField.java
@@ -26,10 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
-import org.JesusFreke.dexlib.util.Output;
+import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Output;
 
 public abstract class CachedIntegerValueField<T extends CachedIntegerValueField>
         implements Field<T> {
diff --git a/src/main/java/org/JesusFreke/dexlib/ClassDataItem.java b/src/main/java/org/jf/dexlib/ClassDataItem.java
similarity index 96%
rename from src/main/java/org/JesusFreke/dexlib/ClassDataItem.java
rename to src/main/java/org/jf/dexlib/ClassDataItem.java
index 1801ce93..16b62220 100644
--- a/src/main/java/org/JesusFreke/dexlib/ClassDataItem.java
+++ b/src/main/java/org/jf/dexlib/ClassDataItem.java
@@ -26,10 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.ItemType;
-import org.JesusFreke.dexlib.util.*;
+import org.jf.dexlib.ItemType;
+import org.jf.dexlib.util.*;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/org/JesusFreke/dexlib/ClassDefItem.java b/src/main/java/org/jf/dexlib/ClassDefItem.java
similarity index 95%
rename from src/main/java/org/JesusFreke/dexlib/ClassDefItem.java
rename to src/main/java/org/jf/dexlib/ClassDefItem.java
index c1350360..c7eabeeb 100644
--- a/src/main/java/org/JesusFreke/dexlib/ClassDefItem.java
+++ b/src/main/java/org/jf/dexlib/ClassDefItem.java
@@ -26,12 +26,12 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.ItemType;
-import org.JesusFreke.dexlib.EncodedValue.EncodedValue;
-import org.JesusFreke.dexlib.EncodedValue.EncodedValueSubField;
-import org.JesusFreke.dexlib.util.TypeUtils;
+import org.jf.dexlib.ItemType;
+import org.jf.dexlib.EncodedValue.EncodedValue;
+import org.jf.dexlib.EncodedValue.EncodedValueSubField;
+import org.jf.dexlib.util.TypeUtils;
 
 import java.util.HashMap;
 import java.util.ArrayList;
diff --git a/src/main/java/org/JesusFreke/dexlib/CodeItem.java b/src/main/java/org/jf/dexlib/CodeItem.java
similarity index 96%
rename from src/main/java/org/JesusFreke/dexlib/CodeItem.java
rename to src/main/java/org/jf/dexlib/CodeItem.java
index 8923c870..054f8c7c 100644
--- a/src/main/java/org/JesusFreke/dexlib/CodeItem.java
+++ b/src/main/java/org/jf/dexlib/CodeItem.java
@@ -26,13 +26,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.ItemType;
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import org.jf.dexlib.ItemType;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/JesusFreke/dexlib/CompositeField.java b/src/main/java/org/jf/dexlib/CompositeField.java
similarity index 93%
rename from src/main/java/org/JesusFreke/dexlib/CompositeField.java
rename to src/main/java/org/jf/dexlib/CompositeField.java
index 7e77972a..8c5e42ca 100644
--- a/src/main/java/org/JesusFreke/dexlib/CompositeField.java
+++ b/src/main/java/org/jf/dexlib/CompositeField.java
@@ -26,10 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 
 public abstract class CompositeField<T extends CompositeField<T>> implements Field<T> {
diff --git a/src/main/java/org/JesusFreke/dexlib/DebugInfoItem.java b/src/main/java/org/jf/dexlib/DebugInfoItem.java
similarity index 92%
rename from src/main/java/org/JesusFreke/dexlib/DebugInfoItem.java
rename to src/main/java/org/jf/dexlib/DebugInfoItem.java
index 4aa51c49..1987098e 100644
--- a/src/main/java/org/JesusFreke/dexlib/DebugInfoItem.java
+++ b/src/main/java/org/jf/dexlib/DebugInfoItem.java
@@ -26,14 +26,14 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.ItemType;
-import org.JesusFreke.dexlib.debug.DebugInstructionFactory;
-import org.JesusFreke.dexlib.debug.EndSequence;
-import org.JesusFreke.dexlib.debug.DebugInstruction;
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.ItemType;
+import org.jf.dexlib.debug.DebugInstructionFactory;
+import org.jf.dexlib.debug.EndSequence;
+import org.jf.dexlib.debug.DebugInstruction;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/JesusFreke/dexlib/DexFile.java b/src/main/java/org/jf/dexlib/DexFile.java
similarity index 96%
rename from src/main/java/org/JesusFreke/dexlib/DexFile.java
rename to src/main/java/org/jf/dexlib/DexFile.java
index 1c95d60e..9fbb7261 100644
--- a/src/main/java/org/JesusFreke/dexlib/DexFile.java
+++ b/src/main/java/org/jf/dexlib/DexFile.java
@@ -26,15 +26,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.util.*;
+import org.jf.dexlib.util.*;
 
 import java.util.HashMap;
-import java.util.ArrayList;
 import java.util.zip.Adler32;
 import java.io.File;
-import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.DigestException;
diff --git a/src/main/java/org/JesusFreke/dexlib/EncodedArrayItem.java b/src/main/java/org/jf/dexlib/EncodedArrayItem.java
similarity index 88%
rename from src/main/java/org/JesusFreke/dexlib/EncodedArrayItem.java
rename to src/main/java/org/jf/dexlib/EncodedArrayItem.java
index e6b01139..11cae1a0 100644
--- a/src/main/java/org/JesusFreke/dexlib/EncodedArrayItem.java
+++ b/src/main/java/org/jf/dexlib/EncodedArrayItem.java
@@ -26,13 +26,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.ItemType;
-import org.JesusFreke.dexlib.EncodedValue.ArrayEncodedValueSubField;
-import org.JesusFreke.dexlib.EncodedValue.EncodedValue;
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.ItemType;
+import org.jf.dexlib.EncodedValue.ArrayEncodedValueSubField;
+import org.jf.dexlib.EncodedValue.EncodedValue;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/org/JesusFreke/dexlib/EncodedValue/AnnotationElement.java b/src/main/java/org/jf/dexlib/EncodedValue/AnnotationElement.java
similarity index 95%
rename from src/main/java/org/JesusFreke/dexlib/EncodedValue/AnnotationElement.java
rename to src/main/java/org/jf/dexlib/EncodedValue/AnnotationElement.java
index e47362ac..a392536b 100644
--- a/src/main/java/org/JesusFreke/dexlib/EncodedValue/AnnotationElement.java
+++ b/src/main/java/org/jf/dexlib/EncodedValue/AnnotationElement.java
@@ -26,9 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.EncodedValue;
+package org.jf.dexlib.EncodedValue;
 
-import org.JesusFreke.dexlib.*;
+import org.jf.dexlib.*;
 
 public class AnnotationElement extends CompositeField<AnnotationElement>
         implements Comparable<AnnotationElement> {
diff --git a/src/main/java/org/JesusFreke/dexlib/EncodedValue/AnnotationEncodedValueSubField.java b/src/main/java/org/jf/dexlib/EncodedValue/AnnotationEncodedValueSubField.java
similarity index 94%
rename from src/main/java/org/JesusFreke/dexlib/EncodedValue/AnnotationEncodedValueSubField.java
rename to src/main/java/org/jf/dexlib/EncodedValue/AnnotationEncodedValueSubField.java
index 35c0c461..f8f92a28 100644
--- a/src/main/java/org/JesusFreke/dexlib/EncodedValue/AnnotationEncodedValueSubField.java
+++ b/src/main/java/org/jf/dexlib/EncodedValue/AnnotationEncodedValueSubField.java
@@ -26,15 +26,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.EncodedValue;
+package org.jf.dexlib.EncodedValue;
 
-import org.JesusFreke.dexlib.*;
+import org.jf.dexlib.*;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Arrays;
 import java.util.Collections;
-import java.lang.reflect.Array;
 
 public class AnnotationEncodedValueSubField extends CompositeField<AnnotationEncodedValueSubField>
     implements EncodedValueSubField<AnnotationEncodedValueSubField> {
diff --git a/src/main/java/org/JesusFreke/dexlib/EncodedValue/ArrayEncodedValueSubField.java b/src/main/java/org/jf/dexlib/EncodedValue/ArrayEncodedValueSubField.java
similarity index 95%
rename from src/main/java/org/JesusFreke/dexlib/EncodedValue/ArrayEncodedValueSubField.java
rename to src/main/java/org/jf/dexlib/EncodedValue/ArrayEncodedValueSubField.java
index 319b801e..976399de 100644
--- a/src/main/java/org/JesusFreke/dexlib/EncodedValue/ArrayEncodedValueSubField.java
+++ b/src/main/java/org/jf/dexlib/EncodedValue/ArrayEncodedValueSubField.java
@@ -26,9 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.EncodedValue;
+package org.jf.dexlib.EncodedValue;
 
-import org.JesusFreke.dexlib.*;
+import org.jf.dexlib.*;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/org/JesusFreke/dexlib/EncodedValue/BoolEncodedValueSubField.java b/src/main/java/org/jf/dexlib/EncodedValue/BoolEncodedValueSubField.java
similarity index 91%
rename from src/main/java/org/JesusFreke/dexlib/EncodedValue/BoolEncodedValueSubField.java
rename to src/main/java/org/jf/dexlib/EncodedValue/BoolEncodedValueSubField.java
index b96a0193..58e44303 100644
--- a/src/main/java/org/JesusFreke/dexlib/EncodedValue/BoolEncodedValueSubField.java
+++ b/src/main/java/org/jf/dexlib/EncodedValue/BoolEncodedValueSubField.java
@@ -26,10 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.EncodedValue;
+package org.jf.dexlib.EncodedValue;
 
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 public class BoolEncodedValueSubField
     extends SimpleEncodedValueSubField<Boolean, BoolEncodedValueSubField>
diff --git a/src/main/java/org/JesusFreke/dexlib/EncodedValue/ByteEncodedValueSubField.java b/src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValueSubField.java
similarity index 91%
rename from src/main/java/org/JesusFreke/dexlib/EncodedValue/ByteEncodedValueSubField.java
rename to src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValueSubField.java
index 50429790..53687b09 100644
--- a/src/main/java/org/JesusFreke/dexlib/EncodedValue/ByteEncodedValueSubField.java
+++ b/src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValueSubField.java
@@ -26,10 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.EncodedValue;
+package org.jf.dexlib.EncodedValue;
 
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 public class ByteEncodedValueSubField
     extends SimpleEncodedValueSubField<Byte, ByteEncodedValueSubField>
diff --git a/src/main/java/org/JesusFreke/dexlib/EncodedValue/CharEncodedValueSubField.java b/src/main/java/org/jf/dexlib/EncodedValue/CharEncodedValueSubField.java
similarity index 90%
rename from src/main/java/org/JesusFreke/dexlib/EncodedValue/CharEncodedValueSubField.java
rename to src/main/java/org/jf/dexlib/EncodedValue/CharEncodedValueSubField.java
index a6ff1a0a..bb9e9e84 100644
--- a/src/main/java/org/JesusFreke/dexlib/EncodedValue/CharEncodedValueSubField.java
+++ b/src/main/java/org/jf/dexlib/EncodedValue/CharEncodedValueSubField.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.EncodedValue;
+package org.jf.dexlib.EncodedValue;
 
-import org.JesusFreke.dexlib.util.EncodedValueUtils;
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.EncodedValueUtils;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 public class CharEncodedValueSubField
     extends SimpleEncodedValueSubField<Character, CharEncodedValueSubField>
diff --git a/src/main/java/org/JesusFreke/dexlib/EncodedValue/DoubleEncodedValueSubField.java b/src/main/java/org/jf/dexlib/EncodedValue/DoubleEncodedValueSubField.java
similarity index 91%
rename from src/main/java/org/JesusFreke/dexlib/EncodedValue/DoubleEncodedValueSubField.java
rename to src/main/java/org/jf/dexlib/EncodedValue/DoubleEncodedValueSubField.java
index f6a2c34f..1317025f 100644
--- a/src/main/java/org/JesusFreke/dexlib/EncodedValue/DoubleEncodedValueSubField.java
+++ b/src/main/java/org/jf/dexlib/EncodedValue/DoubleEncodedValueSubField.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.EncodedValue;
+package org.jf.dexlib.EncodedValue;
 
-import org.JesusFreke.dexlib.util.EncodedValueUtils;
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.EncodedValueUtils;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 public class DoubleEncodedValueSubField
         extends SimpleEncodedValueSubField<Double, DoubleEncodedValueSubField>
diff --git a/src/main/java/org/JesusFreke/dexlib/EncodedValue/EncodedIndexedItemReference.java b/src/main/java/org/jf/dexlib/EncodedValue/EncodedIndexedItemReference.java
similarity index 95%
rename from src/main/java/org/JesusFreke/dexlib/EncodedValue/EncodedIndexedItemReference.java
rename to src/main/java/org/jf/dexlib/EncodedValue/EncodedIndexedItemReference.java
index 00e90dca..eee7e312 100644
--- a/src/main/java/org/JesusFreke/dexlib/EncodedValue/EncodedIndexedItemReference.java
+++ b/src/main/java/org/jf/dexlib/EncodedValue/EncodedIndexedItemReference.java
@@ -26,12 +26,12 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.EncodedValue;
+package org.jf.dexlib.EncodedValue;
 
-import org.JesusFreke.dexlib.*;
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.EncodedValueUtils;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.*;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.EncodedValueUtils;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 public class EncodedIndexedItemReference<T extends IndexedItem<T>>
     implements EncodedValueSubField<EncodedIndexedItemReference<T>> {
diff --git a/src/main/java/org/JesusFreke/dexlib/EncodedValue/EncodedValue.java b/src/main/java/org/jf/dexlib/EncodedValue/EncodedValue.java
similarity index 94%
rename from src/main/java/org/JesusFreke/dexlib/EncodedValue/EncodedValue.java
rename to src/main/java/org/jf/dexlib/EncodedValue/EncodedValue.java
index 497bd3fa..b04cdec6 100644
--- a/src/main/java/org/JesusFreke/dexlib/EncodedValue/EncodedValue.java
+++ b/src/main/java/org/jf/dexlib/EncodedValue/EncodedValue.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.EncodedValue;
+package org.jf.dexlib.EncodedValue;
 
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
-import org.JesusFreke.dexlib.*;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.*;
 
 public class EncodedValue extends CompositeField<EncodedValue> {
     private class ValueTypeArgField implements Field<ValueTypeArgField> {
diff --git a/src/main/java/org/JesusFreke/dexlib/EncodedValue/EncodedValueSubField.java b/src/main/java/org/jf/dexlib/EncodedValue/EncodedValueSubField.java
similarity index 93%
rename from src/main/java/org/JesusFreke/dexlib/EncodedValue/EncodedValueSubField.java
rename to src/main/java/org/jf/dexlib/EncodedValue/EncodedValueSubField.java
index 9ab1b126..b8f7884a 100644
--- a/src/main/java/org/JesusFreke/dexlib/EncodedValue/EncodedValueSubField.java
+++ b/src/main/java/org/jf/dexlib/EncodedValue/EncodedValueSubField.java
@@ -26,9 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.EncodedValue;
+package org.jf.dexlib.EncodedValue;
 
-import org.JesusFreke.dexlib.Field;
+import org.jf.dexlib.Field;
 
 public interface EncodedValueSubField<T extends EncodedValueSubField> extends Field<T>
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/EncodedValue/EncodedValueSubFieldFactory.java b/src/main/java/org/jf/dexlib/EncodedValue/EncodedValueSubFieldFactory.java
similarity index 95%
rename from src/main/java/org/JesusFreke/dexlib/EncodedValue/EncodedValueSubFieldFactory.java
rename to src/main/java/org/jf/dexlib/EncodedValue/EncodedValueSubFieldFactory.java
index 9ae0f401..3aefd573 100644
--- a/src/main/java/org/JesusFreke/dexlib/EncodedValue/EncodedValueSubFieldFactory.java
+++ b/src/main/java/org/jf/dexlib/EncodedValue/EncodedValueSubFieldFactory.java
@@ -26,9 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.EncodedValue;
+package org.jf.dexlib.EncodedValue;
 
-import org.JesusFreke.dexlib.*;
+import org.jf.dexlib.*;
 
 
 public abstract class EncodedValueSubFieldFactory
diff --git a/src/main/java/org/JesusFreke/dexlib/EncodedValue/FloatEncodedValueSubField.java b/src/main/java/org/jf/dexlib/EncodedValue/FloatEncodedValueSubField.java
similarity index 91%
rename from src/main/java/org/JesusFreke/dexlib/EncodedValue/FloatEncodedValueSubField.java
rename to src/main/java/org/jf/dexlib/EncodedValue/FloatEncodedValueSubField.java
index eb233974..77e3d986 100644
--- a/src/main/java/org/JesusFreke/dexlib/EncodedValue/FloatEncodedValueSubField.java
+++ b/src/main/java/org/jf/dexlib/EncodedValue/FloatEncodedValueSubField.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.EncodedValue;
+package org.jf.dexlib.EncodedValue;
 
-import org.JesusFreke.dexlib.util.EncodedValueUtils;
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.EncodedValueUtils;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 public class FloatEncodedValueSubField
         extends SimpleEncodedValueSubField<Float, FloatEncodedValueSubField>
diff --git a/src/main/java/org/JesusFreke/dexlib/EncodedValue/IntEncodedValueSubField.java b/src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValueSubField.java
similarity index 90%
rename from src/main/java/org/JesusFreke/dexlib/EncodedValue/IntEncodedValueSubField.java
rename to src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValueSubField.java
index f49267e8..0837be90 100644
--- a/src/main/java/org/JesusFreke/dexlib/EncodedValue/IntEncodedValueSubField.java
+++ b/src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValueSubField.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.EncodedValue;
+package org.jf.dexlib.EncodedValue;
 
-import org.JesusFreke.dexlib.util.EncodedValueUtils;
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.EncodedValueUtils;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 public class IntEncodedValueSubField
         extends SimpleEncodedValueSubField<Integer, IntEncodedValueSubField>
diff --git a/src/main/java/org/JesusFreke/dexlib/EncodedValue/LongEncodedValueSubField.java b/src/main/java/org/jf/dexlib/EncodedValue/LongEncodedValueSubField.java
similarity index 90%
rename from src/main/java/org/JesusFreke/dexlib/EncodedValue/LongEncodedValueSubField.java
rename to src/main/java/org/jf/dexlib/EncodedValue/LongEncodedValueSubField.java
index 24f08f61..75d616bd 100644
--- a/src/main/java/org/JesusFreke/dexlib/EncodedValue/LongEncodedValueSubField.java
+++ b/src/main/java/org/jf/dexlib/EncodedValue/LongEncodedValueSubField.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.EncodedValue;
+package org.jf.dexlib.EncodedValue;
 
-import org.JesusFreke.dexlib.util.EncodedValueUtils;
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.EncodedValueUtils;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 public class LongEncodedValueSubField
         extends SimpleEncodedValueSubField<Long, LongEncodedValueSubField>
diff --git a/src/main/java/org/JesusFreke/dexlib/EncodedValue/NullEncodedValueSubField.java b/src/main/java/org/jf/dexlib/EncodedValue/NullEncodedValueSubField.java
similarity index 91%
rename from src/main/java/org/JesusFreke/dexlib/EncodedValue/NullEncodedValueSubField.java
rename to src/main/java/org/jf/dexlib/EncodedValue/NullEncodedValueSubField.java
index 93f2d6fe..91f8bfdd 100644
--- a/src/main/java/org/JesusFreke/dexlib/EncodedValue/NullEncodedValueSubField.java
+++ b/src/main/java/org/jf/dexlib/EncodedValue/NullEncodedValueSubField.java
@@ -26,10 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.EncodedValue;
+package org.jf.dexlib.EncodedValue;
 
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 public class NullEncodedValueSubField
     extends SimpleEncodedValueSubField<Object, NullEncodedValueSubField>
diff --git a/src/main/java/org/JesusFreke/dexlib/EncodedValue/ShortEncodedValueSubField.java b/src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValueSubField.java
similarity index 90%
rename from src/main/java/org/JesusFreke/dexlib/EncodedValue/ShortEncodedValueSubField.java
rename to src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValueSubField.java
index 5654c5dc..10a07af2 100644
--- a/src/main/java/org/JesusFreke/dexlib/EncodedValue/ShortEncodedValueSubField.java
+++ b/src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValueSubField.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.EncodedValue;
+package org.jf.dexlib.EncodedValue;
 
-import org.JesusFreke.dexlib.util.EncodedValueUtils;
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.EncodedValueUtils;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 public class ShortEncodedValueSubField
         extends SimpleEncodedValueSubField<Short, ShortEncodedValueSubField>
diff --git a/src/main/java/org/JesusFreke/dexlib/EncodedValue/SimpleEncodedValueSubField.java b/src/main/java/org/jf/dexlib/EncodedValue/SimpleEncodedValueSubField.java
similarity index 94%
rename from src/main/java/org/JesusFreke/dexlib/EncodedValue/SimpleEncodedValueSubField.java
rename to src/main/java/org/jf/dexlib/EncodedValue/SimpleEncodedValueSubField.java
index 613a4181..09219279 100644
--- a/src/main/java/org/JesusFreke/dexlib/EncodedValue/SimpleEncodedValueSubField.java
+++ b/src/main/java/org/jf/dexlib/EncodedValue/SimpleEncodedValueSubField.java
@@ -26,9 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.EncodedValue;
+package org.jf.dexlib.EncodedValue;
 
-import org.JesusFreke.dexlib.DexFile;
+import org.jf.dexlib.DexFile;
 
 public abstract class SimpleEncodedValueSubField<V, T extends SimpleEncodedValueSubField<V,T>> implements EncodedValueSubField<T>
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/EncodedValue/ValueType.java b/src/main/java/org/jf/dexlib/EncodedValue/ValueType.java
similarity index 95%
rename from src/main/java/org/JesusFreke/dexlib/EncodedValue/ValueType.java
rename to src/main/java/org/jf/dexlib/EncodedValue/ValueType.java
index f75e4c76..609250ca 100644
--- a/src/main/java/org/JesusFreke/dexlib/EncodedValue/ValueType.java
+++ b/src/main/java/org/jf/dexlib/EncodedValue/ValueType.java
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.EncodedValue;
+package org.jf.dexlib.EncodedValue;
 
 import java.util.TreeMap;
 
diff --git a/src/main/java/org/JesusFreke/dexlib/Field.java b/src/main/java/org/jf/dexlib/Field.java
similarity index 89%
rename from src/main/java/org/JesusFreke/dexlib/Field.java
rename to src/main/java/org/jf/dexlib/Field.java
index 4c5b598e..46e47b1d 100644
--- a/src/main/java/org/JesusFreke/dexlib/Field.java
+++ b/src/main/java/org/jf/dexlib/Field.java
@@ -26,11 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.util.Output;
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 public interface Field<T extends Field> {
     public void writeTo(AnnotatedOutput out);
diff --git a/src/main/java/org/JesusFreke/dexlib/FieldIdItem.java b/src/main/java/org/jf/dexlib/FieldIdItem.java
similarity index 96%
rename from src/main/java/org/JesusFreke/dexlib/FieldIdItem.java
rename to src/main/java/org/jf/dexlib/FieldIdItem.java
index 4acd992e..961b41e9 100644
--- a/src/main/java/org/JesusFreke/dexlib/FieldIdItem.java
+++ b/src/main/java/org/jf/dexlib/FieldIdItem.java
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
 public class FieldIdItem extends IndexedItem<FieldIdItem> {
     private final IndexedItemReference<TypeIdItem> classTypeReferenceField;
diff --git a/src/main/java/org/JesusFreke/dexlib/FieldListField.java b/src/main/java/org/jf/dexlib/FieldListField.java
similarity index 93%
rename from src/main/java/org/JesusFreke/dexlib/FieldListField.java
rename to src/main/java/org/jf/dexlib/FieldListField.java
index c3987158..05a37461 100644
--- a/src/main/java/org/JesusFreke/dexlib/FieldListField.java
+++ b/src/main/java/org/jf/dexlib/FieldListField.java
@@ -26,10 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/org/JesusFreke/dexlib/FixedByteArrayField.java b/src/main/java/org/jf/dexlib/FixedByteArrayField.java
similarity index 91%
rename from src/main/java/org/JesusFreke/dexlib/FixedByteArrayField.java
rename to src/main/java/org/jf/dexlib/FixedByteArrayField.java
index c7e1d675..f9e66743 100644
--- a/src/main/java/org/JesusFreke/dexlib/FixedByteArrayField.java
+++ b/src/main/java/org/jf/dexlib/FixedByteArrayField.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.ByteArray;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.ByteArray;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 public class FixedByteArrayField implements Field<FixedByteArrayField> {
     protected byte[] value;
diff --git a/src/main/java/org/JesusFreke/dexlib/HeaderItem.java b/src/main/java/org/jf/dexlib/HeaderItem.java
similarity index 96%
rename from src/main/java/org/JesusFreke/dexlib/HeaderItem.java
rename to src/main/java/org/jf/dexlib/HeaderItem.java
index 8bd9cbaf..fff6581f 100644
--- a/src/main/java/org/JesusFreke/dexlib/HeaderItem.java
+++ b/src/main/java/org/jf/dexlib/HeaderItem.java
@@ -26,10 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.ItemType;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.ItemType;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 import java.io.UnsupportedEncodingException;
 
diff --git a/src/main/java/org/JesusFreke/dexlib/IndexedItem.java b/src/main/java/org/jf/dexlib/IndexedItem.java
similarity index 96%
rename from src/main/java/org/JesusFreke/dexlib/IndexedItem.java
rename to src/main/java/org/jf/dexlib/IndexedItem.java
index d8a2f6f2..0b8ff375 100644
--- a/src/main/java/org/JesusFreke/dexlib/IndexedItem.java
+++ b/src/main/java/org/jf/dexlib/IndexedItem.java
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
 public abstract class IndexedItem<T extends IndexedItem> extends Item<T> implements Comparable<T> {
     protected IndexedItem(int index) {
diff --git a/src/main/java/org/JesusFreke/dexlib/IndexedItemReference.java b/src/main/java/org/jf/dexlib/IndexedItemReference.java
similarity index 93%
rename from src/main/java/org/JesusFreke/dexlib/IndexedItemReference.java
rename to src/main/java/org/jf/dexlib/IndexedItemReference.java
index d2796310..c606ef84 100644
--- a/src/main/java/org/JesusFreke/dexlib/IndexedItemReference.java
+++ b/src/main/java/org/jf/dexlib/IndexedItemReference.java
@@ -26,10 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
-
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+package org.jf.dexlib;
 
 public class IndexedItemReference<T extends IndexedItem<T>> extends
         ItemReference<T,IndexedItemReference<T>> implements Comparable<IndexedItemReference<T>> {
diff --git a/src/main/java/org/JesusFreke/dexlib/IndexedSection.java b/src/main/java/org/jf/dexlib/IndexedSection.java
similarity index 94%
rename from src/main/java/org/JesusFreke/dexlib/IndexedSection.java
rename to src/main/java/org/jf/dexlib/IndexedSection.java
index cc0579e2..363887e1 100644
--- a/src/main/java/org/JesusFreke/dexlib/IndexedSection.java
+++ b/src/main/java/org/jf/dexlib/IndexedSection.java
@@ -26,9 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.util.Input;
+import org.jf.dexlib.util.Input;
 
 import java.util.Collections;
 
diff --git a/src/main/java/org/JesusFreke/dexlib/IntegerField.java b/src/main/java/org/jf/dexlib/IntegerField.java
similarity index 92%
rename from src/main/java/org/JesusFreke/dexlib/IntegerField.java
rename to src/main/java/org/jf/dexlib/IntegerField.java
index 32ff89a5..a2c9940e 100644
--- a/src/main/java/org/JesusFreke/dexlib/IntegerField.java
+++ b/src/main/java/org/jf/dexlib/IntegerField.java
@@ -26,10 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.Output;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.Output;
 
 public class IntegerField extends CachedIntegerValueField<IntegerField> {
     public IntegerField(String fieldName) {
diff --git a/src/main/java/org/JesusFreke/dexlib/Item.java b/src/main/java/org/jf/dexlib/Item.java
similarity index 92%
rename from src/main/java/org/JesusFreke/dexlib/Item.java
rename to src/main/java/org/jf/dexlib/Item.java
index d3591cbc..7af35a56 100644
--- a/src/main/java/org/JesusFreke/dexlib/Item.java
+++ b/src/main/java/org/jf/dexlib/Item.java
@@ -26,12 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.Output;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
-import org.JesusFreke.dexlib.ItemType;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.ItemType;
 
 public abstract class Item<T extends Item> {
     protected int offset = -1;
diff --git a/src/main/java/org/JesusFreke/dexlib/ItemReference.java b/src/main/java/org/jf/dexlib/ItemReference.java
similarity index 95%
rename from src/main/java/org/JesusFreke/dexlib/ItemReference.java
rename to src/main/java/org/jf/dexlib/ItemReference.java
index c07b29dc..e677bdd7 100644
--- a/src/main/java/org/JesusFreke/dexlib/ItemReference.java
+++ b/src/main/java/org/jf/dexlib/ItemReference.java
@@ -26,10 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
-import org.JesusFreke.dexlib.util.Input;
+import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
 
 public abstract class ItemReference<T extends Item<T>, S extends ItemReference<T,S>> implements Field<S> {
     private T item = null;
diff --git a/src/main/java/org/JesusFreke/dexlib/ItemType.java b/src/main/java/org/jf/dexlib/ItemType.java
similarity index 99%
rename from src/main/java/org/JesusFreke/dexlib/ItemType.java
rename to src/main/java/org/jf/dexlib/ItemType.java
index 33d4a0de..cc94cf69 100644
--- a/src/main/java/org/JesusFreke/dexlib/ItemType.java
+++ b/src/main/java/org/jf/dexlib/ItemType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
 import java.util.TreeMap;
 
diff --git a/src/main/java/org/JesusFreke/dexlib/Leb128Field.java b/src/main/java/org/jf/dexlib/Leb128Field.java
similarity index 90%
rename from src/main/java/org/JesusFreke/dexlib/Leb128Field.java
rename to src/main/java/org/jf/dexlib/Leb128Field.java
index 7886ad4f..c748b1d1 100644
--- a/src/main/java/org/JesusFreke/dexlib/Leb128Field.java
+++ b/src/main/java/org/jf/dexlib/Leb128Field.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.Leb128Utils;
-import org.JesusFreke.dexlib.util.Output;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.Leb128Utils;
+import org.jf.dexlib.util.Output;
 
 public class Leb128Field extends CachedIntegerValueField {
     public Leb128Field(String fieldName) {
diff --git a/src/main/java/org/JesusFreke/dexlib/Leb128p1Field.java b/src/main/java/org/jf/dexlib/Leb128p1Field.java
similarity index 90%
rename from src/main/java/org/JesusFreke/dexlib/Leb128p1Field.java
rename to src/main/java/org/jf/dexlib/Leb128p1Field.java
index 1cbeee03..b79f0b34 100644
--- a/src/main/java/org/JesusFreke/dexlib/Leb128p1Field.java
+++ b/src/main/java/org/jf/dexlib/Leb128p1Field.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.Leb128Utils;
-import org.JesusFreke.dexlib.util.Output;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.Leb128Utils;
+import org.jf.dexlib.util.Output;
 
 public class Leb128p1Field extends CachedIntegerValueField {
     public Leb128p1Field(String fieldName) {
diff --git a/src/main/java/org/JesusFreke/dexlib/ListSizeField.java b/src/main/java/org/jf/dexlib/ListSizeField.java
similarity index 93%
rename from src/main/java/org/JesusFreke/dexlib/ListSizeField.java
rename to src/main/java/org/jf/dexlib/ListSizeField.java
index 2416830f..d18ba0d4 100644
--- a/src/main/java/org/JesusFreke/dexlib/ListSizeField.java
+++ b/src/main/java/org/jf/dexlib/ListSizeField.java
@@ -26,10 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/org/JesusFreke/dexlib/MapField.java b/src/main/java/org/jf/dexlib/MapField.java
similarity index 93%
rename from src/main/java/org/JesusFreke/dexlib/MapField.java
rename to src/main/java/org/jf/dexlib/MapField.java
index 8887eba1..d99e6eaa 100644
--- a/src/main/java/org/JesusFreke/dexlib/MapField.java
+++ b/src/main/java/org/jf/dexlib/MapField.java
@@ -26,10 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.ItemType;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.ItemType;
 
 public class MapField extends CompositeField<MapField> {
     private final ShortIntegerField sectionTypeField;
diff --git a/src/main/java/org/JesusFreke/dexlib/MapItem.java b/src/main/java/org/jf/dexlib/MapItem.java
similarity index 95%
rename from src/main/java/org/JesusFreke/dexlib/MapItem.java
rename to src/main/java/org/jf/dexlib/MapItem.java
index 1b3cd21e..ef98f5af 100644
--- a/src/main/java/org/JesusFreke/dexlib/MapItem.java
+++ b/src/main/java/org/jf/dexlib/MapItem.java
@@ -26,10 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.ItemType;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.ItemType;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/org/JesusFreke/dexlib/MethodIdItem.java b/src/main/java/org/jf/dexlib/MethodIdItem.java
similarity index 97%
rename from src/main/java/org/JesusFreke/dexlib/MethodIdItem.java
rename to src/main/java/org/jf/dexlib/MethodIdItem.java
index 6efa000c..5cf25d70 100644
--- a/src/main/java/org/JesusFreke/dexlib/MethodIdItem.java
+++ b/src/main/java/org/jf/dexlib/MethodIdItem.java
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
 public class MethodIdItem extends IndexedItem<MethodIdItem> {
     private final IndexedItemReference<TypeIdItem> classTypeReferenceField;
diff --git a/src/main/java/org/JesusFreke/dexlib/NullTerminatedByteArrayField.java b/src/main/java/org/jf/dexlib/NullTerminatedByteArrayField.java
similarity index 92%
rename from src/main/java/org/JesusFreke/dexlib/NullTerminatedByteArrayField.java
rename to src/main/java/org/jf/dexlib/NullTerminatedByteArrayField.java
index 897950c4..7f4da90b 100644
--- a/src/main/java/org/JesusFreke/dexlib/NullTerminatedByteArrayField.java
+++ b/src/main/java/org/jf/dexlib/NullTerminatedByteArrayField.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.ByteArray;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.ByteArray;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 public class NullTerminatedByteArrayField implements Field<NullTerminatedByteArrayField> {
     protected byte[] value;
diff --git a/src/main/java/org/JesusFreke/dexlib/OffsettedItem.java b/src/main/java/org/jf/dexlib/OffsettedItem.java
similarity index 96%
rename from src/main/java/org/JesusFreke/dexlib/OffsettedItem.java
rename to src/main/java/org/jf/dexlib/OffsettedItem.java
index a6e02bfc..db3ee15f 100644
--- a/src/main/java/org/JesusFreke/dexlib/OffsettedItem.java
+++ b/src/main/java/org/jf/dexlib/OffsettedItem.java
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
 public abstract class OffsettedItem<T extends OffsettedItem<T>> extends Item<T> {
     public OffsettedItem(int offset) {
diff --git a/src/main/java/org/JesusFreke/dexlib/OffsettedItemReference.java b/src/main/java/org/jf/dexlib/OffsettedItemReference.java
similarity index 93%
rename from src/main/java/org/JesusFreke/dexlib/OffsettedItemReference.java
rename to src/main/java/org/jf/dexlib/OffsettedItemReference.java
index 5a4ac073..0c44cf71 100644
--- a/src/main/java/org/JesusFreke/dexlib/OffsettedItemReference.java
+++ b/src/main/java/org/jf/dexlib/OffsettedItemReference.java
@@ -26,10 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
-
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+package org.jf.dexlib;
 
 public class OffsettedItemReference<T extends OffsettedItem<T>> extends
         ItemReference<T,OffsettedItemReference<T>> {
diff --git a/src/main/java/org/JesusFreke/dexlib/OffsettedSection.java b/src/main/java/org/jf/dexlib/OffsettedSection.java
similarity index 95%
rename from src/main/java/org/JesusFreke/dexlib/OffsettedSection.java
rename to src/main/java/org/jf/dexlib/OffsettedSection.java
index 2d54a00d..aad5cd48 100644
--- a/src/main/java/org/JesusFreke/dexlib/OffsettedSection.java
+++ b/src/main/java/org/jf/dexlib/OffsettedSection.java
@@ -26,9 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.util.Input;
+import org.jf.dexlib.util.Input;
 
 import java.util.HashMap;
 
diff --git a/src/main/java/org/JesusFreke/dexlib/ProtoIdItem.java b/src/main/java/org/jf/dexlib/ProtoIdItem.java
similarity index 96%
rename from src/main/java/org/JesusFreke/dexlib/ProtoIdItem.java
rename to src/main/java/org/jf/dexlib/ProtoIdItem.java
index 12c43e28..8a991a1f 100644
--- a/src/main/java/org/JesusFreke/dexlib/ProtoIdItem.java
+++ b/src/main/java/org/jf/dexlib/ProtoIdItem.java
@@ -26,9 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.ItemType;
+import org.jf.dexlib.ItemType;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/org/JesusFreke/dexlib/Section.java b/src/main/java/org/jf/dexlib/Section.java
similarity index 93%
rename from src/main/java/org/JesusFreke/dexlib/Section.java
rename to src/main/java/org/jf/dexlib/Section.java
index b4a1e4be..2a01ce12 100644
--- a/src/main/java/org/JesusFreke/dexlib/Section.java
+++ b/src/main/java/org/jf/dexlib/Section.java
@@ -26,11 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.util.Output;
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/org/JesusFreke/dexlib/SectionHeaderInfo.java b/src/main/java/org/jf/dexlib/SectionHeaderInfo.java
similarity index 93%
rename from src/main/java/org/JesusFreke/dexlib/SectionHeaderInfo.java
rename to src/main/java/org/jf/dexlib/SectionHeaderInfo.java
index 3de61856..a4ef82ad 100644
--- a/src/main/java/org/JesusFreke/dexlib/SectionHeaderInfo.java
+++ b/src/main/java/org/jf/dexlib/SectionHeaderInfo.java
@@ -26,10 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 public abstract class SectionHeaderInfo extends CompositeField<SectionHeaderInfo> {
     private final String sectionName;
diff --git a/src/main/java/org/JesusFreke/dexlib/ShortIntegerField.java b/src/main/java/org/jf/dexlib/ShortIntegerField.java
similarity index 92%
rename from src/main/java/org/JesusFreke/dexlib/ShortIntegerField.java
rename to src/main/java/org/jf/dexlib/ShortIntegerField.java
index 686cb56d..2f30730d 100644
--- a/src/main/java/org/JesusFreke/dexlib/ShortIntegerField.java
+++ b/src/main/java/org/jf/dexlib/ShortIntegerField.java
@@ -26,10 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.Output;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.Output;
 
 public class ShortIntegerField extends CachedIntegerValueField {
     public ShortIntegerField(String fieldName) {
diff --git a/src/main/java/org/JesusFreke/dexlib/SignedLeb128Field.java b/src/main/java/org/jf/dexlib/SignedLeb128Field.java
similarity index 90%
rename from src/main/java/org/JesusFreke/dexlib/SignedLeb128Field.java
rename to src/main/java/org/jf/dexlib/SignedLeb128Field.java
index 364311d5..c6ce0b71 100644
--- a/src/main/java/org/JesusFreke/dexlib/SignedLeb128Field.java
+++ b/src/main/java/org/jf/dexlib/SignedLeb128Field.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.Leb128Utils;
-import org.JesusFreke.dexlib.util.Output;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.Leb128Utils;
+import org.jf.dexlib.util.Output;
 
 public class SignedLeb128Field extends CachedIntegerValueField {
     public SignedLeb128Field(String fieldName) {
diff --git a/src/main/java/org/JesusFreke/dexlib/StringDataItem.java b/src/main/java/org/jf/dexlib/StringDataItem.java
similarity index 93%
rename from src/main/java/org/JesusFreke/dexlib/StringDataItem.java
rename to src/main/java/org/jf/dexlib/StringDataItem.java
index da5c5d98..d8dac650 100644
--- a/src/main/java/org/JesusFreke/dexlib/StringDataItem.java
+++ b/src/main/java/org/jf/dexlib/StringDataItem.java
@@ -26,10 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
-import org.JesusFreke.dexlib.util.ByteArray;
-import org.JesusFreke.dexlib.util.Utf8Utils;
+import org.jf.dexlib.util.ByteArray;
+import org.jf.dexlib.util.Utf8Utils;
 
 public class StringDataItem extends OffsettedItem<StringDataItem> implements Comparable<StringDataItem> {
     private String value = null;
diff --git a/src/main/java/org/JesusFreke/dexlib/StringIdItem.java b/src/main/java/org/jf/dexlib/StringIdItem.java
similarity index 96%
rename from src/main/java/org/JesusFreke/dexlib/StringIdItem.java
rename to src/main/java/org/jf/dexlib/StringIdItem.java
index e292cd0d..a2b709ef 100644
--- a/src/main/java/org/JesusFreke/dexlib/StringIdItem.java
+++ b/src/main/java/org/jf/dexlib/StringIdItem.java
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
 public class StringIdItem extends IndexedItem<StringIdItem> {
     private final OffsettedItemReference<StringDataItem> stringDataReferenceField;
diff --git a/src/main/java/org/JesusFreke/dexlib/TypeIdItem.java b/src/main/java/org/jf/dexlib/TypeIdItem.java
similarity index 96%
rename from src/main/java/org/JesusFreke/dexlib/TypeIdItem.java
rename to src/main/java/org/jf/dexlib/TypeIdItem.java
index 0a3e015e..6805f78d 100644
--- a/src/main/java/org/JesusFreke/dexlib/TypeIdItem.java
+++ b/src/main/java/org/jf/dexlib/TypeIdItem.java
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
 public class TypeIdItem extends IndexedItem<TypeIdItem> {
     private final IndexedItemReference<StringIdItem> typeDescriptorReferenceField;
diff --git a/src/main/java/org/JesusFreke/dexlib/TypeListItem.java b/src/main/java/org/jf/dexlib/TypeListItem.java
similarity index 96%
rename from src/main/java/org/JesusFreke/dexlib/TypeListItem.java
rename to src/main/java/org/jf/dexlib/TypeListItem.java
index af951e0e..cad9275b 100644
--- a/src/main/java/org/JesusFreke/dexlib/TypeListItem.java
+++ b/src/main/java/org/jf/dexlib/TypeListItem.java
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib;
+package org.jf.dexlib;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/ArrayData.java b/src/main/java/org/jf/dexlib/code/Format/ArrayData.java
similarity index 91%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/ArrayData.java
rename to src/main/java/org/jf/dexlib/code/Format/ArrayData.java
index 61de0d88..32abbc66 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/ArrayData.java
+++ b/src/main/java/org/jf/dexlib/code/Format/ArrayData.java
@@ -26,11 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.DexFile;
 
 import java.util.List;
 
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format.java b/src/main/java/org/jf/dexlib/code/Format/Format.java
similarity index 93%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format.java
rename to src/main/java/org/jf/dexlib/code/Format/Format.java
index 6ce7eb69..ea76fc3c 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format.java
@@ -26,9 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Opcode;
+import org.jf.dexlib.code.Opcode;
 
 public abstract class Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format10t.java b/src/main/java/org/jf/dexlib/code/Format/Format10t.java
similarity index 90%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format10t.java
rename to src/main/java/org/jf/dexlib/code/Format/Format10t.java
index f7855ffe..c2b3c5d8 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format10t.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format10t.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import org.jf.dexlib.DexFile;
 
 public class Format10t extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format10x.java b/src/main/java/org/jf/dexlib/code/Format/Format10x.java
similarity index 89%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format10x.java
rename to src/main/java/org/jf/dexlib/code/Format/Format10x.java
index 2cae9f6d..daf8b889 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format10x.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format10x.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import org.jf.dexlib.DexFile;
 
 public class Format10x extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format11n.java b/src/main/java/org/jf/dexlib/code/Format/Format11n.java
similarity index 90%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format11n.java
rename to src/main/java/org/jf/dexlib/code/Format/Format11n.java
index d12eb61d..eb85ac2b 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format11n.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format11n.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import org.jf.dexlib.DexFile;
 
 public class Format11n extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format11x.java b/src/main/java/org/jf/dexlib/code/Format/Format11x.java
similarity index 90%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format11x.java
rename to src/main/java/org/jf/dexlib/code/Format/Format11x.java
index fe6fd5f7..04f9f6c9 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format11x.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format11x.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import org.jf.dexlib.DexFile;
 
 public class Format11x extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format12x.java b/src/main/java/org/jf/dexlib/code/Format/Format12x.java
similarity index 90%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format12x.java
rename to src/main/java/org/jf/dexlib/code/Format/Format12x.java
index 053799fa..dcdaaf73 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format12x.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format12x.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import org.jf.dexlib.DexFile;
 
 public class Format12x extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format20t.java b/src/main/java/org/jf/dexlib/code/Format/Format20t.java
similarity index 90%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format20t.java
rename to src/main/java/org/jf/dexlib/code/Format/Format20t.java
index ef938cd9..3355d4c7 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format20t.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format20t.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import org.jf.dexlib.DexFile;
 
 public class Format20t extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format21c.java b/src/main/java/org/jf/dexlib/code/Format/Format21c.java
similarity index 86%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format21c.java
rename to src/main/java/org/jf/dexlib/code/Format/Format21c.java
index a76e447b..fd821632 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format21c.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format21c.java
@@ -26,14 +26,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
-import org.JesusFreke.dexlib.IndexedItem;
-import org.JesusFreke.dexlib.FieldIdItem;
-import org.JesusFreke.dexlib.TypeIdItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import org.jf.dexlib.DexFile;
+import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.TypeIdItem;
 
 public class Format21c extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format21h.java b/src/main/java/org/jf/dexlib/code/Format/Format21h.java
similarity index 90%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format21h.java
rename to src/main/java/org/jf/dexlib/code/Format/Format21h.java
index ef6a7467..b0e032bd 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format21h.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format21h.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import org.jf.dexlib.DexFile;
 
 public class Format21h extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format21s.java b/src/main/java/org/jf/dexlib/code/Format/Format21s.java
similarity index 90%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format21s.java
rename to src/main/java/org/jf/dexlib/code/Format/Format21s.java
index 1f787c79..1c8d780e 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format21s.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format21s.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import org.jf.dexlib.DexFile;
 
 public class Format21s extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format21t.java b/src/main/java/org/jf/dexlib/code/Format/Format21t.java
similarity index 90%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format21t.java
rename to src/main/java/org/jf/dexlib/code/Format/Format21t.java
index c6c72016..4fe6cef1 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format21t.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format21t.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import org.jf.dexlib.DexFile;
 
 public class Format21t extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format22b.java b/src/main/java/org/jf/dexlib/code/Format/Format22b.java
similarity index 89%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format22b.java
rename to src/main/java/org/jf/dexlib/code/Format/Format22b.java
index 9f278dc4..79876366 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format22b.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format22b.java
@@ -26,12 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
-import org.JesusFreke.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import org.jf.dexlib.DexFile;
 
 public class Format22b extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format22c.java b/src/main/java/org/jf/dexlib/code/Format/Format22c.java
similarity index 88%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format22c.java
rename to src/main/java/org/jf/dexlib/code/Format/Format22c.java
index 12c2dc2e..08fd95b8 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format22c.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format22c.java
@@ -26,12 +26,12 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
-import org.JesusFreke.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import org.jf.dexlib.DexFile;
+import org.jf.dexlib.IndexedItem;
 
 public class Format22c extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format22s.java b/src/main/java/org/jf/dexlib/code/Format/Format22s.java
similarity index 90%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format22s.java
rename to src/main/java/org/jf/dexlib/code/Format/Format22s.java
index e91d4a74..24f7b9f3 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format22s.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format22s.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import org.jf.dexlib.DexFile;
 
 public class Format22s extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format22t.java b/src/main/java/org/jf/dexlib/code/Format/Format22t.java
similarity index 89%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format22t.java
rename to src/main/java/org/jf/dexlib/code/Format/Format22t.java
index c21f438d..ea785d61 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format22t.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format22t.java
@@ -26,12 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
-import org.JesusFreke.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import org.jf.dexlib.DexFile;
 
 public class Format22t extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format22x.java b/src/main/java/org/jf/dexlib/code/Format/Format22x.java
similarity index 89%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format22x.java
rename to src/main/java/org/jf/dexlib/code/Format/Format22x.java
index 0f8eba04..c63bfe1d 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format22x.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format22x.java
@@ -26,12 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
-import org.JesusFreke.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import org.jf.dexlib.DexFile;
 
 public class Format22x extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format23x.java b/src/main/java/org/jf/dexlib/code/Format/Format23x.java
similarity index 89%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format23x.java
rename to src/main/java/org/jf/dexlib/code/Format/Format23x.java
index 597ae876..0c4bb9c8 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format23x.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format23x.java
@@ -26,12 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
-import org.JesusFreke.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import org.jf.dexlib.DexFile;
 
 public class Format23x extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format30t.java b/src/main/java/org/jf/dexlib/code/Format/Format30t.java
similarity index 90%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format30t.java
rename to src/main/java/org/jf/dexlib/code/Format/Format30t.java
index 33a1899d..b2bd4a15 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format30t.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format30t.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import org.jf.dexlib.DexFile;
 
 public class Format30t extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format31c.java b/src/main/java/org/jf/dexlib/code/Format/Format31c.java
similarity index 88%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format31c.java
rename to src/main/java/org/jf/dexlib/code/Format/Format31c.java
index 3784f831..7bde2a12 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format31c.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format31c.java
@@ -26,12 +26,12 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
-import org.JesusFreke.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import org.jf.dexlib.DexFile;
+import org.jf.dexlib.IndexedItem;
 
 public class Format31c extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format31i.java b/src/main/java/org/jf/dexlib/code/Format/Format31i.java
similarity index 89%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format31i.java
rename to src/main/java/org/jf/dexlib/code/Format/Format31i.java
index 34e79605..c5ccaa1e 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format31i.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format31i.java
@@ -26,12 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
-import org.JesusFreke.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import org.jf.dexlib.DexFile;
 
 public class Format31i extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format31t.java b/src/main/java/org/jf/dexlib/code/Format/Format31t.java
similarity index 89%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format31t.java
rename to src/main/java/org/jf/dexlib/code/Format/Format31t.java
index e4e1c27f..0686effe 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format31t.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format31t.java
@@ -26,12 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
-import org.JesusFreke.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import org.jf.dexlib.DexFile;
 
 public class Format31t extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format32x.java b/src/main/java/org/jf/dexlib/code/Format/Format32x.java
similarity index 89%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format32x.java
rename to src/main/java/org/jf/dexlib/code/Format/Format32x.java
index 5082e1a6..86ffbc33 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format32x.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format32x.java
@@ -26,12 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
-import org.JesusFreke.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import org.jf.dexlib.DexFile;
 
 public class Format32x extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format35c.java b/src/main/java/org/jf/dexlib/code/Format/Format35c.java
similarity index 93%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format35c.java
rename to src/main/java/org/jf/dexlib/code/Format/Format35c.java
index 35791ced..4c8946e2 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format35c.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format35c.java
@@ -26,12 +26,12 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.*;
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import static org.JesusFreke.dexlib.code.Opcode.*;
+import org.jf.dexlib.*;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import static org.jf.dexlib.code.Opcode.*;
 
 public class Format35c extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format3rc.java b/src/main/java/org/jf/dexlib/code/Format/Format3rc.java
similarity index 93%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format3rc.java
rename to src/main/java/org/jf/dexlib/code/Format/Format3rc.java
index 7bdcd9b9..41f72b7a 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format3rc.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format3rc.java
@@ -26,12 +26,12 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.*;
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import static org.JesusFreke.dexlib.code.Opcode.*;
+import org.jf.dexlib.*;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import static org.jf.dexlib.code.Opcode.*;
 
 public class Format3rc extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/Format51l.java b/src/main/java/org/jf/dexlib/code/Format/Format51l.java
similarity index 89%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/Format51l.java
rename to src/main/java/org/jf/dexlib/code/Format/Format51l.java
index 3a3c7d1d..73d3a1ee 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/Format51l.java
+++ b/src/main/java/org/jf/dexlib/code/Format/Format51l.java
@@ -26,12 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
-import org.JesusFreke.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
+import org.jf.dexlib.DexFile;
 
 public class Format51l extends Format
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/PackedSwitchData.java b/src/main/java/org/jf/dexlib/code/Format/PackedSwitchData.java
similarity index 90%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/PackedSwitchData.java
rename to src/main/java/org/jf/dexlib/code/Format/PackedSwitchData.java
index 9dc27ad1..d78a2f34 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/PackedSwitchData.java
+++ b/src/main/java/org/jf/dexlib/code/Format/PackedSwitchData.java
@@ -26,13 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
-
-import java.util.List;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.DexFile;
 
 public class PackedSwitchData
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/SparseSwitchData.java b/src/main/java/org/jf/dexlib/code/Format/SparseSwitchData.java
similarity index 92%
rename from src/main/java/org/JesusFreke/dexlib/code/Format/SparseSwitchData.java
rename to src/main/java/org/jf/dexlib/code/Format/SparseSwitchData.java
index 39726ecc..5102ae81 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/SparseSwitchData.java
+++ b/src/main/java/org/jf/dexlib/code/Format/SparseSwitchData.java
@@ -26,13 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code.Format;
+package org.jf.dexlib.code.Format;
 
-import org.JesusFreke.dexlib.code.Instruction;
-import org.JesusFreke.dexlib.code.Opcode;
-import org.JesusFreke.dexlib.DexFile;
-
-import java.util.List;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.DexFile;
 
 public class SparseSwitchData
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Instruction.java b/src/main/java/org/jf/dexlib/code/Instruction.java
similarity index 95%
rename from src/main/java/org/JesusFreke/dexlib/code/Instruction.java
rename to src/main/java/org/jf/dexlib/code/Instruction.java
index ad7e344e..d636deba 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Instruction.java
+++ b/src/main/java/org/jf/dexlib/code/Instruction.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code;
+package org.jf.dexlib.code;
 
-import org.JesusFreke.dexlib.*;
-import org.JesusFreke.dexlib.util.Input;
-import org.JesusFreke.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.*;
+import org.jf.dexlib.util.Input;
+import org.jf.dexlib.util.AnnotatedOutput;
 
 public final class Instruction implements Field<Instruction> {
     private DexFile dexFile;
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Opcode.java b/src/main/java/org/jf/dexlib/code/Opcode.java
similarity index 98%
rename from src/main/java/org/JesusFreke/dexlib/code/Opcode.java
rename to src/main/java/org/jf/dexlib/code/Opcode.java
index e70a42dc..b27f90f0 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Opcode.java
+++ b/src/main/java/org/jf/dexlib/code/Opcode.java
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code;
+package org.jf.dexlib.code;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/org/JesusFreke/dexlib/code/ReferenceType.java b/src/main/java/org/jf/dexlib/code/ReferenceType.java
similarity index 94%
rename from src/main/java/org/JesusFreke/dexlib/code/ReferenceType.java
rename to src/main/java/org/jf/dexlib/code/ReferenceType.java
index 21024834..0615e54f 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/ReferenceType.java
+++ b/src/main/java/org/jf/dexlib/code/ReferenceType.java
@@ -26,9 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.code;
+package org.jf.dexlib.code;
 
-import org.JesusFreke.dexlib.*;
+import org.jf.dexlib.*;
 
 public enum ReferenceType
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/debug/AdvanceLine.java b/src/main/java/org/jf/dexlib/debug/AdvanceLine.java
similarity index 88%
rename from src/main/java/org/JesusFreke/dexlib/debug/AdvanceLine.java
rename to src/main/java/org/jf/dexlib/debug/AdvanceLine.java
index bf620340..b3c070b3 100644
--- a/src/main/java/org/JesusFreke/dexlib/debug/AdvanceLine.java
+++ b/src/main/java/org/jf/dexlib/debug/AdvanceLine.java
@@ -26,12 +26,12 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.debug;
+package org.jf.dexlib.debug;
 
-import org.JesusFreke.dexlib.CompositeField;
-import org.JesusFreke.dexlib.Field;
-import org.JesusFreke.dexlib.ByteField;
-import org.JesusFreke.dexlib.SignedLeb128Field;
+import org.jf.dexlib.CompositeField;
+import org.jf.dexlib.Field;
+import org.jf.dexlib.ByteField;
+import org.jf.dexlib.SignedLeb128Field;
 
 public class AdvanceLine extends CompositeField<AdvanceLine> implements DebugInstruction<AdvanceLine> {
     private final ByteField opcodeField;
diff --git a/src/main/java/org/JesusFreke/dexlib/debug/AdvancePC.java b/src/main/java/org/jf/dexlib/debug/AdvancePC.java
similarity index 94%
rename from src/main/java/org/JesusFreke/dexlib/debug/AdvancePC.java
rename to src/main/java/org/jf/dexlib/debug/AdvancePC.java
index fd9370cd..0ed7a320 100644
--- a/src/main/java/org/JesusFreke/dexlib/debug/AdvancePC.java
+++ b/src/main/java/org/jf/dexlib/debug/AdvancePC.java
@@ -26,9 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.debug;
+package org.jf.dexlib.debug;
 
-import org.JesusFreke.dexlib.*;
+import org.jf.dexlib.*;
 
 public class AdvancePC extends CompositeField<AdvancePC> implements DebugInstruction<AdvancePC> {
     private final ByteField opcodeField;
diff --git a/src/main/java/org/JesusFreke/dexlib/debug/DebugInstruction.java b/src/main/java/org/jf/dexlib/debug/DebugInstruction.java
similarity index 93%
rename from src/main/java/org/JesusFreke/dexlib/debug/DebugInstruction.java
rename to src/main/java/org/jf/dexlib/debug/DebugInstruction.java
index 847b7201..7f957de9 100644
--- a/src/main/java/org/JesusFreke/dexlib/debug/DebugInstruction.java
+++ b/src/main/java/org/jf/dexlib/debug/DebugInstruction.java
@@ -26,9 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.debug;
+package org.jf.dexlib.debug;
 
-import org.JesusFreke.dexlib.Field;
+import org.jf.dexlib.Field;
 
 public interface DebugInstruction<T extends DebugInstruction> extends Field<T> {
     public byte getOpcode();
diff --git a/src/main/java/org/JesusFreke/dexlib/debug/DebugInstructionFactory.java b/src/main/java/org/jf/dexlib/debug/DebugInstructionFactory.java
similarity index 93%
rename from src/main/java/org/JesusFreke/dexlib/debug/DebugInstructionFactory.java
rename to src/main/java/org/jf/dexlib/debug/DebugInstructionFactory.java
index c5587a02..9527c7b1 100644
--- a/src/main/java/org/JesusFreke/dexlib/debug/DebugInstructionFactory.java
+++ b/src/main/java/org/jf/dexlib/debug/DebugInstructionFactory.java
@@ -26,10 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.debug;
+package org.jf.dexlib.debug;
 
-import org.JesusFreke.dexlib.DexFile;
-import org.JesusFreke.dexlib.util.Input;
+import org.jf.dexlib.DexFile;
+import org.jf.dexlib.util.Input;
 
 public abstract class DebugInstructionFactory {
     public static DebugInstruction readDebugInstruction(DexFile dexFile, Input in) {
diff --git a/src/main/java/org/JesusFreke/dexlib/debug/EndLocal.java b/src/main/java/org/jf/dexlib/debug/EndLocal.java
similarity index 94%
rename from src/main/java/org/JesusFreke/dexlib/debug/EndLocal.java
rename to src/main/java/org/jf/dexlib/debug/EndLocal.java
index 11979a6c..ae28b757 100644
--- a/src/main/java/org/JesusFreke/dexlib/debug/EndLocal.java
+++ b/src/main/java/org/jf/dexlib/debug/EndLocal.java
@@ -26,9 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.debug;
+package org.jf.dexlib.debug;
 
-import org.JesusFreke.dexlib.*;
+import org.jf.dexlib.*;
 
 public class EndLocal extends CompositeField<EndLocal> implements DebugInstruction<EndLocal> {
     private final ByteField opcode;
diff --git a/src/main/java/org/JesusFreke/dexlib/debug/EndSequence.java b/src/main/java/org/jf/dexlib/debug/EndSequence.java
similarity index 89%
rename from src/main/java/org/JesusFreke/dexlib/debug/EndSequence.java
rename to src/main/java/org/jf/dexlib/debug/EndSequence.java
index 421fec5f..cb59cbca 100644
--- a/src/main/java/org/JesusFreke/dexlib/debug/EndSequence.java
+++ b/src/main/java/org/jf/dexlib/debug/EndSequence.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.debug;
+package org.jf.dexlib.debug;
 
-import org.JesusFreke.dexlib.CompositeField;
-import org.JesusFreke.dexlib.Field;
-import org.JesusFreke.dexlib.ByteField;
+import org.jf.dexlib.CompositeField;
+import org.jf.dexlib.Field;
+import org.jf.dexlib.ByteField;
 
 public class EndSequence extends CompositeField<EndSequence> implements DebugInstruction<EndSequence> {
     public EndSequence() {
diff --git a/src/main/java/org/JesusFreke/dexlib/debug/RestartLocal.java b/src/main/java/org/jf/dexlib/debug/RestartLocal.java
similarity index 94%
rename from src/main/java/org/JesusFreke/dexlib/debug/RestartLocal.java
rename to src/main/java/org/jf/dexlib/debug/RestartLocal.java
index 959981e7..a1b2ba1a 100644
--- a/src/main/java/org/JesusFreke/dexlib/debug/RestartLocal.java
+++ b/src/main/java/org/jf/dexlib/debug/RestartLocal.java
@@ -26,9 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.debug;
+package org.jf.dexlib.debug;
 
-import org.JesusFreke.dexlib.*;
+import org.jf.dexlib.*;
 
 public class RestartLocal extends CompositeField<RestartLocal> implements DebugInstruction<RestartLocal> {
     private final ByteField opcode;
diff --git a/src/main/java/org/JesusFreke/dexlib/debug/SetEpilogueBegin.java b/src/main/java/org/jf/dexlib/debug/SetEpilogueBegin.java
similarity index 90%
rename from src/main/java/org/JesusFreke/dexlib/debug/SetEpilogueBegin.java
rename to src/main/java/org/jf/dexlib/debug/SetEpilogueBegin.java
index 2999bb33..e001ffd1 100644
--- a/src/main/java/org/JesusFreke/dexlib/debug/SetEpilogueBegin.java
+++ b/src/main/java/org/jf/dexlib/debug/SetEpilogueBegin.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.debug;
+package org.jf.dexlib.debug;
 
-import org.JesusFreke.dexlib.CompositeField;
-import org.JesusFreke.dexlib.Field;
-import org.JesusFreke.dexlib.ByteField;
+import org.jf.dexlib.CompositeField;
+import org.jf.dexlib.Field;
+import org.jf.dexlib.ByteField;
 
 public class SetEpilogueBegin extends CompositeField<SetEpilogueBegin> implements DebugInstruction<SetEpilogueBegin> {
     public SetEpilogueBegin() {
diff --git a/src/main/java/org/JesusFreke/dexlib/debug/SetFile.java b/src/main/java/org/jf/dexlib/debug/SetFile.java
similarity index 94%
rename from src/main/java/org/JesusFreke/dexlib/debug/SetFile.java
rename to src/main/java/org/jf/dexlib/debug/SetFile.java
index f510b62a..37ba78b4 100644
--- a/src/main/java/org/JesusFreke/dexlib/debug/SetFile.java
+++ b/src/main/java/org/jf/dexlib/debug/SetFile.java
@@ -26,9 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.debug;
+package org.jf.dexlib.debug;
 
-import org.JesusFreke.dexlib.*;
+import org.jf.dexlib.*;
 
 public class SetFile extends CompositeField<SetFile> implements DebugInstruction<SetFile> {
     private final ByteField opcode;
diff --git a/src/main/java/org/JesusFreke/dexlib/debug/SetPrologueEnd.java b/src/main/java/org/jf/dexlib/debug/SetPrologueEnd.java
similarity index 89%
rename from src/main/java/org/JesusFreke/dexlib/debug/SetPrologueEnd.java
rename to src/main/java/org/jf/dexlib/debug/SetPrologueEnd.java
index 43cd02d4..eb629099 100644
--- a/src/main/java/org/JesusFreke/dexlib/debug/SetPrologueEnd.java
+++ b/src/main/java/org/jf/dexlib/debug/SetPrologueEnd.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.debug;
+package org.jf.dexlib.debug;
 
-import org.JesusFreke.dexlib.CompositeField;
-import org.JesusFreke.dexlib.Field;
-import org.JesusFreke.dexlib.ByteField;
+import org.jf.dexlib.CompositeField;
+import org.jf.dexlib.Field;
+import org.jf.dexlib.ByteField;
 
 public class SetPrologueEnd extends CompositeField<SetPrologueEnd> implements DebugInstruction<SetPrologueEnd> {
     public SetPrologueEnd() {
diff --git a/src/main/java/org/JesusFreke/dexlib/debug/SpecialOpcode.java b/src/main/java/org/jf/dexlib/debug/SpecialOpcode.java
similarity index 90%
rename from src/main/java/org/JesusFreke/dexlib/debug/SpecialOpcode.java
rename to src/main/java/org/jf/dexlib/debug/SpecialOpcode.java
index dda189e9..9c858d74 100644
--- a/src/main/java/org/JesusFreke/dexlib/debug/SpecialOpcode.java
+++ b/src/main/java/org/jf/dexlib/debug/SpecialOpcode.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.debug;
+package org.jf.dexlib.debug;
 
-import org.JesusFreke.dexlib.CompositeField;
-import org.JesusFreke.dexlib.Field;
-import org.JesusFreke.dexlib.ByteField;
+import org.jf.dexlib.CompositeField;
+import org.jf.dexlib.Field;
+import org.jf.dexlib.ByteField;
 
 public class SpecialOpcode extends CompositeField<SpecialOpcode> implements DebugInstruction<SpecialOpcode> {
     private final byte opcode;
diff --git a/src/main/java/org/JesusFreke/dexlib/debug/StartLocal.java b/src/main/java/org/jf/dexlib/debug/StartLocal.java
similarity index 95%
rename from src/main/java/org/JesusFreke/dexlib/debug/StartLocal.java
rename to src/main/java/org/jf/dexlib/debug/StartLocal.java
index 90c09eb3..76999b0f 100644
--- a/src/main/java/org/JesusFreke/dexlib/debug/StartLocal.java
+++ b/src/main/java/org/jf/dexlib/debug/StartLocal.java
@@ -26,9 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.debug;
+package org.jf.dexlib.debug;
 
-import org.JesusFreke.dexlib.*;
+import org.jf.dexlib.*;
 
 public class StartLocal extends CompositeField<StartLocal> implements DebugInstruction<StartLocal> {
     private final ByteField opcodeField;
diff --git a/src/main/java/org/JesusFreke/dexlib/debug/StartLocalExtended.java b/src/main/java/org/jf/dexlib/debug/StartLocalExtended.java
similarity index 95%
rename from src/main/java/org/JesusFreke/dexlib/debug/StartLocalExtended.java
rename to src/main/java/org/jf/dexlib/debug/StartLocalExtended.java
index e4f36314..32ce24b4 100644
--- a/src/main/java/org/JesusFreke/dexlib/debug/StartLocalExtended.java
+++ b/src/main/java/org/jf/dexlib/debug/StartLocalExtended.java
@@ -26,9 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.debug;
+package org.jf.dexlib.debug;
 
-import org.JesusFreke.dexlib.*;
+import org.jf.dexlib.*;
 
 public class StartLocalExtended extends CompositeField<StartLocalExtended> implements DebugInstruction<StartLocalExtended> {
     private final ByteField opcodeField;
diff --git a/src/main/java/org/JesusFreke/dexlib/util/AccessFlags.java b/src/main/java/org/jf/dexlib/util/AccessFlags.java
similarity index 96%
rename from src/main/java/org/JesusFreke/dexlib/util/AccessFlags.java
rename to src/main/java/org/jf/dexlib/util/AccessFlags.java
index 134c1af3..c7aa8497 100644
--- a/src/main/java/org/JesusFreke/dexlib/util/AccessFlags.java
+++ b/src/main/java/org/jf/dexlib/util/AccessFlags.java
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.util;
+package org.jf.dexlib.util;
 
 import java.util.HashMap;
 
diff --git a/src/main/java/org/JesusFreke/dexlib/util/AnnotatedOutput.java b/src/main/java/org/jf/dexlib/util/AnnotatedOutput.java
similarity index 98%
rename from src/main/java/org/JesusFreke/dexlib/util/AnnotatedOutput.java
rename to src/main/java/org/jf/dexlib/util/AnnotatedOutput.java
index d5bb6393..32735a9e 100644
--- a/src/main/java/org/JesusFreke/dexlib/util/AnnotatedOutput.java
+++ b/src/main/java/org/jf/dexlib/util/AnnotatedOutput.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.JesusFreke.dexlib.util;
+package org.jf.dexlib.util;
 
 /**
  * Interface for a binary output destination that may be augmented
diff --git a/src/main/java/org/JesusFreke/dexlib/util/ByteArray.java b/src/main/java/org/jf/dexlib/util/ByteArray.java
similarity index 99%
rename from src/main/java/org/JesusFreke/dexlib/util/ByteArray.java
rename to src/main/java/org/jf/dexlib/util/ByteArray.java
index 278e91b3..3b2bd7b6 100644
--- a/src/main/java/org/JesusFreke/dexlib/util/ByteArray.java
+++ b/src/main/java/org/jf/dexlib/util/ByteArray.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.JesusFreke.dexlib.util;
+package org.jf.dexlib.util;
 
 import java.io.DataInputStream;
 import java.io.IOException;
diff --git a/src/main/java/org/JesusFreke/dexlib/util/ByteArrayAnnotatedOutput.java b/src/main/java/org/jf/dexlib/util/ByteArrayAnnotatedOutput.java
similarity index 99%
rename from src/main/java/org/JesusFreke/dexlib/util/ByteArrayAnnotatedOutput.java
rename to src/main/java/org/jf/dexlib/util/ByteArrayAnnotatedOutput.java
index b4bc3e04..cee9f50b 100644
--- a/src/main/java/org/JesusFreke/dexlib/util/ByteArrayAnnotatedOutput.java
+++ b/src/main/java/org/jf/dexlib/util/ByteArrayAnnotatedOutput.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.JesusFreke.dexlib.util;
+package org.jf.dexlib.util;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/src/main/java/org/JesusFreke/dexlib/util/ByteArrayInput.java b/src/main/java/org/jf/dexlib/util/ByteArrayInput.java
similarity index 96%
rename from src/main/java/org/JesusFreke/dexlib/util/ByteArrayInput.java
rename to src/main/java/org/jf/dexlib/util/ByteArrayInput.java
index c354a74a..852eba47 100644
--- a/src/main/java/org/JesusFreke/dexlib/util/ByteArrayInput.java
+++ b/src/main/java/org/jf/dexlib/util/ByteArrayInput.java
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.util;
+package org.jf.dexlib.util;
 
 /**
  * Implementation of {@link Input} which reads the data from a
diff --git a/src/main/java/org/JesusFreke/dexlib/util/ByteArrayOutput.java b/src/main/java/org/jf/dexlib/util/ByteArrayOutput.java
similarity index 99%
rename from src/main/java/org/JesusFreke/dexlib/util/ByteArrayOutput.java
rename to src/main/java/org/jf/dexlib/util/ByteArrayOutput.java
index 2e3484d1..ffaceb02 100644
--- a/src/main/java/org/JesusFreke/dexlib/util/ByteArrayOutput.java
+++ b/src/main/java/org/jf/dexlib/util/ByteArrayOutput.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.JesusFreke.dexlib.util;
+package org.jf.dexlib.util;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/org/JesusFreke/dexlib/util/DebugInfoBuilder.java b/src/main/java/org/jf/dexlib/util/DebugInfoBuilder.java
similarity index 95%
rename from src/main/java/org/JesusFreke/dexlib/util/DebugInfoBuilder.java
rename to src/main/java/org/jf/dexlib/util/DebugInfoBuilder.java
index d5bf2650..7ce2442d 100644
--- a/src/main/java/org/JesusFreke/dexlib/util/DebugInfoBuilder.java
+++ b/src/main/java/org/jf/dexlib/util/DebugInfoBuilder.java
@@ -26,13 +26,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.util;
+package org.jf.dexlib.util;
 
-import org.JesusFreke.dexlib.debug.*;
-import org.JesusFreke.dexlib.DexFile;
-import org.JesusFreke.dexlib.DebugInfoItem;
-import org.JesusFreke.dexlib.StringIdItem;
-import org.JesusFreke.dexlib.TypeIdItem;
+import org.jf.dexlib.debug.*;
+import org.jf.dexlib.DexFile;
+import org.jf.dexlib.DebugInfoItem;
+import org.jf.dexlib.StringIdItem;
+import org.jf.dexlib.TypeIdItem;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/JesusFreke/dexlib/util/EncodedValueUtils.java b/src/main/java/org/jf/dexlib/util/EncodedValueUtils.java
similarity index 96%
rename from src/main/java/org/JesusFreke/dexlib/util/EncodedValueUtils.java
rename to src/main/java/org/jf/dexlib/util/EncodedValueUtils.java
index 68eb0f0d..a455b1db 100644
--- a/src/main/java/org/JesusFreke/dexlib/util/EncodedValueUtils.java
+++ b/src/main/java/org/jf/dexlib/util/EncodedValueUtils.java
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.util;
+package org.jf.dexlib.util;
 
 public class EncodedValueUtils {
     public static byte getRequiredBytesForSignedIntegralValue(long value) {
diff --git a/src/main/java/org/JesusFreke/dexlib/util/ExceptionWithContext.java b/src/main/java/org/jf/dexlib/util/ExceptionWithContext.java
similarity index 99%
rename from src/main/java/org/JesusFreke/dexlib/util/ExceptionWithContext.java
rename to src/main/java/org/jf/dexlib/util/ExceptionWithContext.java
index 31960476..05495a9c 100644
--- a/src/main/java/org/JesusFreke/dexlib/util/ExceptionWithContext.java
+++ b/src/main/java/org/jf/dexlib/util/ExceptionWithContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.JesusFreke.dexlib.util;
+package org.jf.dexlib.util;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;
diff --git a/src/main/java/org/JesusFreke/dexlib/util/FileUtils.java b/src/main/java/org/jf/dexlib/util/FileUtils.java
similarity index 98%
rename from src/main/java/org/JesusFreke/dexlib/util/FileUtils.java
rename to src/main/java/org/jf/dexlib/util/FileUtils.java
index 86bccea1..e4bd968b 100644
--- a/src/main/java/org/JesusFreke/dexlib/util/FileUtils.java
+++ b/src/main/java/org/jf/dexlib/util/FileUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.JesusFreke.dexlib.util;
+package org.jf.dexlib.util;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/main/java/org/JesusFreke/dexlib/util/Hex.java b/src/main/java/org/jf/dexlib/util/Hex.java
similarity index 99%
rename from src/main/java/org/JesusFreke/dexlib/util/Hex.java
rename to src/main/java/org/jf/dexlib/util/Hex.java
index e9174fa8..6ff373f1 100644
--- a/src/main/java/org/JesusFreke/dexlib/util/Hex.java
+++ b/src/main/java/org/jf/dexlib/util/Hex.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.JesusFreke.dexlib.util;
+package org.jf.dexlib.util;
 
 /**
  * Utilities for formatting numbers as hexadecimal.
diff --git a/src/main/java/org/JesusFreke/dexlib/util/IndentingWriter.java b/src/main/java/org/jf/dexlib/util/IndentingWriter.java
similarity index 99%
rename from src/main/java/org/JesusFreke/dexlib/util/IndentingWriter.java
rename to src/main/java/org/jf/dexlib/util/IndentingWriter.java
index df808d78..06485f89 100644
--- a/src/main/java/org/JesusFreke/dexlib/util/IndentingWriter.java
+++ b/src/main/java/org/jf/dexlib/util/IndentingWriter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.JesusFreke.dexlib.util;
+package org.jf.dexlib.util;
 
 import java.io.FilterWriter;
 import java.io.IOException;
diff --git a/src/main/java/org/JesusFreke/dexlib/util/Input.java b/src/main/java/org/jf/dexlib/util/Input.java
similarity index 96%
rename from src/main/java/org/JesusFreke/dexlib/util/Input.java
rename to src/main/java/org/jf/dexlib/util/Input.java
index b581a4e0..1988c6a5 100644
--- a/src/main/java/org/JesusFreke/dexlib/util/Input.java
+++ b/src/main/java/org/jf/dexlib/util/Input.java
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.util;
+package org.jf.dexlib.util;
 
 /**
  * Interface for a source for binary input. This is similar to 
diff --git a/src/main/java/org/JesusFreke/dexlib/util/Leb128Utils.java b/src/main/java/org/jf/dexlib/util/Leb128Utils.java
similarity index 98%
rename from src/main/java/org/JesusFreke/dexlib/util/Leb128Utils.java
rename to src/main/java/org/jf/dexlib/util/Leb128Utils.java
index e40ebdef..5ed5045e 100644
--- a/src/main/java/org/JesusFreke/dexlib/util/Leb128Utils.java
+++ b/src/main/java/org/jf/dexlib/util/Leb128Utils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.JesusFreke.dexlib.util;
+package org.jf.dexlib.util;
 
 /**
  * LEB128 (little-endian base 128) utilities.
diff --git a/src/main/java/org/JesusFreke/dexlib/util/Output.java b/src/main/java/org/jf/dexlib/util/Output.java
similarity index 99%
rename from src/main/java/org/JesusFreke/dexlib/util/Output.java
rename to src/main/java/org/jf/dexlib/util/Output.java
index dbb76df0..869fbfee 100644
--- a/src/main/java/org/JesusFreke/dexlib/util/Output.java
+++ b/src/main/java/org/jf/dexlib/util/Output.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.JesusFreke.dexlib.util;
+package org.jf.dexlib.util;
 
 /**
  * Interface for a sink for binary output. This is similar to 
diff --git a/src/main/java/org/JesusFreke/dexlib/util/Pair.java b/src/main/java/org/jf/dexlib/util/Pair.java
similarity index 95%
rename from src/main/java/org/JesusFreke/dexlib/util/Pair.java
rename to src/main/java/org/jf/dexlib/util/Pair.java
index 149119e1..8816f68f 100644
--- a/src/main/java/org/JesusFreke/dexlib/util/Pair.java
+++ b/src/main/java/org/jf/dexlib/util/Pair.java
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.util;
+package org.jf.dexlib.util;
 
 public class Pair<A, B> {
     public final A first;
diff --git a/src/main/java/org/JesusFreke/dexlib/util/TryListBuilder.java b/src/main/java/org/jf/dexlib/util/TryListBuilder.java
similarity index 96%
rename from src/main/java/org/JesusFreke/dexlib/util/TryListBuilder.java
rename to src/main/java/org/jf/dexlib/util/TryListBuilder.java
index 2a963818..8ac5b419 100644
--- a/src/main/java/org/JesusFreke/dexlib/util/TryListBuilder.java
+++ b/src/main/java/org/jf/dexlib/util/TryListBuilder.java
@@ -26,11 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.util;
+package org.jf.dexlib.util;
 
-import org.JesusFreke.dexlib.TypeIdItem;
-import org.JesusFreke.dexlib.CodeItem;
-import org.JesusFreke.dexlib.DexFile;
+import org.jf.dexlib.TypeIdItem;
+import org.jf.dexlib.CodeItem;
+import org.jf.dexlib.DexFile;
 
 import java.util.*;
 
diff --git a/src/main/java/org/JesusFreke/dexlib/util/TwoColumnOutput.java b/src/main/java/org/jf/dexlib/util/TwoColumnOutput.java
similarity index 99%
rename from src/main/java/org/JesusFreke/dexlib/util/TwoColumnOutput.java
rename to src/main/java/org/jf/dexlib/util/TwoColumnOutput.java
index 01c209d5..e507cace 100644
--- a/src/main/java/org/JesusFreke/dexlib/util/TwoColumnOutput.java
+++ b/src/main/java/org/jf/dexlib/util/TwoColumnOutput.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.JesusFreke.dexlib.util;
+package org.jf.dexlib.util;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/src/main/java/org/JesusFreke/dexlib/util/TypeUtils.java b/src/main/java/org/jf/dexlib/util/TypeUtils.java
similarity index 89%
rename from src/main/java/org/JesusFreke/dexlib/util/TypeUtils.java
rename to src/main/java/org/jf/dexlib/util/TypeUtils.java
index e1abd219..b82cdd28 100644
--- a/src/main/java/org/JesusFreke/dexlib/util/TypeUtils.java
+++ b/src/main/java/org/jf/dexlib/util/TypeUtils.java
@@ -26,12 +26,12 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.dexlib.util;
+package org.jf.dexlib.util;
 
-import org.JesusFreke.dexlib.EncodedValue.EncodedValueSubFieldFactory;
-import org.JesusFreke.dexlib.EncodedValue.ValueType;
-import org.JesusFreke.dexlib.EncodedValue.EncodedValueSubField;
-import org.JesusFreke.dexlib.DexFile;
+import org.jf.dexlib.EncodedValue.EncodedValueSubFieldFactory;
+import org.jf.dexlib.EncodedValue.ValueType;
+import org.jf.dexlib.EncodedValue.EncodedValueSubField;
+import org.jf.dexlib.DexFile;
 
 public class TypeUtils
 {
diff --git a/src/main/java/org/JesusFreke/dexlib/util/Utf8Utils.java b/src/main/java/org/jf/dexlib/util/Utf8Utils.java
similarity index 97%
rename from src/main/java/org/JesusFreke/dexlib/util/Utf8Utils.java
rename to src/main/java/org/jf/dexlib/util/Utf8Utils.java
index 0d26a371..8e4df613 100644
--- a/src/main/java/org/JesusFreke/dexlib/util/Utf8Utils.java
+++ b/src/main/java/org/jf/dexlib/util/Utf8Utils.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.JesusFreke.dexlib.util;
+package org.jf.dexlib.util;
 
-import org.JesusFreke.dexlib.util.ByteArray;
-import org.JesusFreke.dexlib.util.Hex;
+import org.jf.dexlib.util.ByteArray;
+import org.jf.dexlib.util.Hex;
 
 /**
  * Constants of type <code>CONSTANT_Utf8_info</code>.
diff --git a/src/main/java/org/JesusFreke/smali/SemanticException.java b/src/main/java/org/jf/smali/SemanticException.java
similarity index 98%
rename from src/main/java/org/JesusFreke/smali/SemanticException.java
rename to src/main/java/org/jf/smali/SemanticException.java
index 822dc9fa..d5c5e0f4 100644
--- a/src/main/java/org/JesusFreke/smali/SemanticException.java
+++ b/src/main/java/org/jf/smali/SemanticException.java
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.smali;
+package org.jf.smali;
 
 import org.antlr.runtime.RecognitionException;
 import org.antlr.runtime.IntStream;
diff --git a/src/main/java/org/JesusFreke/smali/UsageException.java b/src/main/java/org/jf/smali/UsageException.java
similarity index 96%
rename from src/main/java/org/JesusFreke/smali/UsageException.java
rename to src/main/java/org/jf/smali/UsageException.java
index c5dbfc08..90149c78 100644
--- a/src/main/java/org/JesusFreke/smali/UsageException.java
+++ b/src/main/java/org/jf/smali/UsageException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.JesusFreke.smali;
+package org.jf.smali;
 
 /**
  * Simple exception class used to communicate that the command-line tool
diff --git a/src/main/java/org/JesusFreke/smali/literalTools.java b/src/main/java/org/jf/smali/literalTools.java
similarity index 96%
rename from src/main/java/org/JesusFreke/smali/literalTools.java
rename to src/main/java/org/jf/smali/literalTools.java
index b1ada63d..8c582722 100644
--- a/src/main/java/org/JesusFreke/smali/literalTools.java
+++ b/src/main/java/org/jf/smali/literalTools.java
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.smali;
+package org.jf.smali;
 
 public class literalTools
 {  
diff --git a/src/main/java/org/JesusFreke/smali/main.java b/src/main/java/org/jf/smali/main.java
similarity index 99%
rename from src/main/java/org/JesusFreke/smali/main.java
rename to src/main/java/org/jf/smali/main.java
index 9ba739cf..166803bb 100644
--- a/src/main/java/org/JesusFreke/smali/main.java
+++ b/src/main/java/org/jf/smali/main.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.JesusFreke.smali;
+package org.jf.smali;
 
 /**
  * Main class for smali. It recognizes enough options to be able to dispatch
diff --git a/src/main/java/org/JesusFreke/smali/smali.java b/src/main/java/org/jf/smali/smali.java
similarity index 93%
rename from src/main/java/org/JesusFreke/smali/smali.java
rename to src/main/java/org/jf/smali/smali.java
index 071399d6..57606ab7 100644
--- a/src/main/java/org/JesusFreke/smali/smali.java
+++ b/src/main/java/org/jf/smali/smali.java
@@ -26,20 +26,16 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.JesusFreke.smali;
+package org.jf.smali;
 
-import org.JesusFreke.dexlib.DexFile;
-import org.JesusFreke.dexlib.util.ByteArrayOutput;
-import org.JesusFreke.dexlib.util.ByteArrayAnnotatedOutput;
+import org.jf.dexlib.DexFile;
+import org.jf.dexlib.util.ByteArrayAnnotatedOutput;
 import org.antlr.runtime.ANTLRInputStream;
 import org.antlr.runtime.CommonTokenStream;
-import org.antlr.runtime.Token;
 import org.antlr.runtime.tree.CommonTree;
 import org.antlr.runtime.tree.CommonTreeNodeStream;
 
 import java.io.*;
-import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
diff --git a/src/test/java/ByteLiteralTest.java b/src/test/java/ByteLiteralTest.java
index 3a345483..f85b8c53 100644
--- a/src/test/java/ByteLiteralTest.java
+++ b/src/test/java/ByteLiteralTest.java
@@ -27,7 +27,7 @@
  */
 
 import org.junit.*;
-import org.JesusFreke.smali.literalTools;
+import org.jf.smali.literalTools;
 
 public class ByteLiteralTest
 {
diff --git a/src/test/java/IntLiteralTest.java b/src/test/java/IntLiteralTest.java
index 1301c794..84895f00 100644
--- a/src/test/java/IntLiteralTest.java
+++ b/src/test/java/IntLiteralTest.java
@@ -27,7 +27,7 @@
  */
 
 import org.junit.*;
-import org.JesusFreke.smali.literalTools;
+import org.jf.smali.literalTools;
 
 public class IntLiteralTest
 {
diff --git a/src/test/java/LongLiteralTest.java b/src/test/java/LongLiteralTest.java
index 00382109..59dad74f 100644
--- a/src/test/java/LongLiteralTest.java
+++ b/src/test/java/LongLiteralTest.java
@@ -27,7 +27,7 @@
  */
 
 import org.junit.*;
-import org.JesusFreke.smali.literalTools;
+import org.jf.smali.literalTools;
 
 public class LongLiteralTest
 {
diff --git a/src/test/java/ShortLiteralTest.java b/src/test/java/ShortLiteralTest.java
index cb904d7a..b2da8082 100644
--- a/src/test/java/ShortLiteralTest.java
+++ b/src/test/java/ShortLiteralTest.java
@@ -27,7 +27,7 @@
  */
 
 import org.junit.*;
-import org.JesusFreke.smali.literalTools;
+import org.jf.smali.literalTools;
 
 public class ShortLiteralTest
 {
diff --git a/src/test/java/TryListBuilderTest.java b/src/test/java/TryListBuilderTest.java
index 29c6d2fe..6edd67ec 100644
--- a/src/test/java/TryListBuilderTest.java
+++ b/src/test/java/TryListBuilderTest.java
@@ -27,11 +27,11 @@
  */
 
 
-import org.JesusFreke.dexlib.util.TryListBuilder;
-import org.JesusFreke.dexlib.util.Pair;
-import org.JesusFreke.dexlib.TypeIdItem;
-import org.JesusFreke.dexlib.DexFile;
-import org.JesusFreke.dexlib.CodeItem;
+import org.jf.dexlib.util.TryListBuilder;
+import org.jf.dexlib.util.Pair;
+import org.jf.dexlib.TypeIdItem;
+import org.jf.dexlib.DexFile;
+import org.jf.dexlib.CodeItem;
 import org.junit.*;
 
 import java.util.List;