Split GUI code to separate module (#242)

* Split into modules

* Post merge compile fixes

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

59 files changed, 28 insertions, 101 deletions

diff --git a/src/test/java/cuchaz/enigma/command/CheckMappingsCommandTest.java b/enigma-cli/src/test/java/cuchaz/enigma/command/CheckMappingsCommandTest.java
index f3b9f85e..a29bba40 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 0a86def0..0a86def0 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 dd4c2083..dd4c2083 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 a179349c..a179349c 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 0a86def0..0a86def0 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 15b42cf5..15b42cf5 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 a179349c..a179349c 100644
--- a/src/test/resources/packageAccess/wrongMappings/two/Two.mapping
+++ b/enigma-cli/src/test/resources/packageAccess/wrongMappings/two/Two.mapping
diff --git a/src/test/java/cuchaz/enigma/PackageVisibilityIndexTest.java b/enigma/src/test/java/cuchaz/enigma/PackageVisibilityIndexTest.java
index 1dc9748b..1dc9748b 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 d64a745b..494d959e 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 6619d26e..6619d26e 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 9e1425a2..9e1425a2 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 85c72f81..85c72f81 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 48975c82..48975c82 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 76e379c3..76e379c3 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 103c366b..103c366b 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 a73880dd..a73880dd 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 0398de4f..0398de4f 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 a420afe1..a420afe1 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 b9ebe559..b9ebe559 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 48d0c830..96fc6dab 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 4dbe8e2f..4dbe8e2f 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 f07e1f8b..f07e1f8b 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 71439fd1..71439fd1 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 c3d41705..c3d41705 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 bc56b3b2..bc56b3b2 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 87b69d32..87b69d32 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 b9c4929c..b9c4929c 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 50e963c0..50e963c0 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 d0dd664d..d0dd664d 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 c5845702..c5845702 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 f652d875..f652d875 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 d1b7601f..d1b7601f 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 94061faa..94061faa 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 71b3a6d8..71b3a6d8 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 976ec426..976ec426 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 b1de3c9a..b1de3c9a 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 ddc4e319..ddc4e319 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 6f5fe304..6f5fe304 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 cf0f6574..cf0f6574 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 19fb19c2..19fb19c2 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 26f3718c..26f3718c 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 fd7f6e7e..fd7f6e7e 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 9d74e443..9d74e443 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 99c83bbf..99c83bbf 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 0b8cf2a5..0b8cf2a5 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 8a92792a..8a92792a 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 a1e6a85c..a1e6a85c 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 013c55ae..013c55ae 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 fd2ebdd5..fd2ebdd5 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 b3a60056..e8319430 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 7cfdacaa..65941e54 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 021a90cb..6e4d7b99 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 d1345583..d1345583 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 ba3575ae..691d8a29 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 9411d269..9411d269 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 f9b04428..f9b04428 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 8d43ba90..8d43ba90 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 c08765c7..c08765c7 100644
--- a/src/test/java/cuchaz/enigma/resources/translation.mappings
+++ b/enigma/src/test/resources/translation.mappings
diff --git a/src/test/java/cuchaz/enigma/TestSourceIndex.java b/src/test/java/cuchaz/enigma/TestSourceIndex.java
deleted file mode 100644
index b2016089..00000000
--- 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);
-                        }
-                }
-        }
-}