diff --git a/testable-agent/src/main/java/com/alibaba/testable/agent/handler/SourceClassHandler.java b/testable-agent/src/main/java/com/alibaba/testable/agent/handler/SourceClassHandler.java
index 9387124..e54d7c7 100644
--- a/testable-agent/src/main/java/com/alibaba/testable/agent/handler/SourceClassHandler.java
+++ b/testable-agent/src/main/java/com/alibaba/testable/agent/handler/SourceClassHandler.java
@@ -135,7 +135,7 @@ public class SourceClassHandler extends BaseClassHandler {
                     break;
                 case Opcodes.INVOKEVIRTUAL:
                 case Opcodes.INVOKEINTERFACE:
-                    // virtual and interface invoke implicitly eat 1 more stack and return 1 more value, deuce
+                    // virtual and interface invoke implicitly eat 1 more stack and return 1 value, deuce
                     stackLevel += ClassUtil.getParameterTypes(((MethodInsnNode)instructions[i]).desc).size();
                     break;
                 case -1:
diff --git a/testable-core/src/main/java/com/alibaba/testable/core/tool/InvokeMatcher.java b/testable-core/src/main/java/com/alibaba/testable/core/matcher/InvokeMatcher.java
similarity index 99%
rename from testable-core/src/main/java/com/alibaba/testable/core/tool/InvokeMatcher.java
rename to testable-core/src/main/java/com/alibaba/testable/core/matcher/InvokeMatcher.java
index 0687595..5f10c21 100644
--- a/testable-core/src/main/java/com/alibaba/testable/core/tool/InvokeMatcher.java
+++ b/testable-core/src/main/java/com/alibaba/testable/core/matcher/InvokeMatcher.java
@@ -1,4 +1,4 @@
-package com.alibaba.testable.core.tool;
+package com.alibaba.testable.core.matcher;
 
 import com.alibaba.testable.core.function.MatchFunction;
 
diff --git a/testable-core/src/main/java/com/alibaba/testable/core/tool/InvokeVerifier.java b/testable-core/src/main/java/com/alibaba/testable/core/matcher/InvokeVerifier.java
similarity index 99%
rename from testable-core/src/main/java/com/alibaba/testable/core/tool/InvokeVerifier.java
rename to testable-core/src/main/java/com/alibaba/testable/core/matcher/InvokeVerifier.java
index 186f755..5dcabe4 100644
--- a/testable-core/src/main/java/com/alibaba/testable/core/tool/InvokeVerifier.java
+++ b/testable-core/src/main/java/com/alibaba/testable/core/matcher/InvokeVerifier.java
@@ -1,4 +1,4 @@
-package com.alibaba.testable.core.tool;
+package com.alibaba.testable.core.matcher;
 
 import com.alibaba.testable.core.error.VerifyFailedError;
 import com.alibaba.testable.core.model.Verification;
diff --git a/testable-core/src/main/java/com/alibaba/testable/core/tool/TestableTool.java b/testable-core/src/main/java/com/alibaba/testable/core/tool/TestableTool.java
index 36f6c5d..ad1de58 100644
--- a/testable-core/src/main/java/com/alibaba/testable/core/tool/TestableTool.java
+++ b/testable-core/src/main/java/com/alibaba/testable/core/tool/TestableTool.java
@@ -1,5 +1,6 @@
 package com.alibaba.testable.core.tool;
 
+import com.alibaba.testable.core.matcher.InvokeVerifier;
 import com.alibaba.testable.core.util.InvokeRecordUtil;
 import com.alibaba.testable.core.util.TestableUtil;