Package updates

70 files changed, 119 insertions, 529 deletions

diff --git a/src/main/java/cuchaz/enigma/Deobfuscator.java b/src/main/java/cuchaz/enigma/Deobfuscator.java
index e1454c7e..3433ca9c 100644
--- a/src/main/java/cuchaz/enigma/Deobfuscator.java
+++ b/src/main/java/cuchaz/enigma/Deobfuscator.java
@@ -29,6 +29,7 @@ import cuchaz.enigma.analysis.*;
 import cuchaz.enigma.bytecode.ClassProtectifier;
 import cuchaz.enigma.bytecode.ClassPublifier;
 import cuchaz.enigma.mapping.*;
+import cuchaz.enigma.mapping.entry.*;
 import cuchaz.enigma.throwables.IllegalNameException;
 import cuchaz.enigma.utils.Utils;
 import org.objectweb.asm.ClassWriter;
diff --git a/src/main/java/cuchaz/enigma/TranslatingTypeLoader.java b/src/main/java/cuchaz/enigma/TranslatingTypeLoader.java
index c91070fc..3f1ff7a1 100644
--- a/src/main/java/cuchaz/enigma/TranslatingTypeLoader.java
+++ b/src/main/java/cuchaz/enigma/TranslatingTypeLoader.java
@@ -19,8 +19,8 @@ import com.strobel.assembler.metadata.ITypeLoader;
 import cuchaz.enigma.analysis.JarIndex;
 import cuchaz.enigma.analysis.ParsedJar;
 import cuchaz.enigma.bytecode.translators.TranslationClassVisitor;
-import cuchaz.enigma.mapping.ClassEntry;
-import cuchaz.enigma.mapping.ReferencedEntryPool;
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.ReferencedEntryPool;
 import cuchaz.enigma.mapping.Translator;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Opcodes;
diff --git a/src/main/java/cuchaz/enigma/analysis/ClassImplementationsTreeNode.java b/src/main/java/cuchaz/enigma/analysis/ClassImplementationsTreeNode.java
index d0e1ddbe..e876bb07 100644
--- a/src/main/java/cuchaz/enigma/analysis/ClassImplementationsTreeNode.java
+++ b/src/main/java/cuchaz/enigma/analysis/ClassImplementationsTreeNode.java
@@ -12,8 +12,8 @@
 package cuchaz.enigma.analysis;
 
 import com.google.common.collect.Lists;
-import cuchaz.enigma.mapping.ClassEntry;
-import cuchaz.enigma.mapping.MethodEntry;
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.MethodEntry;
 import cuchaz.enigma.mapping.Translator;
 
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/src/main/java/cuchaz/enigma/analysis/ClassInheritanceTreeNode.java b/src/main/java/cuchaz/enigma/analysis/ClassInheritanceTreeNode.java
index 8fd71b7f..b8ee17da 100644
--- a/src/main/java/cuchaz/enigma/analysis/ClassInheritanceTreeNode.java
+++ b/src/main/java/cuchaz/enigma/analysis/ClassInheritanceTreeNode.java
@@ -12,7 +12,7 @@
 package cuchaz.enigma.analysis;
 
 import com.google.common.collect.Lists;
-import cuchaz.enigma.mapping.ClassEntry;
+import cuchaz.enigma.mapping.entry.ClassEntry;
 import cuchaz.enigma.mapping.Translator;
 
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/src/main/java/cuchaz/enigma/analysis/EntryReference.java b/src/main/java/cuchaz/enigma/analysis/EntryReference.java
index b972585a..101729d8 100644
--- a/src/main/java/cuchaz/enigma/analysis/EntryReference.java
+++ b/src/main/java/cuchaz/enigma/analysis/EntryReference.java
@@ -11,9 +11,9 @@
 
 package cuchaz.enigma.analysis;
 
-import cuchaz.enigma.mapping.ClassEntry;
-import cuchaz.enigma.mapping.Entry;
-import cuchaz.enigma.mapping.MethodEntry;
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.Entry;
+import cuchaz.enigma.mapping.entry.MethodEntry;
 import cuchaz.enigma.utils.Utils;
 
 import java.util.Arrays;
diff --git a/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java b/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java
index b0bcc91e..656fa320 100644
--- a/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java
+++ b/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java
@@ -15,6 +15,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
 import cuchaz.enigma.mapping.*;
+import cuchaz.enigma.mapping.entry.*;
 
 import java.util.AbstractMap;
 import java.util.List;
diff --git a/src/main/java/cuchaz/enigma/analysis/FieldReferenceTreeNode.java b/src/main/java/cuchaz/enigma/analysis/FieldReferenceTreeNode.java
index 3e467dba..3d0e48b4 100644
--- a/src/main/java/cuchaz/enigma/analysis/FieldReferenceTreeNode.java
+++ b/src/main/java/cuchaz/enigma/analysis/FieldReferenceTreeNode.java
@@ -12,6 +12,9 @@
 package cuchaz.enigma.analysis;
 
 import cuchaz.enigma.mapping.*;
+import cuchaz.enigma.mapping.entry.FieldEntry;
+import cuchaz.enigma.mapping.entry.MethodDefEntry;
+import cuchaz.enigma.mapping.entry.MethodEntry;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 
diff --git a/src/main/java/cuchaz/enigma/analysis/IndexClassVisitor.java b/src/main/java/cuchaz/enigma/analysis/IndexClassVisitor.java
index 97d6ffa2..7828fa94 100644
--- a/src/main/java/cuchaz/enigma/analysis/IndexClassVisitor.java
+++ b/src/main/java/cuchaz/enigma/analysis/IndexClassVisitor.java
@@ -1,6 +1,6 @@
 package cuchaz.enigma.analysis;
 
-import cuchaz.enigma.mapping.ClassDefEntry;
+import cuchaz.enigma.mapping.entry.ClassDefEntry;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.FieldVisitor;
 import org.objectweb.asm.MethodVisitor;
diff --git a/src/main/java/cuchaz/enigma/analysis/IndexInnerClassVisitor.java b/src/main/java/cuchaz/enigma/analysis/IndexInnerClassVisitor.java
index 621bd33b..04742278 100644
--- a/src/main/java/cuchaz/enigma/analysis/IndexInnerClassVisitor.java
+++ b/src/main/java/cuchaz/enigma/analysis/IndexInnerClassVisitor.java
@@ -1,6 +1,6 @@
 package cuchaz.enigma.analysis;
 
