Split GUI code to separate module (#242)

* Split into modules

* Post merge compile fixes

Co-authored-by: modmuss50 <modmuss50@gmail.com>

312 files changed, 1186 insertions, 1431 deletions

diff --git a/.gitignore b/.gitignore
index 662e408..89623a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,231 +1,35 @@
-### Windows ###
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-
-### OSX ###
-*.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-
-### Linux ###
-*~
-
-# temporary files which can be created if a process still has a handle open of a deleted file
-.fuse_hidden*
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
-
-
-### Vim ###
-# swap
-[._]*.s[a-w][a-z]
-[._]s[a-w][a-z]
-# session
-Session.vim
-# temporary
-.netrwhist
-*~
-# auto-generated tag files
-tags
-
-
-### Emacs ###
-# -*- mode: gitignore; -*-
-*~
-\#*\#
-/.emacs.desktop
-/.emacs.desktop.lock
-*.elc
-auto-save-list
-tramp
-.\#*
-
-# Org-mode
-.org-id-locations
-*_archive
-
-# flymake-mode
-*_flymake.*
-
-# eshell files
-/eshell/history
-/eshell/lastdir
-
-# elpa packages
-/elpa/
-
-# reftex files
-*.rel
-
-# AUCTeX auto folder
-/auto/
-
-# cask packages
-.cask/
-dist/
-
-# Flycheck
-flycheck_*.el
-
-# server auth directory
-/server/
-
-# projectiles files
-.projectile
-
-### Intellij ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff:
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/dictionaries
-.idea/vcs.xml
-.idea/jsLibraryMappings.xml
-
-# Sensitive or high-churn files:
-.idea/dataSources.ids
-.idea/dataSources.xml
-.idea/dataSources.local.xml
-.idea/sqlDataSources.xml
-.idea/dynamic.xml
-.idea/uiDesigner.xml
-
-# Gradle:
-.idea/gradle.xml
-.idea/libraries
-
-## File-based project format:
-*.iws
-*.iml
-*.ipr
-
-## Plugin-specific files:
-
-# IntelliJ
-/out/
-.idea
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-### Eclipse ###
+# Gradle
+.gradle
 
+# Eclipse
+.checkstyle
+.classpath
 .metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.settings/
-.loadpath
-.recommenders
-
-# Eclipse Core
+.settings
 .project
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
 *.launch
 
-# CDT-specific (C/C++ Development Tooling)
-.cproject
-
-# JDT-specific (Eclipse Java Development Tools)
-.classpath
-
-# Java annotation processor (APT)
+# Intellij/Idea
 .factorypath
+.idea
+*.iml
+*.ipr
+*.iws
 
-# sbteclipse plugin
-.target
-
-# Tern plugin
-.tern-project
-
-# TeXlipse plugin
-.texlipse
-
-# STS (Spring Tool Suite)
-.springBeans
-
-# Code Recommenders
-.recommenders/
-
-
-### Java ###
-*.class
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-### Gradle ###
-.gradle
-/build/
+# Build artifacts
+bin/
+build/
+jars/
+out/
+classes/
 
-# Ignore Gradle GUI config
-gradle-app.setting
+# Debug artifacts
+run
+*.log
 
-# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
+# Windows
+*.db
+$RECYCLE.BIN/
 
-# Cache of project
-.gradletasknamecache
\ No newline at end of file
+# Mac
+.DS_Store
diff --git a/README.md b/README.md
index 7d01dac..fac036f 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Enigma includes the following open-source libraries:
 
 ## Usage
 
-Pre-compiled jars can be found on the [fabric maven](https://maven.fabricmc.net/cuchaz/enigma/).
+Pre-compiled jars can be found on the [fabric maven](https://maven.fabricmc.net/cuchaz/enigma-swing/).
 
 ### Launching the GUI
 
@@ -25,4 +25,4 @@ Pre-compiled jars can be found on the [fabric maven](https://maven.fabricmc.net/
 
 ### On the command line
 
-`java -cp enigma.jar cuchaz.enigma.CommandMain`
+`java -cp enigma.jar cuchaz.enigma.command.Main`
diff --git a/build.gradle b/build.gradle
index ba2d86c..bd2d99f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,165 +1,59 @@
 plugins {
-    id 'java'
-    id 'com.github.johnrengelman.shadow' version '5.2.0'
     id 'maven-publish'
 }
 
-group = 'cuchaz'
-version = '0.16.1'
+subprojects {
+    apply plugin: 'java'
+    apply plugin: 'maven-publish'
 
-def generatedSourcesDir = "$buildDir/generated-src"
+    sourceCompatibility = 1.8
+    targetCompatibility = 1.8
 
-def buildNumber = System.getenv("BUILD_NUMBER")
-version = version + "+" + (buildNumber ? "build.$buildNumber" : "local")
-
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-
-task generateSources(type: Copy) {
-    from sourceSets.main.java
-    into generatedSourcesDir
-
-    filter { String line ->
-        ("$line".replaceAll('@VERSION@', version))
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        maven { url 'https://maven.fabricmc.net/' }
     }
-}
 
-compileJava.source = generatedSourcesDir
-compileJava.dependsOn generateSources
+    dependencies {
+        implementation 'com.google.guava:guava:28.0-jre'
+        implementation 'com.google.code.gson:gson:2.8.5'
 
-repositories {
-    mavenLocal()
-    mavenCentral()
-
-    maven {
-        name "Modmuss Repository"
-        url 'https://maven.modmuss50.me/'
+        testImplementation 'junit:junit:4.+'
+        testImplementation 'org.hamcrest:hamcrest-all:1.+'
     }
-}
-
-configurations {
-    proGuard
-}
-
-dependencies {
-    implementation 'com.google.guava:guava:28.0-jre'
-    implementation 'com.google.code.gson:gson:2.8.5'
-    implementation 'org.ow2.asm:asm:8.0'
-    implementation 'org.ow2.asm:asm-commons:8.0'
-    implementation 'org.ow2.asm:asm-tree:8.0'
-    implementation 'org.ow2.asm:asm-util:8.0'
-    implementation 'net.sf.jopt-simple:jopt-simple:6.0-alpha-3'
-    implementation 'net.fabricmc:procyon-fabric-compilertools:0.5.35.13'
-    implementation 'net.fabricmc:cfr:0.0.1'
-    implementation 'com.bulenkov:darcula:1.0.0-bobbylight'
-    implementation 'de.sciss:syntaxpane:1.2.0'
-    implementation 'com.github.lukeu:swing-dpi:0.6'
 
-    testImplementation 'junit:junit:4.+'
-    testImplementation 'org.hamcrest:hamcrest-all:1.+'
+    group = 'cuchaz'
+    version = '0.17'
 
-    proGuard 'net.sf.proguard:proguard-base:6.+'
-}
-
-def libraryJarsArg = JavaVersion.current().java9Compatible ? "<java.home>/jmods": "<java.home>/lib/rt.jar"
-
-// For each set of test inputs, create an output jar and obfuscate it.
-file('src/test/java/cuchaz/enigma/inputs').listFiles().each { theFile ->
-    if (theFile.directory) {
-        task("${theFile.name}TestJar", type: Jar) {
-            from(sourceSets.test.output) {
-                include "cuchaz/enigma/inputs/$theFile.name/**/*.class"
-                include 'cuchaz/enigma/inputs/Keep.class'
-            }
-
-            archiveFileName = theFile.name + '.jar'
-            destinationDirectory = file('build/test-inputs')
-        }
-
-        task("${theFile.name}TestObf", type: JavaExec,
-                dependsOn: "${theFile.name}TestJar") {
-            main 'proguard.ProGuard'
-            classpath configurations.proGuard
-
-            args '@src/test/resources/proguard-test.conf', '-injars', file('build/test-inputs/' +
-                    "${theFile.name}.jar"), '-libraryjars', libraryJarsArg,
-                    '-outjars', file('build/test-obf/' + "${theFile.name}.jar")
-        }
+    def buildNumber = System.getenv("BUILD_NUMBER")
+    version = version + "+" + (buildNumber ? "build.$buildNumber" : "local")
 
-        test.dependsOn "${theFile.name}TestObf"
+    task sourcesJar(type: Jar, dependsOn: classes) {
+        classifier = 'sources'
+        from sourceSets.main.allSource
     }
-}
-
-// We also semi-deobfuscate translation.jar to then test it... yeah... oh well.
-task('deobfTranslationInput', type: JavaExec, dependsOn: 'translationTestObf')
-        {
-            classpath sourceSets.main.runtimeClasspath
-            main 'cuchaz.enigma.CommandMain'
-            args 'deobfuscate', file('build/test-obf/translation.jar'),
-                    file('build/test-deobf/translation.jar')
-        }
-test.dependsOn 'deobfTranslationInput'
 
-test {
-    // Since the Minecraft test is really long (like 10 minutes D:) we turn it
-    // off by default.
-    if (!System.getProperty('enableExtremelySlowMinecraftTest', '')
-            .equalsIgnoreCase('true')) {
-        exclude 'cuchaz/enigma/TestSourceIndex.class'
+    java {
+        withSourcesJar()
     }
 
-    // Allow people to specify a custom path to their Minecraft directory.
-    // (Example: `gradle build -Denigma.test.minecraftdir=./`)
-    systemProperties = [
-            'enigma.test.minecraftdir': System.getProperty('test.minecraftdir')
-    ]
-}
-
-// Set the main class.
-jar.manifest.attributes 'Main-Class': 'cuchaz.enigma.Main'
-
-// Make the "fat" application jar. This is useful to just throw in a classpath
-// for tests, though it includes some slightly useless stuff.
-shadowJar {
-    append 'LICENSE'
-    append 'README.md'
-}
-
-// Create a library jar, containing only the deobfuscation code, for use at
-// runtime. This will be deployed to Maven Local with a POM, and can be uploaded
-// to a remote server manually (for now anyway).
-task libJar (type: Jar) {
-    classifier = 'lib'
-
-    from(sourceSets.main.output) {
-        exclude 'cuchaz/enigma/gui/**'
-        exclude 'cuchaz/enigma/convert/**'
-
-        // Main classes + inner classes (keep CommandMain)
-        exclude 'cuchaz/enigma/Main.class'
-        exclude 'cuchaz/enigma/Main.class'
+    publishing {
+        publications {
+            "$project.name"(MavenPublication) {
+                groupId project.group
+                artifactId project.name
+                version project.version
+                from components.java
+            }
+        }
     }
 }
 
-task sourcesJar(type: Jar, dependsOn: generateSources) {
-    classifier = 'sources'
-    from generatedSourcesDir
-    from sourceSets.main.resources
-}
-
 publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            from components.java
-
-            artifact shadowJar
-            artifact libJar
-            artifact sourcesJar
-        }
-    }
-
-    // select the repositories you want to publish to
     repositories {
+        mavenLocal()
+
         if (project.hasProperty('mavenPass')) {
             maven {
                 url = "http://mavenupload.modmuss50.me/"
diff --git a/enigma-cli/build.gradle b/enigma-cli/build.gradle
new file mode 100644
index 0000000..3ee1239
--- /dev/null
+++ b/enigma-cli/build.gradle
@@ -0,0 +1,5 @@
+dependencies {
+    implementation project(':enigma')
+}
+
+jar.manifest.attributes 'Main-Class': 'cuchaz.enigma.command.Main'
diff --git a/src/main/java/cuchaz/enigma/command/CheckMappingsCommand.java b/enigma-cli/src/main/java/cuchaz/enigma/command/CheckMappingsCommand.java
index 9d238e3..e4deef8 100644
--- a/src/main/java/cuchaz/enigma/command/CheckMappingsCommand.java
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/CheckMappingsCommand.java
@@ -5,7 +5,7 @@ import cuchaz.enigma.EnigmaProject;
 import cuchaz.enigma.ProgressListener;
 import cuchaz.enigma.analysis.index.JarIndex;
 import cuchaz.enigma.translation.mapping.EntryMapping;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
 import cuchaz.enigma.translation.mapping.serde.MappingFormat;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.translation.representation.entry.ClassEntry;
diff --git a/src/main/java/cuchaz/enigma/command/Command.java b/enigma-cli/src/main/java/cuchaz/enigma/command/Command.java
index 09dd321..0640e3e 100644
--- a/src/main/java/cuchaz/enigma/command/Command.java
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/Command.java
@@ -4,7 +4,7 @@ import cuchaz.enigma.Enigma;
 import cuchaz.enigma.EnigmaProject;
 import cuchaz.enigma.ProgressListener;
 import cuchaz.enigma.translation.mapping.EntryMapping;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
 import cuchaz.enigma.translation.mapping.serde.MappingFormat;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 
diff --git a/src/main/java/cuchaz/enigma/command/ComposeMappingsCommand.java b/enigma-cli/src/main/java/cuchaz/enigma/command/ComposeMappingsCommand.java
index f57f1fa..e10fd47 100644
--- a/src/main/java/cuchaz/enigma/command/ComposeMappingsCommand.java
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/ComposeMappingsCommand.java
@@ -1,9 +1,10 @@
 package cuchaz.enigma.command;
 
-import cuchaz.enigma.throwables.MappingParseException;
+import cuchaz.enigma.translation.mapping.MappingOperations;
+import cuchaz.enigma.translation.mapping.serde.MappingParseException;
 import cuchaz.enigma.translation.mapping.EntryMapping;
-import cuchaz.enigma.translation.mapping.MappingFileNameFormat;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.MappingFileNameFormat;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.utils.Utils;
 
@@ -32,7 +33,7 @@ public class ComposeMappingsCommand extends Command {
 
         EntryTree<EntryMapping> left = MappingCommandsUtil.read(args[0], Paths.get(args[1]), saveParameters);
         EntryTree<EntryMapping> right = MappingCommandsUtil.read(args[2], Paths.get(args[3]), saveParameters);
-        EntryTree<EntryMapping> result = MappingCommandsUtil.compose(left, right, args[6].equals("left") || args[6].equals("both"), args[6].equals("right") || args[6].equals("both"));
+        EntryTree<EntryMapping> result = MappingOperations.compose(left, right, args[6].equals("left") || args[6].equals("both"), args[6].equals("right") || args[6].equals("both"));
 
         Path output = Paths.get(args[5]);
         Utils.delete(output);
diff --git a/src/main/java/cuchaz/enigma/command/ConvertMappingsCommand.java b/enigma-cli/src/main/java/cuchaz/enigma/command/ConvertMappingsCommand.java
index 689df02..144d89c 100644
--- a/src/main/java/cuchaz/enigma/command/ConvertMappingsCommand.java
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/ConvertMappingsCommand.java
@@ -1,9 +1,9 @@
 package cuchaz.enigma.command;
 
-import cuchaz.enigma.throwables.MappingParseException;
+import cuchaz.enigma.translation.mapping.serde.MappingParseException;
 import cuchaz.enigma.translation.mapping.EntryMapping;
-import cuchaz.enigma.translation.mapping.MappingFileNameFormat;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.MappingFileNameFormat;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.utils.Utils;
 
diff --git a/src/main/java/cuchaz/enigma/command/DecompileCommand.java b/enigma-cli/src/main/java/cuchaz/enigma/command/DecompileCommand.java
index 3d15dac..3d15dac 100644
--- a/src/main/java/cuchaz/enigma/command/DecompileCommand.java
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/DecompileCommand.java
diff --git a/src/main/java/cuchaz/enigma/command/DeobfuscateCommand.java b/enigma-cli/src/main/java/cuchaz/enigma/command/DeobfuscateCommand.java
index b0d2a7d..b0d2a7d 100644
--- a/src/main/java/cuchaz/enigma/command/DeobfuscateCommand.java
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/DeobfuscateCommand.java
diff --git a/src/main/java/cuchaz/enigma/command/InvertMappingsCommand.java b/enigma-cli/src/main/java/cuchaz/enigma/command/InvertMappingsCommand.java
index cd11e2e..0780a96 100644
--- a/src/main/java/cuchaz/enigma/command/InvertMappingsCommand.java
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/InvertMappingsCommand.java
@@ -1,9 +1,10 @@
 package cuchaz.enigma.command;
 
-import cuchaz.enigma.throwables.MappingParseException;
+import cuchaz.enigma.translation.mapping.MappingOperations;
+import cuchaz.enigma.translation.mapping.serde.MappingParseException;
 import cuchaz.enigma.translation.mapping.EntryMapping;
-import cuchaz.enigma.translation.mapping.MappingFileNameFormat;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.MappingFileNameFormat;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.utils.Utils;
 
@@ -31,7 +32,7 @@ public class InvertMappingsCommand extends Command {
         MappingSaveParameters saveParameters = new MappingSaveParameters(MappingFileNameFormat.BY_DEOBF);
 
         EntryTree<EntryMapping> source = MappingCommandsUtil.read(args[0], Paths.get(args[1]), saveParameters);
-        EntryTree<EntryMapping> result = MappingCommandsUtil.invert(source);
+        EntryTree<EntryMapping> result = MappingOperations.invert(source);
 
         Path output = Paths.get(args[3]);
         Utils.delete(output);
diff --git a/src/main/java/cuchaz/enigma/CommandMain.java b/enigma-cli/src/main/java/cuchaz/enigma/command/Main.java
index 93b013d..0a4c1b9 100644
--- a/src/main/java/cuchaz/enigma/CommandMain.java
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/Main.java
@@ -9,15 +9,15 @@
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma;
+package cuchaz.enigma.command;
 
-import cuchaz.enigma.command.*;
+import cuchaz.enigma.Enigma;
 
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
 
-public class CommandMain {
+public class Main {
 
         private static final Map<String, Command> COMMANDS = new LinkedHashMap<>();
 
@@ -46,7 +46,7 @@ public class CommandMain {
                         }
                 } catch (CommandHelpException ex) {
                         System.err.println(ex.getMessage());
-                        System.out.println(String.format("%s - %s", Constants.NAME, Constants.VERSION));
+                        System.out.println(String.format("%s - %s", Enigma.NAME, Enigma.VERSION));
                         System.out.println("Command " + ex.command.name + " has encountered an error! Usage:");
                         printHelp(ex.command);
                         System.exit(1);
@@ -58,9 +58,9 @@ public class CommandMain {
         }
 
         private static void printHelp() {
-                System.out.println(String.format("%s - %s", Constants.NAME, Constants.VERSION));
+                System.out.println(String.format("%s - %s", Enigma.NAME, Enigma.VERSION));
                 System.out.println("Usage:");
-                System.out.println("\tjava -cp enigma.jar cuchaz.enigma.CommandMain <command>");
+                System.out.println("\tjava -cp enigma.jar cuchaz.enigma.command.CommandMain <command>");
                 System.out.println("\twhere <command> is one of:");
 
                 for (Command command : COMMANDS.values()) {
diff --git a/src/main/java/cuchaz/enigma/command/MapSpecializedMethodsCommand.java b/enigma-cli/src/main/java/cuchaz/enigma/command/MapSpecializedMethodsCommand.java
index eb8d5dc..292de19 100644
--- a/src/main/java/cuchaz/enigma/command/MapSpecializedMethodsCommand.java
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/MapSpecializedMethodsCommand.java
@@ -4,10 +4,12 @@ import cuchaz.enigma.ProgressListener;
 import cuchaz.enigma.analysis.ClassCache;
 import cuchaz.enigma.analysis.index.BridgeMethodIndex;
 import cuchaz.enigma.analysis.index.JarIndex;
-import cuchaz.enigma.throwables.MappingParseException;
+import cuchaz.enigma.translation.mapping.serde.MappingFileNameFormat;
+import cuchaz.enigma.translation.mapping.serde.MappingParseException;
 import cuchaz.enigma.translation.MappingTranslator;
 import cuchaz.enigma.translation.Translator;
 import cuchaz.enigma.translation.mapping.*;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.translation.mapping.tree.EntryTreeNode;
 import cuchaz.enigma.translation.mapping.tree.HashEntryTree;
diff --git a/enigma-cli/src/main/java/cuchaz/enigma/command/MappingCommandsUtil.java b/enigma-cli/src/main/java/cuchaz/enigma/command/MappingCommandsUtil.java
new file mode 100644
index 0000000..d365129
--- /dev/null
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/MappingCommandsUtil.java
@@ -0,0 +1,87 @@
+package cuchaz.enigma.command;
+
+import cuchaz.enigma.ProgressListener;
+import cuchaz.enigma.translation.mapping.serde.MappingParseException;
+import cuchaz.enigma.translation.mapping.EntryMapping;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.*;
+import cuchaz.enigma.translation.mapping.serde.enigma.EnigmaMappingsReader;
+import cuchaz.enigma.translation.mapping.serde.enigma.EnigmaMappingsWriter;
+import cuchaz.enigma.translation.mapping.serde.tiny.TinyMappingsReader;
+import cuchaz.enigma.translation.mapping.serde.tiny.TinyMappingsWriter;
+import cuchaz.enigma.translation.mapping.serde.tinyv2.TinyV2Writer;
+import cuchaz.enigma.translation.mapping.tree.EntryTree;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+public final class MappingCommandsUtil {
+    private MappingCommandsUtil() {}
+
+    public static EntryTree<EntryMapping> read(String type, Path path, MappingSaveParameters saveParameters) throws MappingParseException, IOException {
+        if (type.equals("enigma")) {
+            return (Files.isDirectory(path) ? EnigmaMappingsReader.DIRECTORY : EnigmaMappingsReader.ZIP).read(path, ProgressListener.none(), saveParameters);
+        }
+
+        if (type.equals("tiny")) {
+            return TinyMappingsReader.INSTANCE.read(path, ProgressListener.none(), saveParameters);
+        }
+
+        MappingFormat format = null;
+        try {
+            format = MappingFormat.valueOf(type.toUpperCase());
+        } catch (IllegalArgumentException ignored) {
+            if (type.equals("tinyv2")) {
+                format = MappingFormat.TINY_V2;
+            }
+        }
+
+        if (format != null) {
+            return format.getReader().read(path, ProgressListener.none(), saveParameters);
+        }
+
+        throw new IllegalArgumentException("no reader for " + type);
+    }
+
+    public static void write(EntryTree<EntryMapping> mappings, String type, Path path, MappingSaveParameters saveParameters) {
+        if (type.equals("enigma")) {
+            EnigmaMappingsWriter.DIRECTORY.write(mappings, path, ProgressListener.none(), saveParameters);
+            return;
+        }
+
+        if (type.startsWith("tinyv2:") || type.startsWith("tiny_v2:")) {
+            String[] split = type.split(":");
+
+            if (split.length != 3) {
+                throw new IllegalArgumentException("specify column names as 'tinyv2:from_namespace:to_namespace'");
+            }
+
+            new TinyV2Writer(split[1], split[2]).write(mappings, path, ProgressListener.none(), saveParameters);
+            return;
+        }
+
+        if (type.startsWith("tiny:")) {
+            String[] split = type.split(":");
+
+            if (split.length != 3) {
+                throw new IllegalArgumentException("specify column names as 'tiny:from_column:to_column'");
+            }
+
+            new TinyMappingsWriter(split[1], split[2]).write(mappings, path, ProgressListener.none(), saveParameters);
+            return;
+        }
+
+        MappingFormat format = null;
+        try {
+            format = MappingFormat.valueOf(type.toUpperCase());
+        } catch (IllegalArgumentException ignored) {}
+
+        if (format != null) {
+            format.getWriter().write(mappings, path, ProgressListener.none(), saveParameters);
+            return;
+        }
+
+        throw new IllegalArgumentException("no writer for " + type);
+    }
+}
diff --git a/src/test/java/cuchaz/enigma/command/CheckMappingsCommandTest.java b/enigma-cli/src/test/java/cuchaz/enigma/command/CheckMappingsCommandTest.java
index f3b9f85..a29bba4 100644
--- a/src/test/java/cuchaz/enigma/command/CheckMappingsCommandTest.java
+++ b/enigma-cli/src/test/java/cuchaz/enigma/command/CheckMappingsCommandTest.java
@@ -5,16 +5,17 @@ import org.junit.Test;
 import java.io.File;
 
 public class CheckMappingsCommandTest {
+        private static final String PACKAGE_ACCESS = "../enigma/build/test-obf/packageAccess.jar";
 
         @Test(expected = IllegalStateException.class)
         public void testWrong() throws Exception {
-                new CheckMappingsCommand().run(new File("build/test-obf/packageAccess.jar").getAbsolutePath(), new File("src/test/resources" +
+                new CheckMappingsCommand().run(new File(PACKAGE_ACCESS).getAbsolutePath(), new File("src/test/resources" +
                                 "/packageAccess/wrongMappings").getAbsolutePath());
         }
 
         @Test
         public void testRight() throws Exception {
-                new CheckMappingsCommand().run(new File("build/test-obf/packageAccess.jar").getAbsolutePath(), new File("src/test/resources" +
+                new CheckMappingsCommand().run(new File(PACKAGE_ACCESS).getAbsolutePath(), new File("src/test/resources" +
                                 "/packageAccess/correctMappings").getAbsolutePath());
         }
 }
diff --git a/src/test/resources/packageAccess/correctMappings/base/Base.mapping b/enigma-cli/src/test/resources/packageAccess/correctMappings/base/Base.mapping
index 0a86def..0a86def 100644
--- a/src/test/resources/packageAccess/correctMappings/base/Base.mapping
+++ b/enigma-cli/src/test/resources/packageAccess/correctMappings/base/Base.mapping
diff --git a/src/test/resources/packageAccess/correctMappings/base/One.mapping b/enigma-cli/src/test/resources/packageAccess/correctMappings/base/One.mapping
index dd4c208..dd4c208 100644
--- a/src/test/resources/packageAccess/correctMappings/base/One.mapping
+++ b/enigma-cli/src/test/resources/packageAccess/correctMappings/base/One.mapping
diff --git a/src/test/resources/packageAccess/correctMappings/two/Two.mapping b/enigma-cli/src/test/resources/packageAccess/correctMappings/two/Two.mapping
index a179349..a179349 100644
--- a/src/test/resources/packageAccess/correctMappings/two/Two.mapping
+++ b/enigma-cli/src/test/resources/packageAccess/correctMappings/two/Two.mapping
diff --git a/src/test/resources/packageAccess/wrongMappings/base/Base.mapping b/enigma-cli/src/test/resources/packageAccess/wrongMappings/base/Base.mapping
index 0a86def..0a86def 100644
--- a/src/test/resources/packageAccess/wrongMappings/base/Base.mapping
+++ b/enigma-cli/src/test/resources/packageAccess/wrongMappings/base/Base.mapping
diff --git a/src/test/resources/packageAccess/wrongMappings/one/One.mapping b/enigma-cli/src/test/resources/packageAccess/wrongMappings/one/One.mapping
index 15b42cf..15b42cf 100644
--- a/src/test/resources/packageAccess/wrongMappings/one/One.mapping
+++ b/enigma-cli/src/test/resources/packageAccess/wrongMappings/one/One.mapping
diff --git a/src/test/resources/packageAccess/wrongMappings/two/Two.mapping b/enigma-cli/src/test/resources/packageAccess/wrongMappings/two/Two.mapping
index a179349..a179349 100644
--- a/src/test/resources/packageAccess/wrongMappings/two/Two.mapping
+++ b/enigma-cli/src/test/resources/packageAccess/wrongMappings/two/Two.mapping
diff --git a/enigma-server/build.gradle b/enigma-server/build.gradle
new file mode 100644
index 0000000..bf72b18
--- /dev/null
+++ b/enigma-server/build.gradle
@@ -0,0 +1,6 @@
+dependencies {
+    implementation project(':enigma')
+    implementation 'net.sf.jopt-simple:jopt-simple:6.0-alpha-3'
+}
+
+jar.manifest.attributes 'Main-Class': 'cuchaz.enigma.network.DedicatedEnigmaServer'
diff --git a/docs/protocol.md b/enigma-server/docs/protocol.md
index c14ecb8..c14ecb8 100644
--- a/docs/protocol.md
+++ b/enigma-server/docs/protocol.md
diff --git a/enigma-server/src/main/java/cuchaz/enigma/network/ClientPacketHandler.java b/enigma-server/src/main/java/cuchaz/enigma/network/ClientPacketHandler.java
new file mode 100644
index 0000000..720744b
--- /dev/null
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/ClientPacketHandler.java
@@ -0,0 +1,29 @@
+package cuchaz.enigma.network;
+
+import cuchaz.enigma.analysis.EntryReference;
+import cuchaz.enigma.translation.mapping.EntryMapping;
+import cuchaz.enigma.translation.mapping.tree.EntryTree;
+import cuchaz.enigma.network.packet.Packet;
+import cuchaz.enigma.translation.representation.entry.Entry;
+
+import java.util.List;
+
+public interface ClientPacketHandler {
+    void openMappings(EntryTree<EntryMapping> mappings);
+
+    void rename(EntryReference<Entry<?>, Entry<?>> reference, String newName, boolean refreshClassTree, boolean jumpToReference);
+
+    void removeMapping(EntryReference<Entry<?>, Entry<?>> reference, boolean jumpToReference);
+
+    void changeDocs(EntryReference<Entry<?>, Entry<?>> reference, String updatedDocs, boolean jumpToReference);
+
+    void markAsDeobfuscated(EntryReference<Entry<?>, Entry<?>> reference, boolean jumpToReference);
+
+    void disconnectIfConnected(String reason);
+
+    void sendPacket(Packet<ServerPacketHandler> packet);
+
+    void addMessage(Message message);
+
+    void updateUserList(List<String> users);
+}
diff --git a/src/main/java/cuchaz/enigma/network/DedicatedEnigmaServer.java b/enigma-server/src/main/java/cuchaz/enigma/network/DedicatedEnigmaServer.java
index 2cfe823..924302f 100644
--- a/src/main/java/cuchaz/enigma/network/DedicatedEnigmaServer.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/DedicatedEnigmaServer.java
@@ -2,13 +2,14 @@ package cuchaz.enigma.network;
 
 import com.google.common.io.MoreFiles;
 import cuchaz.enigma.*;
-import cuchaz.enigma.throwables.MappingParseException;
+import cuchaz.enigma.translation.mapping.serde.MappingParseException;
 import cuchaz.enigma.translation.mapping.EntryRemapper;
 import cuchaz.enigma.translation.mapping.serde.MappingFormat;
 import cuchaz.enigma.utils.Utils;
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
 import joptsimple.OptionSpec;
+import joptsimple.ValueConverter;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -62,16 +63,16 @@ public class DedicatedEnigmaServer extends EnigmaServer {
                 OptionSpec<Path> jarOpt = parser.accepts("jar", "Jar file to open at startup")
                                 .withRequiredArg()
                                 .required()
-                                .withValuesConvertedBy(Main.PathConverter.INSTANCE);
+                                .withValuesConvertedBy(PathConverter.INSTANCE);
 
                 OptionSpec<Path> mappingsOpt = parser.accepts("mappings", "Mappings file to open at startup")
                                 .withRequiredArg()
                                 .required()
-                                .withValuesConvertedBy(Main.PathConverter.INSTANCE);
+                                .withValuesConvertedBy(PathConverter.INSTANCE);
 
                 OptionSpec<Path> profileOpt = parser.accepts("profile", "Profile json to apply at startup")
                                 .withRequiredArg()
-                                .withValuesConvertedBy(Main.PathConverter.INSTANCE);
+                                .withValuesConvertedBy(PathConverter.INSTANCE);
 
                 OptionSpec<Integer> portOpt = parser.accepts("port", "Port to run the server on")
                                 .withOptionalArg()
@@ -84,7 +85,7 @@ public class DedicatedEnigmaServer extends EnigmaServer {
 
                 OptionSpec<Path> logFileOpt = parser.accepts("log", "The log file to write to")
                                 .withRequiredArg()
-                                .withValuesConvertedBy(Main.PathConverter.INSTANCE)
+                                .withValuesConvertedBy(PathConverter.INSTANCE)
                                 .defaultsTo(Paths.get("log.txt"));
 
                 OptionSet parsedArgs = parser.parse(args);
@@ -161,4 +162,39 @@ public class DedicatedEnigmaServer extends EnigmaServer {
                 mappingFormat.write(getMappings().getObfToDeobf(), getMappings().takeMappingDelta(), mappingsFile, ProgressListener.none(), profile.getMappingSaveParameters());
                 log.flush();
         }
+
+        public static class PathConverter implements ValueConverter<Path> {
+                public static final ValueConverter<Path> INSTANCE = new PathConverter();
+
+                PathConverter() {
+                }
+
+                @Override
+                public Path convert(String path) {
+                        // expand ~ to the home dir
+                        if (path.startsWith("~")) {
+                                // get the home dir
+                                Path dirHome = Paths.get(System.getProperty("user.home"));
+
+                                // is the path just ~/ or is it ~user/ ?
+                                if (path.startsWith("~/")) {
+                                        return dirHome.resolve(path.substring(2));
+                                } else {
+                                        return dirHome.getParent().resolve(path.substring(1));
+                                }
+                        }
+
+                        return Paths.get(path);
+                }
+
+                @Override
+                public Class<? extends Path> valueType() {
+                        return Path.class;
+                }
+
+                @Override
+                public String valuePattern() {
+                        return "path";
+                }
+        }
 }
diff --git a/src/main/java/cuchaz/enigma/network/EnigmaClient.java b/enigma-server/src/main/java/cuchaz/enigma/network/EnigmaClient.java
index bfa53d7..71bd011 100644
--- a/src/main/java/cuchaz/enigma/network/EnigmaClient.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/EnigmaClient.java
@@ -1,30 +1,23 @@
 package cuchaz.enigma.network;
 
-import cuchaz.enigma.gui.GuiController;
-import cuchaz.enigma.network.packet.LoginC2SPacket;
 import cuchaz.enigma.network.packet.Packet;
 import cuchaz.enigma.network.packet.PacketRegistry;
 
-import javax.swing.SwingUtilities;
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.DataOutput;
-import java.io.DataOutputStream;
-import java.io.EOFException;
-import java.io.IOException;
+import javax.swing.*;
+import java.io.*;
 import java.net.Socket;
 import java.net.SocketException;
 
 public class EnigmaClient {
 
-        private final GuiController controller;
+        private final ClientPacketHandler controller;
 
         private final String ip;
         private final int port;
         private Socket socket;
         private DataOutput output;
 
-        public EnigmaClient(GuiController controller, String ip, int port) {
+        public EnigmaClient(ClientPacketHandler controller, String ip, int port) {
                 this.controller = controller;
                 this.ip = ip;
                 this.port = port;
@@ -43,7 +36,7 @@ public class EnigmaClient {
                                         } catch (EOFException | SocketException e) {
                                                 break;
                                         }
-                                        Packet<GuiController> packet = PacketRegistry.createS2CPacket(packetId);
+                                        Packet<ClientPacketHandler> packet = PacketRegistry.createS2CPacket(packetId);
                                         if (packet == null) {
                                                 throw new IOException("Received invalid packet id " + packetId);
                                         }
diff --git a/src/main/java/cuchaz/enigma/network/EnigmaServer.java b/enigma-server/src/main/java/cuchaz/enigma/network/EnigmaServer.java
index b0e15a3..6027a6b 100644
--- a/src/main/java/cuchaz/enigma/network/EnigmaServer.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/EnigmaServer.java
@@ -1,6 +1,5 @@
 package cuchaz.enigma.network;
 
-import cuchaz.enigma.gui.GuiController;
 import cuchaz.enigma.network.packet.KickS2CPacket;
 import cuchaz.enigma.network.packet.MessageS2CPacket;
 import cuchaz.enigma.network.packet.Packet;
@@ -11,7 +10,6 @@ import cuchaz.enigma.network.packet.UserListS2CPacket;
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.mapping.EntryRemapper;
 import cuchaz.enigma.translation.representation.entry.Entry;
-import cuchaz.enigma.utils.Message;
 
 import java.io.DataInput;
 import java.io.DataInputStream;
@@ -175,7 +173,7 @@ public abstract class EnigmaServer {
                 return usernames.get(client);
         }
 
-        public void sendPacket(Socket client, Packet<GuiController> packet) {
+        public void sendPacket(Socket client, Packet<ClientPacketHandler> packet) {
                 if (!client.isClosed()) {
                         int packetId = PacketRegistry.getS2CId(packet);
                         try {
@@ -191,13 +189,13 @@ public abstract class EnigmaServer {
                 }
         }
 
-        public void sendToAll(Packet<GuiController> packet) {
+        public void sendToAll(Packet<ClientPacketHandler> packet) {
                 for (Socket client : clients) {
                         sendPacket(client, packet);
                 }
         }
 
-        public void sendToAllExcept(Socket excluded, Packet<GuiController> packet) {
+        public void sendToAllExcept(Socket excluded, Packet<ClientPacketHandler> packet) {
                 for (Socket client : clients) {
                         if (client != excluded) {
                                 sendPacket(client, packet);
diff --git a/src/main/java/cuchaz/enigma/network/IntegratedEnigmaServer.java b/enigma-server/src/main/java/cuchaz/enigma/network/IntegratedEnigmaServer.java
index 21c6825..21c6825 100644
--- a/src/main/java/cuchaz/enigma/network/IntegratedEnigmaServer.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/IntegratedEnigmaServer.java
diff --git a/src/main/java/cuchaz/enigma/utils/Message.java b/enigma-server/src/main/java/cuchaz/enigma/network/Message.java
index d7c5f23..c157838 100644
--- a/src/main/java/cuchaz/enigma/utils/Message.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/Message.java
@@ -1,4 +1,4 @@
-package cuchaz.enigma.utils;
+package cuchaz.enigma.network;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -7,6 +7,7 @@ import java.util.Objects;
 
 import cuchaz.enigma.network.packet.PacketHelper;
 import cuchaz.enigma.translation.representation.entry.Entry;
+import cuchaz.enigma.utils.I18n;
 
 public abstract class Message {
 
diff --git a/src/main/java/cuchaz/enigma/network/ServerPacketHandler.java b/enigma-server/src/main/java/cuchaz/enigma/network/ServerPacketHandler.java
index 8618553..8618553 100644
--- a/src/main/java/cuchaz/enigma/network/ServerPacketHandler.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/ServerPacketHandler.java
diff --git a/src/main/java/cuchaz/enigma/network/packet/ChangeDocsC2SPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/ChangeDocsC2SPacket.java
index 4d5d86f..1b52cf1 100644
--- a/src/main/java/cuchaz/enigma/network/packet/ChangeDocsC2SPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/ChangeDocsC2SPacket.java
@@ -1,10 +1,10 @@
 package cuchaz.enigma.network.packet;
 
+import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.network.EnigmaServer;
+import cuchaz.enigma.network.Message;
 import cuchaz.enigma.network.ServerPacketHandler;
-import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.representation.entry.Entry;
-import cuchaz.enigma.utils.Message;
 import cuchaz.enigma.utils.Utils;
 
 import java.io.DataInput;
diff --git a/src/main/java/cuchaz/enigma/network/packet/ChangeDocsS2CPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/ChangeDocsS2CPacket.java
index bf5b7cb..12a3025 100644
--- a/src/main/java/cuchaz/enigma/network/packet/ChangeDocsS2CPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/ChangeDocsS2CPacket.java
@@ -1,14 +1,14 @@
 package cuchaz.enigma.network.packet;
 
 import cuchaz.enigma.analysis.EntryReference;
-import cuchaz.enigma.gui.GuiController;
+import cuchaz.enigma.network.ClientPacketHandler;
 import cuchaz.enigma.translation.representation.entry.Entry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-public class ChangeDocsS2CPacket implements Packet<GuiController> {
+public class ChangeDocsS2CPacket implements Packet<ClientPacketHandler> {
         private int syncId;
         private Entry<?> entry;
         private String newDocs;
@@ -37,7 +37,7 @@ public class ChangeDocsS2CPacket implements Packet<GuiController> {
         }
 
         @Override
-        public void handle(GuiController controller) {
+        public void handle(ClientPacketHandler controller) {
                 controller.changeDocs(new EntryReference<>(entry, entry.getName()), newDocs, false);
                 controller.sendPacket(new ConfirmChangeC2SPacket(syncId));
         }
diff --git a/src/main/java/cuchaz/enigma/network/packet/ConfirmChangeC2SPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/ConfirmChangeC2SPacket.java
index 78ef964..78ef964 100644
--- a/src/main/java/cuchaz/enigma/network/packet/ConfirmChangeC2SPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/ConfirmChangeC2SPacket.java
diff --git a/src/main/java/cuchaz/enigma/network/packet/KickS2CPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/KickS2CPacket.java
index bd007d3..9a112a8 100644
--- a/src/main/java/cuchaz/enigma/network/packet/KickS2CPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/KickS2CPacket.java
@@ -1,12 +1,12 @@
 package cuchaz.enigma.network.packet;
 
-import cuchaz.enigma.gui.GuiController;
+import cuchaz.enigma.network.ClientPacketHandler;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-public class KickS2CPacket implements Packet<GuiController> {
+public class KickS2CPacket implements Packet<ClientPacketHandler> {
         private String reason;
 
         KickS2CPacket() {
@@ -27,7 +27,7 @@ public class KickS2CPacket implements Packet<GuiController> {
         }
 
         @Override
-        public void handle(GuiController controller) {
+        public void handle(ClientPacketHandler controller) {
                 controller.disconnectIfConnected(reason);
         }
 }
diff --git a/src/main/java/cuchaz/enigma/network/packet/LoginC2SPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/LoginC2SPacket.java
index 722cbbf..da0f44a 100644
--- a/src/main/java/cuchaz/enigma/network/packet/LoginC2SPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/LoginC2SPacket.java
@@ -2,7 +2,7 @@ package cuchaz.enigma.network.packet;
 
 import cuchaz.enigma.network.EnigmaServer;
 import cuchaz.enigma.network.ServerPacketHandler;
-import cuchaz.enigma.utils.Message;
+import cuchaz.enigma.network.Message;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedC2SPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedC2SPacket.java
index 98d20d9..a41c620 100644
--- a/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedC2SPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedC2SPacket.java
@@ -3,7 +3,7 @@ package cuchaz.enigma.network.packet;
 import cuchaz.enigma.network.ServerPacketHandler;
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.representation.entry.Entry;
-import cuchaz.enigma.utils.Message;
+import cuchaz.enigma.network.Message;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedS2CPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedS2CPacket.java
index b7d6eda..7504430 100644
--- a/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedS2CPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedS2CPacket.java
@@ -1,14 +1,14 @@
 package cuchaz.enigma.network.packet;
 
 import cuchaz.enigma.analysis.EntryReference;
-import cuchaz.enigma.gui.GuiController;
+import cuchaz.enigma.network.ClientPacketHandler;
 import cuchaz.enigma.translation.representation.entry.Entry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-public class MarkDeobfuscatedS2CPacket implements Packet<GuiController> {
+public class MarkDeobfuscatedS2CPacket implements Packet<ClientPacketHandler> {
         private int syncId;
         private Entry<?> entry;
 
@@ -33,7 +33,7 @@ public class MarkDeobfuscatedS2CPacket implements Packet<GuiController> {
         }
 
         @Override
-        public void handle(GuiController controller) {
+        public void handle(ClientPacketHandler controller) {
                 controller.markAsDeobfuscated(new EntryReference<>(entry, entry.getName()), false);
                 controller.sendPacket(new ConfirmChangeC2SPacket(syncId));
         }
diff --git a/src/main/java/cuchaz/enigma/network/packet/MessageC2SPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/MessageC2SPacket.java
index b8e0f14..3bc09e7 100644
--- a/src/main/java/cuchaz/enigma/network/packet/MessageC2SPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/MessageC2SPacket.java
@@ -5,7 +5,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import cuchaz.enigma.network.ServerPacketHandler;
-import cuchaz.enigma.utils.Message;
+import cuchaz.enigma.network.Message;
 
 public class MessageC2SPacket implements Packet<ServerPacketHandler> {
 
diff --git a/src/main/java/cuchaz/enigma/network/packet/MessageS2CPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/MessageS2CPacket.java
index edeaae0..2b07968 100644
--- a/src/main/java/cuchaz/enigma/network/packet/MessageS2CPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/MessageS2CPacket.java
@@ -4,10 +4,10 @@ import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import cuchaz.enigma.gui.GuiController;
-import cuchaz.enigma.utils.Message;
+import cuchaz.enigma.network.ClientPacketHandler;
+import cuchaz.enigma.network.Message;
 
-public class MessageS2CPacket implements Packet<GuiController> {
+public class MessageS2CPacket implements Packet<ClientPacketHandler> {
 
         private Message message;
 
@@ -29,7 +29,7 @@ public class MessageS2CPacket implements Packet<GuiController> {
         }
 
         @Override
-        public void handle(GuiController handler) {
+        public void handle(ClientPacketHandler handler) {
                 handler.addMessage(message);
         }
 
diff --git a/src/main/java/cuchaz/enigma/network/packet/Packet.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/Packet.java
index 2f16dfb..2f16dfb 100644
--- a/src/main/java/cuchaz/enigma/network/packet/Packet.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/Packet.java
diff --git a/src/main/java/cuchaz/enigma/network/packet/PacketHelper.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/PacketHelper.java
index 464606e..464606e 100644
--- a/src/main/java/cuchaz/enigma/network/packet/PacketHelper.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/PacketHelper.java
diff --git a/src/main/java/cuchaz/enigma/network/packet/PacketRegistry.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/PacketRegistry.java
index ba5d9de..3b8af81 100644
--- a/src/main/java/cuchaz/enigma/network/packet/PacketRegistry.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/PacketRegistry.java
@@ -1,6 +1,6 @@
 package cuchaz.enigma.network.packet;
 
-import cuchaz.enigma.gui.GuiController;
+import cuchaz.enigma.network.ClientPacketHandler;
 import cuchaz.enigma.network.ServerPacketHandler;
 
 import java.util.HashMap;
@@ -11,15 +11,15 @@ public class PacketRegistry {
 
         private static final Map<Class<? extends Packet<ServerPacketHandler>>, Integer> c2sPacketIds = new HashMap<>();
         private static final Map<Integer, Supplier<? extends Packet<ServerPacketHandler>>> c2sPacketCreators = new HashMap<>();
-        private static final Map<Class<? extends Packet<GuiController>>, Integer> s2cPacketIds = new HashMap<>();
-        private static final Map<Integer, Supplier<? extends Packet<GuiController>>> s2cPacketCreators = new HashMap<>();
+        private static final Map<Class<? extends Packet<ClientPacketHandler>>, Integer> s2cPacketIds = new HashMap<>();
+        private static final Map<Integer, Supplier<? extends Packet<ClientPacketHandler>>> s2cPacketCreators = new HashMap<>();
 
         private static <T extends Packet<ServerPacketHandler>> void registerC2S(int id, Class<T> clazz, Supplier<T> creator) {
                 c2sPacketIds.put(clazz, id);
                 c2sPacketCreators.put(id, creator);
         }
 
-        private static <T extends Packet<GuiController>> void registerS2C(int id, Class<T> clazz, Supplier<T> creator) {
+        private static <T extends Packet<ClientPacketHandler>> void registerS2C(int id, Class<T> clazz, Supplier<T> creator) {
                 s2cPacketIds.put(clazz, id);
                 s2cPacketCreators.put(id, creator);
         }
@@ -52,12 +52,12 @@ public class PacketRegistry {
                 return creator == null ? null : creator.get();
         }
 
-        public static int getS2CId(Packet<GuiController> packet) {
+        public static int getS2CId(Packet<ClientPacketHandler> packet) {
                 return s2cPacketIds.get(packet.getClass());
         }
 
-        public static Packet<GuiController> createS2CPacket(int id) {
-                Supplier<? extends Packet<GuiController>> creator = s2cPacketCreators.get(id);
+        public static Packet<ClientPacketHandler> createS2CPacket(int id) {
+                Supplier<? extends Packet<ClientPacketHandler>> creator = s2cPacketCreators.get(id);
                 return creator == null ? null : creator.get();
         }
 
diff --git a/src/main/java/cuchaz/enigma/network/packet/RemoveMappingC2SPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RemoveMappingC2SPacket.java
index a3f3d91..3f85228 100644
--- a/src/main/java/cuchaz/enigma/network/packet/RemoveMappingC2SPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RemoveMappingC2SPacket.java
@@ -1,9 +1,9 @@
 package cuchaz.enigma.network.packet;
 
 import cuchaz.enigma.network.ServerPacketHandler;
-import cuchaz.enigma.throwables.IllegalNameException;
+import cuchaz.enigma.translation.mapping.IllegalNameException;
 import cuchaz.enigma.translation.representation.entry.Entry;
-import cuchaz.enigma.utils.Message;
+import cuchaz.enigma.network.Message;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/cuchaz/enigma/network/packet/RemoveMappingS2CPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RemoveMappingS2CPacket.java
index 7bb1b00..70d803c 100644
--- a/src/main/java/cuchaz/enigma/network/packet/RemoveMappingS2CPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RemoveMappingS2CPacket.java
@@ -1,14 +1,14 @@
 package cuchaz.enigma.network.packet;
 
 import cuchaz.enigma.analysis.EntryReference;
-import cuchaz.enigma.gui.GuiController;
+import cuchaz.enigma.network.ClientPacketHandler;
 import cuchaz.enigma.translation.representation.entry.Entry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-public class RemoveMappingS2CPacket implements Packet<GuiController> {
+public class RemoveMappingS2CPacket implements Packet<ClientPacketHandler> {
         private int syncId;
         private Entry<?> entry;
 
@@ -33,7 +33,7 @@ public class RemoveMappingS2CPacket implements Packet<GuiController> {
         }
 
         @Override
-        public void handle(GuiController controller) {
+        public void handle(ClientPacketHandler controller) {
                 controller.removeMapping(new EntryReference<>(entry, entry.getName()), false);
                 controller.sendPacket(new ConfirmChangeC2SPacket(syncId));
         }
diff --git a/src/main/java/cuchaz/enigma/network/packet/RenameC2SPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameC2SPacket.java
index 03e95d6..e3e7e37 100644
--- a/src/main/java/cuchaz/enigma/network/packet/RenameC2SPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameC2SPacket.java
@@ -1,10 +1,10 @@
 package cuchaz.enigma.network.packet;
 
 import cuchaz.enigma.network.ServerPacketHandler;
-import cuchaz.enigma.throwables.IllegalNameException;
+import cuchaz.enigma.translation.mapping.IllegalNameException;
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.representation.entry.Entry;
-import cuchaz.enigma.utils.Message;
+import cuchaz.enigma.network.Message;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/cuchaz/enigma/network/packet/RenameS2CPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameS2CPacket.java
index 058f0e5..787e89e 100644
--- a/src/main/java/cuchaz/enigma/network/packet/RenameS2CPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameS2CPacket.java
@@ -1,14 +1,14 @@
 package cuchaz.enigma.network.packet;
 
 import cuchaz.enigma.analysis.EntryReference;
-import cuchaz.enigma.gui.GuiController;
+import cuchaz.enigma.network.ClientPacketHandler;
 import cuchaz.enigma.translation.representation.entry.Entry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-public class RenameS2CPacket implements Packet<GuiController> {
+public class RenameS2CPacket implements Packet<ClientPacketHandler> {
         private int syncId;
         private Entry<?> entry;
         private String newName;
@@ -41,7 +41,7 @@ public class RenameS2CPacket implements Packet<GuiController> {
         }
 
         @Override
-        public void handle(GuiController controller) {
+        public void handle(ClientPacketHandler controller) {
                 controller.rename(new EntryReference<>(entry, entry.getName()), newName, refreshClassTree, false);
                 controller.sendPacket(new ConfirmChangeC2SPacket(syncId));
         }
diff --git a/src/main/java/cuchaz/enigma/network/packet/SyncMappingsS2CPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/SyncMappingsS2CPacket.java
index e6378d1..76ecbc7 100644
--- a/src/main/java/cuchaz/enigma/network/packet/SyncMappingsS2CPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/SyncMappingsS2CPacket.java
@@ -1,11 +1,11 @@
 package cuchaz.enigma.network.packet;
 
-import cuchaz.enigma.gui.GuiController;
-import cuchaz.enigma.network.EnigmaServer;
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.translation.mapping.tree.EntryTreeNode;
 import cuchaz.enigma.translation.mapping.tree.HashEntryTree;
+import cuchaz.enigma.network.ClientPacketHandler;
+import cuchaz.enigma.network.EnigmaServer;
 import cuchaz.enigma.translation.representation.entry.Entry;
 
 import java.io.DataInput;
@@ -15,7 +15,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class SyncMappingsS2CPacket implements Packet<GuiController> {
+public class SyncMappingsS2CPacket implements Packet<ClientPacketHandler> {
         private EntryTree<EntryMapping> mappings;
 
         SyncMappingsS2CPacket() {
@@ -81,7 +81,7 @@ public class SyncMappingsS2CPacket implements Packet<GuiController> {
         }
 
         @Override
-        public void handle(GuiController controller) {
+        public void handle(ClientPacketHandler controller) {
                 controller.openMappings(mappings);
                 controller.sendPacket(new ConfirmChangeC2SPacket(EnigmaServer.DUMMY_SYNC_ID));
         }
diff --git a/src/main/java/cuchaz/enigma/network/packet/UserListS2CPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/UserListS2CPacket.java
index 8904848..b4a277a 100644
--- a/src/main/java/cuchaz/enigma/network/packet/UserListS2CPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/UserListS2CPacket.java
@@ -1,14 +1,14 @@
 package cuchaz.enigma.network.packet;
 
+import cuchaz.enigma.network.ClientPacketHandler;
+
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import cuchaz.enigma.gui.GuiController;
-
-public class UserListS2CPacket implements Packet<GuiController> {
+public class UserListS2CPacket implements Packet<ClientPacketHandler> {
 
         private List<String> users;
 
@@ -37,7 +37,7 @@ public class UserListS2CPacket implements Packet<GuiController> {
         }
 
         @Override
-        public void handle(GuiController handler) {
+        public void handle(ClientPacketHandler handler) {
                 handler.updateUserList(users);
         }
 
diff --git a/enigma-swing/build.gradle b/enigma-swing/build.gradle
new file mode 100644
index 0000000..a1bcafc
--- /dev/null
+++ b/enigma-swing/build.gradle
@@ -0,0 +1,23 @@
+plugins {
+    id 'com.github.johnrengelman.shadow' version '5.2.0'
+}
+
+dependencies {
+    implementation project(':enigma')
+    implementation project(':enigma-server')
+
+    implementation 'net.sf.jopt-simple:jopt-simple:6.0-alpha-3'
+    implementation 'com.bulenkov:darcula:1.0.0-bobbylight'
+    implementation 'de.sciss:syntaxpane:1.2.0'
+    implementation 'com.github.lukeu:swing-dpi:0.6'
+}
+
+jar.manifest.attributes 'Main-Class': 'cuchaz.enigma.gui.Main'
+
+publishing {
+    publications {
+        shadow(MavenPublication) { publication ->
+            project.shadow.component(publication)
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/cuchaz/enigma/gui/BrowserCaret.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/BrowserCaret.java
index af105db..af105db 100644
--- a/src/main/java/cuchaz/enigma/gui/BrowserCaret.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/BrowserCaret.java
diff --git a/src/main/java/cuchaz/enigma/gui/ClassSelector.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/ClassSelector.java
index a23e24c..3d0e04c 100644
--- a/src/main/java/cuchaz/enigma/gui/ClassSelector.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/ClassSelector.java
@@ -28,7 +28,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.throwables.IllegalNameException;
+import cuchaz.enigma.translation.mapping.IllegalNameException;
 import cuchaz.enigma.translation.Translator;
 import cuchaz.enigma.translation.representation.entry.ClassEntry;
 
diff --git a/src/main/java/cuchaz/enigma/gui/CodeReader.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/CodeReader.java
index e119640..356656b 100644
--- a/src/main/java/cuchaz/enigma/gui/CodeReader.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/CodeReader.java
@@ -11,7 +11,7 @@
 
 package cuchaz.enigma.gui;
 
-import cuchaz.enigma.analysis.Token;
+import cuchaz.enigma.source.Token;
 
 import javax.swing.*;
 import javax.swing.text.BadLocationException;
diff --git a/src/main/java/cuchaz/enigma/gui/ConnectionState.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/ConnectionState.java
index db6590d..db6590d 100644
--- a/src/main/java/cuchaz/enigma/gui/ConnectionState.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/ConnectionState.java
diff --git a/src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java
index 08df3e7..aca5d72 100644
--- a/src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java
@@ -3,10 +3,11 @@ package cuchaz.enigma.gui;
 import cuchaz.enigma.EnigmaProject;
 import cuchaz.enigma.EnigmaServices;
 import cuchaz.enigma.analysis.EntryReference;
-import cuchaz.enigma.analysis.Token;
+import cuchaz.enigma.source.Token;
 import cuchaz.enigma.api.service.NameProposalService;
 import cuchaz.enigma.gui.highlight.TokenHighlightType;
 import cuchaz.enigma.source.SourceIndex;
+import cuchaz.enigma.source.SourceRemapper;
 import cuchaz.enigma.translation.LocalNameGenerator;
 import cuchaz.enigma.translation.Translator;
 import cuchaz.enigma.translation.mapping.EntryRemapper;
diff --git a/src/main/java/cuchaz/enigma/gui/EnigmaQuickFindDialog.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/EnigmaQuickFindDialog.java
index c912be3..c912be3 100644
--- a/src/main/java/cuchaz/enigma/gui/EnigmaQuickFindDialog.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/EnigmaQuickFindDialog.java
diff --git a/src/main/java/cuchaz/enigma/gui/EnigmaSyntaxKit.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/EnigmaSyntaxKit.java
index 42eaa60..2f08a26 100644
--- a/src/main/java/cuchaz/enigma/gui/EnigmaSyntaxKit.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/EnigmaSyntaxKit.java
@@ -1,6 +1,6 @@
 package cuchaz.enigma.gui;
 
-import cuchaz.enigma.config.Config;
+import cuchaz.enigma.gui.config.Config;
 import de.sciss.syntaxpane.components.LineNumbersRuler;
 import de.sciss.syntaxpane.syntaxkits.JavaSyntaxKit;
 import de.sciss.syntaxpane.util.Configuration;
diff --git a/src/main/java/cuchaz/enigma/ExceptionIgnorer.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/ExceptionIgnorer.java
index 84331cc..6246192 100644
--- a/src/main/java/cuchaz/enigma/ExceptionIgnorer.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/ExceptionIgnorer.java
@@ -9,7 +9,7 @@
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma;
+package cuchaz.enigma.gui;
 
 public class ExceptionIgnorer {
 
diff --git a/src/main/java/cuchaz/enigma/gui/Gui.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java
index ed32469..2ed1010 100644
--- a/src/main/java/cuchaz/enigma/gui/Gui.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java
@@ -25,12 +25,11 @@ import javax.swing.tree.*;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
-import cuchaz.enigma.Constants;
+import cuchaz.enigma.Enigma;
 import cuchaz.enigma.EnigmaProfile;
-import cuchaz.enigma.ExceptionIgnorer;
 import cuchaz.enigma.analysis.*;
-import cuchaz.enigma.config.Config;
-import cuchaz.enigma.config.Themes;
+import cuchaz.enigma.gui.config.Config;
+import cuchaz.enigma.gui.config.Themes;
 import cuchaz.enigma.gui.dialog.CrashDialog;
 import cuchaz.enigma.gui.dialog.JavadocDialog;
 import cuchaz.enigma.gui.dialog.SearchDialog;
@@ -46,15 +45,16 @@ import cuchaz.enigma.gui.panels.PanelDeobf;
 import cuchaz.enigma.gui.panels.PanelEditor;
 import cuchaz.enigma.gui.panels.PanelIdentifier;
 import cuchaz.enigma.gui.panels.PanelObf;
+import cuchaz.enigma.gui.util.GuiUtil;
 import cuchaz.enigma.gui.util.History;
 import cuchaz.enigma.network.packet.*;
-import cuchaz.enigma.throwables.IllegalNameException;
+import cuchaz.enigma.source.Token;
+import cuchaz.enigma.translation.mapping.IllegalNameException;
 import cuchaz.enigma.translation.mapping.*;
 import cuchaz.enigma.translation.representation.entry.*;
-import cuchaz.enigma.utils.I18n;
-import cuchaz.enigma.utils.Message;
+import cuchaz.enigma.network.Message;
 import cuchaz.enigma.gui.util.ScaleUtil;
-import cuchaz.enigma.utils.Utils;
+import cuchaz.enigma.utils.I18n;
 import de.sciss.syntaxpane.DefaultSyntaxKit;
 
 public class Gui {
@@ -127,7 +127,7 @@ public class Gui {
                 Config.getInstance().lookAndFeel.setGlobalLAF();
 
                 // init frame
-                this.frame = new JFrame(Constants.NAME);
+                this.frame = new JFrame(Enigma.NAME);
                 final Container pane = this.frame.getContentPane();
                 pane.setLayout(new BorderLayout());
 
@@ -386,7 +386,7 @@ public class Gui {
 
         public void onFinishOpenJar(String jarName) {
                 // update gui
-                this.frame.setTitle(Constants.NAME + " - " + jarName);
+                this.frame.setTitle(Enigma.NAME + " - " + jarName);
                 this.classesPanel.removeAll();
                 this.classesPanel.add(splitClasses);
                 setEditorText(null);
@@ -401,7 +401,7 @@ public class Gui {
         public void onCloseJar() {
 
                 // update gui
-                this.frame.setTitle(Constants.NAME);
+                this.frame.setTitle(Enigma.NAME);
                 setObfClasses(null);
                 setDeobfClasses(null);
                 setEditorText(null);
@@ -551,7 +551,7 @@ public class Gui {
                 label.setPreferredSize(ScaleUtil.getDimension(100, ScaleUtil.invert(label.getPreferredSize().height)));
                 panel.add(label);
 
-                panel.add(Utils.unboldLabel(new JLabel(value, JLabel.LEFT)));
+                panel.add(GuiUtil.unboldLabel(new JLabel(value, JLabel.LEFT)));
 
                 container.add(panel);
         }
@@ -665,7 +665,7 @@ public class Gui {
                         } catch (IllegalNameException ex) {
                                 javadocTextArea.setBorder(BorderFactory.createLineBorder(Color.red, 1));
                                 javadocTextArea.setToolTipText(ex.getReason());
-                                Utils.showToolTipNow(javadocTextArea);
+                                GuiUtil.showToolTipNow(javadocTextArea);
                                 return;
                         }
 
@@ -739,7 +739,7 @@ public class Gui {
                         } catch (IllegalNameException ex) {
                                 renameTextField.setBorder(BorderFactory.createLineBorder(Color.red, 1));
                                 renameTextField.setToolTipText(ex.getReason());
-                                Utils.showToolTipNow(renameTextField);
+                                GuiUtil.showToolTipNow(renameTextField);
                         }
                         return;
                 }
diff --git a/src/main/java/cuchaz/enigma/gui/GuiController.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
index cccc9e8..94979e7 100644
--- a/src/main/java/cuchaz/enigma/gui/GuiController.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
@@ -18,23 +18,21 @@ import cuchaz.enigma.EnigmaProfile;
 import cuchaz.enigma.EnigmaProject;
 import cuchaz.enigma.analysis.*;
 import cuchaz.enigma.api.service.ObfuscationTestService;
-import cuchaz.enigma.bytecode.translators.SourceFixVisitor;
-import cuchaz.enigma.config.Config;
+import cuchaz.enigma.gui.config.Config;
 import cuchaz.enigma.gui.dialog.ProgressDialog;
 import cuchaz.enigma.gui.stats.StatsGenerator;
 import cuchaz.enigma.gui.stats.StatsMember;
+import cuchaz.enigma.gui.util.GuiUtil;
 import cuchaz.enigma.gui.util.History;
-import cuchaz.enigma.network.EnigmaClient;
-import cuchaz.enigma.network.EnigmaServer;
-import cuchaz.enigma.network.IntegratedEnigmaServer;
-import cuchaz.enigma.network.ServerPacketHandler;
+import cuchaz.enigma.network.*;
 import cuchaz.enigma.network.packet.LoginC2SPacket;
 import cuchaz.enigma.network.packet.Packet;
 import cuchaz.enigma.source.*;
-import cuchaz.enigma.throwables.MappingParseException;
+import cuchaz.enigma.translation.mapping.serde.MappingParseException;
 import cuchaz.enigma.translation.Translator;
 import cuchaz.enigma.translation.mapping.*;
 import cuchaz.enigma.translation.mapping.serde.MappingFormat;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.translation.mapping.tree.HashEntryTree;
 import cuchaz.enigma.translation.representation.entry.ClassEntry;
@@ -42,10 +40,7 @@ import cuchaz.enigma.translation.representation.entry.Entry;
 import cuchaz.enigma.translation.representation.entry.FieldEntry;
 import cuchaz.enigma.translation.representation.entry.MethodEntry;
 import cuchaz.enigma.utils.I18n;
-import cuchaz.enigma.utils.Message;
-import cuchaz.enigma.utils.ReadableToken;
 import cuchaz.enigma.utils.Utils;
-import org.objectweb.asm.tree.ClassNode;
 
 import javax.annotation.Nullable;
 import javax.swing.JOptionPane;
@@ -63,7 +58,7 @@ import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-public class GuiController {
+public class GuiController implements ClientPacketHandler {
         private static final ExecutorService DECOMPILER_SERVICE = Executors.newSingleThreadExecutor(
                         new ThreadFactoryBuilder()
                                         .setDaemon(true)
@@ -107,26 +102,12 @@ public class GuiController {
                 return ProgressDialog.runOffThread(gui.getFrame(), progress -> {
                         project = enigma.openJar(jarPath, progress);
                         indexTreeBuilder = new IndexTreeBuilder(project.getJarIndex());
-                        decompiler = createDecompiler();
+                        decompiler = project.createDecompiler(decompilerService);
                         gui.onFinishOpenJar(jarPath.getFileName().toString());
                         refreshClasses();
                 });
         }
 
-        private Decompiler createDecompiler() {
-                return decompilerService.create(name -> {
-                        ClassNode node = project.getClassCache().getClassNode(name);
-
-                        if (node == null) {
-                                return null;
-                        }
-
-                        ClassNode fixedNode = new ClassNode();
-                        node.accept(new SourceFixVisitor(Utils.ASM_VERSION, fixedNode, project.getJarIndex()));
-                        return fixedNode;
-                }, new SourceSettings(true, true));
-        }
-
         public void closeJar() {
                 this.project = null;
                 this.gui.onCloseJar();
@@ -155,6 +136,7 @@ public class GuiController {
                 });
         }
 
+        @Override
         public void openMappings(EntryTree<EntryMapping> mappings) {
                 if (project == null) return;
 
@@ -415,10 +397,10 @@ public class GuiController {
                                 Rectangle viewportBounds = gui.sourceScroller.getViewport().getViewRect();
                                 // Here we pick an "anchor position", which we want to stay in the same vertical location on the screen after the new text has been set
                                 int anchorModelPos = gui.editor.getSelectionStart();
-                                Rectangle anchorViewPos = Utils.safeModelToView(gui.editor, anchorModelPos);
+                                Rectangle anchorViewPos = GuiUtil.safeModelToView(gui.editor, anchorModelPos);
                                 if (anchorViewPos.y < viewportBounds.y || anchorViewPos.y >= viewportBounds.y + viewportBounds.height) {
                                         anchorModelPos = gui.editor.viewToModel(new Point(0, viewportBounds.y));
-                                        anchorViewPos = Utils.safeModelToView(gui.editor, anchorModelPos);
+                                        anchorViewPos = GuiUtil.safeModelToView(gui.editor, anchorModelPos);
                                 }
                                 int obfAnchorPos = currentSource.getObfuscatedOffset(anchorModelPos);
                                 Rectangle anchorViewPos_f = anchorViewPos;
@@ -426,7 +408,7 @@ public class GuiController {
 
                                 loadClass(currentSource.getEntry(), () -> SwingUtilities.invokeLater(() -> {
                                         int newAnchorModelPos = currentSource.getDeobfuscatedOffset(obfAnchorPos);
-                                        Rectangle newAnchorViewPos = Utils.safeModelToView(gui.editor, newAnchorModelPos);
+                                        Rectangle newAnchorViewPos = GuiUtil.safeModelToView(gui.editor, newAnchorModelPos);
                                         int newScrollY = newAnchorViewPos.y - (anchorViewPos_f.y - viewportBounds.y);
 
                                         gui.editor.select(currentSource.getDeobfuscatedOffset(obfSelectionStart), currentSource.getDeobfuscatedOffset(obfSelectionEnd));
@@ -579,6 +561,7 @@ public class GuiController {
                 rename(reference, newName, refreshClassTree, true);
         }
 
+        @Override
         public void rename(EntryReference<Entry<?>, Entry<?>> reference, String newName, boolean refreshClassTree, boolean jumpToReference) {
                 Entry<?> entry = reference.getNameableEntry();
                 project.getMapper().mapFromObf(entry, new EntryMapping(newName));
@@ -593,6 +576,7 @@ public class GuiController {
                 removeMapping(reference, true);
         }
 
+        @Override
         public void removeMapping(EntryReference<Entry<?>, Entry<?>> reference, boolean jumpToReference) {
                 project.getMapper().removeByObf(reference.getNameableEntry());
 
@@ -605,6 +589,7 @@ public class GuiController {
                 changeDocs(reference, updatedDocs, true);
         }
 
+        @Override
         public void changeDocs(EntryReference<Entry<?>, Entry<?>> reference, String updatedDocs, boolean jumpToReference) {
                 changeDoc(reference.entry, Utils.isBlank(updatedDocs) ? null : updatedDocs);
 
@@ -628,6 +613,7 @@ public class GuiController {
                 markAsDeobfuscated(reference, true);
         }
 
+        @Override
         public void markAsDeobfuscated(EntryReference<Entry<?>, Entry<?>> reference, boolean jumpToReference) {
                 EntryRemapper mapper = project.getMapper();
                 Entry<?> entry = reference.getNameableEntry();
@@ -663,7 +649,7 @@ public class GuiController {
         public void setDecompiler(DecompilerService service) {
                 uncommentedSource = null;
                 decompilerService = service;
-                decompiler = createDecompiler();
+                decompiler = project.createDecompiler(decompilerService);
                 refreshCurrentClass(null, RefreshMode.FULL);
         }
 
@@ -691,6 +677,7 @@ public class GuiController {
                 gui.setConnectionState(ConnectionState.HOSTING);
         }
 
+        @Override
         public synchronized void disconnectIfConnected(String reason) {
                 if (client == null && server == null) {
                         return;
@@ -712,16 +699,19 @@ public class GuiController {
                 });
         }
 
+        @Override
         public void sendPacket(Packet<ServerPacketHandler> packet) {
                 if (client != null) {
                         client.sendPacket(packet);
                 }
         }
 
+        @Override
         public void addMessage(Message message) {
                 gui.addMessage(message);
         }
 
+        @Override
         public void updateUserList(List<String> users) {
                 gui.setUserList(users);
         }
diff --git a/src/main/java/cuchaz/enigma/Main.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/Main.java
index 7c87669..1f3aa2c 100644
--- a/src/main/java/cuchaz/enigma/Main.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/Main.java
@@ -9,12 +9,13 @@
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma;
+package cuchaz.enigma.gui;
 
-import cuchaz.enigma.gui.Gui;
-import cuchaz.enigma.gui.GuiController;
+import cuchaz.enigma.EnigmaProfile;
+import cuchaz.enigma.gui.config.Config;
 import cuchaz.enigma.translation.mapping.serde.MappingFormat;
 
+import cuchaz.enigma.utils.I18n;
 import joptsimple.*;
 
 import java.io.IOException;
@@ -53,6 +54,7 @@ public class Main {
 
                         EnigmaProfile parsedProfile = EnigmaProfile.read(options.valueOf(profile));
 
+                        I18n.setLanguage(Config.getInstance().language);
                         Gui gui = new Gui(parsedProfile);
                         GuiController controller = gui.getController();
 
diff --git a/src/main/java/cuchaz/enigma/gui/MessageListCellRenderer.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/MessageListCellRenderer.java
index c9e38cb..1d60340 100644
--- a/src/main/java/cuchaz/enigma/gui/MessageListCellRenderer.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/MessageListCellRenderer.java
@@ -5,7 +5,7 @@ import java.awt.Component;
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.JList;
 
-import cuchaz.enigma.utils.Message;
+import cuchaz.enigma.network.Message;
 
 // For now, just render the translated text.
 // TODO: Icons or something later?
diff --git a/src/main/java/cuchaz/enigma/gui/MethodTreeCellRenderer.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/MethodTreeCellRenderer.java
index 05d90a9..1eead6e 100644
--- a/src/main/java/cuchaz/enigma/gui/MethodTreeCellRenderer.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/MethodTreeCellRenderer.java
@@ -12,7 +12,7 @@
 package cuchaz.enigma.gui;
 
 import cuchaz.enigma.analysis.MethodInheritanceTreeNode;
-import cuchaz.enigma.config.Config;
+import cuchaz.enigma.gui.config.Config;
 
 import javax.swing.*;
 import javax.swing.tree.TreeCellRenderer;
diff --git a/src/main/java/cuchaz/enigma/gui/QuickFindAction.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/QuickFindAction.java
index b7fa2eb..b7fa2eb 100644
--- a/src/main/java/cuchaz/enigma/gui/QuickFindAction.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/QuickFindAction.java
diff --git a/src/main/java/cuchaz/enigma/utils/ReadableToken.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/ReadableToken.java
index de152fe..3e4b30c 100644
--- a/src/main/java/cuchaz/enigma/utils/ReadableToken.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/ReadableToken.java
@@ -9,7 +9,7 @@
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma.utils;
+package cuchaz.enigma.gui;
 
 public class ReadableToken {
 
diff --git a/src/main/java/cuchaz/enigma/gui/RefreshMode.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/RefreshMode.java
index 87cb83b..87cb83b 100644
--- a/src/main/java/cuchaz/enigma/gui/RefreshMode.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/RefreshMode.java
diff --git a/src/main/java/cuchaz/enigma/gui/TokenListCellRenderer.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/TokenListCellRenderer.java
index 7375111..10c418c 100644
--- a/src/main/java/cuchaz/enigma/gui/TokenListCellRenderer.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/TokenListCellRenderer.java
@@ -11,7 +11,7 @@
 
 package cuchaz.enigma.gui;
 
-import cuchaz.enigma.analysis.Token;
+import cuchaz.enigma.source.Token;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/cuchaz/enigma/config/Config.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/Config.java
index e116fce..373dcf0 100644
--- a/src/main/java/cuchaz/enigma/config/Config.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/Config.java
@@ -1,4 +1,4 @@
-package cuchaz.enigma.config;
+package cuchaz.enigma.gui.config;
 
 import com.bulenkov.darcula.DarculaLaf;
 import com.google.common.io.Files;
diff --git a/src/main/java/cuchaz/enigma/config/Themes.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/Themes.java
index 547a420..035b238 100644
--- a/src/main/java/cuchaz/enigma/config/Themes.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/Themes.java
@@ -1,12 +1,9 @@
-package cuchaz.enigma.config;
+package cuchaz.enigma.gui.config;
 
-import java.awt.Font;
 import java.io.IOException;
-import java.lang.reflect.Field;
 
 import javax.swing.SwingUtilities;
 
-import com.github.swingdpi.UiDefaultsScaler;
 import com.google.common.collect.ImmutableMap;
 import cuchaz.enigma.gui.EnigmaSyntaxKit;
 import cuchaz.enigma.gui.Gui;
diff --git a/src/main/java/cuchaz/enigma/gui/dialog/AboutDialog.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/AboutDialog.java
index 43b8265..fff755d 100644
--- a/src/main/java/cuchaz/enigma/gui/dialog/AboutDialog.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/AboutDialog.java
@@ -11,7 +11,8 @@
 
 package cuchaz.enigma.gui.dialog;
 
-import cuchaz.enigma.Constants;
+import cuchaz.enigma.Enigma;
+import cuchaz.enigma.gui.util.GuiUtil;
 import cuchaz.enigma.utils.I18n;
 import cuchaz.enigma.gui.util.ScaleUtil;
 import cuchaz.enigma.utils.Utils;
@@ -24,14 +25,14 @@ public class AboutDialog {
 
         public static void show(JFrame parent) {
                 // init frame
-                final JFrame frame = new JFrame(String.format(I18n.translate("menu.help.about.title"), Constants.NAME));
+                final JFrame frame = new JFrame(String.format(I18n.translate("menu.help.about.title"), Enigma.NAME));
                 final Container pane = frame.getContentPane();
                 pane.setLayout(new FlowLayout());
 
                 // load the content
                 try {
                         String html = Utils.readResourceToString("/about.html");
-                        html = String.format(html, Constants.NAME, Constants.VERSION);
+                        html = String.format(html, Enigma.NAME, Enigma.VERSION);
                         JLabel label = new JLabel(html);
                         label.setHorizontalAlignment(JLabel.CENTER);
                         pane.add(label);
@@ -41,9 +42,9 @@ public class AboutDialog {
 
                 // show the link
                 String html = "<html><a href=\"%s\">%s</a></html>";
-                html = String.format(html, Constants.URL, Constants.URL);
+                html = String.format(html, Enigma.URL, Enigma.URL);
                 JButton link = new JButton(html);
-                link.addActionListener(event -> Utils.openUrl(Constants.URL));
+                link.addActionListener(event -> GuiUtil.openUrl(Enigma.URL));
                 link.setBorderPainted(false);
                 link.setOpaque(false);
                 link.setBackground(Color.WHITE);
diff --git a/src/main/java/cuchaz/enigma/gui/dialog/ChangeDialog.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ChangeDialog.java
index 64219ab..64219ab 100644
--- a/src/main/java/cuchaz/enigma/gui/dialog/ChangeDialog.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ChangeDialog.java
diff --git a/src/main/java/cuchaz/enigma/gui/dialog/ConnectToServerDialog.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ConnectToServerDialog.java
index c5f505c..c5f505c 100644
--- a/src/main/java/cuchaz/enigma/gui/dialog/ConnectToServerDialog.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ConnectToServerDialog.java
diff --git a/src/main/java/cuchaz/enigma/gui/dialog/CrashDialog.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/CrashDialog.java
index 908b42e..c2a93fa 100644
--- a/src/main/java/cuchaz/enigma/gui/dialog/CrashDialog.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/CrashDialog.java
@@ -11,10 +11,10 @@
 
 package cuchaz.enigma.gui.dialog;
 
-import cuchaz.enigma.Constants;
+import cuchaz.enigma.Enigma;
+import cuchaz.enigma.gui.util.GuiUtil;
 import cuchaz.enigma.utils.I18n;
 import cuchaz.enigma.gui.util.ScaleUtil;
-import cuchaz.enigma.utils.Utils;
 
 import javax.swing.*;
 import java.awt.*;
@@ -33,11 +33,11 @@ public class CrashDialog {
 
         private CrashDialog(JFrame parent) {
                 // init frame
-                frame = new JFrame(String.format(I18n.translate("crash.title"), Constants.NAME));
+                frame = new JFrame(String.format(I18n.translate("crash.title"), Enigma.NAME));
                 final Container pane = frame.getContentPane();
                 pane.setLayout(new BorderLayout());
 
-                JLabel label = new JLabel(String.format(I18n.translate("crash.summary"), Constants.NAME));
+                JLabel label = new JLabel(String.format(I18n.translate("crash.summary"), Enigma.NAME));
                 label.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
                 pane.add(label, BorderLayout.NORTH);
 
@@ -66,7 +66,7 @@ public class CrashDialog {
                 });
                 buttonsPanel.add(exportButton);
                 buttonsPanel.add(Box.createHorizontalGlue());
-                buttonsPanel.add(Utils.unboldLabel(new JLabel(I18n.translate("crash.exit.warning"))));
+                buttonsPanel.add(GuiUtil.unboldLabel(new JLabel(I18n.translate("crash.exit.warning"))));
                 JButton ignoreButton = new JButton(I18n.translate("crash.ignore"));
                 ignoreButton.addActionListener(event -> {
                         // close (hide) the dialog
diff --git a/src/main/java/cuchaz/enigma/gui/dialog/CreateServerDialog.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/CreateServerDialog.java
index eea1dff..eea1dff 100644
--- a/src/main/java/cuchaz/enigma/gui/dialog/CreateServerDialog.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/CreateServerDialog.java
diff --git a/src/main/java/cuchaz/enigma/gui/dialog/JavadocDialog.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/JavadocDialog.java
index 7e41441..d81460a 100644
--- a/src/main/java/cuchaz/enigma/gui/dialog/JavadocDialog.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/JavadocDialog.java
@@ -11,9 +11,9 @@
 
 package cuchaz.enigma.gui.dialog;
 
+import cuchaz.enigma.gui.util.GuiUtil;
 import cuchaz.enigma.utils.I18n;
 import cuchaz.enigma.gui.util.ScaleUtil;
-import cuchaz.enigma.utils.Utils;
 
 import javax.swing.*;
 import javax.swing.text.html.HTML;
@@ -59,7 +59,7 @@ public class JavadocDialog {
                 FlowLayout buttonsLayout = new FlowLayout();
                 buttonsLayout.setAlignment(FlowLayout.RIGHT);
                 buttonsPanel.setLayout(buttonsLayout);
-                buttonsPanel.add(Utils.unboldLabel(new JLabel(I18n.translate("javadocs.instruction"))));
+                buttonsPanel.add(GuiUtil.unboldLabel(new JLabel(I18n.translate("javadocs.instruction"))));
                 JButton cancelButton = new JButton(I18n.translate("javadocs.cancel"));
                 cancelButton.addActionListener(event -> {
                         // close (hide) the dialog
diff --git a/src/main/java/cuchaz/enigma/gui/dialog/ProgressDialog.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ProgressDialog.java
index e33ae82..fa40af7 100644
--- a/src/main/java/cuchaz/enigma/gui/dialog/ProgressDialog.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ProgressDialog.java
@@ -11,11 +11,11 @@
 
 package cuchaz.enigma.gui.dialog;
 
-import cuchaz.enigma.Constants;
+import cuchaz.enigma.Enigma;
 import cuchaz.enigma.ProgressListener;
+import cuchaz.enigma.gui.util.GuiUtil;
 import cuchaz.enigma.utils.I18n;
 import cuchaz.enigma.gui.util.ScaleUtil;
-import cuchaz.enigma.utils.Utils;
 
 import javax.swing.*;
 import java.awt.*;
@@ -31,7 +31,7 @@ public class ProgressDialog implements ProgressListener, AutoCloseable {
         public ProgressDialog(JFrame parent) {
 
                 // init frame
-                this.frame = new JFrame(String.format(I18n.translate("progress.operation"), Constants.NAME));
+                this.frame = new JFrame(String.format(I18n.translate("progress.operation"), Enigma.NAME));
                 final Container pane = this.frame.getContentPane();
                 FlowLayout layout = new FlowLayout();
                 layout.setAlignment(FlowLayout.LEFT);
@@ -44,7 +44,7 @@ public class ProgressDialog implements ProgressListener, AutoCloseable {
                 JPanel panel = new JPanel();
                 pane.add(panel);
                 panel.setLayout(new BorderLayout());
-                this.labelText = Utils.unboldLabel(new JLabel());
+                this.labelText = GuiUtil.unboldLabel(new JLabel());
                 this.progress = new JProgressBar();
                 this.labelText.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
                 panel.add(this.labelText, BorderLayout.NORTH);
diff --git a/src/main/java/cuchaz/enigma/gui/dialog/SearchDialog.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/SearchDialog.java
index b283a37..2d396c3 100644
--- a/src/main/java/cuchaz/enigma/gui/dialog/SearchDialog.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/SearchDialog.java
@@ -30,8 +30,8 @@ import cuchaz.enigma.gui.util.AbstractListCellRenderer;
 import cuchaz.enigma.gui.util.ScaleUtil;
 import cuchaz.enigma.translation.representation.entry.ClassEntry;
 import cuchaz.enigma.utils.I18n;
-import cuchaz.enigma.utils.search.SearchEntry;
-import cuchaz.enigma.utils.search.SearchUtil;
+import cuchaz.enigma.gui.search.SearchEntry;
+import cuchaz.enigma.gui.search.SearchUtil;
 
 public class SearchDialog {
 
diff --git a/src/main/java/cuchaz/enigma/gui/dialog/StatsDialog.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/StatsDialog.java
index 868eba7..868eba7 100644
--- a/src/main/java/cuchaz/enigma/gui/dialog/StatsDialog.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/StatsDialog.java
diff --git a/src/main/java/cuchaz/enigma/gui/elements/CollapsibleTabbedPane.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/CollapsibleTabbedPane.java
index fb497b1..fb497b1 100644
--- a/src/main/java/cuchaz/enigma/gui/elements/CollapsibleTabbedPane.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/CollapsibleTabbedPane.java
diff --git a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
index dc2cf8f..24f42ff 100644
--- a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
@@ -1,7 +1,7 @@
 package cuchaz.enigma.gui.elements;
 
-import cuchaz.enigma.config.Config;
-import cuchaz.enigma.config.Themes;
+import cuchaz.enigma.gui.config.Config;
+import cuchaz.enigma.gui.config.Themes;
 import cuchaz.enigma.gui.Gui;
 import cuchaz.enigma.gui.dialog.AboutDialog;
 import cuchaz.enigma.gui.dialog.ChangeDialog;
diff --git a/src/main/java/cuchaz/enigma/gui/elements/PopupMenuBar.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/PopupMenuBar.java
index b92041c..b92041c 100644
--- a/src/main/java/cuchaz/enigma/gui/elements/PopupMenuBar.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/PopupMenuBar.java
diff --git a/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserAny.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserAny.java
index f5f6628..f5f6628 100644
--- a/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserAny.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserAny.java
diff --git a/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserFile.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserFile.java
index cea11a6..cea11a6 100644
--- a/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserFile.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserFile.java
diff --git a/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserFolder.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserFolder.java
index c16e0af..c16e0af 100644
--- a/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserFolder.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserFolder.java
diff --git a/src/main/java/cuchaz/enigma/gui/highlight/BoxHighlightPainter.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/highlight/BoxHighlightPainter.java
index cef6494..3ae4380 100644
--- a/src/main/java/cuchaz/enigma/gui/highlight/BoxHighlightPainter.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/highlight/BoxHighlightPainter.java
@@ -11,7 +11,7 @@
 
 package cuchaz.enigma.gui.highlight;
 
-import cuchaz.enigma.config.Config;
+import cuchaz.enigma.gui.config.Config;
 
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Highlighter;
diff --git a/src/main/java/cuchaz/enigma/gui/highlight/SelectionHighlightPainter.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/highlight/SelectionHighlightPainter.java
index 81a70a9..2e4e462 100644
--- a/src/main/java/cuchaz/enigma/gui/highlight/SelectionHighlightPainter.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/highlight/SelectionHighlightPainter.java
@@ -11,7 +11,7 @@
 
 package cuchaz.enigma.gui.highlight;
 
-import cuchaz.enigma.config.Config;
+import cuchaz.enigma.gui.config.Config;
 
 import javax.swing.text.Highlighter;
 import javax.swing.text.JTextComponent;
diff --git a/src/main/java/cuchaz/enigma/gui/highlight/TokenHighlightType.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/highlight/TokenHighlightType.java
index ae23f32..ae23f32 100644
--- a/src/main/java/cuchaz/enigma/gui/highlight/TokenHighlightType.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/highlight/TokenHighlightType.java
diff --git a/src/main/java/cuchaz/enigma/gui/node/ClassSelectorClassNode.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/node/ClassSelectorClassNode.java
index 922f8f2..922f8f2 100644
--- a/src/main/java/cuchaz/enigma/gui/node/ClassSelectorClassNode.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/node/ClassSelectorClassNode.java
diff --git a/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java
index caa985c..caa985c 100644
--- a/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java
diff --git a/src/main/java/cuchaz/enigma/gui/panels/PanelDeobf.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/PanelDeobf.java
index c24226b..c24226b 100644
--- a/src/main/java/cuchaz/enigma/gui/panels/PanelDeobf.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/PanelDeobf.java
diff --git a/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java
index 8637afd..346d665 100644
--- a/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java
@@ -2,7 +2,7 @@ package cuchaz.enigma.gui.panels;
 
 import cuchaz.enigma.EnigmaProject;
 import cuchaz.enigma.analysis.EntryReference;
-import cuchaz.enigma.config.Config;
+import cuchaz.enigma.gui.config.Config;
 import cuchaz.enigma.gui.BrowserCaret;
 import cuchaz.enigma.gui.Gui;
 import cuchaz.enigma.translation.representation.entry.ClassEntry;
diff --git a/src/main/java/cuchaz/enigma/gui/panels/PanelIdentifier.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/PanelIdentifier.java
index de069bc..8c19efb 100644
--- a/src/main/java/cuchaz/enigma/gui/panels/PanelIdentifier.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/PanelIdentifier.java
@@ -1,9 +1,9 @@
 package cuchaz.enigma.gui.panels;
 
 import cuchaz.enigma.gui.Gui;
+import cuchaz.enigma.gui.util.GuiUtil;
 import cuchaz.enigma.utils.I18n;
 import cuchaz.enigma.gui.util.ScaleUtil;
-import cuchaz.enigma.utils.Utils;
 
 import javax.swing.*;
 import java.awt.*;
@@ -23,7 +23,7 @@ public class PanelIdentifier extends JPanel {
         public void clearReference() {
                 this.removeAll();
                 JLabel label = new JLabel(I18n.translate("info_panel.identifier.none"));
-                Utils.unboldLabel(label);
+                GuiUtil.unboldLabel(label);
                 label.setHorizontalAlignment(JLabel.CENTER);
                 this.add(label);
 
diff --git a/src/main/java/cuchaz/enigma/gui/panels/PanelObf.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/PanelObf.java
index dd7f9f9..dd7f9f9 100644
--- a/src/main/java/cuchaz/enigma/gui/panels/PanelObf.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/PanelObf.java
diff --git a/src/main/java/cuchaz/enigma/utils/search/SearchEntry.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/search/SearchEntry.java
index 48b255f..91727c3 100644
--- a/src/main/java/cuchaz/enigma/utils/search/SearchEntry.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/search/SearchEntry.java
@@ -1,4 +1,4 @@
-package cuchaz.enigma.utils.search;
+package cuchaz.enigma.gui.search;
 
 import java.util.List;
 
diff --git a/src/main/java/cuchaz/enigma/utils/search/SearchUtil.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/search/SearchUtil.java
index a51afbb..a3b35fa 100644
--- a/src/main/java/cuchaz/enigma/utils/search/SearchUtil.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/search/SearchUtil.java
@@ -1,4 +1,4 @@
-package cuchaz.enigma.utils.search;
+package cuchaz.enigma.gui.search;
 
 import java.util.*;
 import java.util.concurrent.Executor;
diff --git a/src/main/java/cuchaz/enigma/gui/stats/StatsGenerator.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/stats/StatsGenerator.java
index e783530..d7f7ec0 100644
--- a/src/main/java/cuchaz/enigma/gui/stats/StatsGenerator.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/stats/StatsGenerator.java
@@ -46,7 +46,7 @@ public class StatsGenerator {
             totalWork += entryIndex.getClasses().size();
         }
 
-        progress.init(totalWork, I18n.translate("progress.stats"));
+        progress.init(totalWork, "progress.stats");
 
         Map<String, Integer> counts = new HashMap<>();
 
diff --git a/src/main/java/cuchaz/enigma/gui/stats/StatsMember.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/stats/StatsMember.java
index 70b4f40..70b4f40 100644
--- a/src/main/java/cuchaz/enigma/gui/stats/StatsMember.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/stats/StatsMember.java
diff --git a/src/main/java/cuchaz/enigma/gui/util/AbstractListCellRenderer.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/util/AbstractListCellRenderer.java
index 612e3e9..612e3e9 100644
--- a/src/main/java/cuchaz/enigma/gui/util/AbstractListCellRenderer.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/util/AbstractListCellRenderer.java
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/util/GuiUtil.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/util/GuiUtil.java
new file mode 100644
index 0000000..70172fe
--- /dev/null
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/util/GuiUtil.java
@@ -0,0 +1,56 @@
+package cuchaz.enigma.gui.util;
+
+import javax.swing.*;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.JTextComponent;
+import java.awt.*;
+import java.awt.event.MouseEvent;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Locale;
+import java.util.StringJoiner;
+
+public class GuiUtil {
+    public static void openUrl(String url) {
+        if (Desktop.isDesktopSupported()) {
+            Desktop desktop = Desktop.getDesktop();
+            try {
+                desktop.browse(new URI(url));
+            } catch (IOException ex) {
+                throw new Error(ex);
+            } catch (URISyntaxException ex) {
+                throw new IllegalArgumentException(ex);
+            }
+        }
+    }
+
+    public static JLabel unboldLabel(JLabel label) {
+        Font font = label.getFont();
+        label.setFont(font.deriveFont(font.getStyle() & ~Font.BOLD));
+        return label;
+    }
+
+    public static void showToolTipNow(JComponent component) {
+        // HACKHACK: trick the tooltip manager into showing the tooltip right now
+        ToolTipManager manager = ToolTipManager.sharedInstance();
+        int oldDelay = manager.getInitialDelay();
+        manager.setInitialDelay(0);
+        manager.mouseMoved(new MouseEvent(component, MouseEvent.MOUSE_MOVED, System.currentTimeMillis(), 0, 0, 0, 0, false));
+        manager.setInitialDelay(oldDelay);
+    }
+
+    public static Rectangle safeModelToView(JTextComponent component, int modelPos) {
+        if (modelPos < 0) {
+            modelPos = 0;
+        } else if (modelPos >= component.getText().length()) {
+            modelPos = component.getText().length();
+        }
+        try {
+            return component.modelToView(modelPos);
+        } catch (BadLocationException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/src/main/java/cuchaz/enigma/gui/util/History.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/util/History.java
index 94f3105..b128699 100644
--- a/src/main/java/cuchaz/enigma/gui/util/History.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/util/History.java
@@ -1,49 +1,49 @@
-package cuchaz.enigma.gui.util;

-

-import com.google.common.collect.Queues;

-

-import java.util.Deque;

-

-public class History<T> {

-        private final Deque<T> previous = Queues.newArrayDeque();

-        private final Deque<T> next = Queues.newArrayDeque();

-        private T current;

-

-        public History(T initial) {

-                current = initial;

-        }

-

-        public T getCurrent() {

-                return current;

-        }

-

-        public void push(T value) {

-                previous.addLast(current);

-                current = value;

-                next.clear();

-        }

-

-        public void replace(T value) {

-                current = value;

-        }

-

-        public boolean canGoBack() {

-                return !previous.isEmpty();

-        }

-

-        public T goBack() {

-                next.addFirst(current);

-                current = previous.removeLast();

-                return current;

-        }

-

-        public boolean canGoForward() {

-                return !next.isEmpty();

-        }

-

-        public T goForward() {

-                previous.addLast(current);

-                current = next.removeFirst();

-                return current;

-        }

-}

+package cuchaz.enigma.gui.util;
+
+import com.google.common.collect.Queues;
+
+import java.util.Deque;
+
+public class History<T> {
+        private final Deque<T> previous = Queues.newArrayDeque();
+        private final Deque<T> next = Queues.newArrayDeque();
+        private T current;
+
+        public History(T initial) {
+                current = initial;
+        }
+
+        public T getCurrent() {
+                return current;
+        }
+
+        public void push(T value) {
+                previous.addLast(current);
+                current = value;
+                next.clear();
+        }
+
+        public void replace(T value) {
+                current = value;
+        }
+
+        public boolean canGoBack() {
+                return !previous.isEmpty();
+        }
+
+        public T goBack() {
+                next.addFirst(current);
+                current = previous.removeLast();
+                return current;
+        }
+
+        public boolean canGoForward() {
+                return !next.isEmpty();
+        }
+
+        public T goForward() {
+                previous.addLast(current);
+                current = next.removeFirst();
+                return current;
+        }
+}
diff --git a/src/main/java/cuchaz/enigma/gui/util/ScaleChangeListener.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/util/ScaleChangeListener.java
index d045c6d..d045c6d 100644
--- a/src/main/java/cuchaz/enigma/gui/util/ScaleChangeListener.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/util/ScaleChangeListener.java
diff --git a/src/main/java/cuchaz/enigma/gui/util/ScaleUtil.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/util/ScaleUtil.java
index 9f722e9..e7ee565 100644
--- a/src/main/java/cuchaz/enigma/gui/util/ScaleUtil.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/util/ScaleUtil.java
@@ -16,7 +16,7 @@ import com.github.swingdpi.plaf.BasicTweaker;
 import com.github.swingdpi.plaf.MetalTweaker;
 import com.github.swingdpi.plaf.NimbusTweaker;
 import com.github.swingdpi.plaf.WindowsTweaker;
-import cuchaz.enigma.config.Config;
+import cuchaz.enigma.gui.config.Config;
 import de.sciss.syntaxpane.DefaultSyntaxKit;
 
 public class ScaleUtil {
diff --git a/src/main/resources/about.html b/enigma-swing/src/main/resources/about.html
index b75c1bf..b75c1bf 100644
--- a/src/main/resources/about.html
+++ b/enigma-swing/src/main/resources/about.html
diff --git a/src/main/resources/stats.html b/enigma-swing/src/main/resources/stats.html
index fcff7c0..fcff7c0 100644
--- a/src/main/resources/stats.html
+++ b/enigma-swing/src/main/resources/stats.html
diff --git a/enigma/build.gradle b/enigma/build.gradle
new file mode 100644
index 0000000..7cebcd1
--- /dev/null
+++ b/enigma/build.gradle
@@ -0,0 +1,63 @@
+configurations {
+    proGuard
+}
+
+dependencies {
+    implementation 'org.ow2.asm:asm:8.0'
+    implementation 'org.ow2.asm:asm-commons:8.0'
+    implementation 'org.ow2.asm:asm-tree:8.0'
+    implementation 'org.ow2.asm:asm-util:8.0'
+
+    implementation 'net.fabricmc:procyon-fabric-compilertools:0.5.35.13'
+    implementation 'net.fabricmc:cfr:0.0.1'
+
+    testImplementation 'junit:junit:4.+'
+    testImplementation 'org.hamcrest:hamcrest-all:1.+'
+    proGuard 'net.sf.proguard:proguard-base:6.+'
+}
+
+// Generate "version.txt" file
+
+ext.genOutputDir = file("$buildDir/generated-resources")
+
+task generateVersionFile {
+    ext.outputFile = file("$genOutputDir/version.txt")
+    outputs.file(outputFile)
+    doLast {
+        outputFile.text = "${project.version}"
+    }
+}
+
+sourceSets.main.output.dir genOutputDir, builtBy: generateVersionFile
+
+// Generate obfuscated JARs for tests
+
+def libraryJarsArg = JavaVersion.current().java9Compatible ? "<java.home>/jmods" : "<java.home>/lib/rt.jar"
+
+file('src/test/java/cuchaz/enigma/inputs').listFiles().each { theFile ->
+    if (theFile.directory) {
+        task("${theFile.name}TestJar", type: Jar) {
+            from(sourceSets.test.output) {
+                include "cuchaz/enigma/inputs/$theFile.name/**/*.class"
+                include 'cuchaz/enigma/inputs/Keep.class'
+            }
+
+            archiveFileName = theFile.name + '.jar'
+            destinationDirectory = file('build/test-inputs')
+        }
+
+        task("${theFile.name}TestObf", type: JavaExec,
+                dependsOn: "${theFile.name}TestJar") {
+            main 'proguard.ProGuard'
+            classpath configurations.proGuard
+
+            args '@src/test/resources/proguard-test.conf', '-injars', file('build/test-inputs/' +
+                    "${theFile.name}.jar"), '-libraryjars', libraryJarsArg,
+                    '-outjars', file('build/test-obf/' + "${theFile.name}.jar")
+        }
+
+        test.dependsOn "${theFile.name}TestObf"
+    }
+}
+
+test.dependsOn 'translationTestObf'
diff --git a/src/main/java/cuchaz/enigma/ClassProvider.java b/enigma/src/main/java/cuchaz/enigma/ClassProvider.java
index 2b91379..2b91379 100644
--- a/src/main/java/cuchaz/enigma/ClassProvider.java
+++ b/enigma/src/main/java/cuchaz/enigma/ClassProvider.java
diff --git a/src/main/java/cuchaz/enigma/Enigma.java b/enigma/src/main/java/cuchaz/enigma/Enigma.java
index f5f0649..73c9a09 100644
--- a/src/main/java/cuchaz/enigma/Enigma.java
+++ b/enigma/src/main/java/cuchaz/enigma/Enigma.java
@@ -22,6 +22,7 @@ import cuchaz.enigma.api.service.EnigmaServiceFactory;
 import cuchaz.enigma.api.service.EnigmaServiceType;
 import cuchaz.enigma.api.service.JarIndexerService;
 import cuchaz.enigma.utils.Utils;
+import org.objectweb.asm.Opcodes;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -29,7 +30,12 @@ import java.util.List;
 import java.util.ServiceLoader;
 
 public class Enigma {
-        private final EnigmaProfile profile;
+    public static final String NAME = "Enigma";
+        public static final String VERSION;
+        public static final String URL = "https://fabricmc.net";
+    public static final int ASM_VERSION = Opcodes.ASM8;
+
+    private final EnigmaProfile profile;
         private final EnigmaServices services;
 
         private Enigma(EnigmaProfile profile, EnigmaServices services) {
@@ -118,4 +124,16 @@ public class Enigma {
                         return new EnigmaServices(services.build());
                 }
         }
+
+        static {
+                String version = null;
+
+                try {
+                        version = Utils.readResourceToString("/version.txt");
+                } catch (Throwable t) {
+                        version = "Unknown Version";
+                }
+
+                VERSION = version;
+        }
 }
diff --git a/src/main/java/cuchaz/enigma/EnigmaProfile.java b/enigma/src/main/java/cuchaz/enigma/EnigmaProfile.java
index 09b90f5..daf2727 100644
--- a/src/main/java/cuchaz/enigma/EnigmaProfile.java
+++ b/enigma/src/main/java/cuchaz/enigma/EnigmaProfile.java
@@ -11,8 +11,8 @@ import com.google.gson.JsonParseException;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.reflect.TypeToken;
 import cuchaz.enigma.api.service.EnigmaServiceType;
-import cuchaz.enigma.translation.mapping.MappingFileNameFormat;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.MappingFileNameFormat;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
 
 import javax.annotation.Nullable;
 import java.io.BufferedReader;
@@ -54,7 +54,7 @@ public final class EnigmaProfile {
                                 return EnigmaProfile.parse(reader);
                         }
                 } else {
-                        try (BufferedReader reader = new BufferedReader(new InputStreamReader(Main.class.getResourceAsStream("/profile.json"), StandardCharsets.UTF_8))) {
+                        try (BufferedReader reader = new BufferedReader(new InputStreamReader(EnigmaProfile.class.getResourceAsStream("/profile.json"), StandardCharsets.UTF_8))) {
                                 return EnigmaProfile.parse(reader);
                         } catch (IOException ex) {
                                 System.err.println("Failed to load default profile, will use empty profile: " + ex.getMessage());
diff --git a/src/main/java/cuchaz/enigma/EnigmaProject.java b/enigma/src/main/java/cuchaz/enigma/EnigmaProject.java
index b345fb3..43ea14e 100644
--- a/src/main/java/cuchaz/enigma/EnigmaProject.java
+++ b/enigma/src/main/java/cuchaz/enigma/EnigmaProject.java
@@ -8,8 +8,8 @@ import cuchaz.enigma.analysis.index.JarIndex;
 import cuchaz.enigma.api.service.NameProposalService;
 import cuchaz.enigma.bytecode.translators.SourceFixVisitor;
 import cuchaz.enigma.bytecode.translators.TranslationClassVisitor;
-import cuchaz.enigma.network.EnigmaServer;
 import cuchaz.enigma.source.*;
+import cuchaz.enigma.translation.ProposingTranslator;
 import cuchaz.enigma.translation.Translator;
 import cuchaz.enigma.translation.mapping.*;
 import cuchaz.enigma.translation.mapping.tree.DeltaTrackingTree;
@@ -20,9 +20,7 @@ import cuchaz.enigma.translation.representation.entry.LocalVariableEntry;
 import cuchaz.enigma.translation.representation.entry.MethodEntry;
 import cuchaz.enigma.utils.I18n;
 
-import cuchaz.enigma.utils.Utils;
 import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.ClassNode;
 
 import java.io.*;
@@ -46,7 +44,7 @@ public class EnigmaProject {
         private EntryRemapper mapper;
 
         public EnigmaProject(Enigma enigma, ClassCache classCache, JarIndex jarIndex, byte[] jarChecksum) {
-                Preconditions.checkArgument(jarChecksum.length == EnigmaServer.CHECKSUM_SIZE);
+                Preconditions.checkArgument(jarChecksum.length == 20);
                 this.enigma = enigma;
                 this.classCache = classCache;
                 this.jarIndex = jarIndex;
@@ -105,6 +103,20 @@ public class EnigmaProject {
                 return droppedMappings.keySet();
         }
 
+        public Decompiler createDecompiler(DecompilerService decompilerService) {
+                return decompilerService.create(name -> {
+                        ClassNode node = this.getClassCache().getClassNode(name);
+
+                        if (node == null) {
+                                return null;
+                        }
+
+                        ClassNode fixedNode = new ClassNode();
+                        node.accept(new SourceFixVisitor(Enigma.ASM_VERSION, fixedNode, getJarIndex()));
+                        return fixedNode;
+                }, new SourceSettings(true, true));
+        }
+
         public boolean isRenamable(Entry<?> obfEntry) {
                 if (obfEntry instanceof MethodEntry) {
                         // HACKHACK: Object methods are not obfuscated identifiers
@@ -162,7 +174,7 @@ public class EnigmaProject {
                                         ClassNode node = classCache.getClassNode(entry.getFullName());
                                         if (node != null) {
                                                 ClassNode translatedNode = new ClassNode();
-                                                node.accept(new TranslationClassVisitor(deobfuscator, Utils.ASM_VERSION, new SourceFixVisitor(Utils.ASM_VERSION, translatedNode, jarIndex)));
+                                                node.accept(new TranslationClassVisitor(deobfuscator, Enigma.ASM_VERSION, new SourceFixVisitor(Enigma.ASM_VERSION, translatedNode, jarIndex)));
                                                 return translatedNode;
                                         }
 
diff --git a/src/main/java/cuchaz/enigma/EnigmaServices.java b/enigma/src/main/java/cuchaz/enigma/EnigmaServices.java
index df3b7bb..df3b7bb 100644
--- a/src/main/java/cuchaz/enigma/EnigmaServices.java
+++ b/enigma/src/main/java/cuchaz/enigma/EnigmaServices.java
diff --git a/src/main/java/cuchaz/enigma/ProgressListener.java b/enigma/src/main/java/cuchaz/enigma/ProgressListener.java
index 6da3b81..6da3b81 100644
--- a/src/main/java/cuchaz/enigma/ProgressListener.java
+++ b/enigma/src/main/java/cuchaz/enigma/ProgressListener.java
diff --git a/src/main/java/cuchaz/enigma/analysis/Access.java b/enigma/src/main/java/cuchaz/enigma/analysis/Access.java
index 82ca669..82ca669 100644
--- a/src/main/java/cuchaz/enigma/analysis/Access.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/Access.java
diff --git a/src/main/java/cuchaz/enigma/analysis/BuiltinPlugin.java b/enigma/src/main/java/cuchaz/enigma/analysis/BuiltinPlugin.java
index dc3f553..4685b39 100644
--- a/src/main/java/cuchaz/enigma/analysis/BuiltinPlugin.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/BuiltinPlugin.java
@@ -1,18 +1,17 @@
 package cuchaz.enigma.analysis;
 
+import cuchaz.enigma.Enigma;
 import cuchaz.enigma.api.EnigmaPlugin;
 import cuchaz.enigma.api.EnigmaPluginContext;
 import cuchaz.enigma.api.service.JarIndexerService;
 import cuchaz.enigma.api.service.NameProposalService;
 import cuchaz.enigma.source.DecompilerService;
 import cuchaz.enigma.source.Decompilers;
-import cuchaz.enigma.source.procyon.ProcyonDecompiler;
 import cuchaz.enigma.translation.representation.TypeDescriptor;
 import cuchaz.enigma.translation.representation.entry.ClassEntry;
 import cuchaz.enigma.translation.representation.entry.Entry;
 import cuchaz.enigma.translation.representation.entry.FieldEntry;
 import cuchaz.enigma.utils.Pair;
-import cuchaz.enigma.utils.Utils;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.FieldVisitor;
@@ -70,7 +69,7 @@ public final class BuiltinPlugin implements EnigmaPlugin {
                 private final List<MethodNode> classInits = new ArrayList<>();
 
                 EnumFieldNameFindingVisitor(Map<Entry<?>, String> mappings) {
-                        super(Utils.ASM_VERSION);
+                        super(Enigma.ASM_VERSION);
                         this.mappings = mappings;
                 }
 
diff --git a/src/main/java/cuchaz/enigma/analysis/ClassCache.java b/enigma/src/main/java/cuchaz/enigma/analysis/ClassCache.java
index f694bf3..a3d24e3 100644
--- a/src/main/java/cuchaz/enigma/analysis/ClassCache.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/ClassCache.java
@@ -4,13 +4,12 @@ import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.ImmutableSet;
 import cuchaz.enigma.ClassProvider;
+import cuchaz.enigma.Enigma;
 import cuchaz.enigma.ProgressListener;
 import cuchaz.enigma.analysis.index.JarIndex;
 import cuchaz.enigma.bytecode.translators.LocalVariableFixVisitor;
-import cuchaz.enigma.utils.Utils;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.ClassNode;
 
 import javax.annotation.Nullable;
@@ -78,7 +77,7 @@ public final class ClassCache implements AutoCloseable, ClassProvider {
 
                 ClassNode node = new ClassNode();
 
-                LocalVariableFixVisitor visitor = new LocalVariableFixVisitor(Utils.ASM_VERSION, node);
+                LocalVariableFixVisitor visitor = new LocalVariableFixVisitor(Enigma.ASM_VERSION, node);
                 reader.accept(visitor, 0);
 
                 return node;
diff --git a/src/main/java/cuchaz/enigma/analysis/ClassImplementationsTreeNode.java b/enigma/src/main/java/cuchaz/enigma/analysis/ClassImplementationsTreeNode.java
index 0fc44ca..0fc44ca 100644
--- a/src/main/java/cuchaz/enigma/analysis/ClassImplementationsTreeNode.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/ClassImplementationsTreeNode.java
diff --git a/src/main/java/cuchaz/enigma/analysis/ClassInheritanceTreeNode.java b/enigma/src/main/java/cuchaz/enigma/analysis/ClassInheritanceTreeNode.java
index 7904c5f..7904c5f 100644
--- a/src/main/java/cuchaz/enigma/analysis/ClassInheritanceTreeNode.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/ClassInheritanceTreeNode.java
diff --git a/src/main/java/cuchaz/enigma/analysis/ClassReferenceTreeNode.java b/enigma/src/main/java/cuchaz/enigma/analysis/ClassReferenceTreeNode.java
index 90d8a6c..90d8a6c 100644
--- a/src/main/java/cuchaz/enigma/analysis/ClassReferenceTreeNode.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/ClassReferenceTreeNode.java
diff --git a/src/main/java/cuchaz/enigma/analysis/EntryReference.java b/enigma/src/main/java/cuchaz/enigma/analysis/EntryReference.java
index 2e738c0..320f945 100644
--- a/src/main/java/cuchaz/enigma/analysis/EntryReference.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/EntryReference.java
@@ -19,10 +19,10 @@ import cuchaz.enigma.translation.mapping.EntryMap;
 import cuchaz.enigma.translation.representation.entry.ClassEntry;
 import cuchaz.enigma.translation.representation.entry.Entry;
 import cuchaz.enigma.translation.representation.entry.MethodEntry;
-import cuchaz.enigma.utils.Utils;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 public class EntryReference<E extends Entry<?>, C extends Entry<?>> implements Translatable {
 
@@ -89,7 +89,7 @@ public class EntryReference<E extends Entry<?>, C extends Entry<?>> implements T
         @Override
         public int hashCode() {
                 if (context != null) {
-                        return Utils.combineHashesOrdered(entry.hashCode(), context.hashCode());
+                        return Objects.hash(entry.hashCode(), context.hashCode());
                 }
                 return entry.hashCode();
         }
diff --git a/src/main/java/cuchaz/enigma/analysis/FieldReferenceTreeNode.java b/enigma/src/main/java/cuchaz/enigma/analysis/FieldReferenceTreeNode.java
index 4beab7f..4beab7f 100644
--- a/src/main/java/cuchaz/enigma/analysis/FieldReferenceTreeNode.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/FieldReferenceTreeNode.java
diff --git a/src/main/java/cuchaz/enigma/analysis/IndexSimpleVerifier.java b/enigma/src/main/java/cuchaz/enigma/analysis/IndexSimpleVerifier.java
index 80a7154..ec8f323 100644
--- a/src/main/java/cuchaz/enigma/analysis/IndexSimpleVerifier.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/IndexSimpleVerifier.java
@@ -1,11 +1,11 @@
 package cuchaz.enigma.analysis;
 
+import cuchaz.enigma.Enigma;
 import cuchaz.enigma.analysis.index.EntryIndex;
 import cuchaz.enigma.analysis.index.InheritanceIndex;
 import cuchaz.enigma.translation.representation.AccessFlags;
 import cuchaz.enigma.translation.representation.entry.ClassDefEntry;
 import cuchaz.enigma.translation.representation.entry.ClassEntry;
-import cuchaz.enigma.utils.Utils;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.analysis.BasicValue;
 import org.objectweb.asm.tree.analysis.SimpleVerifier;
@@ -18,7 +18,7 @@ public class IndexSimpleVerifier extends SimpleVerifier {
     private final InheritanceIndex inheritanceIndex;
 
     public IndexSimpleVerifier(EntryIndex entryIndex, InheritanceIndex inheritanceIndex) {
-        super(Utils.ASM_VERSION, null, null, null, false);
+        super(Enigma.ASM_VERSION, null, null, null, false);
         this.entryIndex = entryIndex;
         this.inheritanceIndex = inheritanceIndex;
     }
diff --git a/src/main/java/cuchaz/enigma/analysis/IndexTreeBuilder.java b/enigma/src/main/java/cuchaz/enigma/analysis/IndexTreeBuilder.java
index 0c2dfd7..0c2dfd7 100644
--- a/src/main/java/cuchaz/enigma/analysis/IndexTreeBuilder.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/IndexTreeBuilder.java
diff --git a/src/main/java/cuchaz/enigma/analysis/InterpreterPair.java b/enigma/src/main/java/cuchaz/enigma/analysis/InterpreterPair.java
index 8a1c238..fad10bf 100644
--- a/src/main/java/cuchaz/enigma/analysis/InterpreterPair.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/InterpreterPair.java
@@ -1,7 +1,6 @@
 package cuchaz.enigma.analysis;
 
-import cuchaz.enigma.utils.Utils;
-import org.objectweb.asm.Opcodes;
+import cuchaz.enigma.Enigma;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.analysis.AnalyzerException;
@@ -17,7 +16,7 @@ public class InterpreterPair<V extends Value, W extends Value> extends Interpret
     private final Interpreter<W> right;
 
     public InterpreterPair(Interpreter<V> left, Interpreter<W> right) {
-        super(Utils.ASM_VERSION);
+        super(Enigma.ASM_VERSION);
         this.left = left;
         this.right = right;
     }
diff --git a/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java b/enigma/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java
index b09f7ac..b09f7ac 100644
--- a/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java
diff --git a/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java b/enigma/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java
index e77b5cc..e77b5cc 100644
--- a/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java
diff --git a/src/main/java/cuchaz/enigma/analysis/MethodNodeWithAction.java b/enigma/src/main/java/cuchaz/enigma/analysis/MethodNodeWithAction.java
index 8117103..8117103 100644
--- a/src/main/java/cuchaz/enigma/analysis/MethodNodeWithAction.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/MethodNodeWithAction.java
diff --git a/src/main/java/cuchaz/enigma/analysis/MethodReferenceTreeNode.java b/enigma/src/main/java/cuchaz/enigma/analysis/MethodReferenceTreeNode.java
index 8995eb5..8995eb5 100644
--- a/src/main/java/cuchaz/enigma/analysis/MethodReferenceTreeNode.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/MethodReferenceTreeNode.java
diff --git a/src/main/java/cuchaz/enigma/analysis/ReferenceTargetType.java b/enigma/src/main/java/cuchaz/enigma/analysis/ReferenceTargetType.java
index 5b19d18..5b19d18 100644
--- a/src/main/java/cuchaz/enigma/analysis/ReferenceTargetType.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/ReferenceTargetType.java
diff --git a/src/main/java/cuchaz/enigma/analysis/ReferenceTreeNode.java b/enigma/src/main/java/cuchaz/enigma/analysis/ReferenceTreeNode.java
index c0a3a75..c0a3a75 100644
--- a/src/main/java/cuchaz/enigma/analysis/ReferenceTreeNode.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/ReferenceTreeNode.java
diff --git a/src/main/java/cuchaz/enigma/analysis/index/BridgeMethodIndex.java b/enigma/src/main/java/cuchaz/enigma/analysis/index/BridgeMethodIndex.java
index a4b1aac..a4b1aac 100644
--- a/src/main/java/cuchaz/enigma/analysis/index/BridgeMethodIndex.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/index/BridgeMethodIndex.java
diff --git a/src/main/java/cuchaz/enigma/analysis/index/EntryIndex.java b/enigma/src/main/java/cuchaz/enigma/analysis/index/EntryIndex.java
index 9a2726e..9a2726e 100644
--- a/src/main/java/cuchaz/enigma/analysis/index/EntryIndex.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/index/EntryIndex.java
diff --git a/src/main/java/cuchaz/enigma/analysis/index/IndexClassVisitor.java b/enigma/src/main/java/cuchaz/enigma/analysis/index/IndexClassVisitor.java
index f9cb23c..f9cb23c 100644
--- a/src/main/java/cuchaz/enigma/analysis/index/IndexClassVisitor.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/index/IndexClassVisitor.java
diff --git a/src/main/java/cuchaz/enigma/analysis/index/IndexReferenceVisitor.java b/enigma/src/main/java/cuchaz/enigma/analysis/index/IndexReferenceVisitor.java
index f3d419e..f3d419e 100644
--- a/src/main/java/cuchaz/enigma/analysis/index/IndexReferenceVisitor.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/index/IndexReferenceVisitor.java
diff --git a/src/main/java/cuchaz/enigma/analysis/index/InheritanceIndex.java b/enigma/src/main/java/cuchaz/enigma/analysis/index/InheritanceIndex.java
index 1ab2abd..1ab2abd 100644
--- a/src/main/java/cuchaz/enigma/analysis/index/InheritanceIndex.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/index/InheritanceIndex.java
diff --git a/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java b/enigma/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java
index e401c2f..de3f5f5 100644
--- a/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java
@@ -13,6 +13,7 @@ package cuchaz.enigma.analysis.index;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
+import cuchaz.enigma.Enigma;
 import cuchaz.enigma.ProgressListener;
 import cuchaz.enigma.analysis.ClassCache;
 import cuchaz.enigma.analysis.ReferenceTargetType;
@@ -22,9 +23,7 @@ import cuchaz.enigma.translation.representation.Lambda;
 import cuchaz.enigma.translation.representation.entry.*;
 import cuchaz.enigma.utils.I18n;
 
-import cuchaz.enigma.utils.Utils;
 import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.Opcodes;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -64,10 +63,10 @@ public class JarIndex implements JarIndexer {
                 progress.init(4, I18n.translate("progress.jar.indexing"));
 
                 progress.step(1, I18n.translate("progress.jar.indexing.entries"));
-                classCache.visit(() -> new IndexClassVisitor(this, Utils.ASM_VERSION), ClassReader.SKIP_CODE);
+                classCache.visit(() -> new IndexClassVisitor(this, Enigma.ASM_VERSION), ClassReader.SKIP_CODE);
 
                 progress.step(2, I18n.translate("progress.jar.indexing.references"));
-                classCache.visit(() -> new IndexReferenceVisitor(this, entryIndex, inheritanceIndex, Utils.ASM_VERSION), 0);
+                classCache.visit(() -> new IndexReferenceVisitor(this, entryIndex, inheritanceIndex, Enigma.ASM_VERSION), 0);
 
                 progress.step(3, I18n.translate("progress.jar.indexing.methods"));
                 bridgeMethodIndex.findBridgeMethods();
diff --git a/src/main/java/cuchaz/enigma/analysis/index/JarIndexer.java b/enigma/src/main/java/cuchaz/enigma/analysis/index/JarIndexer.java
index f17e7c9..f17e7c9 100644
--- a/src/main/java/cuchaz/enigma/analysis/index/JarIndexer.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/index/JarIndexer.java
diff --git a/src/main/java/cuchaz/enigma/analysis/index/PackageVisibilityIndex.java b/enigma/src/main/java/cuchaz/enigma/analysis/index/PackageVisibilityIndex.java
index 63eb730..64de5f3 100644
--- a/src/main/java/cuchaz/enigma/analysis/index/PackageVisibilityIndex.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/index/PackageVisibilityIndex.java
@@ -1,147 +1,147 @@
-package cuchaz.enigma.analysis.index;

-

-import com.google.common.collect.HashMultimap;

-import com.google.common.collect.Lists;

-import com.google.common.collect.Maps;

-import com.google.common.collect.Sets;

-import cuchaz.enigma.analysis.EntryReference;

-import cuchaz.enigma.analysis.ReferenceTargetType;

-import cuchaz.enigma.translation.representation.AccessFlags;

-import cuchaz.enigma.translation.representation.entry.*;

-

-import java.util.*;

-

-public class PackageVisibilityIndex implements JarIndexer {

-        private static boolean requiresSamePackage(AccessFlags entryAcc, EntryReference ref, InheritanceIndex inheritanceIndex) {

-                if (entryAcc.isPublic()) {

-                        return false;

-                }

-

-                if (entryAcc.isProtected()) {

-                        ClassEntry contextClass = ref.context.getContainingClass();

-                        ClassEntry referencedClass = ref.entry.getContainingClass();

-

-                        if (!inheritanceIndex.getAncestors(contextClass).contains(referencedClass)) {

-                                return true; // access to protected member not in superclass

-                        }

-

-                        if (ref.targetType.getKind() == ReferenceTargetType.Kind.NONE) {

-                                return false; // access to superclass or static superclass member

-                        }

-

-                        // access to instance member only valid if target's class assignable to context class

-                        return !(ref.targetType.getKind() == ReferenceTargetType.Kind.UNINITIALIZED ||

-                                        ((ReferenceTargetType.ClassType) ref.targetType).getEntry().equals(contextClass) ||

-                                        inheritanceIndex.getAncestors(((ReferenceTargetType.ClassType) ref.targetType).getEntry()).contains(contextClass));

-                }

-

-                return true;

-        }

-

-        private final HashMultimap<ClassEntry, ClassEntry> connections = HashMultimap.create();

-        private final List<Set<ClassEntry>> partitions = Lists.newArrayList();

-        private final Map<ClassEntry, Set<ClassEntry>> classPartitions = Maps.newHashMap();

-

-        private void addConnection(ClassEntry classA, ClassEntry classB) {

-                if (classA != classB) {

-                        connections.put(classA, classB);

-                        connections.put(classB, classA);

-                }

-        }

-

-        private void buildPartition(Set<ClassEntry> unassignedClasses, Set<ClassEntry> partition, ClassEntry member) {

-                for (ClassEntry connected : connections.get(member)) {

-                        if (unassignedClasses.remove(connected)) {

-                                partition.add(connected);

-                                buildPartition(unassignedClasses, partition, connected);

-                        }

-                }

-        }

-

-        private void addConnections(EntryIndex entryIndex, ReferenceIndex referenceIndex, InheritanceIndex inheritanceIndex) {

-                for (FieldEntry entry : entryIndex.getFields()) {

-                        AccessFlags entryAcc = entryIndex.getFieldAccess(entry);

-                        if (!entryAcc.isPublic() && !entryAcc.isPrivate()) {

-                                for (EntryReference<FieldEntry, MethodDefEntry> ref : referenceIndex.getReferencesToField(entry)) {

-                                        if (requiresSamePackage(entryAcc, ref, inheritanceIndex)) {

-                                                addConnection(ref.entry.getContainingClass(), ref.context.getContainingClass());

-                                        }

-                                }

-                        }

-                }

-

-                for (MethodEntry entry : entryIndex.getMethods()) {

-                        AccessFlags entryAcc = entryIndex.getMethodAccess(entry);

-                        if (!entryAcc.isPublic() && !entryAcc.isPrivate()) {

-                                for (EntryReference<MethodEntry, MethodDefEntry> ref : referenceIndex.getReferencesToMethod(entry)) {

-                                        if (requiresSamePackage(entryAcc, ref, inheritanceIndex)) {

-                                                addConnection(ref.entry.getContainingClass(), ref.context.getContainingClass());

-                                        }

-                                }

-                        }

-                }

-

-                for (ClassEntry entry : entryIndex.getClasses()) {

-                        AccessFlags entryAcc = entryIndex.getClassAccess(entry);

-                        if (!entryAcc.isPublic() && !entryAcc.isPrivate()) {

-                                for (EntryReference<ClassEntry, FieldDefEntry> ref : referenceIndex.getFieldTypeReferencesToClass(entry)) {

-                                        if (requiresSamePackage(entryAcc, ref, inheritanceIndex)) {

-                                                addConnection(ref.entry.getContainingClass(), ref.context.getContainingClass());

-                                        }

-                                }

-

-                                for (EntryReference<ClassEntry, MethodDefEntry> ref : referenceIndex.getMethodTypeReferencesToClass(entry)) {

-                                        if (requiresSamePackage(entryAcc, ref, inheritanceIndex)) {

-                                                addConnection(ref.entry.getContainingClass(), ref.context.getContainingClass());

-                                        }

-                                }

-                        }

-

-                        for (ClassEntry parent : inheritanceIndex.getParents(entry)) {

-                                AccessFlags parentAcc = entryIndex.getClassAccess(parent);

-                                if (parentAcc != null && !parentAcc.isPublic() && !parentAcc.isPrivate()) {

-                                        addConnection(entry, parent);

-                                }

-                        }

-

-                        ClassEntry outerClass = entry.getOuterClass();

-                        if (outerClass != null) {

-                                addConnection(entry, outerClass);

-                        }

-                }

-        }

-

-        private void addPartitions(EntryIndex entryIndex) {

-                Set<ClassEntry> unassignedClasses = Sets.newHashSet(entryIndex.getClasses());

-                while (!unassignedClasses.isEmpty()) {

-                        Iterator<ClassEntry> iterator = unassignedClasses.iterator();

-                        ClassEntry initialEntry = iterator.next();

-                        iterator.remove();

-

-                        HashSet<ClassEntry> partition = Sets.newHashSet();

-                        partition.add(initialEntry);

-                        buildPartition(unassignedClasses, partition, initialEntry);

-                        partitions.add(partition);

-                        for (ClassEntry entry : partition) {

-                                classPartitions.put(entry, partition);

-                        }

-                }

-        }

-

-        public Collection<Set<ClassEntry>> getPartitions() {

-                return partitions;

-        }

-

-        public Set<ClassEntry> getPartition(ClassEntry classEntry) {

-                return classPartitions.get(classEntry);

-        }

-

-        @Override

-        public void processIndex(JarIndex index) {

-                EntryIndex entryIndex = index.getEntryIndex();

-                ReferenceIndex referenceIndex = index.getReferenceIndex();

-                InheritanceIndex inheritanceIndex = index.getInheritanceIndex();

-                addConnections(entryIndex, referenceIndex, inheritanceIndex);

-                addPartitions(entryIndex);

-        }

-}

+package cuchaz.enigma.analysis.index;
+
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import cuchaz.enigma.analysis.EntryReference;
+import cuchaz.enigma.analysis.ReferenceTargetType;
+import cuchaz.enigma.translation.representation.AccessFlags;
+import cuchaz.enigma.translation.representation.entry.*;
+
+import java.util.*;
+
+public class PackageVisibilityIndex implements JarIndexer {
+        private static boolean requiresSamePackage(AccessFlags entryAcc, EntryReference ref, InheritanceIndex inheritanceIndex) {
+                if (entryAcc.isPublic()) {
+                        return false;
+                }
+
+                if (entryAcc.isProtected()) {
+                        ClassEntry contextClass = ref.context.getContainingClass();
+                        ClassEntry referencedClass = ref.entry.getContainingClass();
+
+                        if (!inheritanceIndex.getAncestors(contextClass).contains(referencedClass)) {
+                                return true; // access to protected member not in superclass
+                        }
+
+                        if (ref.targetType.getKind() == ReferenceTargetType.Kind.NONE) {
+                                return false; // access to superclass or static superclass member
+                        }
+
+                        // access to instance member only valid if target's class assignable to context class
+                        return !(ref.targetType.getKind() == ReferenceTargetType.Kind.UNINITIALIZED ||
+                                        ((ReferenceTargetType.ClassType) ref.targetType).getEntry().equals(contextClass) ||
+                                        inheritanceIndex.getAncestors(((ReferenceTargetType.ClassType) ref.targetType).getEntry()).contains(contextClass));
+                }
+
+                return true;
+        }
+
+        private final HashMultimap<ClassEntry, ClassEntry> connections = HashMultimap.create();
+        private final List<Set<ClassEntry>> partitions = Lists.newArrayList();
+        private final Map<ClassEntry, Set<ClassEntry>> classPartitions = Maps.newHashMap();
+
+        private void addConnection(ClassEntry classA, ClassEntry classB) {
+                if (classA != classB) {
+                        connections.put(classA, classB);
+                        connections.put(classB, classA);
+                }
+        }
+
+        private void buildPartition(Set<ClassEntry> unassignedClasses, Set<ClassEntry> partition, ClassEntry member) {
+                for (ClassEntry connected : connections.get(member)) {
+                        if (unassignedClasses.remove(connected)) {
+                                partition.add(connected);
+                                buildPartition(unassignedClasses, partition, connected);
+                        }
+                }
+        }
+
+        private void addConnections(EntryIndex entryIndex, ReferenceIndex referenceIndex, InheritanceIndex inheritanceIndex) {
+                for (FieldEntry entry : entryIndex.getFields()) {
+                        AccessFlags entryAcc = entryIndex.getFieldAccess(entry);
+                        if (!entryAcc.isPublic() && !entryAcc.isPrivate()) {
+                                for (EntryReference<FieldEntry, MethodDefEntry> ref : referenceIndex.getReferencesToField(entry)) {
+                                        if (requiresSamePackage(entryAcc, ref, inheritanceIndex)) {
+                                                addConnection(ref.entry.getContainingClass(), ref.context.getContainingClass());
+                                        }
+                                }
+                        }
+                }
+
+                for (MethodEntry entry : entryIndex.getMethods()) {
+                        AccessFlags entryAcc = entryIndex.getMethodAccess(entry);
+                        if (!entryAcc.isPublic() && !entryAcc.isPrivate()) {
+                                for (EntryReference<MethodEntry, MethodDefEntry> ref : referenceIndex.getReferencesToMethod(entry)) {
+                                        if (requiresSamePackage(entryAcc, ref, inheritanceIndex)) {
+                                                addConnection(ref.entry.getContainingClass(), ref.context.getContainingClass());
+                                        }
+                                }
+                        }
+                }
+
+                for (ClassEntry entry : entryIndex.getClasses()) {
+                        AccessFlags entryAcc = entryIndex.getClassAccess(entry);
+                        if (!entryAcc.isPublic() && !entryAcc.isPrivate()) {
+                                for (EntryReference<ClassEntry, FieldDefEntry> ref : referenceIndex.getFieldTypeReferencesToClass(entry)) {
+                                        if (requiresSamePackage(entryAcc, ref, inheritanceIndex)) {
+                                                addConnection(ref.entry.getContainingClass(), ref.context.getContainingClass());
+                                        }
+                                }
+
+                                for (EntryReference<ClassEntry, MethodDefEntry> ref : referenceIndex.getMethodTypeReferencesToClass(entry)) {
+                                        if (requiresSamePackage(entryAcc, ref, inheritanceIndex)) {
+                                                addConnection(ref.entry.getContainingClass(), ref.context.getContainingClass());
+                                        }
+                                }
+                        }
+
+                        for (ClassEntry parent : inheritanceIndex.getParents(entry)) {
+                                AccessFlags parentAcc = entryIndex.getClassAccess(parent);
+                                if (parentAcc != null && !parentAcc.isPublic() && !parentAcc.isPrivate()) {
+                                        addConnection(entry, parent);
+                                }
+                        }
+
+                        ClassEntry outerClass = entry.getOuterClass();
+                        if (outerClass != null) {
+                                addConnection(entry, outerClass);
+                        }
+                }
+        }
+
+        private void addPartitions(EntryIndex entryIndex) {
+                Set<ClassEntry> unassignedClasses = Sets.newHashSet(entryIndex.getClasses());
+                while (!unassignedClasses.isEmpty()) {
+                        Iterator<ClassEntry> iterator = unassignedClasses.iterator();
+                        ClassEntry initialEntry = iterator.next();
+                        iterator.remove();
+
+                        HashSet<ClassEntry> partition = Sets.newHashSet();
+                        partition.add(initialEntry);
+                        buildPartition(unassignedClasses, partition, initialEntry);
+                        partitions.add(partition);
+                        for (ClassEntry entry : partition) {
+                                classPartitions.put(entry, partition);
+                        }
+                }
+        }
+
+        public Collection<Set<ClassEntry>> getPartitions() {
+                return partitions;
+        }
+
+        public Set<ClassEntry> getPartition(ClassEntry classEntry) {
+                return classPartitions.get(classEntry);
+        }
+
+        @Override
+        public void processIndex(JarIndex index) {
+                EntryIndex entryIndex = index.getEntryIndex();
+                ReferenceIndex referenceIndex = index.getReferenceIndex();
+                InheritanceIndex inheritanceIndex = index.getInheritanceIndex();
+                addConnections(entryIndex, referenceIndex, inheritanceIndex);
+                addPartitions(entryIndex);
+        }
+}
diff --git a/src/main/java/cuchaz/enigma/analysis/index/ReferenceIndex.java b/enigma/src/main/java/cuchaz/enigma/analysis/index/ReferenceIndex.java
index b6797c2..b6797c2 100644
--- a/src/main/java/cuchaz/enigma/analysis/index/ReferenceIndex.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/index/ReferenceIndex.java
diff --git a/src/main/java/cuchaz/enigma/api/EnigmaPlugin.java b/enigma/src/main/java/cuchaz/enigma/api/EnigmaPlugin.java
index bdd6015..bdd6015 100644
--- a/src/main/java/cuchaz/enigma/api/EnigmaPlugin.java
+++ b/enigma/src/main/java/cuchaz/enigma/api/EnigmaPlugin.java
diff --git a/src/main/java/cuchaz/enigma/api/EnigmaPluginContext.java b/enigma/src/main/java/cuchaz/enigma/api/EnigmaPluginContext.java
index a59051a..a59051a 100644
--- a/src/main/java/cuchaz/enigma/api/EnigmaPluginContext.java
+++ b/enigma/src/main/java/cuchaz/enigma/api/EnigmaPluginContext.java
diff --git a/src/main/java/cuchaz/enigma/api/service/EnigmaService.java b/enigma/src/main/java/cuchaz/enigma/api/service/EnigmaService.java
index 526dda7..526dda7 100644
--- a/src/main/java/cuchaz/enigma/api/service/EnigmaService.java
+++ b/enigma/src/main/java/cuchaz/enigma/api/service/EnigmaService.java
diff --git a/src/main/java/cuchaz/enigma/api/service/EnigmaServiceContext.java b/enigma/src/main/java/cuchaz/enigma/api/service/EnigmaServiceContext.java
index 9e433fb..9e433fb 100644
--- a/src/main/java/cuchaz/enigma/api/service/EnigmaServiceContext.java
+++ b/enigma/src/main/java/cuchaz/enigma/api/service/EnigmaServiceContext.java
diff --git a/src/main/java/cuchaz/enigma/api/service/EnigmaServiceFactory.java b/enigma/src/main/java/cuchaz/enigma/api/service/EnigmaServiceFactory.java
index 7c10ac2..7c10ac2 100644
--- a/src/main/java/cuchaz/enigma/api/service/EnigmaServiceFactory.java
+++ b/enigma/src/main/java/cuchaz/enigma/api/service/EnigmaServiceFactory.java
diff --git a/src/main/java/cuchaz/enigma/api/service/EnigmaServiceType.java b/enigma/src/main/java/cuchaz/enigma/api/service/EnigmaServiceType.java
index 358828f..358828f 100644
--- a/src/main/java/cuchaz/enigma/api/service/EnigmaServiceType.java
+++ b/enigma/src/main/java/cuchaz/enigma/api/service/EnigmaServiceType.java
diff --git a/src/main/java/cuchaz/enigma/api/service/JarIndexerService.java b/enigma/src/main/java/cuchaz/enigma/api/service/JarIndexerService.java
index 0cda199..0cda199 100644
--- a/src/main/java/cuchaz/enigma/api/service/JarIndexerService.java
+++ b/enigma/src/main/java/cuchaz/enigma/api/service/JarIndexerService.java
diff --git a/src/main/java/cuchaz/enigma/api/service/NameProposalService.java b/enigma/src/main/java/cuchaz/enigma/api/service/NameProposalService.java
index 4c357db..4c357db 100644
--- a/src/main/java/cuchaz/enigma/api/service/NameProposalService.java
+++ b/enigma/src/main/java/cuchaz/enigma/api/service/NameProposalService.java
diff --git a/src/main/java/cuchaz/enigma/api/service/ObfuscationTestService.java b/enigma/src/main/java/cuchaz/enigma/api/service/ObfuscationTestService.java
index af0cf30..af0cf30 100644
--- a/src/main/java/cuchaz/enigma/api/service/ObfuscationTestService.java
+++ b/enigma/src/main/java/cuchaz/enigma/api/service/ObfuscationTestService.java
diff --git a/src/main/java/cuchaz/enigma/bytecode/translators/AsmObjectTranslator.java b/enigma/src/main/java/cuchaz/enigma/bytecode/translators/AsmObjectTranslator.java
index 1a2b47f..1a2b47f 100644
--- a/src/main/java/cuchaz/enigma/bytecode/translators/AsmObjectTranslator.java
+++ b/enigma/src/main/java/cuchaz/enigma/bytecode/translators/AsmObjectTranslator.java
diff --git a/src/main/java/cuchaz/enigma/bytecode/translators/LocalVariableFixVisitor.java b/enigma/src/main/java/cuchaz/enigma/bytecode/translators/LocalVariableFixVisitor.java
index cfd8fbe..cfd8fbe 100644
--- a/src/main/java/cuchaz/enigma/bytecode/translators/LocalVariableFixVisitor.java
+++ b/enigma/src/main/java/cuchaz/enigma/bytecode/translators/LocalVariableFixVisitor.java
diff --git a/src/main/java/cuchaz/enigma/bytecode/translators/SourceFixVisitor.java b/enigma/src/main/java/cuchaz/enigma/bytecode/translators/SourceFixVisitor.java
index 2b750ea..2b750ea 100644
--- a/src/main/java/cuchaz/enigma/bytecode/translators/SourceFixVisitor.java
+++ b/enigma/src/main/java/cuchaz/enigma/bytecode/translators/SourceFixVisitor.java
diff --git a/src/main/java/cuchaz/enigma/bytecode/translators/TranslationAnnotationVisitor.java b/enigma/src/main/java/cuchaz/enigma/bytecode/translators/TranslationAnnotationVisitor.java
index cb843ad..cb843ad 100644
--- a/src/main/java/cuchaz/enigma/bytecode/translators/TranslationAnnotationVisitor.java
+++ b/enigma/src/main/java/cuchaz/enigma/bytecode/translators/TranslationAnnotationVisitor.java
diff --git a/src/main/java/cuchaz/enigma/bytecode/translators/TranslationClassVisitor.java b/enigma/src/main/java/cuchaz/enigma/bytecode/translators/TranslationClassVisitor.java
index e4c41d3..e4c41d3 100644
--- a/src/main/java/cuchaz/enigma/bytecode/translators/TranslationClassVisitor.java
+++ b/enigma/src/main/java/cuchaz/enigma/bytecode/translators/TranslationClassVisitor.java
diff --git a/src/main/java/cuchaz/enigma/bytecode/translators/TranslationFieldVisitor.java b/enigma/src/main/java/cuchaz/enigma/bytecode/translators/TranslationFieldVisitor.java
index 28fc199..28fc199 100644
--- a/src/main/java/cuchaz/enigma/bytecode/translators/TranslationFieldVisitor.java
+++ b/enigma/src/main/java/cuchaz/enigma/bytecode/translators/TranslationFieldVisitor.java
diff --git a/src/main/java/cuchaz/enigma/bytecode/translators/TranslationMethodVisitor.java b/enigma/src/main/java/cuchaz/enigma/bytecode/translators/TranslationMethodVisitor.java
index a82df1b..a82df1b 100644
--- a/src/main/java/cuchaz/enigma/bytecode/translators/TranslationMethodVisitor.java
+++ b/enigma/src/main/java/cuchaz/enigma/bytecode/translators/TranslationMethodVisitor.java
diff --git a/src/main/java/cuchaz/enigma/bytecode/translators/TranslationSignatureVisitor.java b/enigma/src/main/java/cuchaz/enigma/bytecode/translators/TranslationSignatureVisitor.java
index eebd650..bc4a2f0 100644
--- a/src/main/java/cuchaz/enigma/bytecode/translators/TranslationSignatureVisitor.java
+++ b/enigma/src/main/java/cuchaz/enigma/bytecode/translators/TranslationSignatureVisitor.java
@@ -1,6 +1,6 @@
 package cuchaz.enigma.bytecode.translators;
 
-import cuchaz.enigma.utils.Utils;
+import cuchaz.enigma.Enigma;
 import org.objectweb.asm.signature.SignatureVisitor;
 
 import java.util.Stack;
@@ -13,7 +13,7 @@ public class TranslationSignatureVisitor extends SignatureVisitor {
         private final Stack<String> classStack = new Stack<>();
 
         public TranslationSignatureVisitor(Function<String, String> remapper, SignatureVisitor sv) {
-                super(Utils.ASM_VERSION);
+                super(Enigma.ASM_VERSION);
                 this.remapper = remapper;
                 this.sv = sv;
         }
diff --git a/src/main/java/cuchaz/enigma/source/Decompiler.java b/enigma/src/main/java/cuchaz/enigma/source/Decompiler.java
index c9666d5..c9666d5 100644
--- a/src/main/java/cuchaz/enigma/source/Decompiler.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/Decompiler.java
diff --git a/src/main/java/cuchaz/enigma/source/DecompilerService.java b/enigma/src/main/java/cuchaz/enigma/source/DecompilerService.java
index 377ccbc..377ccbc 100644
--- a/src/main/java/cuchaz/enigma/source/DecompilerService.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/DecompilerService.java
diff --git a/src/main/java/cuchaz/enigma/source/Decompilers.java b/enigma/src/main/java/cuchaz/enigma/source/Decompilers.java
index 7d154a6..7d154a6 100644
--- a/src/main/java/cuchaz/enigma/source/Decompilers.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/Decompilers.java
diff --git a/src/main/java/cuchaz/enigma/source/Source.java b/enigma/src/main/java/cuchaz/enigma/source/Source.java
index 43c4de0..43c4de0 100644
--- a/src/main/java/cuchaz/enigma/source/Source.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/Source.java
diff --git a/src/main/java/cuchaz/enigma/source/SourceIndex.java b/enigma/src/main/java/cuchaz/enigma/source/SourceIndex.java
index 6a335ec..178ce20 100644
--- a/src/main/java/cuchaz/enigma/source/SourceIndex.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/SourceIndex.java
@@ -5,8 +5,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import cuchaz.enigma.analysis.EntryReference;
-import cuchaz.enigma.analysis.Token;
-import cuchaz.enigma.gui.SourceRemapper;
 import cuchaz.enigma.translation.mapping.EntryResolver;
 import cuchaz.enigma.translation.mapping.ResolutionStrategy;
 import cuchaz.enigma.translation.representation.entry.Entry;
diff --git a/src/main/java/cuchaz/enigma/gui/SourceRemapper.java b/enigma/src/main/java/cuchaz/enigma/source/SourceRemapper.java
index f38f44e..b5f8006 100644
--- a/src/main/java/cuchaz/enigma/gui/SourceRemapper.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/SourceRemapper.java
@@ -1,6 +1,4 @@
-package cuchaz.enigma.gui;
-
-import cuchaz.enigma.analysis.Token;
+package cuchaz.enigma.source;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/cuchaz/enigma/source/SourceSettings.java b/enigma/src/main/java/cuchaz/enigma/source/SourceSettings.java
index f6c68e9..f6c68e9 100644
--- a/src/main/java/cuchaz/enigma/source/SourceSettings.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/SourceSettings.java
diff --git a/src/main/java/cuchaz/enigma/analysis/Token.java b/enigma/src/main/java/cuchaz/enigma/source/Token.java
index f0155e5..fad733f 100644
--- a/src/main/java/cuchaz/enigma/analysis/Token.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/Token.java
@@ -9,7 +9,7 @@
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma.analysis;
+package cuchaz.enigma.source;
 
 public class Token implements Comparable<Token> {
 
diff --git a/src/main/java/cuchaz/enigma/source/cfr/CfrDecompiler.java b/enigma/src/main/java/cuchaz/enigma/source/cfr/CfrDecompiler.java
index 9e37f16..9e37f16 100644
--- a/src/main/java/cuchaz/enigma/source/cfr/CfrDecompiler.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/cfr/CfrDecompiler.java
diff --git a/src/main/java/cuchaz/enigma/source/cfr/CfrSource.java b/enigma/src/main/java/cuchaz/enigma/source/cfr/CfrSource.java
index d4f2da6..d4f2da6 100644
--- a/src/main/java/cuchaz/enigma/source/cfr/CfrSource.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/cfr/CfrSource.java
diff --git a/src/main/java/cuchaz/enigma/source/cfr/EnigmaDumper.java b/enigma/src/main/java/cuchaz/enigma/source/cfr/EnigmaDumper.java
index 09e0a9b..e05a6ff 100644
--- a/src/main/java/cuchaz/enigma/source/cfr/EnigmaDumper.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/cfr/EnigmaDumper.java
@@ -1,6 +1,6 @@
 package cuchaz.enigma.source.cfr;
 
-import cuchaz.enigma.analysis.Token;
+import cuchaz.enigma.source.Token;
 import cuchaz.enigma.source.SourceIndex;
 import cuchaz.enigma.translation.representation.MethodDescriptor;
 import cuchaz.enigma.translation.representation.TypeDescriptor;
diff --git a/src/main/java/cuchaz/enigma/source/procyon/EntryParser.java b/enigma/src/main/java/cuchaz/enigma/source/procyon/EntryParser.java
index 2fae61a..2fae61a 100644
--- a/src/main/java/cuchaz/enigma/source/procyon/EntryParser.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/procyon/EntryParser.java
diff --git a/src/main/java/cuchaz/enigma/source/procyon/ProcyonDecompiler.java b/enigma/src/main/java/cuchaz/enigma/source/procyon/ProcyonDecompiler.java
index 37bc0c8..3cbd680 100644
--- a/src/main/java/cuchaz/enigma/source/procyon/ProcyonDecompiler.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/procyon/ProcyonDecompiler.java
@@ -12,7 +12,6 @@ import com.strobel.decompiler.languages.java.ast.AstBuilder;
 import com.strobel.decompiler.languages.java.ast.CompilationUnit;
 import com.strobel.decompiler.languages.java.ast.InsertParenthesesVisitor;
 import cuchaz.enigma.ClassProvider;
-import cuchaz.enigma.api.EnigmaPluginContext;
 import cuchaz.enigma.source.Source;
 import cuchaz.enigma.source.Decompiler;
 import cuchaz.enigma.source.SourceSettings;
@@ -20,7 +19,6 @@ import cuchaz.enigma.source.procyon.transformers.*;
 import cuchaz.enigma.source.procyon.typeloader.CompiledSourceTypeLoader;
 import cuchaz.enigma.source.procyon.typeloader.NoRetryMetadataSystem;
 import cuchaz.enigma.source.procyon.typeloader.SynchronizedTypeLoader;
-import cuchaz.enigma.utils.Utils;
 
 public class ProcyonDecompiler implements Decompiler {
         private final SourceSettings settings;
@@ -34,11 +32,11 @@ public class ProcyonDecompiler implements Decompiler {
                 metadataSystem.setEagerMethodLoadingEnabled(true);
 
                 decompilerSettings = DecompilerSettings.javaDefaults();
-                decompilerSettings.setMergeVariables(Utils.getSystemPropertyAsBoolean("enigma.mergeVariables", true));
-                decompilerSettings.setForceExplicitImports(Utils.getSystemPropertyAsBoolean("enigma.forceExplicitImports", true));
-                decompilerSettings.setForceExplicitTypeArguments(Utils.getSystemPropertyAsBoolean("enigma.forceExplicitTypeArguments", true));
-                decompilerSettings.setShowDebugLineNumbers(Utils.getSystemPropertyAsBoolean("enigma.showDebugLineNumbers", false));
-                decompilerSettings.setShowSyntheticMembers(Utils.getSystemPropertyAsBoolean("enigma.showSyntheticMembers", false));
+                decompilerSettings.setMergeVariables(getSystemPropertyAsBoolean("enigma.mergeVariables", true));
+                decompilerSettings.setForceExplicitImports(getSystemPropertyAsBoolean("enigma.forceExplicitImports", true));
+                decompilerSettings.setForceExplicitTypeArguments(getSystemPropertyAsBoolean("enigma.forceExplicitTypeArguments", true));
+                decompilerSettings.setShowDebugLineNumbers(getSystemPropertyAsBoolean("enigma.showDebugLineNumbers", false));
+                decompilerSettings.setShowSyntheticMembers(getSystemPropertyAsBoolean("enigma.showSyntheticMembers", false));
                 decompilerSettings.setTypeLoader(typeLoader);
 
                 JavaFormattingOptions formattingOptions = decompilerSettings.getJavaFormattingOptions();
@@ -78,4 +76,9 @@ public class ProcyonDecompiler implements Decompiler {
 
                 return new ProcyonSource(source, decompilerSettings);
         }
+
+        private static boolean getSystemPropertyAsBoolean(String property, boolean defValue) {
+                String value = System.getProperty(property);
+                return value == null ? defValue : Boolean.parseBoolean(value);
+        }
 }
diff --git a/src/main/java/cuchaz/enigma/source/procyon/ProcyonSource.java b/enigma/src/main/java/cuchaz/enigma/source/procyon/ProcyonSource.java
index 53c8c70..53c8c70 100644
--- a/src/main/java/cuchaz/enigma/source/procyon/ProcyonSource.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/procyon/ProcyonSource.java
diff --git a/src/main/java/cuchaz/enigma/source/procyon/index/SourceIndexClassVisitor.java b/enigma/src/main/java/cuchaz/enigma/source/procyon/index/SourceIndexClassVisitor.java
index f6eeb15..f6eeb15 100644
--- a/src/main/java/cuchaz/enigma/source/procyon/index/SourceIndexClassVisitor.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/procyon/index/SourceIndexClassVisitor.java
diff --git a/src/main/java/cuchaz/enigma/source/procyon/index/SourceIndexMethodVisitor.java b/enigma/src/main/java/cuchaz/enigma/source/procyon/index/SourceIndexMethodVisitor.java
index 0e8bc51..0e8bc51 100644
--- a/src/main/java/cuchaz/enigma/source/procyon/index/SourceIndexMethodVisitor.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/procyon/index/SourceIndexMethodVisitor.java
diff --git a/src/main/java/cuchaz/enigma/source/procyon/index/SourceIndexVisitor.java b/enigma/src/main/java/cuchaz/enigma/source/procyon/index/SourceIndexVisitor.java
index dad505f..dad505f 100644
--- a/src/main/java/cuchaz/enigma/source/procyon/index/SourceIndexVisitor.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/procyon/index/SourceIndexVisitor.java
diff --git a/src/main/java/cuchaz/enigma/source/procyon/index/TokenFactory.java b/enigma/src/main/java/cuchaz/enigma/source/procyon/index/TokenFactory.java
index 62e7c10..dc36865 100644
--- a/src/main/java/cuchaz/enigma/source/procyon/index/TokenFactory.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/procyon/index/TokenFactory.java
@@ -5,7 +5,7 @@ import com.strobel.decompiler.languages.java.ast.AstNode;
 import com.strobel.decompiler.languages.java.ast.ConstructorDeclaration;
 import com.strobel.decompiler.languages.java.ast.Identifier;
 import com.strobel.decompiler.languages.java.ast.TypeDeclaration;
-import cuchaz.enigma.analysis.Token;
+import cuchaz.enigma.source.Token;
 import cuchaz.enigma.source.SourceIndex;
 
 import java.util.regex.Pattern;
diff --git a/src/main/java/cuchaz/enigma/source/procyon/transformers/AddJavadocsAstTransform.java b/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/AddJavadocsAstTransform.java
index 70fc8c6..70fc8c6 100644
--- a/src/main/java/cuchaz/enigma/source/procyon/transformers/AddJavadocsAstTransform.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/AddJavadocsAstTransform.java
diff --git a/src/main/java/cuchaz/enigma/source/procyon/transformers/DropImportAstTransform.java b/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/DropImportAstTransform.java
index 39e599d..39e599d 100644
--- a/src/main/java/cuchaz/enigma/source/procyon/transformers/DropImportAstTransform.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/DropImportAstTransform.java
diff --git a/src/main/java/cuchaz/enigma/source/procyon/transformers/DropVarModifiersAstTransform.java b/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/DropVarModifiersAstTransform.java
index b8c087b..b8c087b 100644
--- a/src/main/java/cuchaz/enigma/source/procyon/transformers/DropVarModifiersAstTransform.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/DropVarModifiersAstTransform.java
diff --git a/src/main/java/cuchaz/enigma/source/procyon/transformers/InvalidIdentifierFix.java b/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/InvalidIdentifierFix.java
index 34d95fa..34d95fa 100644
--- a/src/main/java/cuchaz/enigma/source/procyon/transformers/InvalidIdentifierFix.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/InvalidIdentifierFix.java
diff --git a/src/main/java/cuchaz/enigma/source/procyon/transformers/Java8Generics.java b/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/Java8Generics.java
index 8accfc7..8accfc7 100644
--- a/src/main/java/cuchaz/enigma/source/procyon/transformers/Java8Generics.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/Java8Generics.java
diff --git a/src/main/java/cuchaz/enigma/source/procyon/transformers/ObfuscatedEnumSwitchRewriterTransform.java b/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/ObfuscatedEnumSwitchRewriterTransform.java
index 32bb72f..32bb72f 100644
--- a/src/main/java/cuchaz/enigma/source/procyon/transformers/ObfuscatedEnumSwitchRewriterTransform.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/ObfuscatedEnumSwitchRewriterTransform.java
diff --git a/src/main/java/cuchaz/enigma/source/procyon/transformers/RemoveObjectCasts.java b/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/RemoveObjectCasts.java
index cf0376f..cf0376f 100644
--- a/src/main/java/cuchaz/enigma/source/procyon/transformers/RemoveObjectCasts.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/RemoveObjectCasts.java
diff --git a/src/main/java/cuchaz/enigma/source/procyon/transformers/VarargsFixer.java b/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/VarargsFixer.java
index d3ddaab..d3ddaab 100644
--- a/src/main/java/cuchaz/enigma/source/procyon/transformers/VarargsFixer.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/VarargsFixer.java
diff --git a/src/main/java/cuchaz/enigma/source/procyon/typeloader/CachingClasspathTypeLoader.java b/enigma/src/main/java/cuchaz/enigma/source/procyon/typeloader/CachingClasspathTypeLoader.java
index e702956..e702956 100644
--- a/src/main/java/cuchaz/enigma/source/procyon/typeloader/CachingClasspathTypeLoader.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/procyon/typeloader/CachingClasspathTypeLoader.java
diff --git a/src/main/java/cuchaz/enigma/source/procyon/typeloader/CachingTypeLoader.java b/enigma/src/main/java/cuchaz/enigma/source/procyon/typeloader/CachingTypeLoader.java
index 5be5ddd..5be5ddd 100644
--- a/src/main/java/cuchaz/enigma/source/procyon/typeloader/CachingTypeLoader.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/procyon/typeloader/CachingTypeLoader.java
diff --git a/src/main/java/cuchaz/enigma/source/procyon/typeloader/CompiledSourceTypeLoader.java b/enigma/src/main/java/cuchaz/enigma/source/procyon/typeloader/CompiledSourceTypeLoader.java
index e703d3b..e703d3b 100644
--- a/src/main/java/cuchaz/enigma/source/procyon/typeloader/CompiledSourceTypeLoader.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/procyon/typeloader/CompiledSourceTypeLoader.java
diff --git a/src/main/java/cuchaz/enigma/source/procyon/typeloader/NoRetryMetadataSystem.java b/enigma/src/main/java/cuchaz/enigma/source/procyon/typeloader/NoRetryMetadataSystem.java
index c4732b0..c4732b0 100644
--- a/src/main/java/cuchaz/enigma/source/procyon/typeloader/NoRetryMetadataSystem.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/procyon/typeloader/NoRetryMetadataSystem.java
diff --git a/src/main/java/cuchaz/enigma/source/procyon/typeloader/SynchronizedTypeLoader.java b/enigma/src/main/java/cuchaz/enigma/source/procyon/typeloader/SynchronizedTypeLoader.java
index 86c6ecc..86c6ecc 100644
--- a/src/main/java/cuchaz/enigma/source/procyon/typeloader/SynchronizedTypeLoader.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/procyon/typeloader/SynchronizedTypeLoader.java
diff --git a/src/main/java/cuchaz/enigma/translation/LocalNameGenerator.java b/enigma/src/main/java/cuchaz/enigma/translation/LocalNameGenerator.java
index 18c966c..18c966c 100644
--- a/src/main/java/cuchaz/enigma/translation/LocalNameGenerator.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/LocalNameGenerator.java
diff --git a/src/main/java/cuchaz/enigma/translation/MappingTranslator.java b/enigma/src/main/java/cuchaz/enigma/translation/MappingTranslator.java
index 529d0ed..529d0ed 100644
--- a/src/main/java/cuchaz/enigma/translation/MappingTranslator.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/MappingTranslator.java
diff --git a/src/main/java/cuchaz/enigma/ProposingTranslator.java b/enigma/src/main/java/cuchaz/enigma/translation/ProposingTranslator.java
index 018fbfd..97866e9 100644
--- a/src/main/java/cuchaz/enigma/ProposingTranslator.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/ProposingTranslator.java
@@ -1,8 +1,6 @@
-package cuchaz.enigma;
+package cuchaz.enigma.translation;
 
 import cuchaz.enigma.api.service.NameProposalService;
-import cuchaz.enigma.translation.Translatable;
-import cuchaz.enigma.translation.Translator;
 import cuchaz.enigma.translation.mapping.EntryRemapper;
 import cuchaz.enigma.translation.mapping.ResolutionStrategy;
 import cuchaz.enigma.translation.representation.entry.Entry;
diff --git a/src/main/java/cuchaz/enigma/translation/SignatureUpdater.java b/enigma/src/main/java/cuchaz/enigma/translation/SignatureUpdater.java
index 3783053..3783053 100644
--- a/src/main/java/cuchaz/enigma/translation/SignatureUpdater.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/SignatureUpdater.java
diff --git a/src/main/java/cuchaz/enigma/translation/Translatable.java b/enigma/src/main/java/cuchaz/enigma/translation/Translatable.java
index 0370ef1..0370ef1 100644
--- a/src/main/java/cuchaz/enigma/translation/Translatable.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/Translatable.java
diff --git a/src/main/java/cuchaz/enigma/translation/TranslationDirection.java b/enigma/src/main/java/cuchaz/enigma/translation/TranslationDirection.java
index 2ecb30b..2ecb30b 100644
--- a/src/main/java/cuchaz/enigma/translation/TranslationDirection.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/TranslationDirection.java
diff --git a/src/main/java/cuchaz/enigma/translation/Translator.java b/enigma/src/main/java/cuchaz/enigma/translation/Translator.java
index c70141f..c70141f 100644
--- a/src/main/java/cuchaz/enigma/translation/Translator.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/Translator.java
diff --git a/src/main/java/cuchaz/enigma/translation/VoidTranslator.java b/enigma/src/main/java/cuchaz/enigma/translation/VoidTranslator.java
index c010833..c010833 100644
--- a/src/main/java/cuchaz/enigma/translation/VoidTranslator.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/VoidTranslator.java
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/AccessModifier.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/AccessModifier.java
index 5b79b79..5b79b79 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/AccessModifier.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/AccessModifier.java
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/EntryMap.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/EntryMap.java
index e1a3253..e1a3253 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/EntryMap.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/EntryMap.java
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/EntryMapping.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/EntryMapping.java
index c607817..c607817 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/EntryMapping.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/EntryMapping.java
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/EntryRemapper.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/EntryRemapper.java
index ad36c97..1dd7eac 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/EntryRemapper.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/EntryRemapper.java
@@ -11,7 +11,6 @@ import cuchaz.enigma.translation.representation.entry.Entry;
 
 import javax.annotation.Nullable;
 import java.util.Collection;
-import java.util.function.UnaryOperator;
 import java.util.stream.Stream;
 
 public class EntryRemapper {
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/EntryResolver.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/EntryResolver.java
index 521f72d..521f72d 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/EntryResolver.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/EntryResolver.java
diff --git a/src/main/java/cuchaz/enigma/throwables/IllegalNameException.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/IllegalNameException.java
index 0155ad2..a7f83cd 100644
--- a/src/main/java/cuchaz/enigma/throwables/IllegalNameException.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/IllegalNameException.java
@@ -9,7 +9,7 @@
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma.throwables;
+package cuchaz.enigma.translation.mapping;
 
 public class IllegalNameException extends RuntimeException {
 
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/IndexEntryResolver.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/IndexEntryResolver.java
index 78231dd..78231dd 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/IndexEntryResolver.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/IndexEntryResolver.java
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/MappingDelta.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/MappingDelta.java
index 1407bb6..1407bb6 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/MappingDelta.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/MappingDelta.java
diff --git a/enigma/src/main/java/cuchaz/enigma/translation/mapping/MappingOperations.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/MappingOperations.java
new file mode 100644
index 0000000..2c03748
--- /dev/null
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/MappingOperations.java
@@ -0,0 +1,71 @@
+package cuchaz.enigma.translation.mapping;
+
+import cuchaz.enigma.translation.mapping.tree.EntryTree;
+import cuchaz.enigma.translation.mapping.tree.EntryTreeNode;
+import cuchaz.enigma.translation.mapping.tree.HashEntryTree;
+import cuchaz.enigma.translation.MappingTranslator;
+import cuchaz.enigma.translation.Translator;
+import cuchaz.enigma.translation.representation.entry.ClassEntry;
+import cuchaz.enigma.translation.representation.entry.Entry;
+import cuchaz.enigma.translation.representation.entry.FieldEntry;
+import cuchaz.enigma.translation.representation.entry.MethodEntry;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class MappingOperations {
+    public static EntryTree<EntryMapping> invert(EntryTree<EntryMapping> mappings) {
+        Translator translator = new MappingTranslator(mappings, VoidEntryResolver.INSTANCE);
+        EntryTree<EntryMapping> result = new HashEntryTree<>();
+
+        for (EntryTreeNode<EntryMapping> node : mappings) {
+            Entry<?> leftEntry = node.getEntry();
+            EntryMapping leftMapping = node.getValue();
+
+            if (!(leftEntry instanceof ClassEntry || leftEntry instanceof MethodEntry || leftEntry instanceof FieldEntry)) {
+                result.insert(translator.translate(leftEntry), leftMapping);
+                continue;
+            }
+
+            Entry<?> rightEntry = translator.translate(leftEntry);
+
+            result.insert(rightEntry, leftMapping == null ? null : leftMapping.withName(leftEntry.getName()));
+        }
+
+        return result;
+    }
+
+    public static EntryTree<EntryMapping> compose(EntryTree<EntryMapping> left, EntryTree<EntryMapping> right, boolean keepLeftOnly, boolean keepRightOnly) {
+        Translator leftTranslator = new MappingTranslator(left, VoidEntryResolver.INSTANCE);
+        EntryTree<EntryMapping> result = new HashEntryTree<>();
+        Set<Entry<?>> addedMappings = new HashSet<>();
+
+        for (EntryTreeNode<EntryMapping> node : left) {
+            Entry<?> leftEntry = node.getEntry();
+            EntryMapping leftMapping = node.getValue();
+
+            Entry<?> rightEntry = leftTranslator.translate(leftEntry);
+
+            EntryMapping rightMapping = right.get(rightEntry);
+            if (rightMapping != null) {
+                result.insert(leftEntry, rightMapping);
+                addedMappings.add(rightEntry);
+            } else if (keepLeftOnly) {
+                result.insert(leftEntry, leftMapping);
+            }
+        }
+
+        if (keepRightOnly) {
+            Translator leftInverseTranslator = new MappingTranslator(invert(left), VoidEntryResolver.INSTANCE);
+            for (EntryTreeNode<EntryMapping> node : right) {
+                Entry<?> rightEntry = node.getEntry();
+                EntryMapping rightMapping = node.getValue();
+
+                if (!addedMappings.contains(rightEntry)) {
+                    result.insert(leftInverseTranslator.translate(rightEntry), rightMapping);
+                }
+            }
+        }
+        return result;
+    }
+}
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/MappingPair.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/MappingPair.java
index 5d39e3d..5d39e3d 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/MappingPair.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/MappingPair.java
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/MappingValidator.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/MappingValidator.java
index dffcb0c..ae615da 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/MappingValidator.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/MappingValidator.java
@@ -2,7 +2,6 @@ package cuchaz.enigma.translation.mapping;
 
 import cuchaz.enigma.analysis.index.InheritanceIndex;
 import cuchaz.enigma.analysis.index.JarIndex;
-import cuchaz.enigma.throwables.IllegalNameException;
 import cuchaz.enigma.translation.Translator;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.translation.representation.entry.ClassEntry;
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/MappingsChecker.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/MappingsChecker.java
index 5d9794f..5d9794f 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/MappingsChecker.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/MappingsChecker.java
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/NameValidator.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/NameValidator.java
index 5bc2f67..74ba633 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/NameValidator.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/NameValidator.java
@@ -11,9 +11,6 @@
 
 package cuchaz.enigma.translation.mapping;
 
-import cuchaz.enigma.throwables.IllegalNameException;
-import cuchaz.enigma.translation.representation.entry.ClassEntry;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Pattern;
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/ResolutionStrategy.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/ResolutionStrategy.java
index 1c28e02..1c28e02 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/ResolutionStrategy.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/ResolutionStrategy.java
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/VoidEntryResolver.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/VoidEntryResolver.java
index 2eab55f..2eab55f 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/VoidEntryResolver.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/VoidEntryResolver.java
diff --git a/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/LfPrintWriter.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/LfPrintWriter.java
new file mode 100644
index 0000000..441949c
--- /dev/null
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/LfPrintWriter.java
@@ -0,0 +1,16 @@
+package cuchaz.enigma.translation.mapping.serde;
+
+import java.io.PrintWriter;
+import java.io.Writer;
+
+public class LfPrintWriter extends PrintWriter {
+    public LfPrintWriter(Writer out) {
+        super(out);
+    }
+
+    @Override
+    public void println() {
+        // https://stackoverflow.com/a/14749004
+        write('\n');
+    }
+}
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/MappingFileNameFormat.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFileNameFormat.java
index e40bfe7..9bc013c 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/MappingFileNameFormat.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFileNameFormat.java
@@ -1,4 +1,4 @@
-package cuchaz.enigma.translation.mapping;
+package cuchaz.enigma.translation.mapping.serde;
 
 import com.google.gson.annotations.SerializedName;
 
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java
index 6c8c343..ca275eb 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java
@@ -1,10 +1,16 @@
 package cuchaz.enigma.translation.mapping.serde;
 
 import cuchaz.enigma.ProgressListener;
-import cuchaz.enigma.throwables.MappingParseException;
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.mapping.MappingDelta;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.enigma.EnigmaMappingsReader;
+import cuchaz.enigma.translation.mapping.serde.enigma.EnigmaMappingsWriter;
+import cuchaz.enigma.translation.mapping.serde.proguard.ProguardMappingsReader;
+import cuchaz.enigma.translation.mapping.serde.srg.SrgMappingsWriter;
+import cuchaz.enigma.translation.mapping.serde.tiny.TinyMappingsReader;
+import cuchaz.enigma.translation.mapping.serde.tiny.TinyMappingsWriter;
+import cuchaz.enigma.translation.mapping.serde.tinyv2.TinyV2Reader;
+import cuchaz.enigma.translation.mapping.serde.tinyv2.TinyV2Writer;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 
 import javax.annotation.Nullable;
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingHelper.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingHelper.java
index 7c8f6cc..7c8f6cc 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingHelper.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingHelper.java
diff --git a/src/main/java/cuchaz/enigma/throwables/MappingParseException.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingParseException.java
index b7e6d42..9d04b97 100644
--- a/src/main/java/cuchaz/enigma/throwables/MappingParseException.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingParseException.java
@@ -9,7 +9,7 @@
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma.throwables;
+package cuchaz.enigma.translation.mapping.serde;
 
 import java.io.File;
 import java.util.function.Supplier;
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/MappingSaveParameters.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingSaveParameters.java
index 07065d6..e78fd95 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/MappingSaveParameters.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingSaveParameters.java
@@ -1,4 +1,4 @@
-package cuchaz.enigma.translation.mapping;
+package cuchaz.enigma.translation.mapping.serde;
 
 import com.google.gson.annotations.SerializedName;
 
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingsReader.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingsReader.java
index 4c60787..2f01375 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingsReader.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingsReader.java
@@ -1,9 +1,7 @@
 package cuchaz.enigma.translation.mapping.serde;
 
 import cuchaz.enigma.ProgressListener;
-import cuchaz.enigma.throwables.MappingParseException;
 import cuchaz.enigma.translation.mapping.EntryMapping;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 
 import java.io.IOException;
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingsWriter.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingsWriter.java
index 8815986..68a8dbb 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingsWriter.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingsWriter.java
@@ -3,7 +3,6 @@ package cuchaz.enigma.translation.mapping.serde;
 import cuchaz.enigma.ProgressListener;
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.mapping.MappingDelta;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 
 import java.nio.file.Path;
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/RawEntryMapping.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/RawEntryMapping.java
index afb40e9..79587a0 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/serde/RawEntryMapping.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/RawEntryMapping.java
@@ -6,25 +6,25 @@ import cuchaz.enigma.translation.mapping.EntryMapping;
 import java.util.ArrayList;
 import java.util.List;
 
-final class RawEntryMapping {
+public final class RawEntryMapping {
         private final String targetName;
         private final AccessModifier access;
         private List<String> javadocs = new ArrayList<>();
 
-        RawEntryMapping(String targetName) {
+        public RawEntryMapping(String targetName) {
                 this(targetName, null);
         }
 
-        RawEntryMapping(String targetName, AccessModifier access) {
+        public RawEntryMapping(String targetName, AccessModifier access) {
                 this.access = access;
                 this.targetName = targetName;
         }
 
-        void addJavadocLine(String line) {
+        public void addJavadocLine(String line) {
                 javadocs.add(line);
         }
 
-        EntryMapping bake() {
+        public EntryMapping bake() {
                 return new EntryMapping(targetName, access, javadocs.isEmpty() ? null : String.join("\n", javadocs));
         }
 }
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/EnigmaFormat.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/enigma/EnigmaFormat.java
index af92ffb..210d328 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/serde/EnigmaFormat.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/enigma/EnigmaFormat.java
@@ -1,4 +1,4 @@
-package cuchaz.enigma.translation.mapping.serde;
+package cuchaz.enigma.translation.mapping.serde.enigma;
 
 public class EnigmaFormat {
         public static final String COMMENT = "COMMENT";
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/EnigmaMappingsReader.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/enigma/EnigmaMappingsReader.java
index 53bbaa3..30de85f 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/serde/EnigmaMappingsReader.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/enigma/EnigmaMappingsReader.java
@@ -1,12 +1,15 @@
-package cuchaz.enigma.translation.mapping.serde;
+package cuchaz.enigma.translation.mapping.serde.enigma;
 
 import com.google.common.base.Charsets;
 import cuchaz.enigma.ProgressListener;
-import cuchaz.enigma.throwables.MappingParseException;
+import cuchaz.enigma.translation.mapping.serde.MappingParseException;
 import cuchaz.enigma.translation.mapping.AccessModifier;
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.mapping.MappingPair;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.MappingHelper;
+import cuchaz.enigma.translation.mapping.serde.MappingsReader;
+import cuchaz.enigma.translation.mapping.serde.RawEntryMapping;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.translation.mapping.tree.HashEntryTree;
 import cuchaz.enigma.translation.representation.MethodDescriptor;
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/EnigmaMappingsWriter.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/enigma/EnigmaMappingsWriter.java
index be0fceb..7570d4b 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/serde/EnigmaMappingsWriter.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/enigma/EnigmaMappingsWriter.java
@@ -9,7 +9,7 @@
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma.translation.mapping.serde;
+package cuchaz.enigma.translation.mapping.serde.enigma;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -35,9 +35,12 @@ import cuchaz.enigma.translation.Translator;
 import cuchaz.enigma.translation.mapping.AccessModifier;
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.mapping.MappingDelta;
-import cuchaz.enigma.translation.mapping.MappingFileNameFormat;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.MappingFileNameFormat;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
 import cuchaz.enigma.translation.mapping.VoidEntryResolver;
+import cuchaz.enigma.translation.mapping.serde.LfPrintWriter;
+import cuchaz.enigma.translation.mapping.serde.MappingHelper;
+import cuchaz.enigma.translation.mapping.serde.MappingsWriter;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.translation.mapping.tree.EntryTreeNode;
 import cuchaz.enigma.translation.representation.entry.ClassEntry;
@@ -46,7 +49,6 @@ import cuchaz.enigma.translation.representation.entry.FieldEntry;
 import cuchaz.enigma.translation.representation.entry.LocalVariableEntry;
 import cuchaz.enigma.translation.representation.entry.MethodEntry;
 import cuchaz.enigma.utils.I18n;
-import cuchaz.enigma.utils.LFPrintWriter;
 
 public enum EnigmaMappingsWriter implements MappingsWriter {
         FILE {
@@ -60,7 +62,7 @@ public enum EnigmaMappingsWriter implements MappingsWriter {
                         progress.init(classes.size(), I18n.translate("progress.mappings.enigma_file.writing"));
 
                         int steps = 0;
-                        try (PrintWriter writer = new LFPrintWriter(Files.newBufferedWriter(path))) {
+                        try (PrintWriter writer = new LfPrintWriter(Files.newBufferedWriter(path))) {
                                 for (ClassEntry classEntry : classes) {
                                         progress.step(steps++, classEntry.getFullName());
                                         writeRoot(writer, mappings, classEntry);
@@ -98,7 +100,7 @@ public enum EnigmaMappingsWriter implements MappingsWriter {
                                         Files.createDirectories(classPath.getParent());
                                         Files.deleteIfExists(classPath);
 
-                                        try (PrintWriter writer = new LFPrintWriter(Files.newBufferedWriter(classPath))) {
+                                        try (PrintWriter writer = new LfPrintWriter(Files.newBufferedWriter(classPath))) {
                                                 writeRoot(writer, mappings, classEntry);
                                         }
                                 } catch (Throwable t) {
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/ProguardMappingsReader.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/proguard/ProguardMappingsReader.java
index b5ede39..034fb41 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/serde/ProguardMappingsReader.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/proguard/ProguardMappingsReader.java
@@ -1,10 +1,11 @@
-package cuchaz.enigma.translation.mapping.serde;
+package cuchaz.enigma.translation.mapping.serde.proguard;
 
 import cuchaz.enigma.ProgressListener;
-import cuchaz.enigma.command.MappingCommandsUtil;
-import cuchaz.enigma.throwables.MappingParseException;
+import cuchaz.enigma.translation.mapping.MappingOperations;
+import cuchaz.enigma.translation.mapping.serde.MappingParseException;
 import cuchaz.enigma.translation.mapping.EntryMapping;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.MappingsReader;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.translation.mapping.tree.HashEntryTree;
 import cuchaz.enigma.translation.representation.MethodDescriptor;
@@ -79,7 +80,7 @@ public class ProguardMappingsReader implements MappingsReader {
             }
         }
 
-        return MappingCommandsUtil.invert(mappings);
+        return MappingOperations.invert(mappings);
     }
 
     private String getDescriptor(String type) {
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/SrgMappingsWriter.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/srg/SrgMappingsWriter.java
index f67f8fc..9c9f103 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/serde/SrgMappingsWriter.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/srg/SrgMappingsWriter.java
@@ -1,4 +1,4 @@
-package cuchaz.enigma.translation.mapping.serde;
+package cuchaz.enigma.translation.mapping.serde.srg;
 
 import com.google.common.collect.Lists;
 import cuchaz.enigma.ProgressListener;
@@ -6,8 +6,10 @@ import cuchaz.enigma.translation.MappingTranslator;
 import cuchaz.enigma.translation.Translator;
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.mapping.MappingDelta;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
 import cuchaz.enigma.translation.mapping.VoidEntryResolver;
+import cuchaz.enigma.translation.mapping.serde.LfPrintWriter;
+import cuchaz.enigma.translation.mapping.serde.MappingsWriter;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.translation.mapping.tree.EntryTreeNode;
 import cuchaz.enigma.translation.representation.entry.ClassEntry;
@@ -15,7 +17,6 @@ import cuchaz.enigma.translation.representation.entry.Entry;
 import cuchaz.enigma.translation.representation.entry.FieldEntry;
 import cuchaz.enigma.translation.representation.entry.MethodEntry;
 import cuchaz.enigma.utils.I18n;
-import cuchaz.enigma.utils.LFPrintWriter;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -55,7 +56,7 @@ public enum SrgMappingsWriter implements MappingsWriter {
                 }
 
                 progress.init(3, I18n.translate("progress.mappings.srg_file.writing"));
-                try (PrintWriter writer = new LFPrintWriter(Files.newBufferedWriter(path))) {
+                try (PrintWriter writer = new LfPrintWriter(Files.newBufferedWriter(path))) {
                         progress.step(0, I18n.translate("type.classes"));
                         classLines.forEach(writer::println);
                         progress.step(1, I18n.translate("type.fields"));
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/TinyMappingsReader.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/tiny/TinyMappingsReader.java
index 773c95e..f3c66df 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/serde/TinyMappingsReader.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/tiny/TinyMappingsReader.java
@@ -1,11 +1,12 @@
-package cuchaz.enigma.translation.mapping.serde;
+package cuchaz.enigma.translation.mapping.serde.tiny;
 
 import com.google.common.base.Charsets;
 import cuchaz.enigma.ProgressListener;
-import cuchaz.enigma.throwables.MappingParseException;
+import cuchaz.enigma.translation.mapping.serde.MappingParseException;
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.mapping.MappingPair;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.MappingsReader;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.translation.mapping.tree.HashEntryTree;
 import cuchaz.enigma.translation.representation.MethodDescriptor;
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/TinyMappingsWriter.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/tiny/TinyMappingsWriter.java
index c82f262..4f78e6f 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/serde/TinyMappingsWriter.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/tiny/TinyMappingsWriter.java
@@ -1,4 +1,4 @@
-package cuchaz.enigma.translation.mapping.serde;
+package cuchaz.enigma.translation.mapping.serde.tiny;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
@@ -7,8 +7,9 @@ import cuchaz.enigma.translation.MappingTranslator;
 import cuchaz.enigma.translation.Translator;
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.mapping.MappingDelta;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
 import cuchaz.enigma.translation.mapping.VoidEntryResolver;
+import cuchaz.enigma.translation.mapping.serde.MappingsWriter;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.translation.mapping.tree.EntryTreeNode;
 import cuchaz.enigma.translation.representation.entry.ClassEntry;
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/TinyV2Reader.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/tinyv2/TinyV2Reader.java
index d81cbdb..dc25569 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/serde/TinyV2Reader.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/tinyv2/TinyV2Reader.java
@@ -1,10 +1,12 @@
-package cuchaz.enigma.translation.mapping.serde;
+package cuchaz.enigma.translation.mapping.serde.tinyv2;
 
 import cuchaz.enigma.ProgressListener;
-import cuchaz.enigma.throwables.MappingParseException;
+import cuchaz.enigma.translation.mapping.serde.MappingParseException;
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.mapping.MappingPair;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.MappingsReader;
+import cuchaz.enigma.translation.mapping.serde.RawEntryMapping;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.translation.mapping.tree.HashEntryTree;
 import cuchaz.enigma.translation.representation.MethodDescriptor;
@@ -14,7 +16,6 @@ import cuchaz.enigma.translation.representation.entry.Entry;
 import cuchaz.enigma.translation.representation.entry.FieldEntry;
 import cuchaz.enigma.translation.representation.entry.LocalVariableEntry;
 import cuchaz.enigma.translation.representation.entry.MethodEntry;
-import cuchaz.enigma.utils.I18n;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -23,7 +24,7 @@ import java.nio.file.Path;
 import java.util.BitSet;
 import java.util.List;
 
-final class TinyV2Reader implements MappingsReader {
+public final class TinyV2Reader implements MappingsReader {
 
         private static final String MINOR_VERSION = "0";
         // 0 indent
@@ -46,7 +47,7 @@ final class TinyV2Reader implements MappingsReader {
         private EntryTree<EntryMapping> read(Path path, List<String> lines, ProgressListener progress) throws MappingParseException {
                 EntryTree<EntryMapping> mappings = new HashEntryTree<>();
 
-                progress.init(lines.size(), I18n.translate("progress.mappings.tiny_v2.loading"));
+                progress.init(lines.size(), "progress.mappings.tiny_v2.loading");
 
                 BitSet state = new BitSet(STATE_SIZE);
                 @SuppressWarnings({"unchecked", "rawtypes"})
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/TinyV2Writer.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/tinyv2/TinyV2Writer.java
index 95e04c3..5546b2f 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/serde/TinyV2Writer.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/tinyv2/TinyV2Writer.java
@@ -1,11 +1,14 @@
-package cuchaz.enigma.translation.mapping.serde;
+package cuchaz.enigma.translation.mapping.serde.tinyv2;
 
 import com.google.common.base.Strings;
 import cuchaz.enigma.ProgressListener;
 import cuchaz.enigma.translation.mapping.EntryMap;
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.mapping.MappingDelta;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.LfPrintWriter;
+import cuchaz.enigma.translation.mapping.serde.MappingHelper;
+import cuchaz.enigma.translation.mapping.serde.MappingsWriter;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.translation.mapping.tree.EntryTreeNode;
 import cuchaz.enigma.translation.representation.entry.ClassEntry;
@@ -13,7 +16,6 @@ import cuchaz.enigma.translation.representation.entry.Entry;
 import cuchaz.enigma.translation.representation.entry.FieldEntry;
 import cuchaz.enigma.translation.representation.entry.LocalVariableEntry;
 import cuchaz.enigma.translation.representation.entry.MethodEntry;
-import cuchaz.enigma.utils.LFPrintWriter;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -40,7 +42,7 @@ public final class TinyV2Writer implements MappingsWriter {
         public void write(EntryTree<EntryMapping> mappings, MappingDelta<EntryMapping> delta, Path path, ProgressListener progress, MappingSaveParameters parameters) {
                 List<EntryTreeNode<EntryMapping>> classes = StreamSupport.stream(mappings.spliterator(), false).filter(node -> node.getEntry() instanceof ClassEntry).collect(Collectors.toList());
 
-                try (PrintWriter writer = new LFPrintWriter(Files.newBufferedWriter(path))) {
+                try (PrintWriter writer = new LfPrintWriter(Files.newBufferedWriter(path))) {
                         writer.println("tiny\t2\t" + MINOR_VERSION + "\t" + obfHeader + "\t" + deobfHeader);
 
                         // no escape names
@@ -166,4 +168,5 @@ public final class TinyV2Writer implements MappingsWriter {
         private String indent(int level) {
                 return Strings.repeat("\t", level);
         }
+
 }
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/tree/DeltaTrackingTree.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/tree/DeltaTrackingTree.java
index 255fa5f..255fa5f 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/tree/DeltaTrackingTree.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/tree/DeltaTrackingTree.java
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/tree/EntryTree.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/tree/EntryTree.java
index daaefcc..daaefcc 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/tree/EntryTree.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/tree/EntryTree.java
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/tree/EntryTreeNode.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/tree/EntryTreeNode.java
index affcd50..affcd50 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/tree/EntryTreeNode.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/tree/EntryTreeNode.java
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/tree/HashEntryTree.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/tree/HashEntryTree.java
index 570941c..570941c 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/tree/HashEntryTree.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/tree/HashEntryTree.java
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/tree/HashTreeNode.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/tree/HashTreeNode.java
index 0a990bd..0a990bd 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/tree/HashTreeNode.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/tree/HashTreeNode.java
diff --git a/src/main/java/cuchaz/enigma/translation/representation/AccessFlags.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/AccessFlags.java
index b280eef..b280eef 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/AccessFlags.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/AccessFlags.java
diff --git a/src/main/java/cuchaz/enigma/translation/representation/Lambda.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/Lambda.java
index 63eb563..ad9389c 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/Lambda.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/Lambda.java
@@ -1,105 +1,105 @@
-package cuchaz.enigma.translation.representation;

-

-import cuchaz.enigma.translation.Translatable;

-import cuchaz.enigma.translation.Translator;

-import cuchaz.enigma.translation.mapping.EntryMap;

-import cuchaz.enigma.translation.mapping.EntryMapping;

-import cuchaz.enigma.translation.mapping.EntryResolver;

-import cuchaz.enigma.translation.mapping.ResolutionStrategy;

-import cuchaz.enigma.translation.representation.entry.ClassEntry;

-import cuchaz.enigma.translation.representation.entry.MethodEntry;

-import cuchaz.enigma.translation.representation.entry.ParentedEntry;

-

-import java.util.Objects;

-

-public class Lambda implements Translatable {

-        private final String invokedName;

-        private final MethodDescriptor invokedType;

-        private final MethodDescriptor samMethodType;

-        private final ParentedEntry<?> implMethod;

-        private final MethodDescriptor instantiatedMethodType;

-

-        public Lambda(String invokedName, MethodDescriptor invokedType, MethodDescriptor samMethodType, ParentedEntry<?> implMethod, MethodDescriptor instantiatedMethodType) {

-                this.invokedName = invokedName;

-                this.invokedType = invokedType;

-                this.samMethodType = samMethodType;

-                this.implMethod = implMethod;

-                this.instantiatedMethodType = instantiatedMethodType;

-        }

-

-        @Override

-        public Lambda translate(Translator translator, EntryResolver resolver, EntryMap<EntryMapping> mappings) {

-                MethodEntry samMethod = new MethodEntry(getInterface(), invokedName, samMethodType);

-                EntryMapping samMethodMapping = resolveMapping(resolver, mappings, samMethod);

-

-                return new Lambda(

-                        samMethodMapping != null ? samMethodMapping.getTargetName() : invokedName,

-                        invokedType.translate(translator, resolver, mappings),

-                        samMethodType.translate(translator, resolver, mappings),

-                        implMethod.translate(translator, resolver, mappings),

-                        instantiatedMethodType.translate(translator, resolver, mappings)

-                );

-        }

-

-        private EntryMapping resolveMapping(EntryResolver resolver, EntryMap<EntryMapping> mappings, MethodEntry methodEntry) {

-                for (MethodEntry entry : resolver.resolveEntry(methodEntry, ResolutionStrategy.RESOLVE_ROOT)) {

-                        EntryMapping mapping = mappings.get(entry);

-                        if (mapping != null) {

-                                return mapping;

-                        }

-                }

-                return null;

-        }

-

-        public ClassEntry getInterface() {

-                return invokedType.getReturnDesc().getTypeEntry();

-        }

-

-        public String getInvokedName() {

-                return invokedName;

-        }

-

-        public MethodDescriptor getInvokedType() {

-                return invokedType;

-        }

-

-        public MethodDescriptor getSamMethodType() {

-                return samMethodType;

-        }

-

-        public ParentedEntry<?> getImplMethod() {

-                return implMethod;

-        }

-

-        public MethodDescriptor getInstantiatedMethodType() {

-                return instantiatedMethodType;

-        }

-

-        @Override

-        public boolean equals(Object o) {

-                if (this == o) return true;

-                if (o == null || getClass() != o.getClass()) return false;

-                Lambda lambda = (Lambda) o;

-                return Objects.equals(invokedName, lambda.invokedName) &&

-                        Objects.equals(invokedType, lambda.invokedType) &&

-                        Objects.equals(samMethodType, lambda.samMethodType) &&

-                        Objects.equals(implMethod, lambda.implMethod) &&

-                        Objects.equals(instantiatedMethodType, lambda.instantiatedMethodType);

-        }

-

-        @Override

-        public int hashCode() {

-                return Objects.hash(invokedName, invokedType, samMethodType, implMethod, instantiatedMethodType);

-        }

-

-        @Override

-        public String toString() {

-                return "Lambda{" +

-                        "invokedName='" + invokedName + '\'' +

-                        ", invokedType=" + invokedType +

-                        ", samMethodType=" + samMethodType +

-                        ", implMethod=" + implMethod +

-                        ", instantiatedMethodType=" + instantiatedMethodType +

-                        '}';

-        }

-}

+package cuchaz.enigma.translation.representation;
+
+import cuchaz.enigma.translation.Translatable;
+import cuchaz.enigma.translation.Translator;
+import cuchaz.enigma.translation.mapping.EntryMap;
+import cuchaz.enigma.translation.mapping.EntryMapping;
+import cuchaz.enigma.translation.mapping.EntryResolver;
+import cuchaz.enigma.translation.mapping.ResolutionStrategy;
+import cuchaz.enigma.translation.representation.entry.ClassEntry;
+import cuchaz.enigma.translation.representation.entry.MethodEntry;
+import cuchaz.enigma.translation.representation.entry.ParentedEntry;
+
+import java.util.Objects;
+
+public class Lambda implements Translatable {
+        private final String invokedName;
+        private final MethodDescriptor invokedType;
+        private final MethodDescriptor samMethodType;
+        private final ParentedEntry<?> implMethod;
+        private final MethodDescriptor instantiatedMethodType;
+
+        public Lambda(String invokedName, MethodDescriptor invokedType, MethodDescriptor samMethodType, ParentedEntry<?> implMethod, MethodDescriptor instantiatedMethodType) {
+                this.invokedName = invokedName;
+                this.invokedType = invokedType;
+                this.samMethodType = samMethodType;
+                this.implMethod = implMethod;
+                this.instantiatedMethodType = instantiatedMethodType;
+        }
+
+        @Override
+        public Lambda translate(Translator translator, EntryResolver resolver, EntryMap<EntryMapping> mappings) {
+                MethodEntry samMethod = new MethodEntry(getInterface(), invokedName, samMethodType);
+                EntryMapping samMethodMapping = resolveMapping(resolver, mappings, samMethod);
+
+                return new Lambda(
+                        samMethodMapping != null ? samMethodMapping.getTargetName() : invokedName,
+                        invokedType.translate(translator, resolver, mappings),
+                        samMethodType.translate(translator, resolver, mappings),
+                        implMethod.translate(translator, resolver, mappings),
+                        instantiatedMethodType.translate(translator, resolver, mappings)
+                );
+        }
+
+        private EntryMapping resolveMapping(EntryResolver resolver, EntryMap<EntryMapping> mappings, MethodEntry methodEntry) {
+                for (MethodEntry entry : resolver.resolveEntry(methodEntry, ResolutionStrategy.RESOLVE_ROOT)) {
+                        EntryMapping mapping = mappings.get(entry);
+                        if (mapping != null) {
+                                return mapping;
+                        }
+                }
+                return null;
+        }
+
+        public ClassEntry getInterface() {
+                return invokedType.getReturnDesc().getTypeEntry();
+        }
+
+        public String getInvokedName() {
+                return invokedName;
+        }
+
+        public MethodDescriptor getInvokedType() {
+                return invokedType;
+        }
+
+        public MethodDescriptor getSamMethodType() {
+                return samMethodType;
+        }
+
+        public ParentedEntry<?> getImplMethod() {
+                return implMethod;
+        }
+
+        public MethodDescriptor getInstantiatedMethodType() {
+                return instantiatedMethodType;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+                if (this == o) return true;
+                if (o == null || getClass() != o.getClass()) return false;
+                Lambda lambda = (Lambda) o;
+                return Objects.equals(invokedName, lambda.invokedName) &&
+                        Objects.equals(invokedType, lambda.invokedType) &&
+                        Objects.equals(samMethodType, lambda.samMethodType) &&
+                        Objects.equals(implMethod, lambda.implMethod) &&
+                        Objects.equals(instantiatedMethodType, lambda.instantiatedMethodType);
+        }
+
+        @Override
+        public int hashCode() {
+                return Objects.hash(invokedName, invokedType, samMethodType, implMethod, instantiatedMethodType);
+        }
+
+        @Override
+        public String toString() {
+                return "Lambda{" +
+                        "invokedName='" + invokedName + '\'' +
+                        ", invokedType=" + invokedType +
+                        ", samMethodType=" + samMethodType +
+                        ", implMethod=" + implMethod +
+                        ", instantiatedMethodType=" + instantiatedMethodType +
+                        '}';
+        }
+}
diff --git a/src/main/java/cuchaz/enigma/translation/representation/MethodDescriptor.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/MethodDescriptor.java
index 37a7014..03c8686 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/MethodDescriptor.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/MethodDescriptor.java
@@ -18,10 +18,10 @@ import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.mapping.EntryResolver;
 import cuchaz.enigma.translation.mapping.EntryMap;
 import cuchaz.enigma.translation.representation.entry.ClassEntry;
-import cuchaz.enigma.utils.Utils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Function;
 
 public class MethodDescriptor implements Translatable {
@@ -97,7 +97,7 @@ public class MethodDescriptor implements Translatable {
 
         @Override
         public int hashCode() {
-                return Utils.combineHashesOrdered(this.argumentDescs.hashCode(), this.returnDesc.hashCode());
+                return Objects.hash(this.argumentDescs.hashCode(), this.returnDesc.hashCode());
         }
 
         public boolean hasClass(ClassEntry classEntry) {
diff --git a/src/main/java/cuchaz/enigma/translation/representation/Signature.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/Signature.java
index 424088a..424088a 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/Signature.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/Signature.java
diff --git a/src/main/java/cuchaz/enigma/translation/representation/TypeDescriptor.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/TypeDescriptor.java
index f7ba849..f7ba849 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/TypeDescriptor.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/TypeDescriptor.java
diff --git a/src/main/java/cuchaz/enigma/translation/representation/entry/ClassDefEntry.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/ClassDefEntry.java
index 6930765..6930765 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/entry/ClassDefEntry.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/ClassDefEntry.java
diff --git a/src/main/java/cuchaz/enigma/translation/representation/entry/ClassEntry.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/ClassEntry.java
index d6171f1..7d4b2ba 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/entry/ClassEntry.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/ClassEntry.java
@@ -11,7 +11,7 @@
 
 package cuchaz.enigma.translation.representation.entry;
 
-import cuchaz.enigma.throwables.IllegalNameException;
+import cuchaz.enigma.translation.mapping.IllegalNameException;
 import cuchaz.enigma.translation.Translator;
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.mapping.NameValidator;
diff --git a/src/main/java/cuchaz/enigma/translation/representation/entry/DefEntry.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/DefEntry.java
index 82536c7..82536c7 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/entry/DefEntry.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/DefEntry.java
diff --git a/src/main/java/cuchaz/enigma/translation/representation/entry/Entry.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/Entry.java
index 72b0391..40bff31 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/entry/Entry.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/Entry.java
@@ -11,7 +11,7 @@
 
 package cuchaz.enigma.translation.representation.entry;
 
-import cuchaz.enigma.throwables.IllegalNameException;
+import cuchaz.enigma.translation.mapping.IllegalNameException;
 import cuchaz.enigma.translation.Translatable;
 import cuchaz.enigma.translation.mapping.NameValidator;
 
diff --git a/src/main/java/cuchaz/enigma/translation/representation/entry/FieldDefEntry.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/FieldDefEntry.java
index f9282b2..f9282b2 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/entry/FieldDefEntry.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/FieldDefEntry.java
diff --git a/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java
index bef0edf..0e47878 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java
@@ -15,9 +15,9 @@ import com.google.common.base.Preconditions;
 import cuchaz.enigma.translation.Translator;
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.representation.TypeDescriptor;
-import cuchaz.enigma.utils.Utils;
 
 import javax.annotation.Nullable;
+import java.util.Objects;
 
 public class FieldEntry extends ParentedEntry<ClassEntry> implements Comparable<FieldEntry> {
         protected final TypeDescriptor desc;
@@ -67,7 +67,7 @@ public class FieldEntry extends ParentedEntry<ClassEntry> implements Comparable<
 
         @Override
         public int hashCode() {
-                return Utils.combineHashesOrdered(this.parent, this.name, this.desc);
+                return Objects.hash(this.parent, this.name, this.desc);
         }
 
         @Override
diff --git a/src/main/java/cuchaz/enigma/translation/representation/entry/LocalVariableDefEntry.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/LocalVariableDefEntry.java
index aad4236..aad4236 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/entry/LocalVariableDefEntry.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/LocalVariableDefEntry.java
diff --git a/src/main/java/cuchaz/enigma/translation/representation/entry/LocalVariableEntry.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/LocalVariableEntry.java
index 3ccb1fa..3f98f03 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/entry/LocalVariableEntry.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/LocalVariableEntry.java
@@ -3,9 +3,9 @@ package cuchaz.enigma.translation.representation.entry;
 import com.google.common.base.Preconditions;
 import cuchaz.enigma.translation.Translator;
 import cuchaz.enigma.translation.mapping.EntryMapping;
-import cuchaz.enigma.utils.Utils;
 
 import javax.annotation.Nullable;
+import java.util.Objects;
 
 /**
  * TypeDescriptor...
@@ -64,7 +64,7 @@ public class LocalVariableEntry extends ParentedEntry<MethodEntry> implements Co
 
         @Override
         public int hashCode() {
-                return Utils.combineHashesOrdered(this.parent, this.index);
+                return Objects.hash(this.parent, this.index);
         }
 
         @Override
diff --git a/src/main/java/cuchaz/enigma/translation/representation/entry/MethodDefEntry.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/MethodDefEntry.java
index 4e75a5c..4e75a5c 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/entry/MethodDefEntry.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/MethodDefEntry.java
diff --git a/src/main/java/cuchaz/enigma/translation/representation/entry/MethodEntry.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/MethodEntry.java
index e1ffad3..086a5c1 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/entry/MethodEntry.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/MethodEntry.java
@@ -15,9 +15,9 @@ import com.google.common.base.Preconditions;
 import cuchaz.enigma.translation.Translator;
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.representation.MethodDescriptor;
-import cuchaz.enigma.utils.Utils;
 
 import javax.annotation.Nullable;
+import java.util.Objects;
 
 public class MethodEntry extends ParentedEntry<ClassEntry> implements Comparable<MethodEntry> {
 
@@ -72,7 +72,7 @@ public class MethodEntry extends ParentedEntry<ClassEntry> implements Comparable
 
         @Override
         public int hashCode() {
-                return Utils.combineHashesOrdered(this.parent, this.name, this.descriptor);
+                return Objects.hash(this.parent, this.name, this.descriptor);
         }
 
         @Override
diff --git a/src/main/java/cuchaz/enigma/translation/representation/entry/ParentedEntry.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/ParentedEntry.java
index cbc5faf..95be22c 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/entry/ParentedEntry.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/ParentedEntry.java
@@ -12,7 +12,6 @@
 package cuchaz.enigma.translation.representation.entry;
 
 import com.google.common.base.Preconditions;
-import cuchaz.enigma.translation.Translatable;
 import cuchaz.enigma.translation.Translator;
 import cuchaz.enigma.translation.mapping.EntryMap;
 import cuchaz.enigma.translation.mapping.EntryMapping;
diff --git a/src/main/java/cuchaz/enigma/utils/I18n.java b/enigma/src/main/java/cuchaz/enigma/utils/I18n.java
index f91c916..e18532b 100644
--- a/src/main/java/cuchaz/enigma/utils/I18n.java
+++ b/enigma/src/main/java/cuchaz/enigma/utils/I18n.java
@@ -16,8 +16,6 @@ import com.google.common.reflect.ClassPath;
 import com.google.common.reflect.ClassPath.ResourceInfo;
 import com.google.gson.Gson;
 
-import cuchaz.enigma.config.Config;
-
 public class I18n {
         public static final String DEFAULT_LANGUAGE = "en_us";
         private static final Gson GSON = new Gson();
@@ -26,8 +24,8 @@ public class I18n {
         private static Map<String, String> languageNames = Maps.newHashMap();
         
         static {
-                translations = load(Config.getInstance().language);
                 defaultTranslations = load(DEFAULT_LANGUAGE);
+                translations = defaultTranslations;
         }
         
         @SuppressWarnings("unchecked")
@@ -61,12 +59,7 @@ public class I18n {
         }
         
         public static void setLanguage(String language) {
-                Config.getInstance().language = language;
-                try {
-                        Config.getInstance().saveConfig();
-                } catch (IOException e) {
-                        e.printStackTrace();
-                }
+                translations = load(language);
         }
         
         public static ArrayList<String> getAvailableLanguages() {
diff --git a/src/main/java/cuchaz/enigma/utils/Pair.java b/enigma/src/main/java/cuchaz/enigma/utils/Pair.java
index bf02cef..bf02cef 100644
--- a/src/main/java/cuchaz/enigma/utils/Pair.java
+++ b/enigma/src/main/java/cuchaz/enigma/utils/Pair.java
diff --git a/enigma/src/main/java/cuchaz/enigma/utils/Utils.java b/enigma/src/main/java/cuchaz/enigma/utils/Utils.java
new file mode 100644
index 0000000..2664099
--- /dev/null
+++ b/enigma/src/main/java/cuchaz/enigma/utils/Utils.java
@@ -0,0 +1,92 @@
+/*******************************************************************************
+ * 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.utils;
+
+import com.google.common.io.CharStreams;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Locale;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+public class Utils {
+    public static String readStreamToString(InputStream in) throws IOException {
+        return CharStreams.toString(new InputStreamReader(in, StandardCharsets.UTF_8));
+    }
+
+    public static String readResourceToString(String path) throws IOException {
+        InputStream in = Utils.class.getResourceAsStream(path);
+        if (in == null) {
+            throw new IllegalArgumentException("Resource not found! " + path);
+        }
+        return readStreamToString(in);
+    }
+
+    public static void delete(Path path) throws IOException {
+        if (Files.exists(path)) {
+            for (Path p : Files.walk(path).sorted(Comparator.reverseOrder()).collect(Collectors.toList())) {
+                Files.delete(p);
+            }
+        }
+    }
+
+    public static byte[] zipSha1(Path path) throws IOException {
+        MessageDigest digest;
+        try {
+            digest = MessageDigest.getInstance("SHA-1");
+        } catch (NoSuchAlgorithmException e) {
+            // Algorithm guaranteed to be supported
+            throw new RuntimeException(e);
+        }
+        try (ZipFile zip = new ZipFile(path.toFile())) {
+            List<? extends ZipEntry> entries = Collections.list(zip.entries());
+            // only compare classes (some implementations may not generate directory entries)
+            entries.removeIf(entry -> !entry.getName().toLowerCase(Locale.ROOT).endsWith(".class"));
+            // different implementations may add zip entries in a different order
+            entries.sort(Comparator.comparing(ZipEntry::getName));
+            byte[] buffer = new byte[8192];
+            for (ZipEntry entry : entries) {
+                digest.update(entry.getName().getBytes(StandardCharsets.UTF_8));
+                try (InputStream in = zip.getInputStream(entry)) {
+                    int n;
+                    while ((n = in.read(buffer)) != -1) {
+                        digest.update(buffer, 0, n);
+                    }
+                }
+            }
+        }
+        return digest.digest();
+    }
+
+    public static boolean isBlank(String input) {
+        if (input == null) {
+            return true;
+        }
+        for (int i = 0; i < input.length(); i++) {
+            if (!Character.isWhitespace(input.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/src/main/resources/META-INF/services/cuchaz.enigma.api.EnigmaPlugin b/enigma/src/main/resources/META-INF/services/cuchaz.enigma.api.EnigmaPlugin
index 136a3e7..136a3e7 100644
--- a/src/main/resources/META-INF/services/cuchaz.enigma.api.EnigmaPlugin
+++ b/enigma/src/main/resources/META-INF/services/cuchaz.enigma.api.EnigmaPlugin
diff --git a/src/main/resources/lang/en_us.json b/enigma/src/main/resources/lang/en_us.json
index dbf4b93..dbf4b93 100644
--- a/src/main/resources/lang/en_us.json
+++ b/enigma/src/main/resources/lang/en_us.json
diff --git a/src/main/resources/lang/fr_fr.json b/enigma/src/main/resources/lang/fr_fr.json
index d169b9a..d169b9a 100644
--- a/src/main/resources/lang/fr_fr.json
+++ b/enigma/src/main/resources/lang/fr_fr.json
diff --git a/src/main/resources/lang/zh_cn.json b/enigma/src/main/resources/lang/zh_cn.json
index f3f503a..f3f503a 100644
--- a/src/main/resources/lang/zh_cn.json
+++ b/enigma/src/main/resources/lang/zh_cn.json
diff --git a/src/main/resources/profile.json b/enigma/src/main/resources/profile.json
index e1af4cd..e1af4cd 100644
--- a/src/main/resources/profile.json
+++ b/enigma/src/main/resources/profile.json
diff --git a/src/test/java/cuchaz/enigma/PackageVisibilityIndexTest.java b/enigma/src/test/java/cuchaz/enigma/PackageVisibilityIndexTest.java
index 1dc9748..1dc9748 100644
--- a/src/test/java/cuchaz/enigma/PackageVisibilityIndexTest.java
+++ b/enigma/src/test/java/cuchaz/enigma/PackageVisibilityIndexTest.java
diff --git a/src/test/java/cuchaz/enigma/TestDeobfed.java b/enigma/src/test/java/cuchaz/enigma/TestDeobfed.java
index d64a745..494d959 100644
--- a/src/test/java/cuchaz/enigma/TestDeobfed.java
+++ b/enigma/src/test/java/cuchaz/enigma/TestDeobfed.java
@@ -13,13 +13,14 @@ package cuchaz.enigma;
 
 import cuchaz.enigma.analysis.ClassCache;
 import cuchaz.enigma.analysis.index.JarIndex;
-import cuchaz.enigma.network.EnigmaServer;
 import cuchaz.enigma.source.Decompiler;
 import cuchaz.enigma.source.Decompilers;
 import cuchaz.enigma.source.SourceSettings;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 
 import static cuchaz.enigma.TestEntryFactory.newClass;
@@ -27,7 +28,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 
 public class TestDeobfed {
-
         private static Enigma enigma;
         private static ClassCache classCache;
         private static JarIndex index;
@@ -36,7 +36,13 @@ public class TestDeobfed {
         public static void beforeClass() throws Exception {
                 enigma = Enigma.create();
 
-                classCache = ClassCache.of(Paths.get("build/test-deobf/translation.jar"));
+                Path obf = Paths.get("build/test-obf/translation.jar");
+                Path deobf = Paths.get("build/test-deobf/translation.jar");
+                Files.createDirectories(deobf.getParent());
+                EnigmaProject project = enigma.openJar(obf, ProgressListener.none());
+                project.exportRemappedJar(ProgressListener.none()).write(deobf, ProgressListener.none());
+
+                classCache = ClassCache.of(deobf);
                 index = classCache.index(ProgressListener.none());
         }
 
@@ -71,7 +77,7 @@ public class TestDeobfed {
 
         @Test
         public void decompile() {
-                EnigmaProject project = new EnigmaProject(enigma, classCache, index, new byte[EnigmaServer.CHECKSUM_SIZE]);
+                EnigmaProject project = new EnigmaProject(enigma, classCache, index, new byte[20]);
                 Decompiler decompiler = Decompilers.PROCYON.create(project.getClassCache(), new SourceSettings(false, false));
 
                 decompiler.getSource("a");
diff --git a/src/test/java/cuchaz/enigma/TestDeobfuscator.java b/enigma/src/test/java/cuchaz/enigma/TestDeobfuscator.java
index 6619d26..6619d26 100644
--- a/src/test/java/cuchaz/enigma/TestDeobfuscator.java
+++ b/enigma/src/test/java/cuchaz/enigma/TestDeobfuscator.java
diff --git a/src/test/java/cuchaz/enigma/TestEntryFactory.java b/enigma/src/test/java/cuchaz/enigma/TestEntryFactory.java
index 9e1425a..9e1425a 100644
--- a/src/test/java/cuchaz/enigma/TestEntryFactory.java
+++ b/enigma/src/test/java/cuchaz/enigma/TestEntryFactory.java
diff --git a/src/test/java/cuchaz/enigma/TestInnerClasses.java b/enigma/src/test/java/cuchaz/enigma/TestInnerClasses.java
index 85c72f8..85c72f8 100644
--- a/src/test/java/cuchaz/enigma/TestInnerClasses.java
+++ b/enigma/src/test/java/cuchaz/enigma/TestInnerClasses.java
diff --git a/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java b/enigma/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java
index 48975c8..48975c8 100644
--- a/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java
+++ b/enigma/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java
diff --git a/src/test/java/cuchaz/enigma/TestJarIndexInheritanceTree.java b/enigma/src/test/java/cuchaz/enigma/TestJarIndexInheritanceTree.java
index 76e379c..76e379c 100644
--- a/src/test/java/cuchaz/enigma/TestJarIndexInheritanceTree.java
+++ b/enigma/src/test/java/cuchaz/enigma/TestJarIndexInheritanceTree.java
diff --git a/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java b/enigma/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java
index 103c366..103c366 100644
--- a/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java
+++ b/enigma/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java
diff --git a/src/test/java/cuchaz/enigma/TestMethodDescriptor.java b/enigma/src/test/java/cuchaz/enigma/TestMethodDescriptor.java
index a73880d..a73880d 100644
--- a/src/test/java/cuchaz/enigma/TestMethodDescriptor.java
+++ b/enigma/src/test/java/cuchaz/enigma/TestMethodDescriptor.java
diff --git a/src/test/java/cuchaz/enigma/TestTokensConstructors.java b/enigma/src/test/java/cuchaz/enigma/TestTokensConstructors.java
index 0398de4..0398de4 100644
--- a/src/test/java/cuchaz/enigma/TestTokensConstructors.java
+++ b/enigma/src/test/java/cuchaz/enigma/TestTokensConstructors.java
diff --git a/src/test/java/cuchaz/enigma/TestTranslator.java b/enigma/src/test/java/cuchaz/enigma/TestTranslator.java
index a420afe..a420afe 100644
--- a/src/test/java/cuchaz/enigma/TestTranslator.java
+++ b/enigma/src/test/java/cuchaz/enigma/TestTranslator.java
diff --git a/src/test/java/cuchaz/enigma/TestTypeDescriptor.java b/enigma/src/test/java/cuchaz/enigma/TestTypeDescriptor.java
index b9ebe55..b9ebe55 100644
--- a/src/test/java/cuchaz/enigma/TestTypeDescriptor.java
+++ b/enigma/src/test/java/cuchaz/enigma/TestTypeDescriptor.java
diff --git a/src/test/java/cuchaz/enigma/TokenChecker.java b/enigma/src/test/java/cuchaz/enigma/TokenChecker.java
index 48d0c83..96fc6da 100644
--- a/src/test/java/cuchaz/enigma/TokenChecker.java
+++ b/enigma/src/test/java/cuchaz/enigma/TokenChecker.java
@@ -16,7 +16,7 @@ import cuchaz.enigma.analysis.ClassCache;
 import cuchaz.enigma.analysis.EntryReference;
 import cuchaz.enigma.source.SourceIndex;
 import cuchaz.enigma.source.*;
-import cuchaz.enigma.analysis.Token;
+import cuchaz.enigma.source.Token;
 import cuchaz.enigma.translation.representation.entry.Entry;
 
 import java.io.IOException;
diff --git a/src/test/java/cuchaz/enigma/inputs/Keep.java b/enigma/src/test/java/cuchaz/enigma/inputs/Keep.java
index 4dbe8e2..4dbe8e2 100644
--- a/src/test/java/cuchaz/enigma/inputs/Keep.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/Keep.java
diff --git a/src/test/java/cuchaz/enigma/inputs/constructors/BaseClass.java b/enigma/src/test/java/cuchaz/enigma/inputs/constructors/BaseClass.java
index f07e1f8..f07e1f8 100644
--- a/src/test/java/cuchaz/enigma/inputs/constructors/BaseClass.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/constructors/BaseClass.java
diff --git a/src/test/java/cuchaz/enigma/inputs/constructors/Caller.java b/enigma/src/test/java/cuchaz/enigma/inputs/constructors/Caller.java
index 71439fd..71439fd 100644
--- a/src/test/java/cuchaz/enigma/inputs/constructors/Caller.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/constructors/Caller.java
diff --git a/src/test/java/cuchaz/enigma/inputs/constructors/DefaultConstructable.java b/enigma/src/test/java/cuchaz/enigma/inputs/constructors/DefaultConstructable.java
index c3d4170..c3d4170 100644
--- a/src/test/java/cuchaz/enigma/inputs/constructors/DefaultConstructable.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/constructors/DefaultConstructable.java
diff --git a/src/test/java/cuchaz/enigma/inputs/constructors/SubClass.java b/enigma/src/test/java/cuchaz/enigma/inputs/constructors/SubClass.java
index bc56b3b..bc56b3b 100644
--- a/src/test/java/cuchaz/enigma/inputs/constructors/SubClass.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/constructors/SubClass.java
diff --git a/src/test/java/cuchaz/enigma/inputs/constructors/SubSubClass.java b/enigma/src/test/java/cuchaz/enigma/inputs/constructors/SubSubClass.java
index 87b69d3..87b69d3 100644
--- a/src/test/java/cuchaz/enigma/inputs/constructors/SubSubClass.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/constructors/SubSubClass.java
diff --git a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java b/enigma/src/test/java/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java
index b9c4929..b9c4929 100644
--- a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java
diff --git a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java b/enigma/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java
index 50e963c..50e963c 100644
--- a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java
diff --git a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java b/enigma/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java
index d0dd664..d0dd664 100644
--- a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java
diff --git a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java b/enigma/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java
index c584570..c584570 100644
--- a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java
diff --git a/src/test/java/cuchaz/enigma/inputs/innerClasses/A_Anonymous.java b/enigma/src/test/java/cuchaz/enigma/inputs/innerClasses/A_Anonymous.java
index f652d87..f652d87 100644
--- a/src/test/java/cuchaz/enigma/inputs/innerClasses/A_Anonymous.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/innerClasses/A_Anonymous.java
diff --git a/src/test/java/cuchaz/enigma/inputs/innerClasses/B_AnonymousWithScopeArgs.java b/enigma/src/test/java/cuchaz/enigma/inputs/innerClasses/B_AnonymousWithScopeArgs.java
index d1b7601..d1b7601 100644
--- a/src/test/java/cuchaz/enigma/inputs/innerClasses/B_AnonymousWithScopeArgs.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/innerClasses/B_AnonymousWithScopeArgs.java
diff --git a/src/test/java/cuchaz/enigma/inputs/innerClasses/C_ConstructorArgs.java b/enigma/src/test/java/cuchaz/enigma/inputs/innerClasses/C_ConstructorArgs.java
index 94061fa..94061fa 100644
--- a/src/test/java/cuchaz/enigma/inputs/innerClasses/C_ConstructorArgs.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/innerClasses/C_ConstructorArgs.java
diff --git a/src/test/java/cuchaz/enigma/inputs/innerClasses/D_Simple.java b/enigma/src/test/java/cuchaz/enigma/inputs/innerClasses/D_Simple.java
index 71b3a6d..71b3a6d 100644
--- a/src/test/java/cuchaz/enigma/inputs/innerClasses/D_Simple.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/innerClasses/D_Simple.java
diff --git a/src/test/java/cuchaz/enigma/inputs/innerClasses/E_AnonymousWithOuterAccess.java b/enigma/src/test/java/cuchaz/enigma/inputs/innerClasses/E_AnonymousWithOuterAccess.java
index 976ec42..976ec42 100644
--- a/src/test/java/cuchaz/enigma/inputs/innerClasses/E_AnonymousWithOuterAccess.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/innerClasses/E_AnonymousWithOuterAccess.java
diff --git a/src/test/java/cuchaz/enigma/inputs/innerClasses/F_ClassTree.java b/enigma/src/test/java/cuchaz/enigma/inputs/innerClasses/F_ClassTree.java
index b1de3c9..b1de3c9 100644
--- a/src/test/java/cuchaz/enigma/inputs/innerClasses/F_ClassTree.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/innerClasses/F_ClassTree.java
diff --git a/src/test/java/cuchaz/enigma/inputs/loneClass/LoneClass.java b/enigma/src/test/java/cuchaz/enigma/inputs/loneClass/LoneClass.java
index ddc4e31..ddc4e31 100644
--- a/src/test/java/cuchaz/enigma/inputs/loneClass/LoneClass.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/loneClass/LoneClass.java
diff --git a/src/test/java/cuchaz/enigma/inputs/packageAccess/Base.java b/enigma/src/test/java/cuchaz/enigma/inputs/packageAccess/Base.java
index 6f5fe30..6f5fe30 100644
--- a/src/test/java/cuchaz/enigma/inputs/packageAccess/Base.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/packageAccess/Base.java
diff --git a/src/test/java/cuchaz/enigma/inputs/packageAccess/SamePackageChild.java b/enigma/src/test/java/cuchaz/enigma/inputs/packageAccess/SamePackageChild.java
index cf0f657..cf0f657 100644
--- a/src/test/java/cuchaz/enigma/inputs/packageAccess/SamePackageChild.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/packageAccess/SamePackageChild.java
diff --git a/src/test/java/cuchaz/enigma/inputs/packageAccess/sub/OtherPackageChild.java b/enigma/src/test/java/cuchaz/enigma/inputs/packageAccess/sub/OtherPackageChild.java
index 19fb19c..19fb19c 100644
--- a/src/test/java/cuchaz/enigma/inputs/packageAccess/sub/OtherPackageChild.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/packageAccess/sub/OtherPackageChild.java
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/A_Basic.java b/enigma/src/test/java/cuchaz/enigma/inputs/translation/A_Basic.java
index 26f3718..26f3718 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/A_Basic.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/translation/A_Basic.java
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/B_BaseClass.java b/enigma/src/test/java/cuchaz/enigma/inputs/translation/B_BaseClass.java
index fd7f6e7..fd7f6e7 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/B_BaseClass.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/translation/B_BaseClass.java
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/C_SubClass.java b/enigma/src/test/java/cuchaz/enigma/inputs/translation/C_SubClass.java
index 9d74e44..9d74e44 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/C_SubClass.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/translation/C_SubClass.java
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/D_AnonymousTesting.java b/enigma/src/test/java/cuchaz/enigma/inputs/translation/D_AnonymousTesting.java
index 99c83bb..99c83bb 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/D_AnonymousTesting.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/translation/D_AnonymousTesting.java
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/E_Bridges.java b/enigma/src/test/java/cuchaz/enigma/inputs/translation/E_Bridges.java
index 0b8cf2a..0b8cf2a 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/E_Bridges.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/translation/E_Bridges.java
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/F_ObjectMethods.java b/enigma/src/test/java/cuchaz/enigma/inputs/translation/F_ObjectMethods.java
index 8a92792..8a92792 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/F_ObjectMethods.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/translation/F_ObjectMethods.java
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/G_OuterClass.java b/enigma/src/test/java/cuchaz/enigma/inputs/translation/G_OuterClass.java
index a1e6a85..a1e6a85 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/G_OuterClass.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/translation/G_OuterClass.java
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/H_NamelessClass.java b/enigma/src/test/java/cuchaz/enigma/inputs/translation/H_NamelessClass.java
index 013c55a..013c55a 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/H_NamelessClass.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/translation/H_NamelessClass.java
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/I_Generics.java b/enigma/src/test/java/cuchaz/enigma/inputs/translation/I_Generics.java
index fd2ebdd..fd2ebdd 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/I_Generics.java
+++ b/enigma/src/test/java/cuchaz/enigma/inputs/translation/I_Generics.java
diff --git a/src/test/java/cuchaz/enigma/mapping/TestComments.java b/enigma/src/test/java/cuchaz/enigma/translation/mapping/TestComments.java
index b3a6005..e831943 100644
--- a/src/test/java/cuchaz/enigma/mapping/TestComments.java
+++ b/enigma/src/test/java/cuchaz/enigma/translation/mapping/TestComments.java
@@ -1,4 +1,4 @@
-package cuchaz.enigma.mapping;
+package cuchaz.enigma.translation.mapping;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -6,12 +6,11 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 
 import cuchaz.enigma.ProgressListener;
-import cuchaz.enigma.throwables.MappingParseException;
-import cuchaz.enigma.translation.mapping.EntryMapping;
-import cuchaz.enigma.translation.mapping.MappingFileNameFormat;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
-import cuchaz.enigma.translation.mapping.serde.EnigmaMappingsReader;
-import cuchaz.enigma.translation.mapping.serde.TinyV2Writer;
+import cuchaz.enigma.translation.mapping.serde.MappingFileNameFormat;
+import cuchaz.enigma.translation.mapping.serde.MappingParseException;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.enigma.EnigmaMappingsReader;
+import cuchaz.enigma.translation.mapping.serde.tinyv2.TinyV2Writer;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import org.junit.Test;
 
diff --git a/src/test/java/cuchaz/enigma/mapping/TestTinyV2InnerClasses.java b/enigma/src/test/java/cuchaz/enigma/translation/mapping/TestTinyV2InnerClasses.java
index 7cfdaca..65941e5 100644
--- a/src/test/java/cuchaz/enigma/mapping/TestTinyV2InnerClasses.java
+++ b/enigma/src/test/java/cuchaz/enigma/translation/mapping/TestTinyV2InnerClasses.java
@@ -9,20 +9,16 @@
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma.mapping;
+package cuchaz.enigma.translation.mapping;
 
 import cuchaz.enigma.Enigma;
 import cuchaz.enigma.EnigmaProject;
 import cuchaz.enigma.ProgressListener;
-import cuchaz.enigma.translation.mapping.serde.EnigmaMappingsReader;
-import cuchaz.enigma.translation.representation.entry.ClassEntry;
-import org.junit.Test;
+import cuchaz.enigma.translation.mapping.serde.enigma.EnigmaMappingsReader;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import static cuchaz.enigma.TestEntryFactory.newClass;
-
 public final class TestTinyV2InnerClasses {
         private Path jar;
         private Path mappings;
diff --git a/src/test/java/cuchaz/enigma/mapping/TestV2Main.java b/enigma/src/test/java/cuchaz/enigma/translation/mapping/TestV2Main.java
index 021a90c..6e4d7b9 100644
--- a/src/test/java/cuchaz/enigma/mapping/TestV2Main.java
+++ b/enigma/src/test/java/cuchaz/enigma/translation/mapping/TestV2Main.java
@@ -1,11 +1,10 @@
-package cuchaz.enigma.mapping;
+package cuchaz.enigma.translation.mapping;
 
 import cuchaz.enigma.ProgressListener;
-import cuchaz.enigma.translation.mapping.EntryMapping;
-import cuchaz.enigma.translation.mapping.MappingFileNameFormat;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
-import cuchaz.enigma.translation.mapping.serde.EnigmaMappingsReader;
-import cuchaz.enigma.translation.mapping.serde.TinyV2Writer;
+import cuchaz.enigma.translation.mapping.serde.MappingFileNameFormat;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.enigma.EnigmaMappingsReader;
+import cuchaz.enigma.translation.mapping.serde.tinyv2.TinyV2Writer;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 
 import java.nio.file.Path;
diff --git a/src/test/resources/comments/test.mapping b/enigma/src/test/resources/comments/test.mapping
index d134558..d134558 100644
--- a/src/test/resources/comments/test.mapping
+++ b/enigma/src/test/resources/comments/test.mapping
diff --git a/src/test/resources/proguard-build.conf b/enigma/src/test/resources/proguard-build.conf
index ba3575a..691d8a2 100644
--- a/src/test/resources/proguard-build.conf
+++ b/enigma/src/test/resources/proguard-build.conf
@@ -2,5 +2,5 @@
 -dontobfuscate
 -dontwarn
 -keep class cuchaz.enigma.Main { static void main(java.lang.String[]); }
--keep class cuchaz.enigma.CommandMain { static void main(java.lang.String[]); }
+-keep class cuchaz.enigma.command.Main { static void main(java.lang.String[]); }
 -keep class de.sciss.syntaxpane.** { *; }
diff --git a/src/test/resources/proguard-test.conf b/enigma/src/test/resources/proguard-test.conf
index 9411d26..9411d26 100644
--- a/src/test/resources/proguard-test.conf
+++ b/enigma/src/test/resources/proguard-test.conf
diff --git a/src/test/resources/tinyV2InnerClasses/c.mapping b/enigma/src/test/resources/tinyV2InnerClasses/c.mapping
index f9b0442..f9b0442 100644
--- a/src/test/resources/tinyV2InnerClasses/c.mapping
+++ b/enigma/src/test/resources/tinyV2InnerClasses/c.mapping
diff --git a/src/test/resources/tinyV2InnerClasses/cuchaz/enigma/Dad.mapping b/enigma/src/test/resources/tinyV2InnerClasses/cuchaz/enigma/Dad.mapping
index 8d43ba9..8d43ba9 100644
--- a/src/test/resources/tinyV2InnerClasses/cuchaz/enigma/Dad.mapping
+++ b/enigma/src/test/resources/tinyV2InnerClasses/cuchaz/enigma/Dad.mapping
diff --git a/src/test/java/cuchaz/enigma/resources/translation.mappings b/enigma/src/test/resources/translation.mappings
index c08765c..c08765c 100644
--- a/src/test/java/cuchaz/enigma/resources/translation.mappings
+++ b/enigma/src/test/resources/translation.mappings
diff --git a/settings.gradle b/settings.gradle
index 8fa1712..8754027 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,4 @@
-rootProject.name = 'enigma'
\ No newline at end of file
+include 'enigma'
+include 'enigma-swing'
+include 'enigma-server'
+include 'enigma-cli'
diff --git a/src/main/java/cuchaz/enigma/Constants.java b/src/main/java/cuchaz/enigma/Constants.java
deleted file mode 100644
index 577315f..0000000
--- a/src/main/java/cuchaz/enigma/Constants.java
+++ /dev/null
@@ -1,20 +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;
-
-public class Constants {
-        public static final String NAME = "Enigma";
-        public static final String VERSION = "@VERSION@/Fabric";
-        public static final String URL = "https://fabricmc.net";
-        public static final int MiB = 1024 * 1024; // 1 mebibyte
-        public static final int KiB = 1024; // 1 kebibyte
-}
diff --git a/src/main/java/cuchaz/enigma/command/MappingCommandsUtil.java b/src/main/java/cuchaz/enigma/command/MappingCommandsUtil.java
deleted file mode 100644
index fc7afbc..0000000
--- a/src/main/java/cuchaz/enigma/command/MappingCommandsUtil.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package cuchaz.enigma.command;
-
-import cuchaz.enigma.ProgressListener;
-import cuchaz.enigma.throwables.MappingParseException;
-import cuchaz.enigma.translation.MappingTranslator;
-import cuchaz.enigma.translation.Translator;
-import cuchaz.enigma.translation.mapping.EntryMapping;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
-import cuchaz.enigma.translation.mapping.VoidEntryResolver;
-import cuchaz.enigma.translation.mapping.serde.*;
-import cuchaz.enigma.translation.mapping.tree.EntryTree;
-import cuchaz.enigma.translation.mapping.tree.EntryTreeNode;
-import cuchaz.enigma.translation.mapping.tree.HashEntryTree;
-import cuchaz.enigma.translation.representation.entry.ClassEntry;
-import cuchaz.enigma.translation.representation.entry.Entry;
-import cuchaz.enigma.translation.representation.entry.FieldEntry;
-import cuchaz.enigma.translation.representation.entry.MethodEntry;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.HashSet;
-import java.util.Set;
-
-public final class MappingCommandsUtil {
-    private MappingCommandsUtil() {}
-
-    public static EntryTree<EntryMapping> invert(EntryTree<EntryMapping> mappings) {
-        Translator translator = new MappingTranslator(mappings, VoidEntryResolver.INSTANCE);
-        EntryTree<EntryMapping> result = new HashEntryTree<>();
-
-        for (EntryTreeNode<EntryMapping> node : mappings) {
-            Entry<?> leftEntry = node.getEntry();
-            EntryMapping leftMapping = node.getValue();
-
-            if (!(leftEntry instanceof ClassEntry || leftEntry instanceof MethodEntry || leftEntry instanceof FieldEntry)) {
-                result.insert(translator.translate(leftEntry), leftMapping);
-                continue;
-            }
-
-            Entry<?> rightEntry = translator.translate(leftEntry);
-
-            result.insert(rightEntry, leftMapping == null ? null : new EntryMapping(leftEntry.getName())); // TODO: leftMapping.withName once javadoc PR is merged
-        }
-
-        return result;
-    }
-
-    public static EntryTree<EntryMapping> compose(EntryTree<EntryMapping> left, EntryTree<EntryMapping> right, boolean keepLeftOnly, boolean keepRightOnly) {
-        Translator leftTranslator = new MappingTranslator(left, VoidEntryResolver.INSTANCE);
-        EntryTree<EntryMapping> result = new HashEntryTree<>();
-        Set<Entry<?>> addedMappings = new HashSet<>();
-
-        for (EntryTreeNode<EntryMapping> node : left) {
-            Entry<?> leftEntry = node.getEntry();
-            EntryMapping leftMapping = node.getValue();
-
-            Entry<?> rightEntry = leftTranslator.translate(leftEntry);
-
-            EntryMapping rightMapping = right.get(rightEntry);
-            if (rightMapping != null) {
-                result.insert(leftEntry, rightMapping);
-                addedMappings.add(rightEntry);
-            } else if (keepLeftOnly) {
-                result.insert(leftEntry, leftMapping);
-            }
-        }
-
-        if (keepRightOnly) {
-            Translator leftInverseTranslator = new MappingTranslator(invert(left), VoidEntryResolver.INSTANCE);
-            for (EntryTreeNode<EntryMapping> node : right) {
-                Entry<?> rightEntry = node.getEntry();
-                EntryMapping rightMapping = node.getValue();
-
-                if (!addedMappings.contains(rightEntry)) {
-                    result.insert(leftInverseTranslator.translate(rightEntry), rightMapping);
-                }
-            }
-        }
-        return result;
-    }
-
-    public static EntryTree<EntryMapping> read(String type, Path path, MappingSaveParameters saveParameters) throws MappingParseException, IOException {
-        if (type.equals("enigma")) {
-            return (Files.isDirectory(path) ? EnigmaMappingsReader.DIRECTORY : EnigmaMappingsReader.ZIP).read(path, ProgressListener.none(), saveParameters);
-        }
-
-        if (type.equals("tiny")) {
-            return TinyMappingsReader.INSTANCE.read(path, ProgressListener.none(), saveParameters);
-        }
-
-        MappingFormat format = null;
-        try {
-            format = MappingFormat.valueOf(type.toUpperCase());
-        } catch (IllegalArgumentException ignored) {
-            if (type.equals("tinyv2")) {
-                format = MappingFormat.TINY_V2;
-            }
-        }
-
-        if (format != null) {
-            return format.getReader().read(path, ProgressListener.none(), saveParameters);
-        }
-
-        throw new IllegalArgumentException("no reader for " + type);
-    }
-
-    public static void write(EntryTree<EntryMapping> mappings, String type, Path path, MappingSaveParameters saveParameters) {
-        if (type.equals("enigma")) {
-            EnigmaMappingsWriter.DIRECTORY.write(mappings, path, ProgressListener.none(), saveParameters);
-            return;
-        }
-
-        if (type.startsWith("tinyv2:") || type.startsWith("tiny_v2:")) {
-            String[] split = type.split(":");
-
-            if (split.length != 3) {
-                throw new IllegalArgumentException("specify column names as 'tinyv2:from_namespace:to_namespace'");
-            }
-
-            new TinyV2Writer(split[1], split[2]).write(mappings, path, ProgressListener.none(), saveParameters);
-            return;
-        }
-
-        if (type.startsWith("tiny:")) {
-            String[] split = type.split(":");
-
-            if (split.length != 3) {
-                throw new IllegalArgumentException("specify column names as 'tiny:from_column:to_column'");
-            }
-
-            new TinyMappingsWriter(split[1], split[2]).write(mappings, path, ProgressListener.none(), saveParameters);
-            return;
-        }
-
-        MappingFormat format = null;
-        try {
-            format = MappingFormat.valueOf(type.toUpperCase());
-        } catch (IllegalArgumentException ignored) {}
-
-        if (format != null) {
-            format.getWriter().write(mappings, path, ProgressListener.none(), saveParameters);
-            return;
-        }
-
-        throw new IllegalArgumentException("no writer for " + type);
-    }
-}
diff --git a/src/main/java/cuchaz/enigma/throwables/MappingConflict.java b/src/main/java/cuchaz/enigma/throwables/MappingConflict.java
deleted file mode 100644
index 95cd449..0000000
--- a/src/main/java/cuchaz/enigma/throwables/MappingConflict.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package cuchaz.enigma.throwables;
-
-public class MappingConflict extends Exception {
-        public MappingConflict(String clazz, String name, String nameExisting) {
-                super(String.format("Conflicting mappings found for %s. The mapping file is %s and the second is %s", clazz, name, nameExisting));
-        }
-}
diff --git a/src/main/java/cuchaz/enigma/utils/LFPrintWriter.java b/src/main/java/cuchaz/enigma/utils/LFPrintWriter.java
deleted file mode 100644
index c12e913..0000000
--- a/src/main/java/cuchaz/enigma/utils/LFPrintWriter.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cuchaz.enigma.utils;
-
-import java.io.PrintWriter;
-import java.io.Writer;
-
-public class LFPrintWriter extends PrintWriter {
-        public LFPrintWriter(Writer out) {
-                super(out);
-        }
-
-        @Override
-        public void println() {
-                // https://stackoverflow.com/a/14749004
-                write('\n');
-        }
-}
diff --git a/src/main/java/cuchaz/enigma/utils/Utils.java b/src/main/java/cuchaz/enigma/utils/Utils.java
deleted file mode 100644
index b45b00d..0000000
--- a/src/main/java/cuchaz/enigma/utils/Utils.java
+++ /dev/null
@@ -1,179 +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.utils;
-
-import com.google.common.io.CharStreams;
-import org.objectweb.asm.Opcodes;
-
-import javax.swing.*;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.JTextComponent;
-import java.awt.*;
-import java.awt.event.MouseEvent;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.*;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-public class Utils {
-        
-        public static final int ASM_VERSION = Opcodes.ASM8;
-
-        public static int combineHashesOrdered(Object... objs) {
-                final int prime = 67;
-                int result = 1;
-                for (Object obj : objs) {
-                        result *= prime;
-                        if (obj != null) {
-                                result += obj.hashCode();
-                        }
-                }
-                return result;
-        }
-
-        public static int combineHashesOrdered(List<Object> objs) {
-                final int prime = 67;
-                int result = 1;
-                for (Object obj : objs) {
-                        result *= prime;
-                        if (obj != null) {
-                                result += obj.hashCode();
-                        }
-                }
-                return result;
-        }
-
-        public static String readStreamToString(InputStream in) throws IOException {
-                return CharStreams.toString(new InputStreamReader(in, "UTF-8"));
-        }
-
-        public static String readResourceToString(String path) throws IOException {
-                InputStream in = Utils.class.getResourceAsStream(path);
-                if (in == null) {
-                        throw new IllegalArgumentException("Resource not found! " + path);
-                }
-                return readStreamToString(in);
-        }
-
-        public static void openUrl(String url) {
-                if (Desktop.isDesktopSupported()) {
-                        Desktop desktop = Desktop.getDesktop();
-                        try {
-                                desktop.browse(new URI(url));
-                        } catch (IOException ex) {
-                                throw new Error(ex);
-                        } catch (URISyntaxException ex) {
-                                throw new IllegalArgumentException(ex);
-                        }
-                }
-        }
-
-        public static JLabel unboldLabel(JLabel label) {
-                Font font = label.getFont();
-                label.setFont(font.deriveFont(font.getStyle() & ~Font.BOLD));
-                return label;
-        }
-
-        public static void showToolTipNow(JComponent component) {
-                // HACKHACK: trick the tooltip manager into showing the tooltip right now
-                ToolTipManager manager = ToolTipManager.sharedInstance();
-                int oldDelay = manager.getInitialDelay();
-                manager.setInitialDelay(0);
-                manager.mouseMoved(new MouseEvent(component, MouseEvent.MOUSE_MOVED, System.currentTimeMillis(), 0, 0, 0, 0, false));
-                manager.setInitialDelay(oldDelay);
-        }
-
-        public static Rectangle safeModelToView(JTextComponent component, int modelPos) {
-                if (modelPos < 0) {
-                        modelPos = 0;
-                } else if (modelPos >= component.getText().length()) {
-                        modelPos = component.getText().length();
-                }
-                try {
-                        return component.modelToView(modelPos);
-                } catch (BadLocationException e) {
-                        throw new RuntimeException(e);
-                }
-        }
-
-        public static boolean getSystemPropertyAsBoolean(String property, boolean defValue) {
-                String value = System.getProperty(property);
-                return value == null ? defValue : Boolean.parseBoolean(value);
-        }
-
-        public static void delete(Path path) throws IOException {
-                if (Files.exists(path)) {
-                        for (Path p : Files.walk(path).sorted(Comparator.reverseOrder()).collect(Collectors.toList())) {
-                                Files.delete(p);
-                        }
-                }
-        }
-
-        public static byte[] zipSha1(Path path) throws IOException {
-                MessageDigest digest;
-                try {
-                        digest = MessageDigest.getInstance("SHA-1");
-                } catch (NoSuchAlgorithmException e) {
-                        // Algorithm guaranteed to be supported
-                        throw new RuntimeException(e);
-                }
-                try (ZipFile zip = new ZipFile(path.toFile())) {
-                        List<? extends ZipEntry> entries = Collections.list(zip.entries());
-                        // only compare classes (some implementations may not generate directory entries)
-                        entries.removeIf(entry -> !entry.getName().toLowerCase(Locale.ROOT).endsWith(".class"));
-                        // different implementations may add zip entries in a different order
-                        entries.sort(Comparator.comparing(ZipEntry::getName));
-                        byte[] buffer = new byte[8192];
-                        for (ZipEntry entry : entries) {
-                                digest.update(entry.getName().getBytes(StandardCharsets.UTF_8));
-                                try (InputStream in = zip.getInputStream(entry)) {
-                                        int n;
-                                        while ((n = in.read(buffer)) != -1) {
-                                                digest.update(buffer, 0, n);
-                                        }
-                                }
-                        }
-                }
-                return digest.digest();
-        }
-
-        public static String caplisiseCamelCase(String input){
-                StringJoiner stringJoiner = new StringJoiner(" ");
-                for (String word : input.toLowerCase(Locale.ROOT).split("_")) {
-                        stringJoiner.add(word.substring(0, 1).toUpperCase(Locale.ROOT) + word.substring(1));
-                }
-                return stringJoiner.toString();
-        }
-
-        public static boolean isBlank(String input) {
-                if (input == null) {
-                        return true;
-                }
-                for (int i = 0; i < input.length(); i++) {
-                        if (!Character.isWhitespace(input.charAt(i))) {
-                                return false;
-                        }
-                }
-                return true;
-        }
-}
diff --git a/src/test/java/cuchaz/enigma/TestSourceIndex.java b/src/test/java/cuchaz/enigma/TestSourceIndex.java
deleted file mode 100644
index b201608..0000000
--- a/src/test/java/cuchaz/enigma/TestSourceIndex.java
+++ /dev/null
@@ -1,74 +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 com.google.common.collect.Sets;
-import cuchaz.enigma.analysis.ClassCache;
-import cuchaz.enigma.source.*;
-import cuchaz.enigma.analysis.index.JarIndex;
-import cuchaz.enigma.translation.representation.entry.ClassEntry;
-import org.junit.Test;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Set;
-
-public class TestSourceIndex {
-        @Test
-        public void indexEverything()
-                throws Exception {
-                // Figure out where Minecraft is...
-                final String mcDir = System.getProperty("enigma.test.minecraftdir");
-                Path mcJar = null;
-                if (mcDir == null) {
-                        String osname = System.getProperty("os.name").toLowerCase();
-                        if (osname.contains("nix") || osname.contains("nux") || osname.contains("solaris")) {
-                                mcJar = Paths.get(System.getProperty("user.home"), ".minecraft/versions/1.8.3/1.8.3.jar");
-                        } else if (osname.contains("mac") || osname.contains("darwin")) {
-                                mcJar = Paths.get(System.getProperty("user.home"), "Library/Application Support/minecraft/versions/1.8.3/1.8.3.jar");
-                        } else if (osname.contains("win")) {
-                                mcJar = Paths.get(System.getenv("AppData"), ".minecraft/versions/1.8.3/1.8.3.jar");
-                        }
-                } else {
-                        mcJar = Paths.get(mcDir, "versions/1.8.3/1.8.3.jar");
-                }
-
-                if (mcJar == null) {
-                        throw new NullPointerException("Couldn't find jar");
-                }
-
-                Enigma enigma = Enigma.create();
-                EnigmaProject project = enigma.openJar(mcJar, ProgressListener.none());
-
-                ClassCache classCache = project.getClassCache();
-                JarIndex index = project.getJarIndex();
-
-                Decompiler decompiler = Decompilers.PROCYON.create(classCache, new SourceSettings(false, false));
-
-                // get all classes that aren't inner classes
-                Set<ClassEntry> classEntries = Sets.newHashSet();
-                for (ClassEntry obfClassEntry : index.getEntryIndex().getClasses()) {
-                        if (!obfClassEntry.isInnerClass()) {
-                                classEntries.add(obfClassEntry);
-                        }
-                }
-
-                for (ClassEntry obfClassEntry : classEntries) {
-                        try {
-                                Source source = decompiler.getSource(obfClassEntry.getName());
-                                source.index();
-                        } catch (Throwable t) {
-                                throw new Error("Unable to index " + obfClassEntry, t);
-                        }
-                }
-        }
-}