diff --git a/src/java/org/lwjgl/input/test/JoystickTest.java b/src/java/org/lwjgl/test/input/JoystickTest.java
similarity index 99%
rename from src/java/org/lwjgl/input/test/JoystickTest.java
rename to src/java/org/lwjgl/test/input/JoystickTest.java
index 363eba0f..c3d19826 100644
--- a/src/java/org/lwjgl/input/test/JoystickTest.java
+++ b/src/java/org/lwjgl/test/input/JoystickTest.java
@@ -4,7 +4,7 @@
  * Created on 13. november 2002, 22:49
  */
 
-package org.lwjgl.input.test;
+package org.lwjgl.test.input;
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/src/java/org/lwjgl/openal/test/ALCTest.java b/src/java/org/lwjgl/test/openal/ALCTest.java
similarity index 99%
rename from src/java/org/lwjgl/openal/test/ALCTest.java
rename to src/java/org/lwjgl/test/openal/ALCTest.java
index da7ba6ff..6c85a14f 100644
--- a/src/java/org/lwjgl/openal/test/ALCTest.java
+++ b/src/java/org/lwjgl/test/openal/ALCTest.java
@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.openal.test;
+package org.lwjgl.test.openal;
 
 import org.lwjgl.openal.AL;
 import org.lwjgl.openal.ALC;
diff --git a/src/java/org/lwjgl/openal/test/ALTest.java b/src/java/org/lwjgl/test/openal/ALTest.java
similarity index 99%
rename from src/java/org/lwjgl/openal/test/ALTest.java
rename to src/java/org/lwjgl/test/openal/ALTest.java
index c605431b..0f18cac3 100644
--- a/src/java/org/lwjgl/openal/test/ALTest.java
+++ b/src/java/org/lwjgl/test/openal/ALTest.java
@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.openal.test;
+package org.lwjgl.test.openal;
 
 import org.lwjgl.openal.AL;
 import org.lwjgl.openal.ALC;
diff --git a/src/java/org/lwjgl/openal/test/ALUTTest.java b/src/java/org/lwjgl/test/openal/ALUTTest.java
similarity index 99%
rename from src/java/org/lwjgl/openal/test/ALUTTest.java
rename to src/java/org/lwjgl/test/openal/ALUTTest.java
index e4e723f2..b8a96f28 100644
--- a/src/java/org/lwjgl/openal/test/ALUTTest.java
+++ b/src/java/org/lwjgl/test/openal/ALUTTest.java
@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.openal.test;
+package org.lwjgl.test.openal;
 
 import org.lwjgl.Sys;
 import org.lwjgl.openal.AL;
diff --git a/src/java/org/lwjgl/openal/test/BasicTest.java b/src/java/org/lwjgl/test/openal/BasicTest.java
similarity index 99%
rename from src/java/org/lwjgl/openal/test/BasicTest.java
rename to src/java/org/lwjgl/test/openal/BasicTest.java
index 83796e71..ee8f87dd 100644
--- a/src/java/org/lwjgl/openal/test/BasicTest.java
+++ b/src/java/org/lwjgl/test/openal/BasicTest.java
@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.openal.test;
+package org.lwjgl.test.openal;
 
 import org.lwjgl.openal.AL;
 import org.lwjgl.openal.ALC;
diff --git a/src/java/org/lwjgl/openal/test/EAXTest.java b/src/java/org/lwjgl/test/openal/EAXTest.java
similarity index 98%
rename from src/java/org/lwjgl/openal/test/EAXTest.java
rename to src/java/org/lwjgl/test/openal/EAXTest.java
index 50c42975..fc42cbef 100644
--- a/src/java/org/lwjgl/openal/test/EAXTest.java
+++ b/src/java/org/lwjgl/test/openal/EAXTest.java
@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.openal.test;
+package org.lwjgl.test.openal;
 
 import org.lwjgl.openal.eax.EAX;
 import org.lwjgl.openal.eax.EAXBufferProperties;
diff --git a/src/java/org/lwjgl/openal/test/PlayTest.java b/src/java/org/lwjgl/test/openal/PlayTest.java
similarity index 99%
rename from src/java/org/lwjgl/openal/test/PlayTest.java
rename to src/java/org/lwjgl/test/openal/PlayTest.java
index 2757cce8..dbfa3751 100644
--- a/src/java/org/lwjgl/openal/test/PlayTest.java
+++ b/src/java/org/lwjgl/test/openal/PlayTest.java
@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.openal.test;
+package org.lwjgl.test.openal;
 
 import org.lwjgl.Sys;
 import org.lwjgl.openal.AL;
diff --git a/src/java/org/lwjgl/openal/test/PlayTestMemory.java b/src/java/org/lwjgl/test/openal/PlayTestMemory.java
similarity index 99%
rename from src/java/org/lwjgl/openal/test/PlayTestMemory.java
rename to src/java/org/lwjgl/test/openal/PlayTestMemory.java
index 17339a9b..c7210514 100644
--- a/src/java/org/lwjgl/openal/test/PlayTestMemory.java
+++ b/src/java/org/lwjgl/test/openal/PlayTestMemory.java
@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.openal.test;
+package org.lwjgl.test.openal;
 
 import org.lwjgl.Sys;
 import org.lwjgl.openal.AL;
diff --git a/src/java/org/lwjgl/opengl/test/Game.java b/src/java/org/lwjgl/test/opengl/Game.java
similarity index 99%
rename from src/java/org/lwjgl/opengl/test/Game.java
rename to src/java/org/lwjgl/test/opengl/Game.java
index 9d738d67..1520272e 100644
--- a/src/java/org/lwjgl/opengl/test/Game.java
+++ b/src/java/org/lwjgl/test/opengl/Game.java
@@ -39,7 +39,7 @@
  * @version $Revision$
  */
 
-package org.lwjgl.opengl.test;
+package org.lwjgl.test.opengl;
 
 import org.lwjgl.*;
 import org.lwjgl.opengl.*;
diff --git a/src/java/org/lwjgl/test/MathTest.java b/src/java/org/lwjgl/test/vector/MathTest.java
similarity index 96%
rename from src/java/org/lwjgl/test/MathTest.java
rename to src/java/org/lwjgl/test/vector/MathTest.java
index 5c688a44..59f83549 100644
--- a/src/java/org/lwjgl/test/MathTest.java
+++ b/src/java/org/lwjgl/test/vector/MathTest.java
@@ -1,4 +1,4 @@
-package org.lwjgl.test;
+package org.lwjgl.test.vector;
 
 import java.nio.*;