diff --git a/src/main/java/com/qi4l/jndi/gadgets/CommonsCollections14.java b/src/main/java/CommonsCollections14.java
similarity index 96%
rename from src/main/java/com/qi4l/jndi/gadgets/CommonsCollections14.java
rename to src/main/java/CommonsCollections14.java
index 19ded7d..f6eb98a 100644
--- a/src/main/java/com/qi4l/jndi/gadgets/CommonsCollections14.java
+++ b/src/main/java/CommonsCollections14.java
@@ -1,5 +1,4 @@
-package com.qi4l.jndi.gadgets;
-
+import com.qi4l.jndi.gadgets.ObjectPayload;
 import com.qi4l.jndi.gadgets.annotation.Authors;
 import com.qi4l.jndi.gadgets.annotation.Dependencies;
 import com.qi4l.jndi.gadgets.utils.Gadgets;
diff --git a/src/main/java/com/qi4l/jndi/gadgets/CommonsCollections15.java b/src/main/java/CommonsCollections15.java
similarity index 96%
rename from src/main/java/com/qi4l/jndi/gadgets/CommonsCollections15.java
rename to src/main/java/CommonsCollections15.java
index 3fb14df..b2bd8b0 100644
--- a/src/main/java/com/qi4l/jndi/gadgets/CommonsCollections15.java
+++ b/src/main/java/CommonsCollections15.java
@@ -1,5 +1,4 @@
-package com.qi4l.jndi.gadgets;
-
+import com.qi4l.jndi.gadgets.ObjectPayload;
 import com.qi4l.jndi.gadgets.annotation.Authors;
 import com.qi4l.jndi.gadgets.annotation.Dependencies;
 import com.qi4l.jndi.gadgets.utils.Gadgets;
diff --git a/src/main/java/com/qi4l/jndi/gadgets/Groovy2.java b/src/main/java/Groovy2.java
similarity index 97%
rename from src/main/java/com/qi4l/jndi/gadgets/Groovy2.java
rename to src/main/java/Groovy2.java
index eaef45e..7a6c864 100644
--- a/src/main/java/com/qi4l/jndi/gadgets/Groovy2.java
+++ b/src/main/java/Groovy2.java
@@ -1,5 +1,4 @@
-package com.qi4l.jndi.gadgets;
-
+import com.qi4l.jndi.gadgets.ObjectPayload;
 import com.qi4l.jndi.gadgets.annotation.Authors;
 import com.qi4l.jndi.gadgets.annotation.Dependencies;
 import com.qi4l.jndi.gadgets.utils.Reflections;
diff --git a/src/main/java/com/qi4l/jndi/gadgets/Hibernate3JDBC.java b/src/main/java/Hibernate3JDBC.java
similarity index 95%
rename from src/main/java/com/qi4l/jndi/gadgets/Hibernate3JDBC.java
rename to src/main/java/Hibernate3JDBC.java
index 18b8294..b8e9d6e 100644
--- a/src/main/java/com/qi4l/jndi/gadgets/Hibernate3JDBC.java
+++ b/src/main/java/Hibernate3JDBC.java
@@ -1,6 +1,6 @@
-package com.qi4l.jndi.gadgets;
-
 import com.alibaba.fastjson.JSONArray;
+import com.qi4l.jndi.gadgets.DynamicDependencies;
+import com.qi4l.jndi.gadgets.ObjectPayload;
 import com.qi4l.jndi.gadgets.annotation.Authors;
 import com.qi4l.jndi.gadgets.annotation.Dependencies;
 import org.hibernate.service.jdbc.connections.internal.DriverManagerConnectionProviderImpl;