diff --git a/src/main/java/com/falsepattern/lib/internal/FalsePatternLib.java b/src/main/java/com/falsepattern/lib/internal/FalsePatternLib.java
index 733057d..852e64c 100644
--- a/src/main/java/com/falsepattern/lib/internal/FalsePatternLib.java
+++ b/src/main/java/com/falsepattern/lib/internal/FalsePatternLib.java
@@ -1,46 +1,22 @@
 package com.falsepattern.lib.internal;
 
-import com.falsepattern.lib.config.ConfigException;
-import com.falsepattern.lib.config.ConfigurationManager;
 import com.falsepattern.lib.internal.proxy.CommonProxy;
-import com.falsepattern.lib.text.FormattedText;
-import com.falsepattern.lib.updates.ModUpdateInfo;
-import com.falsepattern.lib.updates.UpdateChecker;
+
 import cpw.mods.fml.common.*;
-import cpw.mods.fml.common.event.FMLConstructionEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+
 import lombok.Getter;
-import lombok.val;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.event.ClickEvent;
+
 import net.minecraft.launchwrapper.Launch;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.ChatStyle;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IChatComponent;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.entity.EntityJoinWorldEvent;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 /**
  * Utility class used by FalsePatternLib's internal code. This can change between versions without notice, so do not use
  * this in your code!
  */
