Renaming org.dcevm -> com.github.dcevm

Well, dcevm.org domain is lost, so let's use com.github.dcevm for now.

57 files changed, 183 insertions, 212 deletions

diff --git a/agent/src/main/java/META-INF/MANIFEST.MF b/agent/src/main/java/META-INF/MANIFEST.MF
index 9a1b4b72..90ef2ebe 100644
--- a/agent/src/main/java/META-INF/MANIFEST.MF
+++ b/agent/src/main/java/META-INF/MANIFEST.MF
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 Can-Redefine-Classes: true
-Agent-Class: org.dcevm.agent.InstrumentationAgent
-Premain-Class: org.dcevm.agent.InstrumentationAgent
+Agent-Class: com.github.dcevm.agent.InstrumentationAgent
+Premain-Class: com.github.dcevm.agent.InstrumentationAgent
diff --git a/agent/src/main/java/org/dcevm/agent/InstrumentationAgent.java b/agent/src/main/java/com/github/dcevm/agent/InstrumentationAgent.java
index e3a129d5..839027a2 100644
--- a/agent/src/main/java/org/dcevm/agent/InstrumentationAgent.java
+++ b/agent/src/main/java/com/github/dcevm/agent/InstrumentationAgent.java
@@ -1,4 +1,4 @@
-package org.dcevm.agent;
+package com.github.dcevm.agent;
 
 import java.lang.instrument.Instrumentation;
 
diff --git a/dcevm/src/main/java/org/dcevm/ClassRedefinitionPolicy.java b/dcevm/src/main/java/com/github/dcevm/ClassRedefinitionPolicy.java
index 32571863..4fd1be8a 100644
--- a/dcevm/src/main/java/org/dcevm/ClassRedefinitionPolicy.java
+++ b/dcevm/src/main/java/com/github/dcevm/ClassRedefinitionPolicy.java
@@ -21,7 +21,7 @@
  * questions.
  *
  */
-package org.dcevm;
+package com.github.dcevm;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/dcevm/src/main/java/org/dcevm/HotSwapTool.java b/dcevm/src/main/java/com/github/dcevm/HotSwapTool.java
index b622cba9..72d77590 100644
--- a/dcevm/src/main/java/org/dcevm/HotSwapTool.java
+++ b/dcevm/src/main/java/com/github/dcevm/HotSwapTool.java
@@ -21,7 +21,7 @@
  * questions.
  *
  */
-package org.dcevm;
+package com.github.dcevm;
 
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
diff --git a/dcevm/src/main/java/com/github/dcevm/InstrumentationRedefiner.java b/dcevm/src/main/java/com/github/dcevm/InstrumentationRedefiner.java
new file mode 100644
index 00000000..42215435
--- /dev/null
+++ b/dcevm/src/main/java/com/github/dcevm/InstrumentationRedefiner.java
@@ -0,0 +1,31 @@
+package com.github.dcevm;
+
+
+import com.github.dcevm.agent.InstrumentationAgent;
+
+import java.io.IOException;
+import java.lang.instrument.ClassDefinition;
+import java.lang.instrument.Instrumentation;
+import java.lang.instrument.UnmodifiableClassException;
+import java.util.Map;
+
+public class InstrumentationRedefiner implements Redefiner {
+    public void redefineClasses(Map<Class<?>, byte[]> classes) throws ClassNotFoundException, UnmodifiableClassException {
+        Instrumentation instrumentation = InstrumentationAgent.INSTRUMENTATION;
+        if (instrumentation == null) {
+            throw new IllegalStateException("Instrumentation agent is not properly installed!");
+        }
+
+        ClassDefinition[] definitions = new ClassDefinition[classes.size()];
+        int i = 0;
+        for (Map.Entry<Class<?>, byte[]> entry : classes.entrySet()) {
+            definitions[i++] = new ClassDefinition(entry.getKey(), entry.getValue());
+        }
+        instrumentation.redefineClasses(definitions);
+    }
+
+    @Override
+    public void close() throws IOException {
+        // Do nothing.
+    }
+}
diff --git a/dcevm/src/main/java/org/dcevm/JDIRedefiner.java b/dcevm/src/main/java/com/github/dcevm/JDIRedefiner.java
index 6fc742d4..a28444bc 100644
--- a/dcevm/src/main/java/org/dcevm/JDIRedefiner.java
+++ b/dcevm/src/main/java/com/github/dcevm/JDIRedefiner.java
@@ -21,7 +21,7 @@
  * questions.
  *
  */