-import cuchaz.enigma.mapping.ClassEntry;
+import cuchaz.enigma.mapping.entry.ClassEntry;
 import org.objectweb.asm.ClassVisitor;
 
 public class IndexInnerClassVisitor extends ClassVisitor {
diff --git a/src/main/java/cuchaz/enigma/analysis/IndexReferenceVisitor.java b/src/main/java/cuchaz/enigma/analysis/IndexReferenceVisitor.java
index 552601b6..bd64bfc1 100644
--- a/src/main/java/cuchaz/enigma/analysis/IndexReferenceVisitor.java
+++ b/src/main/java/cuchaz/enigma/analysis/IndexReferenceVisitor.java
@@ -2,6 +2,9 @@ package cuchaz.enigma.analysis;
 
 import cuchaz.enigma.bytecode.AccessFlags;
 import cuchaz.enigma.mapping.*;
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.MethodDefEntry;
+import cuchaz.enigma.mapping.entry.ReferencedEntryPool;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.MethodVisitor;
 
diff --git a/src/main/java/cuchaz/enigma/analysis/JarIndex.java b/src/main/java/cuchaz/enigma/analysis/JarIndex.java
index 972d4fe0..54dd5068 100644
--- a/src/main/java/cuchaz/enigma/analysis/JarIndex.java
+++ b/src/main/java/cuchaz/enigma/analysis/JarIndex.java
@@ -14,6 +14,7 @@ package cuchaz.enigma.analysis;
 import com.google.common.collect.*;
 import cuchaz.enigma.bytecode.AccessFlags;
 import cuchaz.enigma.mapping.*;
+import cuchaz.enigma.mapping.entry.*;
 import org.objectweb.asm.Opcodes;
 
 import java.util.*;
diff --git a/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java b/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java
index 6791b831..723fffed 100644
--- a/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java
+++ b/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java
@@ -12,8 +12,8 @@
 package cuchaz.enigma.analysis;
 
 import com.google.common.collect.Lists;
-import cuchaz.enigma.mapping.ClassEntry;
-import cuchaz.enigma.mapping.MethodEntry;
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.MethodEntry;
 import cuchaz.enigma.mapping.Translator;
 
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java b/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java
index f060ed9d..904e5945 100644
--- a/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java
+++ b/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java
@@ -12,8 +12,8 @@
 package cuchaz.enigma.analysis;
 
 import com.google.common.collect.Lists;
-import cuchaz.enigma.mapping.ClassEntry;
-import cuchaz.enigma.mapping.MethodEntry;
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.MethodEntry;
 import cuchaz.enigma.mapping.Translator;
 
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/src/main/java/cuchaz/enigma/analysis/MethodReferenceTreeNode.java b/src/main/java/cuchaz/enigma/analysis/MethodReferenceTreeNode.java
index 37b40730..15ae5153 100644
--- a/src/main/java/cuchaz/enigma/analysis/MethodReferenceTreeNode.java
+++ b/src/main/java/cuchaz/enigma/analysis/MethodReferenceTreeNode.java
@@ -13,6 +13,9 @@ package cuchaz.enigma.analysis;
 
 import com.google.common.collect.Sets;
 import cuchaz.enigma.mapping.*;
+import cuchaz.enigma.mapping.entry.Entry;
+import cuchaz.enigma.mapping.entry.MethodDefEntry;
+import cuchaz.enigma.mapping.entry.MethodEntry;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreeNode;
diff --git a/src/main/java/cuchaz/enigma/analysis/ParsedJar.java b/src/main/java/cuchaz/enigma/analysis/ParsedJar.java
index 78ef722d..fae58f80 100644
--- a/src/main/java/cuchaz/enigma/analysis/ParsedJar.java
+++ b/src/main/java/cuchaz/enigma/analysis/ParsedJar.java
@@ -11,7 +11,7 @@
 
 package cuchaz.enigma.analysis;
 
-import cuchaz.enigma.mapping.ClassEntry;
+import cuchaz.enigma.mapping.entry.ClassEntry;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.tree.ClassNode;
 
diff --git a/src/main/java/cuchaz/enigma/analysis/ReferenceTreeNode.java b/src/main/java/cuchaz/enigma/analysis/ReferenceTreeNode.java
index 04693637..3950d165 100644
--- a/src/main/java/cuchaz/enigma/analysis/ReferenceTreeNode.java
+++ b/src/main/java/cuchaz/enigma/analysis/ReferenceTreeNode.java
@@ -11,7 +11,7 @@
 
 package cuchaz.enigma.analysis;
 
-import cuchaz.enigma.mapping.Entry;
+import cuchaz.enigma.mapping.entry.Entry;
 
 public interface ReferenceTreeNode<E extends Entry, C extends Entry> {
         E getEntry();
diff --git a/src/main/java/cuchaz/enigma/analysis/SourceIndex.java b/src/main/java/cuchaz/enigma/analysis/SourceIndex.java
index 19250c8d..14b2e768 100644
--- a/src/main/java/cuchaz/enigma/analysis/SourceIndex.java
+++ b/src/main/java/cuchaz/enigma/analysis/SourceIndex.java
@@ -18,7 +18,7 @@ import com.google.common.collect.Multimap;
 import com.strobel.decompiler.languages.Region;
 import com.strobel.decompiler.languages.java.ast.AstNode;
 import com.strobel.decompiler.languages.java.ast.Identifier;
-import cuchaz.enigma.mapping.Entry;
+import cuchaz.enigma.mapping.entry.Entry;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/src/main/java/cuchaz/enigma/analysis/SourceIndexClassVisitor.java b/src/main/java/cuchaz/enigma/analysis/SourceIndexClassVisitor.java
index 015eaac6..1e2eed8d 100644
--- a/src/main/java/cuchaz/enigma/analysis/SourceIndexClassVisitor.java
+++ b/src/main/java/cuchaz/enigma/analysis/SourceIndexClassVisitor.java
@@ -17,7 +17,7 @@ import com.strobel.assembler.metadata.TypeDefinition;
 import com.strobel.assembler.metadata.TypeReference;
 import com.strobel.decompiler.languages.TextLocation;
 import com.strobel.decompiler.languages.java.ast.*;
-import cuchaz.enigma.mapping.*;
+import cuchaz.enigma.mapping.entry.*;
 
 public class SourceIndexClassVisitor extends SourceIndexVisitor {
         private final ReferencedEntryPool entryPool;
diff --git a/src/main/java/cuchaz/enigma/analysis/SourceIndexMethodVisitor.java b/src/main/java/cuchaz/enigma/analysis/SourceIndexMethodVisitor.java
index 2a62241d..01e773b3 100644
--- a/src/main/java/cuchaz/enigma/analysis/SourceIndexMethodVisitor.java
+++ b/src/main/java/cuchaz/enigma/analysis/SourceIndexMethodVisitor.java
@@ -20,6 +20,7 @@ import com.strobel.assembler.metadata.TypeReference;
 import com.strobel.decompiler.languages.TextLocation;
 import com.strobel.decompiler.languages.java.ast.*;
 import cuchaz.enigma.mapping.*;
+import cuchaz.enigma.mapping.entry.*;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/cuchaz/enigma/analysis/SourceIndexVisitor.java b/src/main/java/cuchaz/enigma/analysis/SourceIndexVisitor.java
index 241b9f7a..176f2838 100644
--- a/src/main/java/cuchaz/enigma/analysis/SourceIndexVisitor.java
+++ b/src/main/java/cuchaz/enigma/analysis/SourceIndexVisitor.java
@@ -14,8 +14,8 @@ package cuchaz.enigma.analysis;
 import com.strobel.assembler.metadata.TypeDefinition;
 import com.strobel.decompiler.languages.java.ast.*;
 import com.strobel.decompiler.patterns.Pattern;
-import cuchaz.enigma.mapping.ClassEntry;
-import cuchaz.enigma.mapping.ReferencedEntryPool;
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.ReferencedEntryPool;
 
 public class SourceIndexVisitor implements IAstVisitor<SourceIndex, Void> {
         private final ReferencedEntryPool entryPool;
diff --git a/src/main/java/cuchaz/enigma/analysis/TranslationIndex.java b/src/main/java/cuchaz/enigma/analysis/TranslationIndex.java
index 3cd80ffd..0c8ed9cd 100644
--- a/src/main/java/cuchaz/enigma/analysis/TranslationIndex.java
+++ b/src/main/java/cuchaz/enigma/analysis/TranslationIndex.java
@@ -17,6 +17,7 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import cuchaz.enigma.bytecode.AccessFlags;
 import cuchaz.enigma.mapping.*;
+import cuchaz.enigma.mapping.entry.*;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/src/main/java/cuchaz/enigma/bytecode/translators/TranslationClassVisitor.java b/src/main/java/cuchaz/enigma/bytecode/translators/TranslationClassVisitor.java
index 24bfe24d..3f61c291 100644
--- a/src/main/java/cuchaz/enigma/bytecode/translators/TranslationClassVisitor.java
+++ b/src/main/java/cuchaz/enigma/bytecode/translators/TranslationClassVisitor.java
@@ -14,6 +14,7 @@ package cuchaz.enigma.bytecode.translators;
 import cuchaz.enigma.analysis.JarIndex;
 import cuchaz.enigma.bytecode.AccessFlags;
 import cuchaz.enigma.mapping.*;
+import cuchaz.enigma.mapping.entry.*;
 import org.objectweb.asm.*;
 
 import java.util.regex.Pattern;
diff --git a/src/main/java/cuchaz/enigma/bytecode/translators/TranslationMethodVisitor.java b/src/main/java/cuchaz/enigma/bytecode/translators/TranslationMethodVisitor.java
index e40becc4..b2192e47 100644
--- a/src/main/java/cuchaz/enigma/bytecode/translators/TranslationMethodVisitor.java
+++ b/src/main/java/cuchaz/enigma/bytecode/translators/TranslationMethodVisitor.java
@@ -1,6 +1,7 @@
 package cuchaz.enigma.bytecode.translators;
 
 import cuchaz.enigma.mapping.*;
+import cuchaz.enigma.mapping.entry.*;
 import org.objectweb.asm.*;
 
 import java.util.Locale;
diff --git a/src/main/java/cuchaz/enigma/gui/ClassSelector.java b/src/main/java/cuchaz/enigma/gui/ClassSelector.java
index ed84ef24..76e8c3fb 100644
--- a/src/main/java/cuchaz/enigma/gui/ClassSelector.java
+++ b/src/main/java/cuchaz/enigma/gui/ClassSelector.java
@@ -17,7 +17,7 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import cuchaz.enigma.gui.node.ClassSelectorClassNode;
 import cuchaz.enigma.gui.node.ClassSelectorPackageNode;
-import cuchaz.enigma.mapping.ClassEntry;
+import cuchaz.enigma.mapping.entry.ClassEntry;
 import cuchaz.enigma.throwables.IllegalNameException;
 
 import javax.swing.*;
diff --git a/src/main/java/cuchaz/enigma/gui/CodeReader.java b/src/main/java/cuchaz/enigma/gui/CodeReader.java
index 97deaf3c..ac45b4a7 100644
--- a/src/main/java/cuchaz/enigma/gui/CodeReader.java
+++ b/src/main/java/cuchaz/enigma/gui/CodeReader.java
@@ -17,8 +17,8 @@ import cuchaz.enigma.analysis.EntryReference;
 import cuchaz.enigma.analysis.SourceIndex;
 import cuchaz.enigma.analysis.Token;
 import cuchaz.enigma.gui.highlight.SelectionHighlightPainter;
-import cuchaz.enigma.mapping.ClassEntry;
-import cuchaz.enigma.mapping.Entry;
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.Entry;
 import de.sciss.syntaxpane.DefaultSyntaxKit;
 
 import javax.swing.*;
diff --git a/src/main/java/cuchaz/enigma/gui/Gui.java b/src/main/java/cuchaz/enigma/gui/Gui.java
index 5d9f7cbb..cfac8ad8 100644
--- a/src/main/java/cuchaz/enigma/gui/Gui.java
+++ b/src/main/java/cuchaz/enigma/gui/Gui.java
@@ -32,6 +32,7 @@ import cuchaz.enigma.gui.panels.PanelEditor;
 import cuchaz.enigma.gui.panels.PanelIdentifier;
 import cuchaz.enigma.gui.panels.PanelObf;
 import cuchaz.enigma.mapping.*;
+import cuchaz.enigma.mapping.entry.*;
 import cuchaz.enigma.throwables.IllegalNameException;
 import cuchaz.enigma.utils.Utils;
 import de.sciss.syntaxpane.DefaultSyntaxKit;
diff --git a/src/main/java/cuchaz/enigma/gui/GuiController.java b/src/main/java/cuchaz/enigma/gui/GuiController.java
index a5528a73..837cff20 100644
--- a/src/main/java/cuchaz/enigma/gui/GuiController.java
+++ b/src/main/java/cuchaz/enigma/gui/GuiController.java
@@ -18,6 +18,10 @@ import cuchaz.enigma.Deobfuscator;
 import cuchaz.enigma.analysis.*;
 import cuchaz.enigma.gui.dialog.ProgressDialog;
 import cuchaz.enigma.mapping.*;
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.Entry;
+import cuchaz.enigma.mapping.entry.FieldEntry;
+import cuchaz.enigma.mapping.entry.MethodEntry;
 import cuchaz.enigma.throwables.MappingParseException;
 import cuchaz.enigma.utils.ReadableToken;
 
diff --git a/src/main/java/cuchaz/enigma/gui/ScoredClassEntry.java b/src/main/java/cuchaz/enigma/gui/ScoredClassEntry.java
index 1fd2fa85..34ec26ee 100644
--- a/src/main/java/cuchaz/enigma/gui/ScoredClassEntry.java
+++ b/src/main/java/cuchaz/enigma/gui/ScoredClassEntry.java
@@ -11,7 +11,7 @@
 
 package cuchaz.enigma.gui;
 
-import cuchaz.enigma.mapping.ClassEntry;
+import cuchaz.enigma.mapping.entry.ClassEntry;
 
 public class ScoredClassEntry extends ClassEntry {
 
diff --git a/src/main/java/cuchaz/enigma/gui/node/ClassSelectorClassNode.java b/src/main/java/cuchaz/enigma/gui/node/ClassSelectorClassNode.java
index dc933cd5..a965a8fa 100644
--- a/src/main/java/cuchaz/enigma/gui/node/ClassSelectorClassNode.java
+++ b/src/main/java/cuchaz/enigma/gui/node/ClassSelectorClassNode.java
@@ -11,7 +11,7 @@
 
 package cuchaz.enigma.gui.node;
 
-import cuchaz.enigma.mapping.ClassEntry;
+import cuchaz.enigma.mapping.entry.ClassEntry;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 
diff --git a/src/main/java/cuchaz/enigma/gui/panels/PanelObf.java b/src/main/java/cuchaz/enigma/gui/panels/PanelObf.java
index 4bbd32bd..9eb8f8f8 100644
--- a/src/main/java/cuchaz/enigma/gui/panels/PanelObf.java
+++ b/src/main/java/cuchaz/enigma/gui/panels/PanelObf.java
@@ -2,7 +2,7 @@ package cuchaz.enigma.gui.panels;
 
 import cuchaz.enigma.gui.ClassSelector;
 import cuchaz.enigma.gui.Gui;
-import cuchaz.enigma.mapping.ClassEntry;
+import cuchaz.enigma.mapping.entry.ClassEntry;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/cuchaz/enigma/mapping/ClassMapping.java b/src/main/java/cuchaz/enigma/mapping/ClassMapping.java
index c782250d..d9de5678 100644
--- a/src/main/java/cuchaz/enigma/mapping/ClassMapping.java
+++ b/src/main/java/cuchaz/enigma/mapping/ClassMapping.java
@@ -12,6 +12,9 @@
 package cuchaz.enigma.mapping;
 
 import com.google.common.collect.Maps;
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.FieldEntry;
+import cuchaz.enigma.mapping.entry.MethodEntry;
 import cuchaz.enigma.throwables.MappingConflict;
 
 import java.util.ArrayList;
diff --git a/src/main/java/cuchaz/enigma/mapping/DirectionalTranslator.java b/src/main/java/cuchaz/enigma/mapping/DirectionalTranslator.java
index 12832673..c9e2ab49 100644
--- a/src/main/java/cuchaz/enigma/mapping/DirectionalTranslator.java
+++ b/src/main/java/cuchaz/enigma/mapping/DirectionalTranslator.java
@@ -15,6 +15,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import cuchaz.enigma.analysis.TranslationIndex;
 import cuchaz.enigma.bytecode.AccessFlags;
+import cuchaz.enigma.mapping.entry.*;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/cuchaz/enigma/mapping/FieldMapping.java b/src/main/java/cuchaz/enigma/mapping/FieldMapping.java
index 3c46a37e..8fbe095b 100644
--- a/src/main/java/cuchaz/enigma/mapping/FieldMapping.java
+++ b/src/main/java/cuchaz/enigma/mapping/FieldMapping.java
@@ -11,6 +11,8 @@
 
 package cuchaz.enigma.mapping;
 
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.FieldEntry;
 import cuchaz.enigma.throwables.IllegalNameException;
 
 public class FieldMapping implements Comparable<FieldMapping>, MemberMapping<FieldEntry> {
diff --git a/src/main/java/cuchaz/enigma/mapping/LocalVariableMapping.java b/src/main/java/cuchaz/enigma/mapping/LocalVariableMapping.java
index 193c566e..62dbcf31 100644
--- a/src/main/java/cuchaz/enigma/mapping/LocalVariableMapping.java
+++ b/src/main/java/cuchaz/enigma/mapping/LocalVariableMapping.java
@@ -11,6 +11,9 @@
 
 package cuchaz.enigma.mapping;
 
+import cuchaz.enigma.mapping.entry.LocalVariableEntry;
+import cuchaz.enigma.mapping.entry.MethodEntry;
+
 public class LocalVariableMapping implements Comparable<LocalVariableMapping> {
 
         private int index;
diff --git a/src/main/java/cuchaz/enigma/mapping/Mappings.java b/src/main/java/cuchaz/enigma/mapping/Mappings.java
index cc1ec9cc..9b907a9c 100644
--- a/src/main/java/cuchaz/enigma/mapping/Mappings.java
+++ b/src/main/java/cuchaz/enigma/mapping/Mappings.java
@@ -16,6 +16,8 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import cuchaz.enigma.analysis.TranslationIndex;
 import cuchaz.enigma.bytecode.AccessFlags;
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.MethodEntry;
 import cuchaz.enigma.throwables.MappingConflict;
 
 import java.io.File;
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java b/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java
index 4d5be2f6..a42f255a 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java
@@ -14,6 +14,10 @@ package cuchaz.enigma.mapping;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import cuchaz.enigma.analysis.JarIndex;
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.EntryFactory;
+import cuchaz.enigma.mapping.entry.FieldEntry;
+import cuchaz.enigma.mapping.entry.MethodEntry;
 
 import java.util.Map;
 
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java b/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java
index e215a0fc..85b6d2ab 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java
@@ -13,6 +13,7 @@ package cuchaz.enigma.mapping;
 
 import com.google.common.collect.Lists;
 import cuchaz.enigma.analysis.JarIndex;
+import cuchaz.enigma.mapping.entry.*;
 import cuchaz.enigma.throwables.IllegalNameException;
 import cuchaz.enigma.throwables.MappingConflict;
 
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsSRGWriter.java b/src/main/java/cuchaz/enigma/mapping/MappingsSRGWriter.java
index 95daa73f..32f0ee9f 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsSRGWriter.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsSRGWriter.java
@@ -2,6 +2,7 @@ package cuchaz.enigma.mapping;
 
 import com.google.common.base.Charsets;
 import cuchaz.enigma.analysis.TranslationIndex;
+import cuchaz.enigma.mapping.entry.ReferencedEntryPool;
 
 import java.io.*;
 import java.util.ArrayList;
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java b/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java
index e635fa18..e5734a3a 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java
@@ -2,6 +2,7 @@ package cuchaz.enigma.mapping;
 
 import com.google.common.base.Charsets;
 import com.google.common.collect.Maps;
+import cuchaz.enigma.mapping.entry.ClassEntry;
 import cuchaz.enigma.throwables.MappingConflict;
 import cuchaz.enigma.throwables.MappingParseException;
 
diff --git a/src/main/java/cuchaz/enigma/mapping/MemberMapping.java b/src/main/java/cuchaz/enigma/mapping/MemberMapping.java
index d4514d42..6effb91f 100644
--- a/src/main/java/cuchaz/enigma/mapping/MemberMapping.java
+++ b/src/main/java/cuchaz/enigma/mapping/MemberMapping.java
@@ -11,6 +11,9 @@
 
 package cuchaz.enigma.mapping;
 
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.Entry;
+
 public interface MemberMapping<T extends Entry> {
         T getObfEntry(ClassEntry classEntry);
 
diff --git a/src/main/java/cuchaz/enigma/mapping/MethodDescriptor.java b/src/main/java/cuchaz/enigma/mapping/MethodDescriptor.java
index 210ada07..b56d1d48 100644
--- a/src/main/java/cuchaz/enigma/mapping/MethodDescriptor.java
+++ b/src/main/java/cuchaz/enigma/mapping/MethodDescriptor.java
@@ -12,6 +12,7 @@
 package cuchaz.enigma.mapping;
 
 import com.google.common.collect.Lists;
+import cuchaz.enigma.mapping.entry.ClassEntry;
 import cuchaz.enigma.utils.Utils;
 
 import java.util.ArrayList;
diff --git a/src/main/java/cuchaz/enigma/mapping/MethodMapping.java b/src/main/java/cuchaz/enigma/mapping/MethodMapping.java
index 2f7fe53c..363bab80 100644
--- a/src/main/java/cuchaz/enigma/mapping/MethodMapping.java
+++ b/src/main/java/cuchaz/enigma/mapping/MethodMapping.java
@@ -13,6 +13,8 @@ package cuchaz.enigma.mapping;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.MethodEntry;
 import cuchaz.enigma.throwables.IllegalNameException;
 import cuchaz.enigma.throwables.MappingConflict;
 
diff --git a/src/main/java/cuchaz/enigma/mapping/NameValidator.java b/src/main/java/cuchaz/enigma/mapping/NameValidator.java
index f178093d..9273c9bc 100644
--- a/src/main/java/cuchaz/enigma/mapping/NameValidator.java
+++ b/src/main/java/cuchaz/enigma/mapping/NameValidator.java
@@ -11,6 +11,7 @@
 
 package cuchaz.enigma.mapping;
 
+import cuchaz.enigma.mapping.entry.ClassEntry;
 import cuchaz.enigma.throwables.IllegalNameException;
 
 import java.util.Arrays;
diff --git a/src/main/java/cuchaz/enigma/mapping/Translator.java b/src/main/java/cuchaz/enigma/mapping/Translator.java
index 59bdf1a3..ab55a02d 100644
--- a/src/main/java/cuchaz/enigma/mapping/Translator.java
+++ b/src/main/java/cuchaz/enigma/mapping/Translator.java
@@ -11,6 +11,8 @@
 
 package cuchaz.enigma.mapping;
 
+import cuchaz.enigma.mapping.entry.*;
+
 public interface Translator {
         ClassEntry getTranslatedClass(ClassEntry entry);
 
diff --git a/src/main/java/cuchaz/enigma/mapping/Type.java b/src/main/java/cuchaz/enigma/mapping/Type.java
deleted file mode 100644
index 609bd64e..00000000
--- a/src/main/java/cuchaz/enigma/mapping/Type.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 Jeff Martin.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser General Public
- * License v3.0 which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Contributors:
- * Jeff Martin - initial API and implementation
- ******************************************************************************/
-
-package cuchaz.enigma.mapping;
-
-import com.google.common.collect.Maps;
-
-import java.util.Map;
-
-public class Type {
-
-        protected String name;
-
-        public Type(String name) {
-
-                // don't deal with generics
-                // this is just for raw jvm types
-                if (name.charAt(0) == 'T' || name.indexOf('<') >= 0 || name.indexOf('>') >= 0) {
-                        throw new IllegalArgumentException("don't use with generic types or templates: " + name);
-                }
-
-                this.name = name;
-        }
-
-        public Type(Type other, ClassNameReplacer replacer) {
-                this.name = other.name;
-                if (other.isClass()) {
-                        String replacedName = replacer.replace(other.getClassEntry().getClassName());
-                        if (replacedName != null) {
-                                this.name = "L" + replacedName + ";";
-                        }
-                } else if (other.isArray() && other.hasClass()) {
-                        String replacedName = replacer.replace(other.getClassEntry().getClassName());
-                        if (replacedName != null) {
-                                this.name = Type.getArrayPrefix(other.getArrayDimension()) + "L" + replacedName + ";";
-                        }
-                }
-        }
-
-        public static String parseFirst(String in) {
-
-                if (in == null || in.length() <= 0) {
-                        throw new IllegalArgumentException("No type to parse, input is empty!");
-                }
-
-                // read one type from the input
-
-                char c = in.charAt(0);
-
-                // first check for void
-                if (c == 'V') {
-                        return "V";
-                }
-
-                // then check for primitives
-                Primitive primitive = Primitive.get(c);
-                if (primitive != null) {
-                        return in.substring(0, 1);
-                }
-
-                // then check for classes
-                if (c == 'L') {
-                        return readClass(in);
-                }
-
-                // then check for templates
-                if (c == 'T') {
-                        return readClass(in);
-                }
-
-                // then check for arrays
-                int dim = countArrayDimension(in);
-                if (dim > 0) {
-                        String arrayType = Type.parseFirst(in.substring(dim));
-                        return in.substring(0, dim + arrayType.length());
-                }
-
-                throw new IllegalArgumentException("don't know how to parse: " + in);
-        }
-
-        private static String getArrayPrefix(int dimension) {
-                StringBuilder buf = new StringBuilder();
-                for (int i = 0; i < dimension; i++) {
-                        buf.append("[");
-                }
-                return buf.toString();
-        }
-
-        private static int countArrayDimension(String in) {
-                int i = 0;
-                while (i < in.length() && in.charAt(i) == '[')
-                        i++;
-                return i;
-        }
-
-        private static String readClass(String in) {
-                // read all the characters in the buffer until we hit a ';'
-                // include the parameters too
-                StringBuilder buf = new StringBuilder();
-                int depth = 0;
-                for (int i = 0; i < in.length(); i++) {
-                        char c = in.charAt(i);
-                        buf.append(c);
-
-                        if (c == '<') {
-                                depth++;
-                        } else if (c == '>') {
-                                depth--;
-                        } else if (depth == 0 && c == ';') {
-                                return buf.toString();
-                        }
-                }
-                return null;
-        }
-
-        @Override
-        public String toString() {
-                return this.name;
-        }
-
-        public boolean isVoid() {
-                return this.name.length() == 1 && this.name.charAt(0) == 'V';
-        }
-
-        public boolean isPrimitive() {
-                return this.name.length() == 1 && Primitive.get(this.name.charAt(0)) != null;
-        }
-
-        public Primitive getPrimitive() {
-                if (!isPrimitive()) {
-                        throw new IllegalStateException("not a primitive");
-                }
-                return Primitive.get(this.name.charAt(0));
-        }
-
-        public boolean isClass() {
-                return this.name.charAt(0) == 'L' && this.name.charAt(this.name.length() - 1) == ';';
-        }
-
-        public ClassEntry getClassEntry() {
-                if (isClass()) {
-                        String name = this.name.substring(1, this.name.length() - 1);
-
-                        int pos = name.indexOf('<');
-                        if (pos >= 0) {
-                                // remove the parameters from the class name
-                                name = name.substring(0, pos);
-                        }
-
-                        return new ClassEntry(name);
-
-                } else if (isArray() && getArrayType().isClass()) {
-                        return getArrayType().getClassEntry();
-                } else {
-                        throw new IllegalStateException("type doesn't have a class");
-                }
-        }
-
-        public boolean isArray() {
-                return this.name.charAt(0) == '[';
-        }
-
-        public int getArrayDimension() {
-                if (!isArray()) {
-                        throw new IllegalStateException("not an array");
-                }
-                return countArrayDimension(this.name);
-        }
-
-        public Type getArrayType() {
-                if (!isArray()) {
-                        throw new IllegalStateException("not an array");
-                }
-                return new Type(this.name.substring(getArrayDimension(), this.name.length()));
-        }
-
-        public boolean hasClass() {
-                return isClass() || (isArray() && getArrayType().hasClass());
-        }
-
-        @Override
-        public boolean equals(Object other) {
-                return other instanceof Type && equals((Type) other);
-        }
-
-        public boolean equals(Type other) {
-                return this.name.equals(other.name);
-        }
-
-        public int hashCode() {
-                return this.name.hashCode();
-        }
-
-        public enum Primitive {
-                Byte('B'),
-                Character('C'),
-                Short('S'),
-                Integer('I'),
-                Long('J'),
-                Float('F'),
-                Double('D'),
-                Boolean('Z');
-
-                private static final Map<Character, Primitive> lookup;
-
-                static {
-                        lookup = Maps.newTreeMap();
-                        for (Primitive val : values()) {
-                                lookup.put(val.getCode(), val);
-                        }
-                }
-
-                private char code;
-
-                Primitive(char code) {
-                        this.code = code;
-                }
-
-                public static Primitive get(char code) {
-                        return lookup.get(code);
-                }
-
-                public char getCode() {
-                        return this.code;
-                }
-        }
-}
diff --git a/src/main/java/cuchaz/enigma/mapping/TypeDescriptor.java b/src/main/java/cuchaz/enigma/mapping/TypeDescriptor.java
index 9c0fe6d5..58fa6513 100644
--- a/src/main/java/cuchaz/enigma/mapping/TypeDescriptor.java
+++ b/src/main/java/cuchaz/enigma/mapping/TypeDescriptor.java
@@ -12,6 +12,7 @@
 package cuchaz.enigma.mapping;
 
 import com.google.common.collect.Maps;
+import cuchaz.enigma.mapping.entry.ClassEntry;
 
 import java.util.Map;
 import java.util.function.Function;
diff --git a/src/main/java/cuchaz/enigma/mapping/ClassDefEntry.java b/src/main/java/cuchaz/enigma/mapping/entry/ClassDefEntry.java
index dc1b02e7..75e7f1bd 100644
--- a/src/main/java/cuchaz/enigma/mapping/ClassDefEntry.java
+++ b/src/main/java/cuchaz/enigma/mapping/entry/ClassDefEntry.java
@@ -9,7 +9,7 @@
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma.mapping;
+package cuchaz.enigma.mapping.entry;
 
 import com.google.common.base.Preconditions;
 import cuchaz.enigma.bytecode.AccessFlags;
diff --git a/src/main/java/cuchaz/enigma/mapping/ClassEntry.java b/src/main/java/cuchaz/enigma/mapping/entry/ClassEntry.java
index a49f8dd5..fc604d82 100644
--- a/src/main/java/cuchaz/enigma/mapping/ClassEntry.java
+++ b/src/main/java/cuchaz/enigma/mapping/entry/ClassEntry.java
@@ -9,7 +9,7 @@
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma.mapping;
+package cuchaz.enigma.mapping.entry;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
diff --git a/src/main/java/cuchaz/enigma/mapping/Entry.java b/src/main/java/cuchaz/enigma/mapping/entry/Entry.java
index eb783e96..b612140f 100644
--- a/src/main/java/cuchaz/enigma/mapping/Entry.java
+++ b/src/main/java/cuchaz/enigma/mapping/entry/Entry.java
@@ -9,7 +9,7 @@
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma.mapping;
+package cuchaz.enigma.mapping.entry;
 
 public interface Entry {
         String getName();
diff --git a/src/main/java/cuchaz/enigma/mapping/EntryFactory.java b/src/main/java/cuchaz/enigma/mapping/entry/EntryFactory.java
index c20f6f5f..5bd159f4 100644
--- a/src/main/java/cuchaz/enigma/mapping/EntryFactory.java
+++ b/src/main/java/cuchaz/enigma/mapping/entry/EntryFactory.java
@@ -9,9 +9,13 @@
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma.mapping;
+package cuchaz.enigma.mapping.entry;
 
 import cuchaz.enigma.analysis.JarIndex;
+import cuchaz.enigma.mapping.ClassMapping;
+import cuchaz.enigma.mapping.FieldMapping;
+import cuchaz.enigma.mapping.MethodDescriptor;
+import cuchaz.enigma.mapping.MethodMapping;
 
 public class EntryFactory {
         public static ClassEntry getObfClassEntry(JarIndex jarIndex, ClassMapping classMapping) {
diff --git a/src/main/java/cuchaz/enigma/mapping/FieldDefEntry.java b/src/main/java/cuchaz/enigma/mapping/entry/FieldDefEntry.java
index 262c16c5..78ea5f76 100644
--- a/src/main/java/cuchaz/enigma/mapping/FieldDefEntry.java
+++ b/src/main/java/cuchaz/enigma/mapping/entry/FieldDefEntry.java
@@ -9,10 +9,11 @@
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma.mapping;
+package cuchaz.enigma.mapping.entry;
 
 import com.google.common.base.Preconditions;
 import cuchaz.enigma.bytecode.AccessFlags;
+import cuchaz.enigma.mapping.TypeDescriptor;
 
 public class FieldDefEntry extends FieldEntry {
         private final AccessFlags access;
diff --git a/src/main/java/cuchaz/enigma/mapping/FieldEntry.java b/src/main/java/cuchaz/enigma/mapping/entry/FieldEntry.java
index c118ac05..b6e1554d 100644
--- a/src/main/java/cuchaz/enigma/mapping/FieldEntry.java
+++ b/src/main/java/cuchaz/enigma/mapping/entry/FieldEntry.java
@@ -9,9 +9,10 @@
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma.mapping;
+package cuchaz.enigma.mapping.entry;
 
 import com.google.common.base.Preconditions;
+import cuchaz.enigma.mapping.TypeDescriptor;
 import cuchaz.enigma.utils.Utils;
 
 public class FieldEntry implements Entry {
diff --git a/src/main/java/cuchaz/enigma/mapping/LocalVariableDefEntry.java b/src/main/java/cuchaz/enigma/mapping/entry/LocalVariableDefEntry.java
index cc677c55..0c4f3c17 100644
--- a/src/main/java/cuchaz/enigma/mapping/LocalVariableDefEntry.java
+++ b/src/main/java/cuchaz/enigma/mapping/entry/LocalVariableDefEntry.java
@@ -1,6 +1,7 @@
-package cuchaz.enigma.mapping;
+package cuchaz.enigma.mapping.entry;
 
 import com.google.common.base.Preconditions;
+import cuchaz.enigma.mapping.TypeDescriptor;
 import cuchaz.enigma.utils.Utils;
 
 /**
diff --git a/src/main/java/cuchaz/enigma/mapping/LocalVariableEntry.java b/src/main/java/cuchaz/enigma/mapping/entry/LocalVariableEntry.java
index dcfd0ff7..a794d0a0 100644
--- a/src/main/java/cuchaz/enigma/mapping/LocalVariableEntry.java
+++ b/src/main/java/cuchaz/enigma/mapping/entry/LocalVariableEntry.java
@@ -1,6 +1,7 @@
-package cuchaz.enigma.mapping;
+package cuchaz.enigma.mapping.entry;
 
 import com.google.common.base.Preconditions;
+import cuchaz.enigma.mapping.MethodDescriptor;
 import cuchaz.enigma.utils.Utils;
 
 /**
diff --git a/src/main/java/cuchaz/enigma/mapping/MethodDefEntry.java b/src/main/java/cuchaz/enigma/mapping/entry/MethodDefEntry.java
index d6a160d5..1d2c094d 100644
--- a/src/main/java/cuchaz/enigma/mapping/MethodDefEntry.java
+++ b/src/main/java/cuchaz/enigma/mapping/entry/MethodDefEntry.java
@@ -9,10 +9,11 @@
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma.mapping;
+package cuchaz.enigma.mapping.entry;
 
 import com.google.common.base.Preconditions;
 import cuchaz.enigma.bytecode.AccessFlags;
+import cuchaz.enigma.mapping.MethodDescriptor;
 
 public class MethodDefEntry extends MethodEntry {
 
diff --git a/src/main/java/cuchaz/enigma/mapping/MethodEntry.java b/src/main/java/cuchaz/enigma/mapping/entry/MethodEntry.java
index f8a5ff15..1abc5b12 100644
--- a/src/main/java/cuchaz/enigma/mapping/MethodEntry.java
+++ b/src/main/java/cuchaz/enigma/mapping/entry/MethodEntry.java
@@ -9,9 +9,10 @@
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma.mapping;
+package cuchaz.enigma.mapping.entry;
 
 import com.google.common.base.Preconditions;
+import cuchaz.enigma.mapping.MethodDescriptor;
 import cuchaz.enigma.utils.Utils;
 
 public class MethodEntry implements Entry {
diff --git a/src/main/java/cuchaz/enigma/mapping/ProcyonEntryFactory.java b/src/main/java/cuchaz/enigma/mapping/entry/ProcyonEntryFactory.java
index 93006564..e42a334e 100644
--- a/src/main/java/cuchaz/enigma/mapping/ProcyonEntryFactory.java
+++ b/src/main/java/cuchaz/enigma/mapping/entry/ProcyonEntryFactory.java
@@ -9,10 +9,12 @@
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma.mapping;
+package cuchaz.enigma.mapping.entry;
 
 import com.strobel.assembler.metadata.*;
 import cuchaz.enigma.bytecode.AccessFlags;
+import cuchaz.enigma.mapping.MethodDescriptor;
+import cuchaz.enigma.mapping.TypeDescriptor;
 
 import java.util.List;
 
diff --git a/src/main/java/cuchaz/enigma/mapping/ReferencedEntryPool.java b/src/main/java/cuchaz/enigma/mapping/entry/ReferencedEntryPool.java
index 2abc76c6..338d209e 100644
--- a/src/main/java/cuchaz/enigma/mapping/ReferencedEntryPool.java
+++ b/src/main/java/cuchaz/enigma/mapping/entry/ReferencedEntryPool.java
@@ -9,7 +9,10 @@
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma.mapping;
+package cuchaz.enigma.mapping.entry;
+
+import cuchaz.enigma.mapping.MethodDescriptor;
+import cuchaz.enigma.mapping.TypeDescriptor;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/test/java/cuchaz/enigma/TestDeobfed.java b/src/test/java/cuchaz/enigma/TestDeobfed.java
index fbdebd61..744f954d 100644
--- a/src/test/java/cuchaz/enigma/TestDeobfed.java
+++ b/src/test/java/cuchaz/enigma/TestDeobfed.java
@@ -13,7 +13,7 @@ package cuchaz.enigma;
 
 import cuchaz.enigma.analysis.JarIndex;
 import cuchaz.enigma.analysis.ParsedJar;
-import cuchaz.enigma.mapping.ReferencedEntryPool;
+import cuchaz.enigma.mapping.entry.ReferencedEntryPool;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
diff --git a/src/test/java/cuchaz/enigma/TestDeobfuscator.java b/src/test/java/cuchaz/enigma/TestDeobfuscator.java
index 62a52861..63a6f552 100644
--- a/src/test/java/cuchaz/enigma/TestDeobfuscator.java
+++ b/src/test/java/cuchaz/enigma/TestDeobfuscator.java
@@ -12,7 +12,7 @@
 package cuchaz.enigma;
 
 import com.google.common.collect.Lists;
-import cuchaz.enigma.mapping.ClassEntry;
+import cuchaz.enigma.mapping.entry.ClassEntry;
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/src/test/java/cuchaz/enigma/TestEntryFactory.java b/src/test/java/cuchaz/enigma/TestEntryFactory.java
index 067dcbfe..4f52609e 100644
--- a/src/test/java/cuchaz/enigma/TestEntryFactory.java
+++ b/src/test/java/cuchaz/enigma/TestEntryFactory.java
@@ -13,6 +13,9 @@ package cuchaz.enigma;
 
 import cuchaz.enigma.analysis.EntryReference;
 import cuchaz.enigma.mapping.*;
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.FieldEntry;
+import cuchaz.enigma.mapping.entry.MethodEntry;
 
 public class TestEntryFactory {
 
diff --git a/src/test/java/cuchaz/enigma/TestInnerClasses.java b/src/test/java/cuchaz/enigma/TestInnerClasses.java
index 30e127e6..f739c11e 100644
--- a/src/test/java/cuchaz/enigma/TestInnerClasses.java
+++ b/src/test/java/cuchaz/enigma/TestInnerClasses.java
@@ -13,8 +13,8 @@ package cuchaz.enigma;
 
 import cuchaz.enigma.analysis.JarIndex;
 import cuchaz.enigma.analysis.ParsedJar;
-import cuchaz.enigma.mapping.ClassEntry;
-import cuchaz.enigma.mapping.ReferencedEntryPool;
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.ReferencedEntryPool;
 import org.junit.Test;
 
 import java.util.jar.JarFile;
diff --git a/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java b/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java
index b20b27b6..dd275b38 100644
--- a/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java
+++ b/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java
@@ -14,10 +14,10 @@ package cuchaz.enigma;
 import cuchaz.enigma.analysis.EntryReference;
 import cuchaz.enigma.analysis.JarIndex;
 import cuchaz.enigma.analysis.ParsedJar;
-import cuchaz.enigma.mapping.ClassEntry;
-import cuchaz.enigma.mapping.MethodDefEntry;
-import cuchaz.enigma.mapping.MethodEntry;
-import cuchaz.enigma.mapping.ReferencedEntryPool;
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.MethodDefEntry;
+import cuchaz.enigma.mapping.entry.MethodEntry;
+import cuchaz.enigma.mapping.entry.ReferencedEntryPool;
 import org.junit.Test;
 
 import java.io.File;
diff --git a/src/test/java/cuchaz/enigma/TestJarIndexInheritanceTree.java b/src/test/java/cuchaz/enigma/TestJarIndexInheritanceTree.java
index d1c85964..5bef4e57 100644
--- a/src/test/java/cuchaz/enigma/TestJarIndexInheritanceTree.java
+++ b/src/test/java/cuchaz/enigma/TestJarIndexInheritanceTree.java
@@ -12,7 +12,7 @@
 package cuchaz.enigma;
 
 import cuchaz.enigma.analysis.*;
-import cuchaz.enigma.mapping.*;
+import cuchaz.enigma.mapping.entry.*;
 import org.junit.Test;
 
 import java.util.Collection;
diff --git a/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java b/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java
index d03f3fb4..b1c128c2 100644
--- a/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java
+++ b/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java
@@ -13,6 +13,7 @@ package cuchaz.enigma;
 
 import cuchaz.enigma.analysis.*;
 import cuchaz.enigma.mapping.*;
+import cuchaz.enigma.mapping.entry.*;
 import org.junit.Test;
 
 import java.util.Collection;
diff --git a/src/test/java/cuchaz/enigma/TestSourceIndex.java b/src/test/java/cuchaz/enigma/TestSourceIndex.java
index 6e9e5aec..07542753 100644
--- a/src/test/java/cuchaz/enigma/TestSourceIndex.java
+++ b/src/test/java/cuchaz/enigma/TestSourceIndex.java
@@ -13,7 +13,7 @@ package cuchaz.enigma;
 
 import com.google.common.collect.Sets;
 import com.strobel.decompiler.languages.java.ast.CompilationUnit;
-import cuchaz.enigma.mapping.ClassEntry;
+import cuchaz.enigma.mapping.entry.ClassEntry;
 import org.junit.Test;
 
 import java.io.File;
diff --git a/src/test/java/cuchaz/enigma/TestTokensConstructors.java b/src/test/java/cuchaz/enigma/TestTokensConstructors.java
index 0148f2c3..0e98da7f 100644
--- a/src/test/java/cuchaz/enigma/TestTokensConstructors.java
+++ b/src/test/java/cuchaz/enigma/TestTokensConstructors.java
@@ -11,7 +11,7 @@
 
 package cuchaz.enigma;
 
-import cuchaz.enigma.mapping.MethodEntry;
+import cuchaz.enigma.mapping.entry.MethodEntry;
 import org.junit.Test;
 
 import java.util.jar.JarFile;
diff --git a/src/test/java/cuchaz/enigma/TestTranslator.java b/src/test/java/cuchaz/enigma/TestTranslator.java
index b63dff86..9b6eb916 100644
--- a/src/test/java/cuchaz/enigma/TestTranslator.java
+++ b/src/test/java/cuchaz/enigma/TestTranslator.java
@@ -11,7 +11,7 @@
 
 package cuchaz.enigma;
 
-import cuchaz.enigma.mapping.Entry;
+import cuchaz.enigma.mapping.entry.Entry;
 import cuchaz.enigma.mapping.Mappings;
 import cuchaz.enigma.mapping.Translator;
 import org.junit.BeforeClass;
diff --git a/src/test/java/cuchaz/enigma/TestType.java b/src/test/java/cuchaz/enigma/TestType.java
deleted file mode 100644
index 43dacb0c..00000000
--- a/src/test/java/cuchaz/enigma/TestType.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 Jeff Martin.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser General Public
- * License v3.0 which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl.html
- *
- * Contributors:
- *     Jeff Martin - initial API and implementation
- ******************************************************************************/
-
-package cuchaz.enigma;
-
-import cuchaz.enigma.mapping.Type;
-import org.junit.Test;
-
-import static cuchaz.enigma.TestEntryFactory.newClass;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-
-public class TestType {
-
-        @Test
-        public void isVoid() {
-                assertThat(new Type("V").isVoid(), is(true));
-                assertThat(new Type("Z").isVoid(), is(false));
-                assertThat(new Type("B").isVoid(), is(false));
-                assertThat(new Type("C").isVoid(), is(false));
-                assertThat(new Type("I").isVoid(), is(false));
-                assertThat(new Type("J").isVoid(), is(false));
-                assertThat(new Type("F").isVoid(), is(false));
-                assertThat(new Type("D").isVoid(), is(false));
-                assertThat(new Type("LFoo;").isVoid(), is(false));
-                assertThat(new Type("[I").isVoid(), is(false));
-        }
-
-        @Test
-        public void isPrimitive() {
-                assertThat(new Type("V").isPrimitive(), is(false));
-                assertThat(new Type("Z").isPrimitive(), is(true));
-                assertThat(new Type("B").isPrimitive(), is(true));
-                assertThat(new Type("C").isPrimitive(), is(true));
-                assertThat(new Type("I").isPrimitive(), is(true));
-                assertThat(new Type("J").isPrimitive(), is(true));
-                assertThat(new Type("F").isPrimitive(), is(true));
-                assertThat(new Type("D").isPrimitive(), is(true));
-                assertThat(new Type("LFoo;").isPrimitive(), is(false));
-                assertThat(new Type("[I").isPrimitive(), is(false));
-        }
-
-        @Test
-        public void getPrimitive() {
-                assertThat(new Type("Z").getPrimitive(), is(Type.Primitive.Boolean));
-                assertThat(new Type("B").getPrimitive(), is(Type.Primitive.Byte));
-                assertThat(new Type("C").getPrimitive(), is(Type.Primitive.Character));
-                assertThat(new Type("I").getPrimitive(), is(Type.Primitive.Integer));
-                assertThat(new Type("J").getPrimitive(), is(Type.Primitive.Long));
-                assertThat(new Type("F").getPrimitive(), is(Type.Primitive.Float));
-                assertThat(new Type("D").getPrimitive(), is(Type.Primitive.Double));
-        }
-
-        @Test
-        public void isClass() {
-                assertThat(new Type("V").isClass(), is(false));
-                assertThat(new Type("Z").isClass(), is(false));
-                assertThat(new Type("B").isClass(), is(false));
-                assertThat(new Type("C").isClass(), is(false));
-                assertThat(new Type("I").isClass(), is(false));
-                assertThat(new Type("J").isClass(), is(false));
-                assertThat(new Type("F").isClass(), is(false));
-                assertThat(new Type("D").isClass(), is(false));
-                assertThat(new Type("LFoo;").isClass(), is(true));
-                assertThat(new Type("[I").isClass(), is(false));
-        }
-
-        @Test
-        public void getClassEntry() {
-                assertThat(new Type("LFoo;").getClassEntry(), is(newClass("Foo")));
-                assertThat(new Type("Ljava/lang/String;").getClassEntry(), is(newClass("java/lang/String")));
-        }
-
-        @Test
-        public void getArrayClassEntry() {
-                assertThat(new Type("[LFoo;").getClassEntry(), is(newClass("Foo")));
-                assertThat(new Type("[[[Ljava/lang/String;").getClassEntry(), is(newClass("java/lang/String")));
-        }
-
-        @Test
-        public void isArray() {
-                assertThat(new Type("V").isArray(), is(false));
-                assertThat(new Type("Z").isArray(), is(false));
-                assertThat(new Type("B").isArray(), is(false));
-                assertThat(new Type("C").isArray(), is(false));
-                assertThat(new Type("I").isArray(), is(false));
-                assertThat(new Type("J").isArray(), is(false));
-                assertThat(new Type("F").isArray(), is(false));
-                assertThat(new Type("D").isArray(), is(false));
-                assertThat(new Type("LFoo;").isArray(), is(false));
-                assertThat(new Type("[I").isArray(), is(true));
-        }
-
-        @Test
-        public void getArrayDimension() {
-                assertThat(new Type("[I").getArrayDimension(), is(1));
-                assertThat(new Type("[[I").getArrayDimension(), is(2));
-                assertThat(new Type("[[[I").getArrayDimension(), is(3));
-        }
-
-        @Test
-        public void getArrayType() {
-                assertThat(new Type("[I").getArrayType(), is(new Type("I")));
-                assertThat(new Type("[[I").getArrayType(), is(new Type("I")));
-                assertThat(new Type("[[[I").getArrayType(), is(new Type("I")));
-                assertThat(new Type("[Ljava/lang/String;").getArrayType(), is(new Type("Ljava/lang/String;")));
-        }
-
-        @Test
-        public void hasClass() {
-                assertThat(new Type("LFoo;").hasClass(), is(true));
-                assertThat(new Type("Ljava/lang/String;").hasClass(), is(true));
-                assertThat(new Type("[LBar;").hasClass(), is(true));
-                assertThat(new Type("[[[LCat;").hasClass(), is(true));
-
-                assertThat(new Type("V").hasClass(), is(false));
-                assertThat(new Type("[I").hasClass(), is(false));
-                assertThat(new Type("[[[I").hasClass(), is(false));
-                assertThat(new Type("Z").hasClass(), is(false));
-        }
-
-        @Test
-        public void parseVoid() {
-                final String answer = "V";
-                assertThat(Type.parseFirst("V"), is(answer));
-                assertThat(Type.parseFirst("VVV"), is(answer));
-                assertThat(Type.parseFirst("VIJ"), is(answer));
-                assertThat(Type.parseFirst("V[I"), is(answer));
-                assertThat(Type.parseFirst("VLFoo;"), is(answer));
-                assertThat(Type.parseFirst("V[LFoo;"), is(answer));
-        }
-
-        @Test
-        public void parsePrimitive() {
-                final String answer = "I";
-                assertThat(Type.parseFirst("I"), is(answer));
-                assertThat(Type.parseFirst("III"), is(answer));
-                assertThat(Type.parseFirst("IJZ"), is(answer));
-                assertThat(Type.parseFirst("I[I"), is(answer));
-                assertThat(Type.parseFirst("ILFoo;"), is(answer));
-                assertThat(Type.parseFirst("I[LFoo;"), is(answer));
-        }
-
-        @Test
-        public void parseClass() {
-                {
-                        final String answer = "LFoo;";
-                        assertThat(Type.parseFirst("LFoo;"), is(answer));
-                        assertThat(Type.parseFirst("LFoo;I"), is(answer));
-                        assertThat(Type.parseFirst("LFoo;JZ"), is(answer));
-                        assertThat(Type.parseFirst("LFoo;[I"), is(answer));
-                        assertThat(Type.parseFirst("LFoo;LFoo;"), is(answer));
-                        assertThat(Type.parseFirst("LFoo;[LFoo;"), is(answer));
-                }
-                {
-                        final String answer = "Ljava/lang/String;";
-                        assertThat(Type.parseFirst("Ljava/lang/String;"), is(answer));
-                        assertThat(Type.parseFirst("Ljava/lang/String;I"), is(answer));
-                        assertThat(Type.parseFirst("Ljava/lang/String;JZ"), is(answer));
-                        assertThat(Type.parseFirst("Ljava/lang/String;[I"), is(answer));
-                        assertThat(Type.parseFirst("Ljava/lang/String;LFoo;"), is(answer));
-                        assertThat(Type.parseFirst("Ljava/lang/String;[LFoo;"), is(answer));
-                }
-        }
-
-        @Test
-        public void parseArray() {
-                {
-                        final String answer = "[I";
-                        assertThat(Type.parseFirst("[I"), is(answer));
-                        assertThat(Type.parseFirst("[III"), is(answer));
-                        assertThat(Type.parseFirst("[IJZ"), is(answer));
-                        assertThat(Type.parseFirst("[I[I"), is(answer));
-                        assertThat(Type.parseFirst("[ILFoo;"), is(answer));
-                }
-                {
-                        final String answer = "[[I";
-                        assertThat(Type.parseFirst("[[I"), is(answer));
-                        assertThat(Type.parseFirst("[[III"), is(answer));
-                        assertThat(Type.parseFirst("[[IJZ"), is(answer));
-                        assertThat(Type.parseFirst("[[I[I"), is(answer));
-                        assertThat(Type.parseFirst("[[ILFoo;"), is(answer));
-                }
-                {
-                        final String answer = "[LFoo;";
-                        assertThat(Type.parseFirst("[LFoo;"), is(answer));
-                        assertThat(Type.parseFirst("[LFoo;II"), is(answer));
-                        assertThat(Type.parseFirst("[LFoo;JZ"), is(answer));
-                        assertThat(Type.parseFirst("[LFoo;[I"), is(answer));
-                        assertThat(Type.parseFirst("[LFoo;LFoo;"), is(answer));
-                }
-        }
-
-        @Test
-        public void equals() {
-                assertThat(new Type("V"), is(new Type("V")));
-                assertThat(new Type("Z"), is(new Type("Z")));
-                assertThat(new Type("B"), is(new Type("B")));
-                assertThat(new Type("C"), is(new Type("C")));
-                assertThat(new Type("I"), is(new Type("I")));
-                assertThat(new Type("J"), is(new Type("J")));
-                assertThat(new Type("F"), is(new Type("F")));
-                assertThat(new Type("D"), is(new Type("D")));
-                assertThat(new Type("LFoo;"), is(new Type("LFoo;")));
-                assertThat(new Type("[I"), is(new Type("[I")));
-                assertThat(new Type("[[[I"), is(new Type("[[[I")));
-                assertThat(new Type("[LFoo;"), is(new Type("[LFoo;")));
-
-                assertThat(new Type("V"), is(not(new Type("I"))));
-                assertThat(new Type("I"), is(not(new Type("J"))));
-                assertThat(new Type("I"), is(not(new Type("LBar;"))));
-                assertThat(new Type("I"), is(not(new Type("[I"))));
-                assertThat(new Type("LFoo;"), is(not(new Type("LBar;"))));
-                assertThat(new Type("[I"), is(not(new Type("[Z"))));
-                assertThat(new Type("[[[I"), is(not(new Type("[I"))));
-                assertThat(new Type("[LFoo;"), is(not(new Type("[LBar;"))));
-        }
-
-        @Test
-        public void testToString() {
-                assertThat(new Type("V").toString(), is("V"));
-                assertThat(new Type("Z").toString(), is("Z"));
-                assertThat(new Type("B").toString(), is("B"));
-                assertThat(new Type("C").toString(), is("C"));
-                assertThat(new Type("I").toString(), is("I"));
-                assertThat(new Type("J").toString(), is("J"));
-                assertThat(new Type("F").toString(), is("F"));
-                assertThat(new Type("D").toString(), is("D"));
-                assertThat(new Type("LFoo;").toString(), is("LFoo;"));
-                assertThat(new Type("[I").toString(), is("[I"));
-                assertThat(new Type("[[[I").toString(), is("[[[I"));
-                assertThat(new Type("[LFoo;").toString(), is("[LFoo;"));
-        }
-}
diff --git a/src/test/java/cuchaz/enigma/TokenChecker.java b/src/test/java/cuchaz/enigma/TokenChecker.java
index c6ced488..d863a5ae 100644
--- a/src/test/java/cuchaz/enigma/TokenChecker.java
+++ b/src/test/java/cuchaz/enigma/TokenChecker.java
@@ -16,7 +16,7 @@ import com.strobel.decompiler.languages.java.ast.CompilationUnit;
 import cuchaz.enigma.analysis.EntryReference;
 import cuchaz.enigma.analysis.SourceIndex;
 import cuchaz.enigma.analysis.Token;
-import cuchaz.enigma.mapping.Entry;
+import cuchaz.enigma.mapping.entry.Entry;
 
 import java.io.IOException;
 import java.util.Collection;