diff --git a/src/main/java/moe/yushi/authlibinjector/AuthlibInjector.java b/src/main/java/moe/yushi/authlibinjector/AuthlibInjector.java
index 053ad01..52190ca 100644
--- a/src/main/java/moe/yushi/authlibinjector/AuthlibInjector.java
+++ b/src/main/java/moe/yushi/authlibinjector/AuthlibInjector.java
@@ -49,16 +49,16 @@ import moe.yushi.authlibinjector.httpd.QueryProfileFilter;
 import moe.yushi.authlibinjector.httpd.QueryUUIDsFilter;
 import moe.yushi.authlibinjector.httpd.URLFilter;
 import moe.yushi.authlibinjector.httpd.URLProcessor;
-import moe.yushi.authlibinjector.transform.AuthlibLogInterceptor;
 import moe.yushi.authlibinjector.transform.ClassTransformer;
 import moe.yushi.authlibinjector.transform.ConstantURLTransformUnit;
 import moe.yushi.authlibinjector.transform.DumpClassListener;
-import moe.yushi.authlibinjector.transform.MainArgumentsTransformer;
-import moe.yushi.authlibinjector.transform.SkinWhitelistTransformUnit;
-import moe.yushi.authlibinjector.transform.YggdrasilKeyTransformUnit;
+import moe.yushi.authlibinjector.transform.support.AuthlibLogInterceptor;
 import moe.yushi.authlibinjector.transform.support.CitizensTransformer;
 import moe.yushi.authlibinjector.transform.support.MC52974Workaround;
 import moe.yushi.authlibinjector.transform.support.MC52974_1710Workaround;
+import moe.yushi.authlibinjector.transform.support.MainArgumentsTransformer;
+import moe.yushi.authlibinjector.transform.support.SkinWhitelistTransformUnit;
+import moe.yushi.authlibinjector.transform.support.YggdrasilKeyTransformUnit;
 import moe.yushi.authlibinjector.util.Logging;
 import moe.yushi.authlibinjector.yggdrasil.CustomYggdrasilAPIProvider;
 import moe.yushi.authlibinjector.yggdrasil.MojangYggdrasilAPIProvider;
diff --git a/src/main/java/moe/yushi/authlibinjector/transform/AuthlibLogInterceptor.java b/src/main/java/moe/yushi/authlibinjector/transform/support/AuthlibLogInterceptor.java
similarity index 97%
rename from src/main/java/moe/yushi/authlibinjector/transform/AuthlibLogInterceptor.java
rename to src/main/java/moe/yushi/authlibinjector/transform/support/AuthlibLogInterceptor.java
index 36fd244..deefb33 100644
--- a/src/main/java/moe/yushi/authlibinjector/transform/AuthlibLogInterceptor.java
+++ b/src/main/java/moe/yushi/authlibinjector/transform/support/AuthlibLogInterceptor.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package moe.yushi.authlibinjector.transform;
+package moe.yushi.authlibinjector.transform.support;
 
 import static org.objectweb.asm.Opcodes.ASM7;
 import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
@@ -37,6 +37,9 @@ import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Type;
 