-package org.dcevm;
+package com.github.dcevm;
 
 import com.sun.jdi.Bootstrap;
 import com.sun.jdi.ReferenceType;
diff --git a/dcevm/src/main/java/org/dcevm/Redefiner.java b/dcevm/src/main/java/com/github/dcevm/Redefiner.java
index cd183fe3..620ab263 100644
--- a/dcevm/src/main/java/org/dcevm/Redefiner.java
+++ b/dcevm/src/main/java/com/github/dcevm/Redefiner.java
@@ -21,7 +21,7 @@
  * questions.
  *
  */
-package org.dcevm;
+package com.github.dcevm;
 
 import java.io.Closeable;
 import java.lang.instrument.UnmodifiableClassException;
diff --git a/dcevm/src/main/java/org/dcevm/TestClassAdapter.java b/dcevm/src/main/java/com/github/dcevm/TestClassAdapter.java
index bd4b2daf..aadf1b22 100644
--- a/dcevm/src/main/java/org/dcevm/TestClassAdapter.java
+++ b/dcevm/src/main/java/com/github/dcevm/TestClassAdapter.java
@@ -21,7 +21,7 @@
  * questions.
  *
  */
-package org.dcevm;
+package com.github.dcevm;
 
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.MethodVisitor;
diff --git a/dcevm/src/main/java/org/dcevm/InstrumentationRedefiner.java b/dcevm/src/main/java/org/dcevm/InstrumentationRedefiner.java
deleted file mode 100644
index 247fbb2e..00000000
--- a/dcevm/src/main/java/org/dcevm/InstrumentationRedefiner.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-package org.dcevm;
-
-
-import org.dcevm.agent.InstrumentationAgent;
-
-import java.io.IOException;
-import java.lang.instrument.ClassDefinition;
-import java.lang.instrument.Instrumentation;
-import java.lang.instrument.UnmodifiableClassException;
-import java.util.Map;
-
-public class InstrumentationRedefiner implements Redefiner {
-    public void redefineClasses(Map<Class<?>, byte[]> classes) throws ClassNotFoundException, UnmodifiableClassException {
-        Instrumentation instrumentation = InstrumentationAgent.INSTRUMENTATION;
-        if (instrumentation == null) {
-            throw new IllegalStateException("Instrumentation agent is not properly installed!");
-        }
-
-        ClassDefinition[] definitions = new ClassDefinition[classes.size()];
-        int i = 0;
-        for (Map.Entry<Class<?>, byte[]> entry : classes.entrySet()) {
-            definitions[i++] = new ClassDefinition(entry.getKey(), entry.getValue());
-        }
-        instrumentation.redefineClasses(definitions);
-    }
-
-    @Override
-    public void close() throws IOException {
-        // Do nothing.
-    }
-}
diff --git a/dcevm/src/test/java7/org/dcevm/test/LightTestSuite.java b/dcevm/src/test/java7/com/github/dcevm/test/LightTestSuite.java
index b5a2af02..5e6633d6 100644
--- a/dcevm/src/test/java7/org/dcevm/test/LightTestSuite.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/LightTestSuite.java
@@ -22,13 +22,13 @@
  *
  */
 
-package org.dcevm.test;
+package com.github.dcevm.test;
 
-import org.dcevm.test.body.BodyTestSuite;
-import org.dcevm.test.eval.EvalTestSuite;
-import org.dcevm.test.fields.FieldsTestSuite;
-import org.dcevm.test.methods.MethodsTestSuite;
-import org.dcevm.test.structural.StructuralTestSuite;
+import com.github.dcevm.test.body.BodyTestSuite;
+import com.github.dcevm.test.eval.EvalTestSuite;
+import com.github.dcevm.test.fields.FieldsTestSuite;
+import com.github.dcevm.test.methods.MethodsTestSuite;
+import com.github.dcevm.test.structural.StructuralTestSuite;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
diff --git a/dcevm/src/test/java7/org/dcevm/test/TestUtil.java b/dcevm/src/test/java7/com/github/dcevm/test/TestUtil.java
index 7876dac5..0d88d843 100644
--- a/dcevm/src/test/java7/org/dcevm/test/TestUtil.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/TestUtil.java
@@ -22,12 +22,10 @@
  *
  */
 
