diff --git a/src/main/java/haidnor/jvm/HaidnorJVM.java b/src/main/java/haidnor/jvm/HaidnorJVM.java
index 14febdd..96953e4 100644
--- a/src/main/java/haidnor/jvm/HaidnorJVM.java
+++ b/src/main/java/haidnor/jvm/HaidnorJVM.java
@@ -5,7 +5,7 @@ import haidnor.jvm.classloader.JVMClassLoader;
 import haidnor.jvm.core.JavaExecutionEngine;
 import haidnor.jvm.rtda.Metaspace;
 import haidnor.jvm.runtime.JVMThread;
-import haidnor.jvm.util.JVMThreadHolder;
+import haidnor.jvm.core.JVMThreadHolder;
 import lombok.SneakyThrows;
 import org.apache.commons.cli.*;
 
@@ -84,7 +84,8 @@ public class HaidnorJVM {
     public static void testRun(Class<?> mainClass) {
         JVMThreadHolder.set(new JVMThread());
         JVMClassLoader bootClassLoader = new JVMClassLoader("ApplicationClassLoader");
-        JavaClass mainMeteKlass = bootClassLoader.loadWithClassPath(mainClass.getName().replace('.', '/'));
-        JavaExecutionEngine.callMain(mainMeteKlass);
+        JavaClass javaClass = bootClassLoader.loadWithClassPath(mainClass.getName().replace('.', '/'));
+        JavaExecutionEngine.callMain(javaClass);
     }
+
 }
\ No newline at end of file
diff --git a/src/main/java/haidnor/jvm/util/CodeStream.java b/src/main/java/haidnor/jvm/core/CodeStream.java
similarity index 98%
rename from src/main/java/haidnor/jvm/util/CodeStream.java
rename to src/main/java/haidnor/jvm/core/CodeStream.java
index f662102..890e55f 100644
--- a/src/main/java/haidnor/jvm/util/CodeStream.java
+++ b/src/main/java/haidnor/jvm/core/CodeStream.java
@@ -1,4 +1,4 @@
-package haidnor.jvm.util;
+package haidnor.jvm.core;
 
 
 import haidnor.jvm.bcel.classfile.Code;
diff --git a/src/main/java/haidnor/jvm/util/JVMThreadHolder.java b/src/main/java/haidnor/jvm/core/JVMThreadHolder.java
similarity index 92%
rename from src/main/java/haidnor/jvm/util/JVMThreadHolder.java
rename to src/main/java/haidnor/jvm/core/JVMThreadHolder.java
index e361cbc..c47b7af 100644
--- a/src/main/java/haidnor/jvm/util/JVMThreadHolder.java
+++ b/src/main/java/haidnor/jvm/core/JVMThreadHolder.java
@@ -1,4 +1,4 @@
-package haidnor.jvm.util;
+package haidnor.jvm.core;
 
 import haidnor.jvm.runtime.JVMThread;
 
