diff --git a/test/src/test/java/jenkins/security/Security218BlackBoxTest.java b/test/src/test/java/jenkins/security/Security218BlackBoxTest.java
index 731830548d6d88a34dec1ecca42b5968db7d1a56..3a7320160c324648910a999942a446eda80819ef 100644
--- a/test/src/test/java/jenkins/security/Security218BlackBoxTest.java
+++ b/test/src/test/java/jenkins/security/Security218BlackBoxTest.java
@@ -30,7 +30,7 @@ import hudson.remoting.Callable;
 import hudson.remoting.Channel;
 import java.io.File;
 import java.io.PrintStream;
-import jenkins.security.ysoserial.payloads.Payload;
+import jenkins.security.security218.Payload;
 import org.jenkinsci.remoting.RoleChecker;
 import org.junit.Test;
 import static org.junit.Assert.*;
diff --git a/test/src/main/java/jenkins/security/ysoserial/payloads/Payload.java b/test/src/test/java/jenkins/security/security218/Payload.java
similarity index 81%
rename from test/src/main/java/jenkins/security/ysoserial/payloads/Payload.java
rename to test/src/test/java/jenkins/security/security218/Payload.java
index 5d05611b6aff04bf654924484aa1c7758c79ec42..43dc97a995f9cc9b49c51c2c7982ca1ffb082d39 100644
--- a/test/src/main/java/jenkins/security/ysoserial/payloads/Payload.java
+++ b/test/src/test/java/jenkins/security/security218/Payload.java
@@ -21,7 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial.payloads;
+package jenkins.security.security218;
+
+import jenkins.security.security218.ysoserial.payloads.CommonsCollections1;
+import jenkins.security.security218.ysoserial.payloads.CommonsCollections2;
+import jenkins.security.security218.ysoserial.payloads.Groovy1;
+import jenkins.security.security218.ysoserial.payloads.ObjectPayload;
+import jenkins.security.security218.ysoserial.payloads.Spring1;
 
 
 /**
diff --git a/test/src/main/java/jenkins/security/ysoserial/ExecBlockingSecurityManager.java b/test/src/test/java/jenkins/security/security218/ysoserial/ExecBlockingSecurityManager.java
similarity index 97%
rename from test/src/main/java/jenkins/security/ysoserial/ExecBlockingSecurityManager.java
rename to test/src/test/java/jenkins/security/security218/ysoserial/ExecBlockingSecurityManager.java
index 6c7d891accf80d341266616517fa41482edcaa95..7c6a40be7d510a878a622bb7a2913e473ac1e36b 100644
--- a/test/src/main/java/jenkins/security/ysoserial/ExecBlockingSecurityManager.java
+++ b/test/src/test/java/jenkins/security/security218/ysoserial/ExecBlockingSecurityManager.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial;
+package jenkins.security.security218.ysoserial;
 
 import java.security.Permission;
 import java.util.concurrent.Callable;
diff --git a/test/src/main/java/jenkins/security/ysoserial/payloads/CommonsCollections1.java b/test/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections1.java
similarity index 93%
rename from test/src/main/java/jenkins/security/ysoserial/payloads/CommonsCollections1.java
rename to test/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections1.java
index 31bc5821e1f55c10a684b329d6249c218f11b7eb..e4436c8752a3a7cb02b609b5c73378f62928e3da 100644
--- a/test/src/main/java/jenkins/security/ysoserial/payloads/CommonsCollections1.java
+++ b/test/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections1.java
@@ -21,14 +21,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial.payloads;
+package jenkins.security.security218.ysoserial.payloads;
 
 import java.lang.reflect.InvocationHandler;
 import java.util.HashMap;
 import java.util.Map;
-import jenkins.security.ysoserial.util.Gadgets;
-import jenkins.security.ysoserial.util.PayloadRunner;
-import jenkins.security.ysoserial.util.Reflections;
+import jenkins.security.security218.ysoserial.util.Gadgets;
+import jenkins.security.security218.ysoserial.util.PayloadRunner;
+import jenkins.security.security218.ysoserial.util.Reflections;
 
 import org.apache.commons.collections.Transformer;
 import org.apache.commons.collections.functors.ChainedTransformer;
diff --git a/test/src/main/java/jenkins/security/ysoserial/payloads/CommonsCollections2.java b/test/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections2.java
similarity index 91%
rename from test/src/main/java/jenkins/security/ysoserial/payloads/CommonsCollections2.java
rename to test/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections2.java
index 59a78a6d00866f669c174aa7e342c544df306af6..94b9afa3ee93b3a57385bd512c9addb4abfc420c 100644
--- a/test/src/main/java/jenkins/security/ysoserial/payloads/CommonsCollections2.java
+++ b/test/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections2.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial.payloads;
+package jenkins.security.security218.ysoserial.payloads;
 
 import java.util.PriorityQueue;
 import java.util.Queue;
@@ -29,9 +29,9 @@ import java.util.Queue;
 import org.apache.commons.collections4.comparators.TransformingComparator;
 import org.apache.commons.collections4.functors.InvokerTransformer;
 
-import jenkins.security.ysoserial.util.Gadgets;
-import jenkins.security.ysoserial.util.PayloadRunner;
-import jenkins.security.ysoserial.util.Reflections;
+import jenkins.security.security218.ysoserial.util.Gadgets;
+import jenkins.security.security218.ysoserial.util.PayloadRunner;
+import jenkins.security.security218.ysoserial.util.Reflections;
 import org.apache.xalan.xsltc.trax.TemplatesImpl;
 
 /*
diff --git a/test/src/main/java/jenkins/security/ysoserial/payloads/Groovy1.java b/test/src/test/java/jenkins/security/security218/ysoserial/payloads/Groovy1.java
similarity index 92%
rename from test/src/main/java/jenkins/security/ysoserial/payloads/Groovy1.java
rename to test/src/test/java/jenkins/security/security218/ysoserial/payloads/Groovy1.java
index 201251fff68f441592150875a0bda713f934b4a2..3e332495d60d66f27fe684400b4025d905000d8b 100644
--- a/test/src/main/java/jenkins/security/ysoserial/payloads/Groovy1.java
+++ b/test/src/test/java/jenkins/security/security218/ysoserial/payloads/Groovy1.java
@@ -21,12 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial.payloads;
+package jenkins.security.security218.ysoserial.payloads;
 
 import java.lang.reflect.InvocationHandler;
 import java.util.Map;
-import jenkins.security.ysoserial.util.Gadgets;
-import jenkins.security.ysoserial.util.PayloadRunner;
+import jenkins.security.security218.ysoserial.util.Gadgets;
+import jenkins.security.security218.ysoserial.util.PayloadRunner;
 
 import org.codehaus.groovy.runtime.ConvertedClosure;
 import org.codehaus.groovy.runtime.MethodClosure;
diff --git a/test/src/main/java/jenkins/security/ysoserial/payloads/ObjectPayload.java b/test/src/test/java/jenkins/security/security218/ysoserial/payloads/ObjectPayload.java
similarity index 95%
rename from test/src/main/java/jenkins/security/ysoserial/payloads/ObjectPayload.java
rename to test/src/test/java/jenkins/security/security218/ysoserial/payloads/ObjectPayload.java
index cf291b921323ec0acd5ed21414174d66f38fc461..22c656b8f60ce564e5115c6577f04eb58a133904 100644
--- a/test/src/main/java/jenkins/security/ysoserial/payloads/ObjectPayload.java
+++ b/test/src/test/java/jenkins/security/security218/ysoserial/payloads/ObjectPayload.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial.payloads;
+package jenkins.security.security218.ysoserial.payloads;
 
 public interface ObjectPayload<T> {
 	/*
diff --git a/test/src/main/java/jenkins/security/ysoserial/payloads/Spring1.java b/test/src/test/java/jenkins/security/security218/ysoserial/payloads/Spring1.java
similarity index 93%
rename from test/src/main/java/jenkins/security/ysoserial/payloads/Spring1.java
rename to test/src/test/java/jenkins/security/security218/ysoserial/payloads/Spring1.java
index 4f60ede4bf6232dd1bb5018f69d8e2051ee931fa..103f01f2cb2ca3fc60f3373b4906e5a4fecae0c7 100644
--- a/test/src/main/java/jenkins/security/ysoserial/payloads/Spring1.java
+++ b/test/src/test/java/jenkins/security/security218/ysoserial/payloads/Spring1.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial.payloads;
+package jenkins.security.security218.ysoserial.payloads;
 
 import static java.lang.Class.forName;
 
@@ -34,9 +34,9 @@ import javax.xml.transform.Templates;
 import org.springframework.beans.factory.ObjectFactory;
 
 
-import jenkins.security.ysoserial.util.Gadgets;
-import jenkins.security.ysoserial.util.PayloadRunner;
-import jenkins.security.ysoserial.util.Reflections;
+import jenkins.security.security218.ysoserial.util.Gadgets;
+import jenkins.security.security218.ysoserial.util.PayloadRunner;
+import jenkins.security.security218.ysoserial.util.Reflections;
 import org.apache.xalan.xsltc.trax.TemplatesImpl;
 
 /*
diff --git a/test/src/main/java/jenkins/security/ysoserial/util/ClassFiles.java b/test/src/test/java/jenkins/security/security218/ysoserial/util/ClassFiles.java
similarity index 97%
rename from test/src/main/java/jenkins/security/ysoserial/util/ClassFiles.java
rename to test/src/test/java/jenkins/security/security218/ysoserial/util/ClassFiles.java
index 2d1e6da972575443ee9bbe147a5a9ef76391f4fa..fe2ed52cbd35284a44586312627a572e53fcdec5 100644
--- a/test/src/main/java/jenkins/security/ysoserial/util/ClassFiles.java
+++ b/test/src/test/java/jenkins/security/security218/ysoserial/util/ClassFiles.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial.util;
+package jenkins.security.security218.ysoserial.util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/test/src/main/java/jenkins/security/ysoserial/util/Gadgets.java b/test/src/test/java/jenkins/security/security218/ysoserial/util/Gadgets.java
similarity index 98%
rename from test/src/main/java/jenkins/security/ysoserial/util/Gadgets.java
rename to test/src/test/java/jenkins/security/security218/ysoserial/util/Gadgets.java
index 2369c542a25ed94f94d7a944f727b4b0d5944255..676cdf8ed60197e832fc3b0dd6edb237ebd4bf03 100644
--- a/test/src/main/java/jenkins/security/ysoserial/util/Gadgets.java
+++ b/test/src/test/java/jenkins/security/security218/ysoserial/util/Gadgets.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial.util;
+package jenkins.security.security218.ysoserial.util;
 
 import java.io.Serializable;
 import java.lang.reflect.Array;
diff --git a/test/src/main/java/jenkins/security/ysoserial/util/PayloadRunner.java b/test/src/test/java/jenkins/security/security218/ysoserial/util/PayloadRunner.java
similarity index 85%
rename from test/src/main/java/jenkins/security/ysoserial/util/PayloadRunner.java
rename to test/src/test/java/jenkins/security/security218/ysoserial/util/PayloadRunner.java
index 82d6eb25ff5912285087d327af22e9f9e7498892..0097e7ed9617f0cf2ab1fbf5407480bc0a6e8636 100644
--- a/test/src/main/java/jenkins/security/ysoserial/util/PayloadRunner.java
+++ b/test/src/test/java/jenkins/security/security218/ysoserial/util/PayloadRunner.java
@@ -21,14 +21,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial.util;
+package jenkins.security.security218.ysoserial.util;
 
 
 import java.util.concurrent.Callable;
-import jenkins.security.ysoserial.ExecBlockingSecurityManager;
-import jenkins.security.ysoserial.payloads.ObjectPayload;
-import static jenkins.security.ysoserial.util.Serializables.deserialize;
-import static jenkins.security.ysoserial.util.Serializables.serialize;
+import jenkins.security.security218.ysoserial.ExecBlockingSecurityManager;
+import jenkins.security.security218.ysoserial.payloads.ObjectPayload;
+import static jenkins.security.security218.ysoserial.util.Serializables.deserialize;
+import static jenkins.security.security218.ysoserial.util.Serializables.serialize;
 
 /*
  * utility class for running exploits locally from command line
diff --git a/test/src/main/java/jenkins/security/ysoserial/util/Reflections.java b/test/src/test/java/jenkins/security/security218/ysoserial/util/Reflections.java
similarity index 97%
rename from test/src/main/java/jenkins/security/ysoserial/util/Reflections.java
rename to test/src/test/java/jenkins/security/security218/ysoserial/util/Reflections.java
index 6869055512521b2e475cf506838bda1bc549311e..f542a0e606acda5f3493bf1700f2b37d118f442a 100644
--- a/test/src/main/java/jenkins/security/ysoserial/util/Reflections.java
+++ b/test/src/test/java/jenkins/security/security218/ysoserial/util/Reflections.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial.util;
+package jenkins.security.security218.ysoserial.util;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
diff --git a/test/src/main/java/jenkins/security/ysoserial/util/Serializables.java b/test/src/test/java/jenkins/security/security218/ysoserial/util/Serializables.java
similarity index 97%
rename from test/src/main/java/jenkins/security/ysoserial/util/Serializables.java
rename to test/src/test/java/jenkins/security/security218/ysoserial/util/Serializables.java
index 242acf050f050e1666c0252d9743e9fc3b0852a1..b5e73c977731a92067cc753e903b68eea61aecb3 100644
--- a/test/src/main/java/jenkins/security/ysoserial/util/Serializables.java
+++ b/test/src/test/java/jenkins/security/security218/ysoserial/util/Serializables.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package jenkins.security.ysoserial.util;
+package jenkins.security.security218.ysoserial.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;