-package org.dcevm.test;
+package com.github.dcevm.test;
 
 import junit.framework.Assert;
-import org.dcevm.HotSwapTool;
-
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import com.github.dcevm.HotSwapTool;
 
 /**
  * Utility methods for unit testing.
diff --git a/dcevm/src/test/java7/org/dcevm/test/body/ArrayTest.java b/dcevm/src/test/java7/com/github/dcevm/test/body/ArrayTest.java
index d82f5010..96552556 100644
--- a/dcevm/src/test/java7/org/dcevm/test/body/ArrayTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/body/ArrayTest.java
@@ -22,16 +22,14 @@
  *
  */
 
-package org.dcevm.test.body;
+package com.github.dcevm.test.body;
 
-import org.dcevm.test.TestUtil;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.lang.reflect.Array;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
diff --git a/dcevm/src/test/java7/org/dcevm/test/body/BodyTestSuite.java b/dcevm/src/test/java7/com/github/dcevm/test/body/BodyTestSuite.java
index 37426aab..d6d687a8 100644
--- a/dcevm/src/test/java7/org/dcevm/test/body/BodyTestSuite.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/body/BodyTestSuite.java
@@ -22,7 +22,7 @@
  *
  */
 
-package org.dcevm.test.body;
+package com.github.dcevm.test.body;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/dcevm/src/test/java7/org/dcevm/test/body/ClassRenamingTestCase.java b/dcevm/src/test/java7/com/github/dcevm/test/body/ClassRenamingTestCase.java
index 84488815..ec390522 100644
--- a/dcevm/src/test/java7/org/dcevm/test/body/ClassRenamingTestCase.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/body/ClassRenamingTestCase.java
@@ -21,12 +21,12 @@
  * questions.
  *
  */
-package org.dcevm.test.body;
+package com.github.dcevm.test.body;
 
-import org.dcevm.ClassRedefinitionPolicy;
+import com.github.dcevm.ClassRedefinitionPolicy;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/body/EMCPTest.java b/dcevm/src/test/java7/com/github/dcevm/test/body/EMCPTest.java
index 0d28d6fe..1e82d6f3 100644
--- a/dcevm/src/test/java7/org/dcevm/test/body/EMCPTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/body/EMCPTest.java
@@ -21,14 +21,14 @@
  * questions.
  *
  */
-package org.dcevm.test.body;
+package com.github.dcevm.test.body;
 
-import org.dcevm.test.TestUtil;
+import com.github.dcevm.test.TestUtil;
 import org.junit.Test;
 
 import java.io.PrintStream;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/body/FacTest.java b/dcevm/src/test/java7/com/github/dcevm/test/body/FacTest.java
index 832ea7a8..caf9e3e2 100644
--- a/dcevm/src/test/java7/org/dcevm/test/body/FacTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/body/FacTest.java
@@ -22,13 +22,13 @@
  *
  */
 
-package org.dcevm.test.body;
+package com.github.dcevm.test.body;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/body/FibTest.java b/dcevm/src/test/java7/com/github/dcevm/test/body/FibTest.java
index c95f2de5..bd449e7d 100644
--- a/dcevm/src/test/java7/org/dcevm/test/body/FibTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/body/FibTest.java
@@ -22,13 +22,13 @@
  *
  */
 
-package org.dcevm.test.body;
+package com.github.dcevm.test.body;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/body/MultipleThreadsTest.java b/dcevm/src/test/java7/com/github/dcevm/test/body/MultipleThreadsTest.java
index 4966a2fc..d6b8913e 100644
--- a/dcevm/src/test/java7/org/dcevm/test/body/MultipleThreadsTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/body/MultipleThreadsTest.java
@@ -22,13 +22,13 @@
  *
  */
 
-package org.dcevm.test.body;
+package com.github.dcevm.test.body;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
diff --git a/dcevm/src/test/java7/org/dcevm/test/body/OldActivationTest.java b/dcevm/src/test/java7/com/github/dcevm/test/body/OldActivationTest.java
index 3ad7f400..5533a497 100644
--- a/dcevm/src/test/java7/org/dcevm/test/body/OldActivationTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/body/OldActivationTest.java
@@ -22,13 +22,13 @@
  *
  */
 