+import moe.yushi.authlibinjector.transform.CallbackMethod;
+import moe.yushi.authlibinjector.transform.CallbackSupport;
+import moe.yushi.authlibinjector.transform.TransformUnit;
 import moe.yushi.authlibinjector.util.Logging;
 
 public class AuthlibLogInterceptor implements TransformUnit {
diff --git a/src/main/java/moe/yushi/authlibinjector/transform/support/MC52974Workaround.java b/src/main/java/moe/yushi/authlibinjector/transform/support/MC52974Workaround.java
index 032b103..94614f0 100644
--- a/src/main/java/moe/yushi/authlibinjector/transform/support/MC52974Workaround.java
+++ b/src/main/java/moe/yushi/authlibinjector/transform/support/MC52974Workaround.java
@@ -29,7 +29,6 @@ import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.MethodVisitor;
 
 import moe.yushi.authlibinjector.AuthlibInjector;
-import moe.yushi.authlibinjector.transform.MainArgumentsTransformer;
 import moe.yushi.authlibinjector.transform.TransformUnit;
 import moe.yushi.authlibinjector.util.Logging;
 
diff --git a/src/main/java/moe/yushi/authlibinjector/transform/support/MC52974_1710Workaround.java b/src/main/java/moe/yushi/authlibinjector/transform/support/MC52974_1710Workaround.java
index abd5f5d..b73f45b 100644
--- a/src/main/java/moe/yushi/authlibinjector/transform/support/MC52974_1710Workaround.java
+++ b/src/main/java/moe/yushi/authlibinjector/transform/support/MC52974_1710Workaround.java
@@ -35,7 +35,6 @@ import org.objectweb.asm.MethodVisitor;
 import moe.yushi.authlibinjector.AuthlibInjector;
 import moe.yushi.authlibinjector.transform.CallbackMethod;
 import moe.yushi.authlibinjector.transform.CallbackSupport;
-import moe.yushi.authlibinjector.transform.MainArgumentsTransformer;
 import moe.yushi.authlibinjector.transform.TransformUnit;
 import moe.yushi.authlibinjector.util.Logging;
 import moe.yushi.authlibinjector.util.WeakIdentityHashMap;
diff --git a/src/main/java/moe/yushi/authlibinjector/transform/MainArgumentsTransformer.java b/src/main/java/moe/yushi/authlibinjector/transform/support/MainArgumentsTransformer.java
similarity index 94%
rename from src/main/java/moe/yushi/authlibinjector/transform/MainArgumentsTransformer.java
rename to src/main/java/moe/yushi/authlibinjector/transform/support/MainArgumentsTransformer.java
index 02011e2..554fbbb 100644
--- a/src/main/java/moe/yushi/authlibinjector/transform/MainArgumentsTransformer.java
+++ b/src/main/java/moe/yushi/authlibinjector/transform/support/MainArgumentsTransformer.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package moe.yushi.authlibinjector.transform;
+package moe.yushi.authlibinjector.transform.support;
 
 import static java.util.stream.Collectors.joining;
 import static org.objectweb.asm.Opcodes.ALOAD;
@@ -31,6 +31,9 @@ import java.util.stream.Stream;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.MethodVisitor;
 
+import moe.yushi.authlibinjector.transform.CallbackMethod;
+import moe.yushi.authlibinjector.transform.CallbackSupport;
+import moe.yushi.authlibinjector.transform.TransformUnit;
 import moe.yushi.authlibinjector.util.Logging;
 
 public class MainArgumentsTransformer implements TransformUnit {
diff --git a/src/main/java/moe/yushi/authlibinjector/transform/SkinWhitelistTransformUnit.java b/src/main/java/moe/yushi/authlibinjector/transform/support/SkinWhitelistTransformUnit.java
similarity index 97%
rename from src/main/java/moe/yushi/authlibinjector/transform/SkinWhitelistTransformUnit.java
rename to src/main/java/moe/yushi/authlibinjector/transform/support/SkinWhitelistTransformUnit.java
index 6f0e789..a951088 100644
--- a/src/main/java/moe/yushi/authlibinjector/transform/SkinWhitelistTransformUnit.java
+++ b/src/main/java/moe/yushi/authlibinjector/transform/support/SkinWhitelistTransformUnit.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package moe.yushi.authlibinjector.transform;
+package moe.yushi.authlibinjector.transform.support;
 
 import static org.objectweb.asm.Opcodes.AASTORE;
 import static org.objectweb.asm.Opcodes.ANEWARRAY;
@@ -28,6 +28,8 @@ import java.util.Optional;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.MethodVisitor;
 
+import moe.yushi.authlibinjector.transform.TransformUnit;
+
 public class SkinWhitelistTransformUnit implements TransformUnit {
 
 	private String[] skinWhitelist;
diff --git a/src/main/java/moe/yushi/authlibinjector/transform/YggdrasilKeyTransformUnit.java b/src/main/java/moe/yushi/authlibinjector/transform/support/YggdrasilKeyTransformUnit.java
similarity index 95%
rename from src/main/java/moe/yushi/authlibinjector/transform/YggdrasilKeyTransformUnit.java
rename to src/main/java/moe/yushi/authlibinjector/transform/support/YggdrasilKeyTransformUnit.java
index fdcec91..891334c 100644
--- a/src/main/java/moe/yushi/authlibinjector/transform/YggdrasilKeyTransformUnit.java
+++ b/src/main/java/moe/yushi/authlibinjector/transform/support/YggdrasilKeyTransformUnit.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package moe.yushi.authlibinjector.transform;
+package moe.yushi.authlibinjector.transform.support;
 
 import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
 import static org.objectweb.asm.Opcodes.ACC_STATIC;
@@ -44,6 +44,10 @@ import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.MethodVisitor;
 
+import moe.yushi.authlibinjector.transform.CallbackMethod;
+import moe.yushi.authlibinjector.transform.CallbackSupport;
+import moe.yushi.authlibinjector.transform.TransformUnit;
+
 public class YggdrasilKeyTransformUnit implements TransformUnit {
 
 	private static final List<PublicKey> PUBLIC_KEYS = new CopyOnWriteArrayList<>();
@@ -104,7 +108,7 @@ public class YggdrasilKeyTransformUnit implements TransformUnit {
 					mv.visitFrame(F_CHOP, 1, null, 0, null);
 					mv.visitInsn(ICONST_0);
 					mv.visitInsn(IRETURN);
-					mv.visitMaxs(2, 4);
+					mv.visitMaxs(-1, -1);
 					mv.visitEnd();
 				}
 
diff --git a/src/test/java/moe/yushi/authlibinjector/test/VersionSeriesDetectTest.java b/src/test/java/moe/yushi/authlibinjector/test/VersionSeriesDetectTest.java
index 722ccfe..97e76c4 100644
--- a/src/test/java/moe/yushi/authlibinjector/test/VersionSeriesDetectTest.java
+++ b/src/test/java/moe/yushi/authlibinjector/test/VersionSeriesDetectTest.java
@@ -16,7 +16,7 @@
  */
 package moe.yushi.authlibinjector.test;
 
-import static moe.yushi.authlibinjector.transform.MainArgumentsTransformer.inferVersionSeries;
+import static moe.yushi.authlibinjector.transform.support.MainArgumentsTransformer.inferVersionSeries;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Optional;