diff --git a/pom.xml b/pom.xml
index 400e49b..ee4a37b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,6 +11,7 @@
     <properties>
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
+        <kotlin.version>2.1.20</kotlin.version>
     </properties>
 
     <dependencies>
@@ -26,18 +27,88 @@
             <artifactId>gson</artifactId>
             <version>2.11.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test</artifactId>
+            <version>${kotlin.version}</version>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${kotlin.version}</version>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <source>src/main/java</source>
+                                <source>target/generated-sources/annotations</source>
+                                <source>src</source>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <jvmTarget>${maven.compiler.target}</jvmTarget>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
+                <executions>
+                    <execution>
+                        <id>default-compile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <execution>
+                        <id>default-testCompile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>testCompile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>testCompile</goal>
+                        </goals>
+                    </execution>
+                </executions>
                 <configuration>
-                    <source>{maven.compiler.source}</source>
+                    <source>${maven.compiler.source}</source>
                     <target>{maven.compiler.target}</target>
+                    <release>21</release>
+                    <compilerArgs>
+                        <arg>--enable-preview</arg>
+                    </compilerArgs>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/src/Main.java b/src/main/java/Main.java
similarity index 84%
rename from src/Main.java
rename to src/main/java/Main.java
index d5238c9..b7b3de2 100644
--- a/src/Main.java
+++ b/src/main/java/Main.java
@@ -1,3 +1,5 @@
+package main.java;
+
 public class Main {
     public static void main(String[] args) {
         System.out.println("Hello, World!");
diff --git a/src/VarHandlerDemoRunner.java b/src/main/java/VarHandlerDemoRunner.java
similarity index 98%
rename from src/VarHandlerDemoRunner.java
rename to src/main/java/VarHandlerDemoRunner.java
index b13ac66..8e30c2d 100644
--- a/src/VarHandlerDemoRunner.java
+++ b/src/main/java/VarHandlerDemoRunner.java
@@ -1,3 +1,5 @@
+package main.java;
+
 import jvm.VarHandleDemo;
 
 import java.lang.invoke.MethodHandles;
diff --git a/src/main/java/jvm/classfile/TestClass.java b/src/main/java/jvm/classfile/TestClass.java
new file mode 100644
index 0000000..31de396
--- /dev/null
+++ b/src/main/java/jvm/classfile/TestClass.java
@@ -0,0 +1,13 @@
+package jvm.classfile;
+
+/**
+ * Compile for examine class file
+ */
+public class TestClass {
+
+    private int m;
+
+    public int inc() {
+        return m+1;
+    }
+}
diff --git a/src/main/java/jvm/classfile/TestClassK.kt b/src/main/java/jvm/classfile/TestClassK.kt
new file mode 100644
index 0000000..3b18cb6
--- /dev/null
+++ b/src/main/java/jvm/classfile/TestClassK.kt
@@ -0,0 +1,9 @@
+package jvm.classfile
+
+class TestClassK {
+    private var m: Int = 0;
+
+    fun inc() : Int {
+        return m + 1
+    }
+}
\ No newline at end of file