-package org.dcevm.test.body;
+package com.github.dcevm.test.body;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/body/RedefinePrivateMethodTest.java b/dcevm/src/test/java7/com/github/dcevm/test/body/RedefinePrivateMethodTest.java
index 935907fa..cd448cc4 100644
--- a/dcevm/src/test/java7/org/dcevm/test/body/RedefinePrivateMethodTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/body/RedefinePrivateMethodTest.java
@@ -22,13 +22,13 @@
  *
  */
 
-package org.dcevm.test.body;
+package com.github.dcevm.test.body;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/body/RefactorActiveMethodTest.java b/dcevm/src/test/java7/com/github/dcevm/test/body/RefactorActiveMethodTest.java
index 4dd433ce..15ddf8e3 100644
--- a/dcevm/src/test/java7/org/dcevm/test/body/RefactorActiveMethodTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/body/RefactorActiveMethodTest.java
@@ -22,13 +22,13 @@
  *
  */
 
-package org.dcevm.test.body;
+package com.github.dcevm.test.body;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/body/SimpleStaticTest.java b/dcevm/src/test/java7/com/github/dcevm/test/body/SimpleStaticTest.java
index a456381d..65438c9f 100644
--- a/dcevm/src/test/java7/org/dcevm/test/body/SimpleStaticTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/body/SimpleStaticTest.java
@@ -22,14 +22,14 @@
  *
  */
 
-package org.dcevm.test.body;
+package com.github.dcevm.test.body;
 
-import org.dcevm.test.TestUtil;
+import com.github.dcevm.test.TestUtil;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/body/StaticTest.java b/dcevm/src/test/java7/com/github/dcevm/test/body/StaticTest.java
index b4369b77..8b1300c2 100644
--- a/dcevm/src/test/java7/org/dcevm/test/body/StaticTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/body/StaticTest.java
@@ -22,7 +22,7 @@
  *
  */
 
-package org.dcevm.test.body;
+package com.github.dcevm.test.body;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -31,8 +31,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static junit.framework.Assert.assertNull;
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
diff --git a/dcevm/src/test/java7/org/dcevm/test/body/StressTest.java b/dcevm/src/test/java7/com/github/dcevm/test/body/StressTest.java
index 3d955810..21cae9f4 100644
--- a/dcevm/src/test/java7/org/dcevm/test/body/StressTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/body/StressTest.java
@@ -22,13 +22,13 @@
  *
  */
 
-package org.dcevm.test.body;
+package com.github.dcevm.test.body;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/eval/AddingInterfaceTest.java b/dcevm/src/test/java7/com/github/dcevm/test/eval/AddingInterfaceTest.java
index a3bec93d..223073c3 100644
--- a/dcevm/src/test/java7/org/dcevm/test/eval/AddingInterfaceTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/eval/AddingInterfaceTest.java
@@ -22,14 +22,14 @@
  *
  */
 
-package org.dcevm.test.eval;
+package com.github.dcevm.test.eval;
 
-import org.dcevm.test.TestUtil;
+import com.github.dcevm.test.TestUtil;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 
 /**
  * Adds an implemented interface to a class and tests whether an instance of this class can then really be treated as an instance of the interface.
diff --git a/dcevm/src/test/java7/org/dcevm/test/eval/EvalTestSuite.java b/dcevm/src/test/java7/com/github/dcevm/test/eval/EvalTestSuite.java
index f9baf6c9..f162c523 100644
--- a/dcevm/src/test/java7/org/dcevm/test/eval/EvalTestSuite.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/eval/EvalTestSuite.java
@@ -22,7 +22,7 @@
  *
  */
 
-package org.dcevm.test.eval;
+package com.github.dcevm.test.eval;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/dcevm/src/test/java7/org/dcevm/test/eval/FractionTest.java b/dcevm/src/test/java7/com/github/dcevm/test/eval/FractionTest.java
index 37ed44f6..24460ffc 100644
--- a/dcevm/src/test/java7/org/dcevm/test/eval/FractionTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/eval/FractionTest.java
@@ -22,17 +22,17 @@
  *
  */
 
-package org.dcevm.test.eval;
+package com.github.dcevm.test.eval;
 