-@SuppressWarnings("UnstableApiUsage")
 @Mod(modid = Tags.MODID,
      name = Tags.MODNAME,
      version = Tags.VERSION,
diff --git a/src/main/java/com/falsepattern/lib/reflection/MappingManager.java b/src/main/java/com/falsepattern/lib/mapping/MappingManager.java
similarity index 91%
rename from src/main/java/com/falsepattern/lib/reflection/MappingManager.java
rename to src/main/java/com/falsepattern/lib/mapping/MappingManager.java
index 9b692b1..cf7254d 100644
--- a/src/main/java/com/falsepattern/lib/reflection/MappingManager.java
+++ b/src/main/java/com/falsepattern/lib/mapping/MappingManager.java
@@ -1,13 +1,13 @@
-package com.falsepattern.lib.reflection;
+package com.falsepattern.lib.mapping;
 
 import com.falsepattern.lib.internal.CoreLoadingPlugin;
 import com.falsepattern.lib.internal.FalsePatternLib;
-import com.falsepattern.lib.reflection.storage.Lookup;
-import com.falsepattern.lib.reflection.types.MappingType;
-import com.falsepattern.lib.reflection.types.NameType;
-import com.falsepattern.lib.reflection.types.UniversalClass;
-import com.falsepattern.lib.reflection.types.UniversalField;
-import com.falsepattern.lib.reflection.types.UniversalMethod;
+import com.falsepattern.lib.mapping.storage.Lookup;
+import com.falsepattern.lib.mapping.types.MappingType;
+import com.falsepattern.lib.mapping.types.NameType;
+import com.falsepattern.lib.mapping.types.UniversalClass;
+import com.falsepattern.lib.mapping.types.UniversalField;
+import com.falsepattern.lib.mapping.types.UniversalMethod;
 import com.falsepattern.lib.util.ResourceUtil;
 import lombok.SneakyThrows;
 import lombok.val;
@@ -27,6 +27,7 @@ public class MappingManager {
     private static synchronized void initialize() {
         if (initialized) return;
         initialized = true;
+        long start = System.nanoTime();
         val stringPool = new HashMap<String, String>();
         {
             val classMappings = ResourceUtil.getResourceStringFromJar("/classes.csv", FalsePatternLib.class).split("\n");
@@ -53,6 +54,8 @@ public class MappingManager {
                 new UniversalMethod(clazz, line, stringPool);
             }
         }
+        long end = System.nanoTime();
+        System.out.println("Parsed in " + (end - start) / 1000000 + "ms");
     }
 
     public static UniversalClass classForName(NameType nameType, MappingType mappingType, String className) throws ClassNotFoundException {
diff --git a/src/main/java/com/falsepattern/lib/reflection/storage/Lookup.java b/src/main/java/com/falsepattern/lib/mapping/storage/Lookup.java
similarity index 95%
rename from src/main/java/com/falsepattern/lib/reflection/storage/Lookup.java
rename to src/main/java/com/falsepattern/lib/mapping/storage/Lookup.java
index 93d31fb..f02cb6b 100644
--- a/src/main/java/com/falsepattern/lib/reflection/storage/Lookup.java
+++ b/src/main/java/com/falsepattern/lib/mapping/storage/Lookup.java
@@ -1,6 +1,6 @@
-package com.falsepattern.lib.reflection.storage;
+package com.falsepattern.lib.mapping.storage;
 
-import com.falsepattern.lib.reflection.types.MappingType;
+import com.falsepattern.lib.mapping.types.MappingType;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
 import lombok.experimental.Accessors;
diff --git a/src/main/java/com/falsepattern/lib/reflection/storage/MappedString.java b/src/main/java/com/falsepattern/lib/mapping/storage/MappedString.java
similarity index 94%
rename from src/main/java/com/falsepattern/lib/reflection/storage/MappedString.java
rename to src/main/java/com/falsepattern/lib/mapping/storage/MappedString.java
index 35be973..f4a9310 100644
--- a/src/main/java/com/falsepattern/lib/reflection/storage/MappedString.java
+++ b/src/main/java/com/falsepattern/lib/mapping/storage/MappedString.java
@@ -1,6 +1,6 @@
-package com.falsepattern.lib.reflection.storage;
+package com.falsepattern.lib.mapping.storage;
 
-import com.falsepattern.lib.reflection.types.MappingType;
+import com.falsepattern.lib.mapping.types.MappingType;
 import lombok.AccessLevel;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
diff --git a/src/main/java/com/falsepattern/lib/reflection/types/MappingType.java b/src/main/java/com/falsepattern/lib/mapping/types/MappingType.java
similarity index 54%
rename from src/main/java/com/falsepattern/lib/reflection/types/MappingType.java
rename to src/main/java/com/falsepattern/lib/mapping/types/MappingType.java
index 52c1c72..90426a1 100644
--- a/src/main/java/com/falsepattern/lib/reflection/types/MappingType.java
+++ b/src/main/java/com/falsepattern/lib/mapping/types/MappingType.java
@@ -1,4 +1,4 @@
-package com.falsepattern.lib.reflection.types;
+package com.falsepattern.lib.mapping.types;
 
 public enum MappingType {
     Notch,
diff --git a/src/main/java/com/falsepattern/lib/reflection/types/NameType.java b/src/main/java/com/falsepattern/lib/mapping/types/NameType.java
similarity index 52%
rename from src/main/java/com/falsepattern/lib/reflection/types/NameType.java
rename to src/main/java/com/falsepattern/lib/mapping/types/NameType.java
index 1a47845..4acc3fb 100644
--- a/src/main/java/com/falsepattern/lib/reflection/types/NameType.java
+++ b/src/main/java/com/falsepattern/lib/mapping/types/NameType.java
@@ -1,4 +1,4 @@
-package com.falsepattern.lib.reflection.types;
+package com.falsepattern.lib.mapping.types;
 
 public enum NameType {
     Internal,
diff --git a/src/main/java/com/falsepattern/lib/reflection/types/UniversalClass.java b/src/main/java/com/falsepattern/lib/mapping/types/UniversalClass.java
similarity index 92%
rename from src/main/java/com/falsepattern/lib/reflection/types/UniversalClass.java
rename to src/main/java/com/falsepattern/lib/mapping/types/UniversalClass.java
index 2107281..a0f4278 100644
--- a/src/main/java/com/falsepattern/lib/reflection/types/UniversalClass.java
+++ b/src/main/java/com/falsepattern/lib/mapping/types/UniversalClass.java
@@ -1,8 +1,8 @@
-package com.falsepattern.lib.reflection.types;
+package com.falsepattern.lib.mapping.types;
 
 import com.falsepattern.lib.internal.CoreLoadingPlugin;
-import com.falsepattern.lib.reflection.storage.Lookup;
-import com.falsepattern.lib.reflection.storage.MappedString;
+import com.falsepattern.lib.mapping.storage.Lookup;
+import com.falsepattern.lib.mapping.storage.MappedString;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
@@ -84,6 +84,10 @@ public class UniversalClass {
         }
     }
 
+    public String getNameAsDescriptor(MappingType mappingType) {
+        return "L" + getName(NameType.Internal, mappingType) + ";";
+    }
+
     public UniversalField getField(MappingType mappingType, String fieldName) throws NoSuchFieldException {
         try {
             return fields.get(mappingType, fieldName);
diff --git a/src/main/java/com/falsepattern/lib/reflection/types/UniversalField.java b/src/main/java/com/falsepattern/lib/mapping/types/UniversalField.java
similarity index 90%
rename from src/main/java/com/falsepattern/lib/reflection/types/UniversalField.java
rename to src/main/java/com/falsepattern/lib/mapping/types/UniversalField.java
index dc28d48..462bb2d 100644
--- a/src/main/java/com/falsepattern/lib/reflection/types/UniversalField.java
+++ b/src/main/java/com/falsepattern/lib/mapping/types/UniversalField.java
@@ -1,7 +1,7 @@
-package com.falsepattern.lib.reflection.types;
+package com.falsepattern.lib.mapping.types;
 
-import com.falsepattern.lib.reflection.ReflectionUtil;
-import com.falsepattern.lib.reflection.storage.MappedString;
+import com.falsepattern.lib.util.ReflectionUtil;
+import com.falsepattern.lib.mapping.storage.MappedString;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
@@ -29,8 +29,8 @@ public class UniversalField {
 
     public UniversalField(@NonNull UniversalClass parent, String[] names, Map<String, String> stringPool) {
         this.parent = parent;
-        parent.addField(this);
         name = new MappedString(names, 0, 1, (str) -> str.substring(str.lastIndexOf('/') + 1), stringPool);
+        parent.addField(this);
     }
 
     public String getName(MappingType mappingType) {
diff --git a/src/main/java/com/falsepattern/lib/reflection/types/UniversalMethod.java b/src/main/java/com/falsepattern/lib/mapping/types/UniversalMethod.java
similarity index 96%
rename from src/main/java/com/falsepattern/lib/reflection/types/UniversalMethod.java
rename to src/main/java/com/falsepattern/lib/mapping/types/UniversalMethod.java
index 5932f5f..801d4e2 100644
--- a/src/main/java/com/falsepattern/lib/reflection/types/UniversalMethod.java
+++ b/src/main/java/com/falsepattern/lib/mapping/types/UniversalMethod.java
@@ -1,7 +1,7 @@
-package com.falsepattern.lib.reflection.types;
+package com.falsepattern.lib.mapping.types;
 
-import com.falsepattern.lib.reflection.ReflectionUtil;
-import com.falsepattern.lib.reflection.storage.MappedString;
+import com.falsepattern.lib.util.ReflectionUtil;
+import com.falsepattern.lib.mapping.storage.MappedString;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
@@ -35,10 +35,10 @@ public class UniversalMethod {
 
     public UniversalMethod(@NonNull UniversalClass parent, String[] names, Map<String, String> stringPool) {
         this.parent = parent;
-        parent.addMethod(this);
         name = new MappedString(names, 0, 2, (str) -> str.substring(str.lastIndexOf('/') + 1), stringPool);
         descriptor = new MappedString(names, 1, 2, (str) -> str, stringPool);
         fusedNameDescriptor = MappedString.fuse(name, descriptor, "", stringPool);
+        parent.addMethod(this);
     }
 
     public String getName(MappingType mappingType) {
diff --git a/src/main/java/com/falsepattern/lib/reflection/ReflectionUtil.java b/src/main/java/com/falsepattern/lib/util/ReflectionUtil.java
similarity index 94%
rename from src/main/java/com/falsepattern/lib/reflection/ReflectionUtil.java
rename to src/main/java/com/falsepattern/lib/util/ReflectionUtil.java
index 029e6bf..cbe1bec 100644
--- a/src/main/java/com/falsepattern/lib/reflection/ReflectionUtil.java
+++ b/src/main/java/com/falsepattern/lib/util/ReflectionUtil.java
@@ -1,4 +1,4 @@
-package com.falsepattern.lib.reflection;
+package com.falsepattern.lib.util;
 
 import lombok.SneakyThrows;