diff --git a/src/main/java/haidnor/jvm/core/JavaExecutionEngine.java b/src/main/java/haidnor/jvm/core/JavaExecutionEngine.java
index aafe291..f34f032 100644
--- a/src/main/java/haidnor/jvm/core/JavaExecutionEngine.java
+++ b/src/main/java/haidnor/jvm/core/JavaExecutionEngine.java
@@ -9,8 +9,6 @@ import haidnor.jvm.instruction.control.ReturnableInstruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.JVMThread;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
-import haidnor.jvm.util.JVMThreadHolder;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/src/main/java/haidnor/jvm/instruction/Instruction.java b/src/main/java/haidnor/jvm/instruction/Instruction.java
index 331db8c..6ab7085 100644
--- a/src/main/java/haidnor/jvm/instruction/Instruction.java
+++ b/src/main/java/haidnor/jvm/instruction/Instruction.java
@@ -1,7 +1,7 @@
 package haidnor.jvm.instruction;
 
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/src/main/java/haidnor/jvm/instruction/InstructionFactory.java b/src/main/java/haidnor/jvm/instruction/InstructionFactory.java
index e602194..befe732 100644
--- a/src/main/java/haidnor/jvm/instruction/InstructionFactory.java
+++ b/src/main/java/haidnor/jvm/instruction/InstructionFactory.java
@@ -11,7 +11,7 @@ import haidnor.jvm.instruction.math.*;
 import haidnor.jvm.instruction.references.*;
 import haidnor.jvm.instruction.stack.*;
 import haidnor.jvm.instruction.stores.*;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public abstract class InstructionFactory {
 
diff --git a/src/main/java/haidnor/jvm/instruction/comparisons/DCMPG.java b/src/main/java/haidnor/jvm/instruction/comparisons/DCMPG.java
index 3fe4f61..67d22ea 100644
--- a/src/main/java/haidnor/jvm/instruction/comparisons/DCMPG.java
+++ b/src/main/java/haidnor/jvm/instruction/comparisons/DCMPG.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.comparisons;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * @author wang xiang
diff --git a/src/main/java/haidnor/jvm/instruction/comparisons/DCMPL.java b/src/main/java/haidnor/jvm/instruction/comparisons/DCMPL.java
index 0f2b8f3..1d65fb9 100644
--- a/src/main/java/haidnor/jvm/instruction/comparisons/DCMPL.java
+++ b/src/main/java/haidnor/jvm/instruction/comparisons/DCMPL.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.comparisons;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * @author wang xiang
diff --git a/src/main/java/haidnor/jvm/instruction/comparisons/FCMPG.java b/src/main/java/haidnor/jvm/instruction/comparisons/FCMPG.java
index d57fd7e..6948ed0 100644
--- a/src/main/java/haidnor/jvm/instruction/comparisons/FCMPG.java
+++ b/src/main/java/haidnor/jvm/instruction/comparisons/FCMPG.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.comparisons;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 /**
  * @author wang xiang
  */
diff --git a/src/main/java/haidnor/jvm/instruction/comparisons/FCMPL.java b/src/main/java/haidnor/jvm/instruction/comparisons/FCMPL.java
index 5dba400..b538190 100644
--- a/src/main/java/haidnor/jvm/instruction/comparisons/FCMPL.java
+++ b/src/main/java/haidnor/jvm/instruction/comparisons/FCMPL.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.comparisons;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 /**
  * @author wang xiang
  */
diff --git a/src/main/java/haidnor/jvm/instruction/comparisons/IFEQ.java b/src/main/java/haidnor/jvm/instruction/comparisons/IFEQ.java
index a9fb754..df3676f 100644
--- a/src/main/java/haidnor/jvm/instruction/comparisons/IFEQ.java
+++ b/src/main/java/haidnor/jvm/instruction/comparisons/IFEQ.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class IFEQ extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/comparisons/IFGE.java b/src/main/java/haidnor/jvm/instruction/comparisons/IFGE.java
index 8a4e263..9f90efc 100644
--- a/src/main/java/haidnor/jvm/instruction/comparisons/IFGE.java
+++ b/src/main/java/haidnor/jvm/instruction/comparisons/IFGE.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class IFGE extends Instruction {
     /**
diff --git a/src/main/java/haidnor/jvm/instruction/comparisons/IFGT.java b/src/main/java/haidnor/jvm/instruction/comparisons/IFGT.java
index d91b3aa..86850fe 100644
--- a/src/main/java/haidnor/jvm/instruction/comparisons/IFGT.java
+++ b/src/main/java/haidnor/jvm/instruction/comparisons/IFGT.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class IFGT extends Instruction {
     /**
diff --git a/src/main/java/haidnor/jvm/instruction/comparisons/IFLE.java b/src/main/java/haidnor/jvm/instruction/comparisons/IFLE.java
index 566deb7..1da2e12 100644
--- a/src/main/java/haidnor/jvm/instruction/comparisons/IFLE.java
+++ b/src/main/java/haidnor/jvm/instruction/comparisons/IFLE.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class IFLE extends Instruction {
     /**
diff --git a/src/main/java/haidnor/jvm/instruction/comparisons/IFLT.java b/src/main/java/haidnor/jvm/instruction/comparisons/IFLT.java
index aba66af..4e9af95 100644
--- a/src/main/java/haidnor/jvm/instruction/comparisons/IFLT.java
+++ b/src/main/java/haidnor/jvm/instruction/comparisons/IFLT.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class IFLT extends Instruction {
     /**
diff --git a/src/main/java/haidnor/jvm/instruction/comparisons/IFNE.java b/src/main/java/haidnor/jvm/instruction/comparisons/IFNE.java
index 76c7fba..f54d739 100644
--- a/src/main/java/haidnor/jvm/instruction/comparisons/IFNE.java
+++ b/src/main/java/haidnor/jvm/instruction/comparisons/IFNE.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class IFNE extends Instruction {
     /**
diff --git a/src/main/java/haidnor/jvm/instruction/comparisons/IF_ACMPEQ.java b/src/main/java/haidnor/jvm/instruction/comparisons/IF_ACMPEQ.java
index 47f74ac..f31bfc5 100644
--- a/src/main/java/haidnor/jvm/instruction/comparisons/IF_ACMPEQ.java
+++ b/src/main/java/haidnor/jvm/instruction/comparisons/IF_ACMPEQ.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.comparisons;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 /**
  * @author wang xiang
  */
diff --git a/src/main/java/haidnor/jvm/instruction/comparisons/IF_ACMPNE.java b/src/main/java/haidnor/jvm/instruction/comparisons/IF_ACMPNE.java
index fcadaf6..10d0ddc 100644
--- a/src/main/java/haidnor/jvm/instruction/comparisons/IF_ACMPNE.java
+++ b/src/main/java/haidnor/jvm/instruction/comparisons/IF_ACMPNE.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.comparisons;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 /**
  * @author wang xiang
  */
diff --git a/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPEQ.java b/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPEQ.java
index 7a73bdb..5c3bbbe 100644
--- a/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPEQ.java
+++ b/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPEQ.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * Java VM opcode.
diff --git a/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPGE.java b/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPGE.java
index 92da062..9b7e138 100644
--- a/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPGE.java
+++ b/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPGE.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * Java VM opcode.
diff --git a/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPGT.java b/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPGT.java
index c4dc330..b2a7d48 100644
--- a/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPGT.java
+++ b/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPGT.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * Java VM opcode.
diff --git a/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPLE.java b/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPLE.java
index 73d7768..d884a8b 100644
--- a/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPLE.java
+++ b/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPLE.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * Java VM opcode.
diff --git a/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPLT.java b/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPLT.java
index 4d5ae29..2fb8a82 100644
--- a/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPLT.java
+++ b/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPLT.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * Java VM opcode.
diff --git a/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPNE.java b/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPNE.java
index acca433..03a6056 100644
--- a/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPNE.java
+++ b/src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPNE.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * Java VM opcode.
diff --git a/src/main/java/haidnor/jvm/instruction/comparisons/LCMP.java b/src/main/java/haidnor/jvm/instruction/comparisons/LCMP.java
index 60e3daf..12ba78e 100644
--- a/src/main/java/haidnor/jvm/instruction/comparisons/LCMP.java
+++ b/src/main/java/haidnor/jvm/instruction/comparisons/LCMP.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.comparisons;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class LCMP extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/constants/ACONST_NULL.java b/src/main/java/haidnor/jvm/instruction/constants/ACONST_NULL.java
index 2af3132..0db53c0 100644
--- a/src/main/java/haidnor/jvm/instruction/constants/ACONST_NULL.java
+++ b/src/main/java/haidnor/jvm/instruction/constants/ACONST_NULL.java
@@ -4,7 +4,7 @@ import haidnor.jvm.bcel.Const;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class ACONST_NULL extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/constants/BIPUSH.java b/src/main/java/haidnor/jvm/instruction/constants/BIPUSH.java
index 115670f..ba32cbe 100644
--- a/src/main/java/haidnor/jvm/instruction/constants/BIPUSH.java
+++ b/src/main/java/haidnor/jvm/instruction/constants/BIPUSH.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/constants/DCONST_0.java b/src/main/java/haidnor/jvm/instruction/constants/DCONST_0.java
index d177a7c..f7468d2 100644
--- a/src/main/java/haidnor/jvm/instruction/constants/DCONST_0.java
+++ b/src/main/java/haidnor/jvm/instruction/constants/DCONST_0.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/constants/DCONST_1.java b/src/main/java/haidnor/jvm/instruction/constants/DCONST_1.java
index 336afd9..7ec0d9c 100644
--- a/src/main/java/haidnor/jvm/instruction/constants/DCONST_1.java
+++ b/src/main/java/haidnor/jvm/instruction/constants/DCONST_1.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/constants/FCONST_1.java b/src/main/java/haidnor/jvm/instruction/constants/FCONST_1.java
index 9d6d767..f725dea 100644
--- a/src/main/java/haidnor/jvm/instruction/constants/FCONST_1.java
+++ b/src/main/java/haidnor/jvm/instruction/constants/FCONST_1.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/constants/FCONST_2.java b/src/main/java/haidnor/jvm/instruction/constants/FCONST_2.java
index 06da1af..5ba3913 100644
--- a/src/main/java/haidnor/jvm/instruction/constants/FCONST_2.java
+++ b/src/main/java/haidnor/jvm/instruction/constants/FCONST_2.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/constants/ICONST_0.java b/src/main/java/haidnor/jvm/instruction/constants/ICONST_0.java
index 9c8f7ff..1706f12 100644
--- a/src/main/java/haidnor/jvm/instruction/constants/ICONST_0.java
+++ b/src/main/java/haidnor/jvm/instruction/constants/ICONST_0.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/constants/ICONST_1.java b/src/main/java/haidnor/jvm/instruction/constants/ICONST_1.java
index b500e45..c5a7d5f 100644
--- a/src/main/java/haidnor/jvm/instruction/constants/ICONST_1.java
+++ b/src/main/java/haidnor/jvm/instruction/constants/ICONST_1.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/constants/ICONST_2.java b/src/main/java/haidnor/jvm/instruction/constants/ICONST_2.java
index f7479f9..2b3317d 100644
--- a/src/main/java/haidnor/jvm/instruction/constants/ICONST_2.java
+++ b/src/main/java/haidnor/jvm/instruction/constants/ICONST_2.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/constants/ICONST_3.java b/src/main/java/haidnor/jvm/instruction/constants/ICONST_3.java
index 986df4a..f16df08 100644
--- a/src/main/java/haidnor/jvm/instruction/constants/ICONST_3.java
+++ b/src/main/java/haidnor/jvm/instruction/constants/ICONST_3.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/constants/ICONST_4.java b/src/main/java/haidnor/jvm/instruction/constants/ICONST_4.java
index 0170f5f..20ea482 100644
--- a/src/main/java/haidnor/jvm/instruction/constants/ICONST_4.java
+++ b/src/main/java/haidnor/jvm/instruction/constants/ICONST_4.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/constants/ICONST_5.java b/src/main/java/haidnor/jvm/instruction/constants/ICONST_5.java
index 7ee2d8a..44a4fce 100644
--- a/src/main/java/haidnor/jvm/instruction/constants/ICONST_5.java
+++ b/src/main/java/haidnor/jvm/instruction/constants/ICONST_5.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/constants/ICONST_M1.java b/src/main/java/haidnor/jvm/instruction/constants/ICONST_M1.java
index 5cf6fd8..2122452 100644
--- a/src/main/java/haidnor/jvm/instruction/constants/ICONST_M1.java
+++ b/src/main/java/haidnor/jvm/instruction/constants/ICONST_M1.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/constants/LCONST_0.java b/src/main/java/haidnor/jvm/instruction/constants/LCONST_0.java
index 65feb10..02886d3 100644
--- a/src/main/java/haidnor/jvm/instruction/constants/LCONST_0.java
+++ b/src/main/java/haidnor/jvm/instruction/constants/LCONST_0.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/constants/LCONST_1.java b/src/main/java/haidnor/jvm/instruction/constants/LCONST_1.java
index 5889ceb..3398b60 100644
--- a/src/main/java/haidnor/jvm/instruction/constants/LCONST_1.java
+++ b/src/main/java/haidnor/jvm/instruction/constants/LCONST_1.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/constants/LDC.java b/src/main/java/haidnor/jvm/instruction/constants/LDC.java
index eeb2178..8582cac 100644
--- a/src/main/java/haidnor/jvm/instruction/constants/LDC.java
+++ b/src/main/java/haidnor/jvm/instruction/constants/LDC.java
@@ -5,7 +5,7 @@ import haidnor.jvm.bcel.classfile.*;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/constants/LDC2W.java b/src/main/java/haidnor/jvm/instruction/constants/LDC2W.java
index 7795f36..a1cdd5f 100644
--- a/src/main/java/haidnor/jvm/instruction/constants/LDC2W.java
+++ b/src/main/java/haidnor/jvm/instruction/constants/LDC2W.java
@@ -8,7 +8,7 @@ import haidnor.jvm.bcel.classfile.ConstantPool;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * 将 long 或 double 型常量从常量池中推送至栈顶 (宽索引)
diff --git a/src/main/java/haidnor/jvm/instruction/constants/LDC_W.java b/src/main/java/haidnor/jvm/instruction/constants/LDC_W.java
index db891ec..69af375 100644
--- a/src/main/java/haidnor/jvm/instruction/constants/LDC_W.java
+++ b/src/main/java/haidnor/jvm/instruction/constants/LDC_W.java
@@ -5,7 +5,7 @@ import haidnor.jvm.bcel.classfile.*;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/constants/NOP.java b/src/main/java/haidnor/jvm/instruction/constants/NOP.java
index 2ffdbea..9ad824c 100644
--- a/src/main/java/haidnor/jvm/instruction/constants/NOP.java
+++ b/src/main/java/haidnor/jvm/instruction/constants/NOP.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.constants;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * Java VM opcode.
diff --git a/src/main/java/haidnor/jvm/instruction/constants/SIPUSH.java b/src/main/java/haidnor/jvm/instruction/constants/SIPUSH.java
index b1c4d3a..8e7d0fd 100644
--- a/src/main/java/haidnor/jvm/instruction/constants/SIPUSH.java
+++ b/src/main/java/haidnor/jvm/instruction/constants/SIPUSH.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/control/ARETURN.java b/src/main/java/haidnor/jvm/instruction/control/ARETURN.java
index 2767dbf..6ad1e98 100644
--- a/src/main/java/haidnor/jvm/instruction/control/ARETURN.java
+++ b/src/main/java/haidnor/jvm/instruction/control/ARETURN.java
@@ -2,8 +2,8 @@ package haidnor.jvm.instruction.control;
 
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
-import haidnor.jvm.util.JVMThreadHolder;
+import haidnor.jvm.core.CodeStream;
+import haidnor.jvm.core.JVMThreadHolder;
 
 public class ARETURN extends ReturnableInstruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/control/DRETURN.java b/src/main/java/haidnor/jvm/instruction/control/DRETURN.java
index cdfa6a8..1c3eb58 100644
--- a/src/main/java/haidnor/jvm/instruction/control/DRETURN.java
+++ b/src/main/java/haidnor/jvm/instruction/control/DRETURN.java
@@ -2,8 +2,8 @@ package haidnor.jvm.instruction.control;
 
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
-import haidnor.jvm.util.JVMThreadHolder;
+import haidnor.jvm.core.CodeStream;
+import haidnor.jvm.core.JVMThreadHolder;
 
 public class DRETURN extends ReturnableInstruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/control/FRETURN.java b/src/main/java/haidnor/jvm/instruction/control/FRETURN.java
index 99f2b44..063e4b9 100644
--- a/src/main/java/haidnor/jvm/instruction/control/FRETURN.java
+++ b/src/main/java/haidnor/jvm/instruction/control/FRETURN.java
@@ -2,8 +2,8 @@ package haidnor.jvm.instruction.control;
 
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
-import haidnor.jvm.util.JVMThreadHolder;
+import haidnor.jvm.core.CodeStream;
+import haidnor.jvm.core.JVMThreadHolder;
 
 public class FRETURN extends ReturnableInstruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/control/IRETURN.java b/src/main/java/haidnor/jvm/instruction/control/IRETURN.java
index 5299e66..31854c9 100644
--- a/src/main/java/haidnor/jvm/instruction/control/IRETURN.java
+++ b/src/main/java/haidnor/jvm/instruction/control/IRETURN.java
@@ -2,8 +2,8 @@ package haidnor.jvm.instruction.control;
 
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
-import haidnor.jvm.util.JVMThreadHolder;
+import haidnor.jvm.core.CodeStream;
+import haidnor.jvm.core.JVMThreadHolder;
 
 public class IRETURN extends ReturnableInstruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/control/LOOKUPSWITCH.java b/src/main/java/haidnor/jvm/instruction/control/LOOKUPSWITCH.java
index 87b7d6a..f839940 100644
--- a/src/main/java/haidnor/jvm/instruction/control/LOOKUPSWITCH.java
+++ b/src/main/java/haidnor/jvm/instruction/control/LOOKUPSWITCH.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.control;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class LOOKUPSWITCH extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/control/LRETURN.java b/src/main/java/haidnor/jvm/instruction/control/LRETURN.java
index a0f58eb..4a1064a 100644
--- a/src/main/java/haidnor/jvm/instruction/control/LRETURN.java
+++ b/src/main/java/haidnor/jvm/instruction/control/LRETURN.java
@@ -2,8 +2,8 @@ package haidnor.jvm.instruction.control;
 
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
-import haidnor.jvm.util.JVMThreadHolder;
+import haidnor.jvm.core.CodeStream;
+import haidnor.jvm.core.JVMThreadHolder;
 
 public class LRETURN extends ReturnableInstruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/control/RET.java b/src/main/java/haidnor/jvm/instruction/control/RET.java
index 18410e8..a072b30 100644
--- a/src/main/java/haidnor/jvm/instruction/control/RET.java
+++ b/src/main/java/haidnor/jvm/instruction/control/RET.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.control;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * RET（Return）指令是 Java 虚拟机中的一条指令，用于从方法中返回并将控制流转移到调用该方法的位置。
diff --git a/src/main/java/haidnor/jvm/instruction/control/RETURN.java b/src/main/java/haidnor/jvm/instruction/control/RETURN.java
index ea869fc..bcb1056 100644
--- a/src/main/java/haidnor/jvm/instruction/control/RETURN.java
+++ b/src/main/java/haidnor/jvm/instruction/control/RETURN.java
@@ -1,8 +1,8 @@
 package haidnor.jvm.instruction.control;
 
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
-import haidnor.jvm.util.JVMThreadHolder;
+import haidnor.jvm.core.CodeStream;
+import haidnor.jvm.core.JVMThreadHolder;
 
 public class RETURN extends ReturnableInstruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/control/ReturnableInstruction.java b/src/main/java/haidnor/jvm/instruction/control/ReturnableInstruction.java
index 5e00204..5768f58 100644
--- a/src/main/java/haidnor/jvm/instruction/control/ReturnableInstruction.java
+++ b/src/main/java/haidnor/jvm/instruction/control/ReturnableInstruction.java
@@ -1,7 +1,7 @@
 package haidnor.jvm.instruction.control;
 
 import haidnor.jvm.instruction.Instruction;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * return 系列字节码指令的抽象类
diff --git a/src/main/java/haidnor/jvm/instruction/control/TABLESWITCH.java b/src/main/java/haidnor/jvm/instruction/control/TABLESWITCH.java
index d4b71ef..7fa7705 100644
--- a/src/main/java/haidnor/jvm/instruction/control/TABLESWITCH.java
+++ b/src/main/java/haidnor/jvm/instruction/control/TABLESWITCH.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.control;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class TABLESWITCH extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/conversions/D2F.java b/src/main/java/haidnor/jvm/instruction/conversions/D2F.java
index bbfc874..5d198c0 100644
--- a/src/main/java/haidnor/jvm/instruction/conversions/D2F.java
+++ b/src/main/java/haidnor/jvm/instruction/conversions/D2F.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.conversions;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class D2F extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/conversions/D2I.java b/src/main/java/haidnor/jvm/instruction/conversions/D2I.java
index 94f5e44..0a95f54 100644
--- a/src/main/java/haidnor/jvm/instruction/conversions/D2I.java
+++ b/src/main/java/haidnor/jvm/instruction/conversions/D2I.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.conversions;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class D2I extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/conversions/D2L.java b/src/main/java/haidnor/jvm/instruction/conversions/D2L.java
index 1bba3f0..1f14da3 100644
--- a/src/main/java/haidnor/jvm/instruction/conversions/D2L.java
+++ b/src/main/java/haidnor/jvm/instruction/conversions/D2L.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.conversions;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class D2L extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/conversions/F2D.java b/src/main/java/haidnor/jvm/instruction/conversions/F2D.java
index a4a0d77..d91920d 100644
--- a/src/main/java/haidnor/jvm/instruction/conversions/F2D.java
+++ b/src/main/java/haidnor/jvm/instruction/conversions/F2D.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.conversions;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class F2D extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/conversions/F2I.java b/src/main/java/haidnor/jvm/instruction/conversions/F2I.java
index 0a95939..a8d35ca 100644
--- a/src/main/java/haidnor/jvm/instruction/conversions/F2I.java
+++ b/src/main/java/haidnor/jvm/instruction/conversions/F2I.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.conversions;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class F2I extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/conversions/F2L.java b/src/main/java/haidnor/jvm/instruction/conversions/F2L.java
index cdadf34..7e50dbf 100644
--- a/src/main/java/haidnor/jvm/instruction/conversions/F2L.java
+++ b/src/main/java/haidnor/jvm/instruction/conversions/F2L.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.conversions;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class F2L extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/conversions/I2B.java b/src/main/java/haidnor/jvm/instruction/conversions/I2B.java
index 1b84a80..3c282e6 100644
--- a/src/main/java/haidnor/jvm/instruction/conversions/I2B.java
+++ b/src/main/java/haidnor/jvm/instruction/conversions/I2B.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.conversions;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * JVM中的I2B指令是用于执行将整数类型（int）转换为字节类型（byte）的指令。该指令将一个int类型的数值从操作数栈中弹出，并将其转换为一个字节（byte）。
diff --git a/src/main/java/haidnor/jvm/instruction/conversions/I2C.java b/src/main/java/haidnor/jvm/instruction/conversions/I2C.java
index 04a9b08..de30d1a 100644
--- a/src/main/java/haidnor/jvm/instruction/conversions/I2C.java
+++ b/src/main/java/haidnor/jvm/instruction/conversions/I2C.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.conversions;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * char 类型的数据是以 int 形式存在的,因此不需要做任何处理
diff --git a/src/main/java/haidnor/jvm/instruction/conversions/I2D.java b/src/main/java/haidnor/jvm/instruction/conversions/I2D.java
index e62a3dd..f0e17f7 100644
--- a/src/main/java/haidnor/jvm/instruction/conversions/I2D.java
+++ b/src/main/java/haidnor/jvm/instruction/conversions/I2D.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.conversions;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class I2D extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/conversions/I2F.java b/src/main/java/haidnor/jvm/instruction/conversions/I2F.java
index 7c4daf5..565e5c6 100644
--- a/src/main/java/haidnor/jvm/instruction/conversions/I2F.java
+++ b/src/main/java/haidnor/jvm/instruction/conversions/I2F.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.conversions;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class I2F extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/conversions/I2L.java b/src/main/java/haidnor/jvm/instruction/conversions/I2L.java
index 6bb9ac8..6f68392 100644
--- a/src/main/java/haidnor/jvm/instruction/conversions/I2L.java
+++ b/src/main/java/haidnor/jvm/instruction/conversions/I2L.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.conversions;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class I2L extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/conversions/I2S.java b/src/main/java/haidnor/jvm/instruction/conversions/I2S.java
index fe9cd1e..9a0a436 100644
--- a/src/main/java/haidnor/jvm/instruction/conversions/I2S.java
+++ b/src/main/java/haidnor/jvm/instruction/conversions/I2S.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.conversions;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class I2S extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/conversions/L2D.java b/src/main/java/haidnor/jvm/instruction/conversions/L2D.java
index fd38919..1882eb4 100644
--- a/src/main/java/haidnor/jvm/instruction/conversions/L2D.java
+++ b/src/main/java/haidnor/jvm/instruction/conversions/L2D.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.conversions;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class L2D extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/conversions/L2F.java b/src/main/java/haidnor/jvm/instruction/conversions/L2F.java
index ae4d084..87331a1 100644
--- a/src/main/java/haidnor/jvm/instruction/conversions/L2F.java
+++ b/src/main/java/haidnor/jvm/instruction/conversions/L2F.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.conversions;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class L2F extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/conversions/L2I.java b/src/main/java/haidnor/jvm/instruction/conversions/L2I.java
index 7e43556..ed762e2 100644
--- a/src/main/java/haidnor/jvm/instruction/conversions/L2I.java
+++ b/src/main/java/haidnor/jvm/instruction/conversions/L2I.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.conversions;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class L2I extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/extended/GOTO.java b/src/main/java/haidnor/jvm/instruction/extended/GOTO.java
index c723d79..0d32837 100644
--- a/src/main/java/haidnor/jvm/instruction/extended/GOTO.java
+++ b/src/main/java/haidnor/jvm/instruction/extended/GOTO.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.extended;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * Java VM opcode.
diff --git a/src/main/java/haidnor/jvm/instruction/extended/GOTO_W.java b/src/main/java/haidnor/jvm/instruction/extended/GOTO_W.java
index 2042b7e..4783039 100644
--- a/src/main/java/haidnor/jvm/instruction/extended/GOTO_W.java
+++ b/src/main/java/haidnor/jvm/instruction/extended/GOTO_W.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.extended;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class GOTO_W extends Instruction {
     /**
diff --git a/src/main/java/haidnor/jvm/instruction/extended/IFNONNULL.java b/src/main/java/haidnor/jvm/instruction/extended/IFNONNULL.java
index eb7fc24..21d1342 100644
--- a/src/main/java/haidnor/jvm/instruction/extended/IFNONNULL.java
+++ b/src/main/java/haidnor/jvm/instruction/extended/IFNONNULL.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.extended;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class IFNONNULL extends Instruction {
     /**
diff --git a/src/main/java/haidnor/jvm/instruction/extended/IFNULL.java b/src/main/java/haidnor/jvm/instruction/extended/IFNULL.java
index 1ee4e72..8fce7eb 100644
--- a/src/main/java/haidnor/jvm/instruction/extended/IFNULL.java
+++ b/src/main/java/haidnor/jvm/instruction/extended/IFNULL.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.extended;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class IFNULL extends Instruction {
     /**
diff --git a/src/main/java/haidnor/jvm/instruction/extended/MULTIANEWARRAY.java b/src/main/java/haidnor/jvm/instruction/extended/MULTIANEWARRAY.java
index 1833c97..744468b 100644
--- a/src/main/java/haidnor/jvm/instruction/extended/MULTIANEWARRAY.java
+++ b/src/main/java/haidnor/jvm/instruction/extended/MULTIANEWARRAY.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.extended;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class MULTIANEWARRAY extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/extended/WIDE.java b/src/main/java/haidnor/jvm/instruction/extended/WIDE.java
index bbe453c..f782731 100644
--- a/src/main/java/haidnor/jvm/instruction/extended/WIDE.java
+++ b/src/main/java/haidnor/jvm/instruction/extended/WIDE.java
@@ -5,7 +5,7 @@ import haidnor.jvm.instruction.loads.*;
 import haidnor.jvm.instruction.math.IINC;
 import haidnor.jvm.instruction.stores.*;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class WIDE extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/loads/AALOAD.java b/src/main/java/haidnor/jvm/instruction/loads/AALOAD.java
index 020e8d1..6a4323f 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/AALOAD.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/AALOAD.java
@@ -4,7 +4,7 @@ import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.Instance;
 import haidnor.jvm.rtda.InstanceArray;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 
 public class AALOAD extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/loads/ALOAD.java b/src/main/java/haidnor/jvm/instruction/loads/ALOAD.java
index d5ad7a8..53d7916 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/ALOAD.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/ALOAD.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 
diff --git a/src/main/java/haidnor/jvm/instruction/loads/ALOAD_0.java b/src/main/java/haidnor/jvm/instruction/loads/ALOAD_0.java
index 3aadccc..b57d782 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/ALOAD_0.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/ALOAD_0.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class ALOAD_0 extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/loads/ALOAD_1.java b/src/main/java/haidnor/jvm/instruction/loads/ALOAD_1.java
index 83cd693..bf8c6ae 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/ALOAD_1.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/ALOAD_1.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class ALOAD_1 extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/loads/ALOAD_2.java b/src/main/java/haidnor/jvm/instruction/loads/ALOAD_2.java
index 8b52c1d..6980487 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/ALOAD_2.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/ALOAD_2.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class ALOAD_2 extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/loads/ALOAD_3.java b/src/main/java/haidnor/jvm/instruction/loads/ALOAD_3.java
index 62e30c8..7295b39 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/ALOAD_3.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/ALOAD_3.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class ALOAD_3 extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/loads/BALOAD.java b/src/main/java/haidnor/jvm/instruction/loads/BALOAD.java
index 5e9bbf4..b393c83 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/BALOAD.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/BALOAD.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.BasicTypeArray;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 
 public class BALOAD extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/loads/CALOAD.java b/src/main/java/haidnor/jvm/instruction/loads/CALOAD.java
index 3ccc6a1..a1a2504 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/CALOAD.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/CALOAD.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.BasicTypeArray;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 
 public class CALOAD extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/loads/DALOAD.java b/src/main/java/haidnor/jvm/instruction/loads/DALOAD.java
index 5db952e..93bdbd2 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/DALOAD.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/DALOAD.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.BasicTypeArray;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 
 public class DALOAD extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/loads/DLOAD.java b/src/main/java/haidnor/jvm/instruction/loads/DLOAD.java
index 5ab371a..2657ec9 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/DLOAD.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/DLOAD.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 
diff --git a/src/main/java/haidnor/jvm/instruction/loads/DLOAD_0.java b/src/main/java/haidnor/jvm/instruction/loads/DLOAD_0.java
index d0c442d..db88b89 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/DLOAD_0.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/DLOAD_0.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class DLOAD_0 extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/loads/DLOAD_1.java b/src/main/java/haidnor/jvm/instruction/loads/DLOAD_1.java
index e4c39ff..bfd206c 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/DLOAD_1.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/DLOAD_1.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class DLOAD_1 extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/loads/DLOAD_2.java b/src/main/java/haidnor/jvm/instruction/loads/DLOAD_2.java
index 18d1181..fd52f6a 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/DLOAD_2.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/DLOAD_2.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class DLOAD_2 extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/loads/DLOAD_3.java b/src/main/java/haidnor/jvm/instruction/loads/DLOAD_3.java
index 02736c3..738e0fb 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/DLOAD_3.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/DLOAD_3.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class DLOAD_3 extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/loads/FALOAD.java b/src/main/java/haidnor/jvm/instruction/loads/FALOAD.java
index f6e21d1..d18a717 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/FALOAD.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/FALOAD.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.BasicTypeArray;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 
 public class FALOAD extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/loads/FLOAD.java b/src/main/java/haidnor/jvm/instruction/loads/FLOAD.java
index 071824c..810e06d 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/FLOAD.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/FLOAD.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 
diff --git a/src/main/java/haidnor/jvm/instruction/loads/FLOAD_0.java b/src/main/java/haidnor/jvm/instruction/loads/FLOAD_0.java
index be08423..0235c10 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/FLOAD_0.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/FLOAD_0.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class FLOAD_0 extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/loads/FLOAD_1.java b/src/main/java/haidnor/jvm/instruction/loads/FLOAD_1.java
index e310aec..adb7bcc 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/FLOAD_1.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/FLOAD_1.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class FLOAD_1 extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/loads/FLOAD_2.java b/src/main/java/haidnor/jvm/instruction/loads/FLOAD_2.java
index 656b3c5..7b54e84 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/FLOAD_2.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/FLOAD_2.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class FLOAD_2 extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/loads/FLOAD_3.java b/src/main/java/haidnor/jvm/instruction/loads/FLOAD_3.java
index 222489f..4744ab0 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/FLOAD_3.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/FLOAD_3.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class FLOAD_3 extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/loads/IALOAD.java b/src/main/java/haidnor/jvm/instruction/loads/IALOAD.java
index 4abd5d2..20a3307 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/IALOAD.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/IALOAD.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.BasicTypeArray;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 
 public class IALOAD extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/loads/ILOAD.java b/src/main/java/haidnor/jvm/instruction/loads/ILOAD.java
index 2ab2a66..cdce777 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/ILOAD.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/ILOAD.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 
diff --git a/src/main/java/haidnor/jvm/instruction/loads/ILOAD_0.java b/src/main/java/haidnor/jvm/instruction/loads/ILOAD_0.java
index 52d0d84..87e9316 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/ILOAD_0.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/ILOAD_0.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/loads/ILOAD_1.java b/src/main/java/haidnor/jvm/instruction/loads/ILOAD_1.java
index 83d2c68..1f8538a 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/ILOAD_1.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/ILOAD_1.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/loads/ILOAD_2.java b/src/main/java/haidnor/jvm/instruction/loads/ILOAD_2.java
index 8aca145..ee62166 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/ILOAD_2.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/ILOAD_2.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/loads/ILOAD_3.java b/src/main/java/haidnor/jvm/instruction/loads/ILOAD_3.java
index 6499455..70f9cbf 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/ILOAD_3.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/ILOAD_3.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/loads/LALOAD.java b/src/main/java/haidnor/jvm/instruction/loads/LALOAD.java
index ade4a89..005e20f 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/LALOAD.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/LALOAD.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.BasicTypeArray;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 
 public class LALOAD extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/loads/LLOAD.java b/src/main/java/haidnor/jvm/instruction/loads/LLOAD.java
index e19afcc..12532d4 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/LLOAD.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/LLOAD.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 
diff --git a/src/main/java/haidnor/jvm/instruction/loads/LLOAD_0.java b/src/main/java/haidnor/jvm/instruction/loads/LLOAD_0.java
index a5c0104..c602b0e 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/LLOAD_0.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/LLOAD_0.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class LLOAD_0 extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/loads/LLOAD_1.java b/src/main/java/haidnor/jvm/instruction/loads/LLOAD_1.java
index 4a15dbc..dd35b1a 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/LLOAD_1.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/LLOAD_1.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class LLOAD_1 extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/loads/LLOAD_2.java b/src/main/java/haidnor/jvm/instruction/loads/LLOAD_2.java
index fb16f36..fc36e0f 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/LLOAD_2.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/LLOAD_2.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class LLOAD_2 extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/loads/LLOAD_3.java b/src/main/java/haidnor/jvm/instruction/loads/LLOAD_3.java
index 945b037..45a5609 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/LLOAD_3.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/LLOAD_3.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class LLOAD_3 extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/loads/SALOAD.java b/src/main/java/haidnor/jvm/instruction/loads/SALOAD.java
index a51a2fa..cd18364 100644
--- a/src/main/java/haidnor/jvm/instruction/loads/SALOAD.java
+++ b/src/main/java/haidnor/jvm/instruction/loads/SALOAD.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.loads;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.BasicTypeArray;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 
 public class SALOAD extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/DADD.java b/src/main/java/haidnor/jvm/instruction/math/DADD.java
index 9a3544d..f5314cd 100644
--- a/src/main/java/haidnor/jvm/instruction/math/DADD.java
+++ b/src/main/java/haidnor/jvm/instruction/math/DADD.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class DADD extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/DDIV.java b/src/main/java/haidnor/jvm/instruction/math/DDIV.java
index 7204e4f..645a243 100644
--- a/src/main/java/haidnor/jvm/instruction/math/DDIV.java
+++ b/src/main/java/haidnor/jvm/instruction/math/DDIV.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class DDIV extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/DMUL.java b/src/main/java/haidnor/jvm/instruction/math/DMUL.java
index 482e0a0..d0dd8bc 100644
--- a/src/main/java/haidnor/jvm/instruction/math/DMUL.java
+++ b/src/main/java/haidnor/jvm/instruction/math/DMUL.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class DMUL extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/DNEG.java b/src/main/java/haidnor/jvm/instruction/math/DNEG.java
index 3b91a4d..73cb429 100644
--- a/src/main/java/haidnor/jvm/instruction/math/DNEG.java
+++ b/src/main/java/haidnor/jvm/instruction/math/DNEG.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class DNEG extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/DREM.java b/src/main/java/haidnor/jvm/instruction/math/DREM.java
index 5eab3b2..38193d1 100644
--- a/src/main/java/haidnor/jvm/instruction/math/DREM.java
+++ b/src/main/java/haidnor/jvm/instruction/math/DREM.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class DREM extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/DSUB.java b/src/main/java/haidnor/jvm/instruction/math/DSUB.java
index 553af3b..3f9eeb8 100644
--- a/src/main/java/haidnor/jvm/instruction/math/DSUB.java
+++ b/src/main/java/haidnor/jvm/instruction/math/DSUB.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class DSUB extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/FADD.java b/src/main/java/haidnor/jvm/instruction/math/FADD.java
index e902127..c523851 100644
--- a/src/main/java/haidnor/jvm/instruction/math/FADD.java
+++ b/src/main/java/haidnor/jvm/instruction/math/FADD.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class FADD extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/FDIV.java b/src/main/java/haidnor/jvm/instruction/math/FDIV.java
index 6caa0e7..59f16da 100644
--- a/src/main/java/haidnor/jvm/instruction/math/FDIV.java
+++ b/src/main/java/haidnor/jvm/instruction/math/FDIV.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class FDIV extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/FMUL.java b/src/main/java/haidnor/jvm/instruction/math/FMUL.java
index e6b4c97..e52a2de 100644
--- a/src/main/java/haidnor/jvm/instruction/math/FMUL.java
+++ b/src/main/java/haidnor/jvm/instruction/math/FMUL.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class FMUL extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/FNEG.java b/src/main/java/haidnor/jvm/instruction/math/FNEG.java
index 789a17f..fb1d2e6 100644
--- a/src/main/java/haidnor/jvm/instruction/math/FNEG.java
+++ b/src/main/java/haidnor/jvm/instruction/math/FNEG.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class FNEG extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/FREM.java b/src/main/java/haidnor/jvm/instruction/math/FREM.java
index e21b2fa..72fc251 100644
--- a/src/main/java/haidnor/jvm/instruction/math/FREM.java
+++ b/src/main/java/haidnor/jvm/instruction/math/FREM.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class FREM extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/FSUB.java b/src/main/java/haidnor/jvm/instruction/math/FSUB.java
index 201df87..023955e 100644
--- a/src/main/java/haidnor/jvm/instruction/math/FSUB.java
+++ b/src/main/java/haidnor/jvm/instruction/math/FSUB.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class FSUB extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/IADD.java b/src/main/java/haidnor/jvm/instruction/math/IADD.java
index dc3120d..a93c04f 100644
--- a/src/main/java/haidnor/jvm/instruction/math/IADD.java
+++ b/src/main/java/haidnor/jvm/instruction/math/IADD.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class IADD extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/IAND.java b/src/main/java/haidnor/jvm/instruction/math/IAND.java
index 396420f..bbf10e8 100644
--- a/src/main/java/haidnor/jvm/instruction/math/IAND.java
+++ b/src/main/java/haidnor/jvm/instruction/math/IAND.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.math;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class IAND extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/math/IDIV.java b/src/main/java/haidnor/jvm/instruction/math/IDIV.java
index e8a5c82..a135065 100644
--- a/src/main/java/haidnor/jvm/instruction/math/IDIV.java
+++ b/src/main/java/haidnor/jvm/instruction/math/IDIV.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class IDIV extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/IINC.java b/src/main/java/haidnor/jvm/instruction/math/IINC.java
index 8dd1958..ed6a868 100644
--- a/src/main/java/haidnor/jvm/instruction/math/IINC.java
+++ b/src/main/java/haidnor/jvm/instruction/math/IINC.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.math;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * Java VM opcode.
diff --git a/src/main/java/haidnor/jvm/instruction/math/IMUL.java b/src/main/java/haidnor/jvm/instruction/math/IMUL.java
index df5ff2d..9c833dc 100644
--- a/src/main/java/haidnor/jvm/instruction/math/IMUL.java
+++ b/src/main/java/haidnor/jvm/instruction/math/IMUL.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class IMUL extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/INEG.java b/src/main/java/haidnor/jvm/instruction/math/INEG.java
index f66dc08..81b0e50 100644
--- a/src/main/java/haidnor/jvm/instruction/math/INEG.java
+++ b/src/main/java/haidnor/jvm/instruction/math/INEG.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class INEG extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/IOR.java b/src/main/java/haidnor/jvm/instruction/math/IOR.java
index 0202bb3..bcfc78a 100644
--- a/src/main/java/haidnor/jvm/instruction/math/IOR.java
+++ b/src/main/java/haidnor/jvm/instruction/math/IOR.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.math;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class IOR extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/math/IREM.java b/src/main/java/haidnor/jvm/instruction/math/IREM.java
index 8cad36a..96e7611 100644
--- a/src/main/java/haidnor/jvm/instruction/math/IREM.java
+++ b/src/main/java/haidnor/jvm/instruction/math/IREM.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class IREM extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/ISHL.java b/src/main/java/haidnor/jvm/instruction/math/ISHL.java
index d9273b5..fb2e44b 100644
--- a/src/main/java/haidnor/jvm/instruction/math/ISHL.java
+++ b/src/main/java/haidnor/jvm/instruction/math/ISHL.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.math;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class ISHL extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/math/ISHR.java b/src/main/java/haidnor/jvm/instruction/math/ISHR.java
index ae36c0d..02bf610 100644
--- a/src/main/java/haidnor/jvm/instruction/math/ISHR.java
+++ b/src/main/java/haidnor/jvm/instruction/math/ISHR.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.math;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class ISHR extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/math/ISUB.java b/src/main/java/haidnor/jvm/instruction/math/ISUB.java
index 197ec04..73357ba 100644
--- a/src/main/java/haidnor/jvm/instruction/math/ISUB.java
+++ b/src/main/java/haidnor/jvm/instruction/math/ISUB.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class ISUB extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/IUSHR.java b/src/main/java/haidnor/jvm/instruction/math/IUSHR.java
index 7f0c822..3dba105 100644
--- a/src/main/java/haidnor/jvm/instruction/math/IUSHR.java
+++ b/src/main/java/haidnor/jvm/instruction/math/IUSHR.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.math;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * JVM中的IUSHR指令是用于执行无符号右移操作的指令。该指令将两个整数值从操作数栈中弹出，
diff --git a/src/main/java/haidnor/jvm/instruction/math/IXOR.java b/src/main/java/haidnor/jvm/instruction/math/IXOR.java
index f6aceba..fb12023 100644
--- a/src/main/java/haidnor/jvm/instruction/math/IXOR.java
+++ b/src/main/java/haidnor/jvm/instruction/math/IXOR.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.math;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class IXOR extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/math/LADD.java b/src/main/java/haidnor/jvm/instruction/math/LADD.java
index 62b2f03..67b2731 100644
--- a/src/main/java/haidnor/jvm/instruction/math/LADD.java
+++ b/src/main/java/haidnor/jvm/instruction/math/LADD.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class LADD extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/LAND.java b/src/main/java/haidnor/jvm/instruction/math/LAND.java
index 06988b9..10db161 100644
--- a/src/main/java/haidnor/jvm/instruction/math/LAND.java
+++ b/src/main/java/haidnor/jvm/instruction/math/LAND.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.math;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class LAND extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/math/LDIV.java b/src/main/java/haidnor/jvm/instruction/math/LDIV.java
index 16772cf..49b1d0d 100644
--- a/src/main/java/haidnor/jvm/instruction/math/LDIV.java
+++ b/src/main/java/haidnor/jvm/instruction/math/LDIV.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class LDIV extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/LMUL.java b/src/main/java/haidnor/jvm/instruction/math/LMUL.java
index 1bc1d7e..20e3d82 100644
--- a/src/main/java/haidnor/jvm/instruction/math/LMUL.java
+++ b/src/main/java/haidnor/jvm/instruction/math/LMUL.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class LMUL extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/LNEG.java b/src/main/java/haidnor/jvm/instruction/math/LNEG.java
index 53922c6..41ad568 100644
--- a/src/main/java/haidnor/jvm/instruction/math/LNEG.java
+++ b/src/main/java/haidnor/jvm/instruction/math/LNEG.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class LNEG extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/LOR.java b/src/main/java/haidnor/jvm/instruction/math/LOR.java
index 024a15d..239df16 100644
--- a/src/main/java/haidnor/jvm/instruction/math/LOR.java
+++ b/src/main/java/haidnor/jvm/instruction/math/LOR.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.math;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class LOR extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/math/LREM.java b/src/main/java/haidnor/jvm/instruction/math/LREM.java
index 68a4a50..f1b5ed2 100644
--- a/src/main/java/haidnor/jvm/instruction/math/LREM.java
+++ b/src/main/java/haidnor/jvm/instruction/math/LREM.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class LREM extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/LSHL.java b/src/main/java/haidnor/jvm/instruction/math/LSHL.java
index 8177ad2..bb4affa 100644
--- a/src/main/java/haidnor/jvm/instruction/math/LSHL.java
+++ b/src/main/java/haidnor/jvm/instruction/math/LSHL.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.math;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class LSHL extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/math/LSHR.java b/src/main/java/haidnor/jvm/instruction/math/LSHR.java
index 7837209..5c15f75 100644
--- a/src/main/java/haidnor/jvm/instruction/math/LSHR.java
+++ b/src/main/java/haidnor/jvm/instruction/math/LSHR.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.math;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class LSHR extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/math/LSUB.java b/src/main/java/haidnor/jvm/instruction/math/LSUB.java
index 8f3986f..8fee757 100644
--- a/src/main/java/haidnor/jvm/instruction/math/LSUB.java
+++ b/src/main/java/haidnor/jvm/instruction/math/LSUB.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.math;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 public class LSUB extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/math/LUSHR.java b/src/main/java/haidnor/jvm/instruction/math/LUSHR.java
index fbe63a9..511bc5f 100644
--- a/src/main/java/haidnor/jvm/instruction/math/LUSHR.java
+++ b/src/main/java/haidnor/jvm/instruction/math/LUSHR.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.math;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class LUSHR extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/math/LXOR.java b/src/main/java/haidnor/jvm/instruction/math/LXOR.java
index cb13220..30fd479 100644
--- a/src/main/java/haidnor/jvm/instruction/math/LXOR.java
+++ b/src/main/java/haidnor/jvm/instruction/math/LXOR.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.math;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class LXOR extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/references/ANEWARRAY.java b/src/main/java/haidnor/jvm/instruction/references/ANEWARRAY.java
index 13c52b6..7168ff8 100644
--- a/src/main/java/haidnor/jvm/instruction/references/ANEWARRAY.java
+++ b/src/main/java/haidnor/jvm/instruction/references/ANEWARRAY.java
@@ -10,7 +10,7 @@ import haidnor.jvm.rtda.InstanceArray;
 import haidnor.jvm.rtda.Metaspace;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class ANEWARRAY extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/references/ARRAYLENGTH.java b/src/main/java/haidnor/jvm/instruction/references/ARRAYLENGTH.java
index 0b5ca55..998e528 100644
--- a/src/main/java/haidnor/jvm/instruction/references/ARRAYLENGTH.java
+++ b/src/main/java/haidnor/jvm/instruction/references/ARRAYLENGTH.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.references;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.ArrayInstance;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 public class ARRAYLENGTH extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/references/ATHROW.java b/src/main/java/haidnor/jvm/instruction/references/ATHROW.java
index fc5a2c0..8a08fea 100644
--- a/src/main/java/haidnor/jvm/instruction/references/ATHROW.java
+++ b/src/main/java/haidnor/jvm/instruction/references/ATHROW.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.references;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 public class ATHROW extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/references/CHECKCAST.java b/src/main/java/haidnor/jvm/instruction/references/CHECKCAST.java
index 15a4874..d55c142 100644
--- a/src/main/java/haidnor/jvm/instruction/references/CHECKCAST.java
+++ b/src/main/java/haidnor/jvm/instruction/references/CHECKCAST.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.references;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 public class CHECKCAST extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/references/GETFIELD.java b/src/main/java/haidnor/jvm/instruction/references/GETFIELD.java
index 9e8d540..5ab653b 100644
--- a/src/main/java/haidnor/jvm/instruction/references/GETFIELD.java
+++ b/src/main/java/haidnor/jvm/instruction/references/GETFIELD.java
@@ -5,7 +5,7 @@ import haidnor.jvm.bcel.classfile.JavaField;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.Instance;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 public class GETFIELD extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/references/GETSTATIC.java b/src/main/java/haidnor/jvm/instruction/references/GETSTATIC.java
index fb93e1e..f6739e3 100644
--- a/src/main/java/haidnor/jvm/instruction/references/GETSTATIC.java
+++ b/src/main/java/haidnor/jvm/instruction/references/GETSTATIC.java
@@ -6,7 +6,7 @@ import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.Metaspace;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 import java.lang.reflect.Field;
diff --git a/src/main/java/haidnor/jvm/instruction/references/INSTANCEOF.java b/src/main/java/haidnor/jvm/instruction/references/INSTANCEOF.java
index 0d0dcf1..cda4625 100644
--- a/src/main/java/haidnor/jvm/instruction/references/INSTANCEOF.java
+++ b/src/main/java/haidnor/jvm/instruction/references/INSTANCEOF.java
@@ -8,7 +8,7 @@ import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.Instance;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/references/INVOKEDYNAMIC.java b/src/main/java/haidnor/jvm/instruction/references/INVOKEDYNAMIC.java
index 5dc978a..5a15181 100644
--- a/src/main/java/haidnor/jvm/instruction/references/INVOKEDYNAMIC.java
+++ b/src/main/java/haidnor/jvm/instruction/references/INVOKEDYNAMIC.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.references;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 public class INVOKEDYNAMIC extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/references/INVOKEINTERFACE.java b/src/main/java/haidnor/jvm/instruction/references/INVOKEINTERFACE.java
index fe5129a..78895d4 100644
--- a/src/main/java/haidnor/jvm/instruction/references/INVOKEINTERFACE.java
+++ b/src/main/java/haidnor/jvm/instruction/references/INVOKEINTERFACE.java
@@ -9,7 +9,7 @@ import haidnor.jvm.rtda.Instance;
 import haidnor.jvm.rtda.Metaspace;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 import java.lang.reflect.Method;
diff --git a/src/main/java/haidnor/jvm/instruction/references/INVOKESPECIAL.java b/src/main/java/haidnor/jvm/instruction/references/INVOKESPECIAL.java
index b0e04aa..e4cf545 100644
--- a/src/main/java/haidnor/jvm/instruction/references/INVOKESPECIAL.java
+++ b/src/main/java/haidnor/jvm/instruction/references/INVOKESPECIAL.java
@@ -8,7 +8,7 @@ import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.Metaspace;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/references/INVOKESTATIC.java b/src/main/java/haidnor/jvm/instruction/references/INVOKESTATIC.java
index de71b90..a2eb13d 100644
--- a/src/main/java/haidnor/jvm/instruction/references/INVOKESTATIC.java
+++ b/src/main/java/haidnor/jvm/instruction/references/INVOKESTATIC.java
@@ -7,7 +7,7 @@ import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.Metaspace;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 import java.util.Objects;
diff --git a/src/main/java/haidnor/jvm/instruction/references/INVOKEVIRTUAL.java b/src/main/java/haidnor/jvm/instruction/references/INVOKEVIRTUAL.java
index 427c682..3883505 100644
--- a/src/main/java/haidnor/jvm/instruction/references/INVOKEVIRTUAL.java
+++ b/src/main/java/haidnor/jvm/instruction/references/INVOKEVIRTUAL.java
@@ -8,7 +8,7 @@ import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.Metaspace;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 import java.lang.reflect.Method;
diff --git a/src/main/java/haidnor/jvm/instruction/references/JSR.java b/src/main/java/haidnor/jvm/instruction/references/JSR.java
index eccb23c..d80fbf7 100644
--- a/src/main/java/haidnor/jvm/instruction/references/JSR.java
+++ b/src/main/java/haidnor/jvm/instruction/references/JSR.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.references;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/references/JSR_W.java b/src/main/java/haidnor/jvm/instruction/references/JSR_W.java
index 09513e8..3a857c4 100644
--- a/src/main/java/haidnor/jvm/instruction/references/JSR_W.java
+++ b/src/main/java/haidnor/jvm/instruction/references/JSR_W.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.references;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/references/MONITORENTER.java b/src/main/java/haidnor/jvm/instruction/references/MONITORENTER.java
index 58b9655..b146481 100644
--- a/src/main/java/haidnor/jvm/instruction/references/MONITORENTER.java
+++ b/src/main/java/haidnor/jvm/instruction/references/MONITORENTER.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.references;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 public class MONITORENTER extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/references/MONITOREXIT.java b/src/main/java/haidnor/jvm/instruction/references/MONITOREXIT.java
index 9be38f1..ede5400 100644
--- a/src/main/java/haidnor/jvm/instruction/references/MONITOREXIT.java
+++ b/src/main/java/haidnor/jvm/instruction/references/MONITOREXIT.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.references;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 public class MONITOREXIT extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/references/NEW.java b/src/main/java/haidnor/jvm/instruction/references/NEW.java
index 5691ece..f266e25 100644
--- a/src/main/java/haidnor/jvm/instruction/references/NEW.java
+++ b/src/main/java/haidnor/jvm/instruction/references/NEW.java
@@ -9,7 +9,7 @@ import haidnor.jvm.rtda.Instance;
 import haidnor.jvm.rtda.Metaspace;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 public class NEW extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/references/NEWARRAY.java b/src/main/java/haidnor/jvm/instruction/references/NEWARRAY.java
index cce3c6e..b1f6aca 100644
--- a/src/main/java/haidnor/jvm/instruction/references/NEWARRAY.java
+++ b/src/main/java/haidnor/jvm/instruction/references/NEWARRAY.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.references;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.BasicTypeArray;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 import haidnor.jvm.bcel.Const;
 
diff --git a/src/main/java/haidnor/jvm/instruction/references/PUTFIELD.java b/src/main/java/haidnor/jvm/instruction/references/PUTFIELD.java
index e18170f..60964ee 100644
--- a/src/main/java/haidnor/jvm/instruction/references/PUTFIELD.java
+++ b/src/main/java/haidnor/jvm/instruction/references/PUTFIELD.java
@@ -6,7 +6,7 @@ import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.Instance;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 public class PUTFIELD extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/references/PUTSTATIC.java b/src/main/java/haidnor/jvm/instruction/references/PUTSTATIC.java
index 2f9cf6a..60d7cd4 100644
--- a/src/main/java/haidnor/jvm/instruction/references/PUTSTATIC.java
+++ b/src/main/java/haidnor/jvm/instruction/references/PUTSTATIC.java
@@ -4,7 +4,7 @@ import haidnor.jvm.bcel.classfile.*;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.Metaspace;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/stack/DUP.java b/src/main/java/haidnor/jvm/instruction/stack/DUP.java
index e29a03b..e326bc9 100644
--- a/src/main/java/haidnor/jvm/instruction/stack/DUP.java
+++ b/src/main/java/haidnor/jvm/instruction/stack/DUP.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stack;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 public class DUP extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/stack/DUP2.java b/src/main/java/haidnor/jvm/instruction/stack/DUP2.java
index ea7e3dd..2479c67 100644
--- a/src/main/java/haidnor/jvm/instruction/stack/DUP2.java
+++ b/src/main/java/haidnor/jvm/instruction/stack/DUP2.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stack;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/stack/DUP2_X1.java b/src/main/java/haidnor/jvm/instruction/stack/DUP2_X1.java
index 32e8910..205ccba 100644
--- a/src/main/java/haidnor/jvm/instruction/stack/DUP2_X1.java
+++ b/src/main/java/haidnor/jvm/instruction/stack/DUP2_X1.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stack;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 import haidnor.jvm.bcel.Const;
 
diff --git a/src/main/java/haidnor/jvm/instruction/stack/DUP2_X2.java b/src/main/java/haidnor/jvm/instruction/stack/DUP2_X2.java
index 671ee27..482d03b 100644
--- a/src/main/java/haidnor/jvm/instruction/stack/DUP2_X2.java
+++ b/src/main/java/haidnor/jvm/instruction/stack/DUP2_X2.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stack;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 import haidnor.jvm.bcel.Const;
 
diff --git a/src/main/java/haidnor/jvm/instruction/stack/DUP_X1.java b/src/main/java/haidnor/jvm/instruction/stack/DUP_X1.java
index 6829c32..107c9af 100644
--- a/src/main/java/haidnor/jvm/instruction/stack/DUP_X1.java
+++ b/src/main/java/haidnor/jvm/instruction/stack/DUP_X1.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stack;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/stack/DUP_X2.java b/src/main/java/haidnor/jvm/instruction/stack/DUP_X2.java
index e8430a3..d769f86 100644
--- a/src/main/java/haidnor/jvm/instruction/stack/DUP_X2.java
+++ b/src/main/java/haidnor/jvm/instruction/stack/DUP_X2.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stack;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 /**
diff --git a/src/main/java/haidnor/jvm/instruction/stack/POP.java b/src/main/java/haidnor/jvm/instruction/stack/POP.java
index 3543f15..1d5a78c 100644
--- a/src/main/java/haidnor/jvm/instruction/stack/POP.java
+++ b/src/main/java/haidnor/jvm/instruction/stack/POP.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.stack;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 public class POP extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/stack/POP2.java b/src/main/java/haidnor/jvm/instruction/stack/POP2.java
index 289ae75..5576307 100644
--- a/src/main/java/haidnor/jvm/instruction/stack/POP2.java
+++ b/src/main/java/haidnor/jvm/instruction/stack/POP2.java
@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.stack;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 public class POP2 extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/stack/SWAP.java b/src/main/java/haidnor/jvm/instruction/stack/SWAP.java
index ccf515e..61ff8b4 100644
--- a/src/main/java/haidnor/jvm/instruction/stack/SWAP.java
+++ b/src/main/java/haidnor/jvm/instruction/stack/SWAP.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stack;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.Instance;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 public class SWAP extends Instruction {
diff --git a/src/main/java/haidnor/jvm/instruction/stores/AASTORE.java b/src/main/java/haidnor/jvm/instruction/stores/AASTORE.java
index 1a60aff..b1a151c 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/AASTORE.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/AASTORE.java
@@ -4,7 +4,7 @@ import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.Instance;
 import haidnor.jvm.rtda.InstanceArray;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class AASTORE extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/ASTORE.java b/src/main/java/haidnor/jvm/instruction/stores/ASTORE.java
index 96a1b90..eb4636d 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/ASTORE.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/ASTORE.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class ASTORE extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/ASTORE_0.java b/src/main/java/haidnor/jvm/instruction/stores/ASTORE_0.java
index 930ba45..2ccb4ff 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/ASTORE_0.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/ASTORE_0.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class ASTORE_0 extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/ASTORE_1.java b/src/main/java/haidnor/jvm/instruction/stores/ASTORE_1.java
index 14faefe..d73b95c 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/ASTORE_1.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/ASTORE_1.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class ASTORE_1 extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/ASTORE_2.java b/src/main/java/haidnor/jvm/instruction/stores/ASTORE_2.java
index c04efc9..ba4ad3a 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/ASTORE_2.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/ASTORE_2.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class ASTORE_2 extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/ASTORE_3.java b/src/main/java/haidnor/jvm/instruction/stores/ASTORE_3.java
index 966d894..dc0f07b 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/ASTORE_3.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/ASTORE_3.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class ASTORE_3 extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/BASTORE.java b/src/main/java/haidnor/jvm/instruction/stores/BASTORE.java
index 5bf333d..42a214e 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/BASTORE.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/BASTORE.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.BasicTypeArray;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class BASTORE extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/CASTORE.java b/src/main/java/haidnor/jvm/instruction/stores/CASTORE.java
index c59dcdc..c4e4dff 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/CASTORE.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/CASTORE.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.BasicTypeArray;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class CASTORE extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/DASTORE.java b/src/main/java/haidnor/jvm/instruction/stores/DASTORE.java
index a4359b0..885ddfe 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/DASTORE.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/DASTORE.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.BasicTypeArray;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class DASTORE extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/DSTORE.java b/src/main/java/haidnor/jvm/instruction/stores/DSTORE.java
index a6f18d9..87b02ea 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/DSTORE.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/DSTORE.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class DSTORE extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/DSTORE_0.java b/src/main/java/haidnor/jvm/instruction/stores/DSTORE_0.java
index e3e188b..90cfe97 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/DSTORE_0.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/DSTORE_0.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class DSTORE_0 extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/DSTORE_1.java b/src/main/java/haidnor/jvm/instruction/stores/DSTORE_1.java
index 9e9aad3..1956dfb 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/DSTORE_1.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/DSTORE_1.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class DSTORE_1 extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/DSTORE_2.java b/src/main/java/haidnor/jvm/instruction/stores/DSTORE_2.java
index 943ce56..42388f2 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/DSTORE_2.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/DSTORE_2.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class DSTORE_2 extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/DSTORE_3.java b/src/main/java/haidnor/jvm/instruction/stores/DSTORE_3.java
index 874ecff..760c26c 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/DSTORE_3.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/DSTORE_3.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class DSTORE_3 extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/FASTORE.java b/src/main/java/haidnor/jvm/instruction/stores/FASTORE.java
index 52ee484..f91c663 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/FASTORE.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/FASTORE.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.BasicTypeArray;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class FASTORE extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/FSTORE.java b/src/main/java/haidnor/jvm/instruction/stores/FSTORE.java
index 0b21d8b..85811cc 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/FSTORE.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/FSTORE.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class FSTORE extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/FSTORE_0.java b/src/main/java/haidnor/jvm/instruction/stores/FSTORE_0.java
index 9f3d662..236a724 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/FSTORE_0.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/FSTORE_0.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class FSTORE_0 extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/FSTORE_1.java b/src/main/java/haidnor/jvm/instruction/stores/FSTORE_1.java
index 39a02d4..267c695 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/FSTORE_1.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/FSTORE_1.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class FSTORE_1 extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/FSTORE_2.java b/src/main/java/haidnor/jvm/instruction/stores/FSTORE_2.java
index 93c878d..8f28da0 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/FSTORE_2.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/FSTORE_2.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class FSTORE_2 extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/FSTORE_3.java b/src/main/java/haidnor/jvm/instruction/stores/FSTORE_3.java
index 2fbc978..23b07c6 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/FSTORE_3.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/FSTORE_3.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class FSTORE_3 extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/IASTORE.java b/src/main/java/haidnor/jvm/instruction/stores/IASTORE.java
index ce632e4..58bdab1 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/IASTORE.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/IASTORE.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.BasicTypeArray;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class IASTORE extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/ISTORE.java b/src/main/java/haidnor/jvm/instruction/stores/ISTORE.java
index 596adcc..fd737c4 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/ISTORE.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/ISTORE.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class ISTORE extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/ISTORE_0.java b/src/main/java/haidnor/jvm/instruction/stores/ISTORE_0.java
index 34b1c45..60fe0be 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/ISTORE_0.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/ISTORE_0.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class ISTORE_0 extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/ISTORE_1.java b/src/main/java/haidnor/jvm/instruction/stores/ISTORE_1.java
index d48c064..e779367 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/ISTORE_1.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/ISTORE_1.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class ISTORE_1 extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/ISTORE_2.java b/src/main/java/haidnor/jvm/instruction/stores/ISTORE_2.java
index 166bc3a..dc3266d 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/ISTORE_2.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/ISTORE_2.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class ISTORE_2 extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/ISTORE_3.java b/src/main/java/haidnor/jvm/instruction/stores/ISTORE_3.java
index 7e9fe6e..e9e85c6 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/ISTORE_3.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/ISTORE_3.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class ISTORE_3 extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/LASTORE.java b/src/main/java/haidnor/jvm/instruction/stores/LASTORE.java
index f8b8a7c..f13dcbb 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/LASTORE.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/LASTORE.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.BasicTypeArray;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class LASTORE extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/LSTORE.java b/src/main/java/haidnor/jvm/instruction/stores/LSTORE.java
index 764dbfd..5e9dd48 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/LSTORE.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/LSTORE.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class LSTORE extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/LSTORE_0.java b/src/main/java/haidnor/jvm/instruction/stores/LSTORE_0.java
index 2c5711a..367f8f3 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/LSTORE_0.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/LSTORE_0.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class LSTORE_0 extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/LSTORE_1.java b/src/main/java/haidnor/jvm/instruction/stores/LSTORE_1.java
index 3b3d390..4006489 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/LSTORE_1.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/LSTORE_1.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class LSTORE_1 extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/LSTORE_2.java b/src/main/java/haidnor/jvm/instruction/stores/LSTORE_2.java
index e993b72..aafcf77 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/LSTORE_2.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/LSTORE_2.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class LSTORE_2 extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/LSTORE_3.java b/src/main/java/haidnor/jvm/instruction/stores/LSTORE_3.java
index eb4cb25..52064ab 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/LSTORE_3.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/LSTORE_3.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class LSTORE_3 extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/instruction/stores/SASTORE.java b/src/main/java/haidnor/jvm/instruction/stores/SASTORE.java
index 4d4ebf6..03db785 100644
--- a/src/main/java/haidnor/jvm/instruction/stores/SASTORE.java
+++ b/src/main/java/haidnor/jvm/instruction/stores/SASTORE.java
@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.stores;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.rtda.BasicTypeArray;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class SASTORE extends Instruction {
 
diff --git a/src/main/java/haidnor/jvm/runtime/Frame.java b/src/main/java/haidnor/jvm/runtime/Frame.java
index 7276226..7b2b29d 100644
--- a/src/main/java/haidnor/jvm/runtime/Frame.java
+++ b/src/main/java/haidnor/jvm/runtime/Frame.java
@@ -5,7 +5,7 @@ import haidnor.jvm.bcel.classfile.Code;
 import haidnor.jvm.bcel.classfile.JavaClass;
 import haidnor.jvm.bcel.classfile.JavaMethod;
 import haidnor.jvm.rtda.Instance;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.Getter;
 
 import java.util.Stack;