-import org.dcevm.HotSwapTool;
+import com.github.dcevm.HotSwapTool;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 
 /**
  * @author Thomas Wuerthinger
diff --git a/dcevm/src/test/java7/org/dcevm/test/eval/GeometryScenario.java b/dcevm/src/test/java7/com/github/dcevm/test/eval/GeometryScenario.java
index f671b6ca..f50ad95f 100644
--- a/dcevm/src/test/java7/org/dcevm/test/eval/GeometryScenario.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/eval/GeometryScenario.java
@@ -21,14 +21,14 @@
  * questions.
  *
  */
-package org.dcevm.test.eval;
+package com.github.dcevm.test.eval;
 
-import org.dcevm.test.TestUtil;
+import com.github.dcevm.test.TestUtil;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/fields/ComplexFieldTest.java b/dcevm/src/test/java7/com/github/dcevm/test/fields/ComplexFieldTest.java
index e7562349..f0f7dfa9 100644
--- a/dcevm/src/test/java7/org/dcevm/test/fields/ComplexFieldTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/fields/ComplexFieldTest.java
@@ -22,13 +22,13 @@
  *
  */
 
-package org.dcevm.test.fields;
+package com.github.dcevm.test.fields;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/fields/EnumTest.java b/dcevm/src/test/java7/com/github/dcevm/test/fields/EnumTest.java
index a5443bef..24836c4d 100644
--- a/dcevm/src/test/java7/org/dcevm/test/fields/EnumTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/fields/EnumTest.java
@@ -22,13 +22,13 @@
  *
  */
 
-package org.dcevm.test.fields;
+package com.github.dcevm.test.fields;
 
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
diff --git a/dcevm/src/test/java7/org/dcevm/test/fields/FieldAlignmentTest.java b/dcevm/src/test/java7/com/github/dcevm/test/fields/FieldAlignmentTest.java
index ebd47771..ee287224 100644
--- a/dcevm/src/test/java7/org/dcevm/test/fields/FieldAlignmentTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/fields/FieldAlignmentTest.java
@@ -22,13 +22,13 @@
  *
  */
 
-package org.dcevm.test.fields;
+package com.github.dcevm.test.fields;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 
 /**
  * Complex field test.
diff --git a/dcevm/src/test/java7/org/dcevm/test/fields/FieldChangedOrderTest.java b/dcevm/src/test/java7/com/github/dcevm/test/fields/FieldChangedOrderTest.java
index 99f03afa..1c98f6a2 100644
--- a/dcevm/src/test/java7/org/dcevm/test/fields/FieldChangedOrderTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/fields/FieldChangedOrderTest.java
@@ -22,13 +22,13 @@
  *
  */
 
-package org.dcevm.test.fields;
+package com.github.dcevm.test.fields;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/fields/FieldModificationTest.java b/dcevm/src/test/java7/com/github/dcevm/test/fields/FieldModificationTest.java
index 3529e6ad..8dd9dfcc 100644
--- a/dcevm/src/test/java7/org/dcevm/test/fields/FieldModificationTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/fields/FieldModificationTest.java
@@ -22,13 +22,13 @@
  *
  */
 
-package org.dcevm.test.fields;
+package com.github.dcevm.test.fields;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/fields/FieldsTestSuite.java b/dcevm/src/test/java7/com/github/dcevm/test/fields/FieldsTestSuite.java
index 55ce5941..9c431dbf 100644
--- a/dcevm/src/test/java7/org/dcevm/test/fields/FieldsTestSuite.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/fields/FieldsTestSuite.java
@@ -22,7 +22,7 @@
  *
  */
 
-package org.dcevm.test.fields;
+package com.github.dcevm.test.fields;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/dcevm/src/test/java7/org/dcevm/test/fields/ObjectStressTest.java b/dcevm/src/test/java7/com/github/dcevm/test/fields/ObjectStressTest.java
index 5109fb9b..9bd4ccf3 100644
--- a/dcevm/src/test/java7/org/dcevm/test/fields/ObjectStressTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/fields/ObjectStressTest.java
@@ -22,13 +22,13 @@
  *
  */
 
-package org.dcevm.test.fields;
+package com.github.dcevm.test.fields;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/fields/RedefinePrivateFieldTest.java b/dcevm/src/test/java7/com/github/dcevm/test/fields/RedefinePrivateFieldTest.java
index c2ea1dea..2256f930 100644
--- a/dcevm/src/test/java7/org/dcevm/test/fields/RedefinePrivateFieldTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/fields/RedefinePrivateFieldTest.java
@@ -22,13 +22,13 @@
  *
  */
 
-package org.dcevm.test.fields;
+package com.github.dcevm.test.fields;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/fields/StringFieldTest.java b/dcevm/src/test/java7/com/github/dcevm/test/fields/StringFieldTest.java
index 2bf7167a..e668ea7f 100644
--- a/dcevm/src/test/java7/org/dcevm/test/fields/StringFieldTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/fields/StringFieldTest.java
@@ -22,13 +22,13 @@
  *
  */
 
-package org.dcevm.test.fields;
+package com.github.dcevm.test.fields;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/fields/YieldTest.java b/dcevm/src/test/java7/com/github/dcevm/test/fields/YieldTest.java
index 0f5dc40c..aa7f3b43 100644
--- a/dcevm/src/test/java7/org/dcevm/test/fields/YieldTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/fields/YieldTest.java
@@ -22,7 +22,7 @@
  *
  */
 
-package org.dcevm.test.fields;
+package com.github.dcevm.test.fields;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -31,8 +31,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/methods/AddMethodTest.java b/dcevm/src/test/java7/com/github/dcevm/test/methods/AddMethodTest.java
index 7a56b577..cfb328ff 100644
--- a/dcevm/src/test/java7/org/dcevm/test/methods/AddMethodTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/methods/AddMethodTest.java
@@ -21,14 +21,14 @@
  * questions.
  *
  */
-package org.dcevm.test.methods;
+package com.github.dcevm.test.methods;
 
-import org.dcevm.test.TestUtil;
+import com.github.dcevm.test.TestUtil;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
diff --git a/dcevm/src/test/java7/org/dcevm/test/methods/AnnotationTest.java b/dcevm/src/test/java7/com/github/dcevm/test/methods/AnnotationTest.java
index bb25162f..64a04a81 100644
--- a/dcevm/src/test/java7/org/dcevm/test/methods/AnnotationTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/methods/AnnotationTest.java
@@ -21,7 +21,7 @@
  * questions.
  *
  */
-package org.dcevm.test.methods;
+package com.github.dcevm.test.methods;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -30,8 +30,8 @@ import java.lang.annotation.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/methods/ClassObjectHashcodeTest.java b/dcevm/src/test/java7/com/github/dcevm/test/methods/ClassObjectHashcodeTest.java
index 846c86e4..8c0f0c0e 100644
--- a/dcevm/src/test/java7/org/dcevm/test/methods/ClassObjectHashcodeTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/methods/ClassObjectHashcodeTest.java
@@ -21,12 +21,12 @@
  * questions.
  *
  */
-package org.dcevm.test.methods;
+package com.github.dcevm.test.methods;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
diff --git a/dcevm/src/test/java7/org/dcevm/test/methods/ClassObjectSynchronizationTest.java b/dcevm/src/test/java7/com/github/dcevm/test/methods/ClassObjectSynchronizationTest.java
index 8bf5eab5..4ff340e2 100644
--- a/dcevm/src/test/java7/org/dcevm/test/methods/ClassObjectSynchronizationTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/methods/ClassObjectSynchronizationTest.java
@@ -21,12 +21,12 @@
  * questions.
  *
  */
-package org.dcevm.test.methods;
+package com.github.dcevm.test.methods;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
diff --git a/dcevm/src/test/java7/org/dcevm/test/methods/ClassReflectionTest.java b/dcevm/src/test/java7/com/github/dcevm/test/methods/ClassReflectionTest.java
index 75fc38b4..c539fc5f 100644
--- a/dcevm/src/test/java7/org/dcevm/test/methods/ClassReflectionTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/methods/ClassReflectionTest.java
@@ -22,18 +22,17 @@
  *
  */
 
-package org.dcevm.test.methods;
+package com.github.dcevm.test.methods;
 
 import junit.framework.Assert;
-import org.dcevm.test.TestUtil;
+import com.github.dcevm.test.TestUtil;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.lang.ref.SoftReference;
-import java.lang.reflect.Method;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/methods/DeleteActiveMethodTest.java b/dcevm/src/test/java7/com/github/dcevm/test/methods/DeleteActiveMethodTest.java
index da957093..065ac632 100644
--- a/dcevm/src/test/java7/org/dcevm/test/methods/DeleteActiveMethodTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/methods/DeleteActiveMethodTest.java
@@ -22,15 +22,15 @@
  *
  */
 
-package org.dcevm.test.methods;
+package com.github.dcevm.test.methods;
 
 import junit.framework.Assert;
-import org.dcevm.test.TestUtil;
+import com.github.dcevm.test.TestUtil;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/methods/MethodReflectionTest.java b/dcevm/src/test/java7/com/github/dcevm/test/methods/MethodReflectionTest.java
index 7c1eaaf7..f5a6f105 100644
--- a/dcevm/src/test/java7/org/dcevm/test/methods/MethodReflectionTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/methods/MethodReflectionTest.java
@@ -22,7 +22,7 @@
  *
  */
 
-package org.dcevm.test.methods;
+package com.github.dcevm.test.methods;
 
 import junit.framework.Assert;
 import org.junit.Before;
@@ -30,8 +30,8 @@ import org.junit.Test;
 
 import java.lang.reflect.Method;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/methods/MethodsTestSuite.java b/dcevm/src/test/java7/com/github/dcevm/test/methods/MethodsTestSuite.java
index 20888623..2b616ea4 100644
--- a/dcevm/src/test/java7/org/dcevm/test/methods/MethodsTestSuite.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/methods/MethodsTestSuite.java
@@ -22,7 +22,7 @@
  *
  */
 
-package org.dcevm.test.methods;
+package com.github.dcevm.test.methods;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/dcevm/src/test/java7/org/dcevm/test/methods/OverrideMethodTest.java b/dcevm/src/test/java7/com/github/dcevm/test/methods/OverrideMethodTest.java
index dc98d608..9c974ec4 100644
--- a/dcevm/src/test/java7/org/dcevm/test/methods/OverrideMethodTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/methods/OverrideMethodTest.java
@@ -22,13 +22,13 @@
  *
  */
 
-package org.dcevm.test.methods;
+package com.github.dcevm.test.methods;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/methods/SingleClassReflectionTest.java b/dcevm/src/test/java7/com/github/dcevm/test/methods/SingleClassReflectionTest.java
index 61d3d31a..5b8bb830 100644
--- a/dcevm/src/test/java7/org/dcevm/test/methods/SingleClassReflectionTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/methods/SingleClassReflectionTest.java
@@ -22,13 +22,13 @@
  *
  */
 
-package org.dcevm.test.methods;
+package com.github.dcevm.test.methods;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/methods/SingleClassTest.java b/dcevm/src/test/java7/com/github/dcevm/test/methods/SingleClassTest.java
index 4e12bc26..a9b30b0b 100644
--- a/dcevm/src/test/java7/org/dcevm/test/methods/SingleClassTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/methods/SingleClassTest.java
@@ -22,13 +22,13 @@
  *
  */
 
-package org.dcevm.test.methods;
+package com.github.dcevm.test.methods;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/structural/AnonymousClassInMethodTest.java b/dcevm/src/test/java7/com/github/dcevm/test/structural/AnonymousClassInMethodTest.java
index 5f923110..10caeba2 100644
--- a/dcevm/src/test/java7/org/dcevm/test/structural/AnonymousClassInMethodTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/structural/AnonymousClassInMethodTest.java
@@ -1,11 +1,10 @@
-package org.dcevm.test.structural;
+package com.github.dcevm.test.structural;
 
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 
 /**
  * Test insertion and swap of anonymous classes.
diff --git a/dcevm/src/test/java7/org/dcevm/test/structural/InterfaceTest.java b/dcevm/src/test/java7/com/github/dcevm/test/structural/InterfaceTest.java
index 1a089965..f514373b 100644
--- a/dcevm/src/test/java7/org/dcevm/test/structural/InterfaceTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/structural/InterfaceTest.java
@@ -22,13 +22,13 @@
  *
  */
 
-package org.dcevm.test.structural;
+package com.github.dcevm.test.structural;
 
-import org.dcevm.test.TestUtil;
+import com.github.dcevm.test.TestUtil;
 import org.junit.*;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.*;
 
 /**
diff --git a/dcevm/src/test/java7/org/dcevm/test/structural/RedefineClassClassTest.java b/dcevm/src/test/java7/com/github/dcevm/test/structural/RedefineClassClassTest.java
index e0da9002..d0af2372 100644
--- a/dcevm/src/test/java7/org/dcevm/test/structural/RedefineClassClassTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/structural/RedefineClassClassTest.java
@@ -21,15 +21,15 @@
  * questions.
  *
  */
-package org.dcevm.test.structural;
+package com.github.dcevm.test.structural;
 
-import org.dcevm.ClassRedefinitionPolicy;
+import com.github.dcevm.ClassRedefinitionPolicy;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 
 /**
  * Smallest test case for redefining the interface java/lang/reflect/Type (causes java/lang/Class being redefined)
diff --git a/dcevm/src/test/java7/org/dcevm/test/structural/RedefineObjectClassTest.java b/dcevm/src/test/java7/com/github/dcevm/test/structural/RedefineObjectClassTest.java
index 08d07c1a..5947be3e 100644
--- a/dcevm/src/test/java7/org/dcevm/test/structural/RedefineObjectClassTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/structural/RedefineObjectClassTest.java
@@ -21,15 +21,15 @@
  * questions.
  *
  */
-package org.dcevm.test.structural;
+package com.github.dcevm.test.structural;
 
-import org.dcevm.ClassRedefinitionPolicy;
+import com.github.dcevm.ClassRedefinitionPolicy;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**
@@ -85,7 +85,7 @@ public class RedefineObjectClassTest {
         }
 
         public final String myTestFunction___() {
-            return "org/dcevm/test";
+            return "com/github/dcevm/test";
         }
 
         public final native void notify___();
@@ -141,7 +141,7 @@ public class RedefineObjectClassTest {
 
 
         //assertEquals("test", o.toString());
-        assertEquals("org/dcevm/test", Helper.access(o));
+        assertEquals("com/github/dcevm/test", Helper.access(o));
         __toVersion__(0);
         __toVersion__(1);
         __toVersion__(0);
diff --git a/dcevm/src/test/java7/org/dcevm/test/structural/StructuralTestSuite.java b/dcevm/src/test/java7/com/github/dcevm/test/structural/StructuralTestSuite.java
index 633ba059..861cbe83 100644
--- a/dcevm/src/test/java7/org/dcevm/test/structural/StructuralTestSuite.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/structural/StructuralTestSuite.java
@@ -22,7 +22,7 @@
  *
  */
 
-package org.dcevm.test.structural;
+package com.github.dcevm.test.structural;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/dcevm/src/test/java7/org/dcevm/test/structural/ThisTypeChange.java b/dcevm/src/test/java7/com/github/dcevm/test/structural/ThisTypeChange.java
index 9cfde217..bd5de1b1 100644
--- a/dcevm/src/test/java7/org/dcevm/test/structural/ThisTypeChange.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/structural/ThisTypeChange.java
@@ -22,14 +22,14 @@
  *
  */
 
-package org.dcevm.test.structural;
+package com.github.dcevm.test.structural;
 
-import org.dcevm.test.TestUtil;
+import com.github.dcevm.test.TestUtil;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 
 /**
  * Tests that change the type of the object references by the Java this pointer.
diff --git a/dcevm/src/test/java7/org/dcevm/test/util/HotSwapTestHelper.java b/dcevm/src/test/java7/com/github/dcevm/test/util/HotSwapTestHelper.java
index 5ecbd83e..b6fc4ff0 100644
--- a/dcevm/src/test/java7/org/dcevm/test/util/HotSwapTestHelper.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/util/HotSwapTestHelper.java
@@ -21,9 +21,9 @@
  * questions.
  *
  */
-package org.dcevm.test.util;
+package com.github.dcevm.test.util;
 
-import org.dcevm.HotSwapTool;
+import com.github.dcevm.HotSwapTool;
 
 /**
  * Shortcut methods for testing. Methods are named this way to make them more visible in the test code.
diff --git a/dcevm/src/test/java8/org/dcevm/test/methods/DefaultMethodsTest.java b/dcevm/src/test/java8/com/github/dcevm/test/methods/DefaultMethodsTest.java
index de6b3c64..15b354a7 100644
--- a/dcevm/src/test/java8/org/dcevm/test/methods/DefaultMethodsTest.java
+++ b/dcevm/src/test/java8/com/github/dcevm/test/methods/DefaultMethodsTest.java
@@ -22,13 +22,13 @@
  *
  */
 
-package org.dcevm.test.methods;
+package com.github.dcevm.test.methods;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.dcevm.test.util.HotSwapTestHelper.__toVersion__;
-import static org.dcevm.test.util.HotSwapTestHelper.__version__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
+import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
 import static org.junit.Assert.assertEquals;
 
 /**