diff --git a/src/java/org/lwjgl/generator/BufferKind.java b/src/java/org/lwjgl/generator/BufferKind.java
deleted file mode 100644
index 401f0fcd..00000000
--- a/src/java/org/lwjgl/generator/BufferKind.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- *   its contributors may be used to endorse or promote products derived
- *   from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * 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.generator;
-
-/**
- * $Id$
- *
- * @author elias_naur <elias_naur@users.sourceforge.net>
- * @version $Revision$
- */
-
-public enum BufferKind {
-	UnpackPBO,
-	PackPBO,
-	ElementVBO,
-	ArrayVBO
-}
diff --git a/src/java/org/lwjgl/generator/Mode.java b/src/java/org/lwjgl/generator/Mode.java
deleted file mode 100644
index a042ff8e..00000000
--- a/src/java/org/lwjgl/generator/Mode.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- *   its contributors may be used to endorse or promote products derived
- *   from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * 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.generator;
-
-public enum Mode {
-	BUFFEROBJECT,
-	AUTOS,
-	NORMAL
-}
diff --git a/src/java/org/lwjgl/generator/Platform.java b/src/java/org/lwjgl/generator/Platform.java
deleted file mode 100644
index 3a6edc77..00000000
--- a/src/java/org/lwjgl/generator/Platform.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- *   its contributors may be used to endorse or promote products derived
- *   from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * 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.generator;
-
-/**
- * $Id$
- *
- * @author elias_naur <elias_naur@users.sourceforge.net>
- * @version $Revision$
- */
-
-import java.io.PrintWriter;
-
-public enum Platform {
-	WGL,
-	GLX,
-	ALL;
-	
-	public void printPrologue(PrintWriter writer) {
-		if (this == ALL)
-			return;
-		writer.print("#ifdef ");
-		switch (this) {
-			case WGL:
-				writer.println("_WIN32");
-				break;
-			case GLX:
-				writer.println("_X11");
-				break;
-			default:
-				throw new RuntimeException(this + " is not supported");
-		}
-	}
-
-	public void printEpilogue(PrintWriter writer) {
-		if (this == ALL)
-			return;
-		writer.println("#endif");
-	}
-	
-	public String getOSPrefix() {
-		switch (this) {
-			case WGL:
-				return "Windows";
-			case GLX:
-				return "Linux";
-			default:
-				throw new RuntimeException(this + " has no OS specific prefix");
-		}
-	}
-	
-	public String getPrefix() {
-		switch (this) {
-			case WGL:
-				return "wgl";
-			case GLX:
-				return "glX";
-			case ALL:
-				return "gl";
-			default:
-				throw new RuntimeException(this + " is not supported");
-		}
-	}
-}
diff --git a/src/java/org/lwjgl/generator/Signedness.java b/src/java/org/lwjgl/generator/Signedness.java
deleted file mode 100644
index a8cc7b6b..00000000
--- a/src/java/org/lwjgl/generator/Signedness.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- *   its contributors may be used to endorse or promote products derived
- *   from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * 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.generator;
-
-/**
- * $Id$
- *
- * @author elias_naur <elias_naur@users.sourceforge.net>
- * @version $Revision$
- */
-
-public enum Signedness {
-	SIGNED,
-	UNSIGNED,
-	NONE,
-	BOTH
-}
diff --git a/src/java/org/lwjgl/generator/ALTypeMap.java b/src/java/org/lwjgl/util/generator/ALTypeMap.java
similarity index 99%
rename from src/java/org/lwjgl/generator/ALTypeMap.java
rename to src/java/org/lwjgl/util/generator/ALTypeMap.java
index e14779ad..4f3a7364 100644
--- a/src/java/org/lwjgl/generator/ALTypeMap.java
+++ b/src/java/org/lwjgl/util/generator/ALTypeMap.java
@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.lwjgl.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/ALboolean.java b/src/java/org/lwjgl/util/generator/ALboolean.java
similarity index 98%
rename from src/java/org/lwjgl/generator/ALboolean.java
rename to src/java/org/lwjgl/util/generator/ALboolean.java
index 659c42ad..223be60a 100644
--- a/src/java/org/lwjgl/generator/ALboolean.java
+++ b/src/java/org/lwjgl/util/generator/ALboolean.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/ALbyte.java b/src/java/org/lwjgl/util/generator/ALbyte.java
similarity index 98%
rename from src/java/org/lwjgl/generator/ALbyte.java
rename to src/java/org/lwjgl/util/generator/ALbyte.java
index c7894a20..663465d8 100644
--- a/src/java/org/lwjgl/generator/ALbyte.java
+++ b/src/java/org/lwjgl/util/generator/ALbyte.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/ALenum.java b/src/java/org/lwjgl/util/generator/ALenum.java
similarity index 98%
rename from src/java/org/lwjgl/generator/ALenum.java
rename to src/java/org/lwjgl/util/generator/ALenum.java
index 1a375f54..ac66660f 100644
--- a/src/java/org/lwjgl/generator/ALenum.java
+++ b/src/java/org/lwjgl/util/generator/ALenum.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/ALfloat.java b/src/java/org/lwjgl/util/generator/ALfloat.java
similarity index 98%
rename from src/java/org/lwjgl/generator/ALfloat.java
rename to src/java/org/lwjgl/util/generator/ALfloat.java
index 5a34c1b5..f03b6a19 100644
--- a/src/java/org/lwjgl/generator/ALfloat.java
+++ b/src/java/org/lwjgl/util/generator/ALfloat.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/ALint.java b/src/java/org/lwjgl/util/generator/ALint.java
similarity index 98%
rename from src/java/org/lwjgl/generator/ALint.java
rename to src/java/org/lwjgl/util/generator/ALint.java
index 8b0a2a46..81f56792 100644
--- a/src/java/org/lwjgl/generator/ALint.java
+++ b/src/java/org/lwjgl/util/generator/ALint.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/ALshort.java b/src/java/org/lwjgl/util/generator/ALshort.java
similarity index 98%
rename from src/java/org/lwjgl/generator/ALshort.java
rename to src/java/org/lwjgl/util/generator/ALshort.java
index 156eaa50..6a78e9c9 100644
--- a/src/java/org/lwjgl/generator/ALshort.java
+++ b/src/java/org/lwjgl/util/generator/ALshort.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/ALsizei.java b/src/java/org/lwjgl/util/generator/ALsizei.java
similarity index 98%
rename from src/java/org/lwjgl/generator/ALsizei.java
rename to src/java/org/lwjgl/util/generator/ALsizei.java
index 9680453b..2c97765f 100644
--- a/src/java/org/lwjgl/generator/ALsizei.java
+++ b/src/java/org/lwjgl/util/generator/ALsizei.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/ALubyte.java b/src/java/org/lwjgl/util/generator/ALubyte.java
similarity index 98%
rename from src/java/org/lwjgl/generator/ALubyte.java
rename to src/java/org/lwjgl/util/generator/ALubyte.java
index b0675651..4930e095 100644
--- a/src/java/org/lwjgl/generator/ALubyte.java
+++ b/src/java/org/lwjgl/util/generator/ALubyte.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/ALuint.java b/src/java/org/lwjgl/util/generator/ALuint.java
similarity index 98%
rename from src/java/org/lwjgl/generator/ALuint.java
rename to src/java/org/lwjgl/util/generator/ALuint.java
index d4c23710..ad8b96d2 100644
--- a/src/java/org/lwjgl/generator/ALuint.java
+++ b/src/java/org/lwjgl/util/generator/ALuint.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/ALvoid.java b/src/java/org/lwjgl/util/generator/ALvoid.java
similarity index 98%
rename from src/java/org/lwjgl/generator/ALvoid.java
rename to src/java/org/lwjgl/util/generator/ALvoid.java
index f06c3e83..1c802a7a 100644
--- a/src/java/org/lwjgl/generator/ALvoid.java
+++ b/src/java/org/lwjgl/util/generator/ALvoid.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/Auto.java b/src/java/org/lwjgl/util/generator/Auto.java
similarity index 98%
rename from src/java/org/lwjgl/generator/Auto.java
rename to src/java/org/lwjgl/util/generator/Auto.java
index 86e97f4a..c3fff708 100644
--- a/src/java/org/lwjgl/generator/Auto.java
+++ b/src/java/org/lwjgl/util/generator/Auto.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/AutoResultSize.java b/src/java/org/lwjgl/util/generator/AutoResultSize.java
similarity index 98%
rename from src/java/org/lwjgl/generator/AutoResultSize.java
rename to src/java/org/lwjgl/util/generator/AutoResultSize.java
index 4a515fa5..4f6428f2 100644
--- a/src/java/org/lwjgl/generator/AutoResultSize.java
+++ b/src/java/org/lwjgl/util/generator/AutoResultSize.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/AutoSize.java b/src/java/org/lwjgl/util/generator/AutoSize.java
similarity index 98%
rename from src/java/org/lwjgl/generator/AutoSize.java
rename to src/java/org/lwjgl/util/generator/AutoSize.java
index 9b51de73..518085f3 100644
--- a/src/java/org/lwjgl/generator/AutoSize.java
+++ b/src/java/org/lwjgl/util/generator/AutoSize.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/AutoType.java b/src/java/org/lwjgl/util/generator/AutoType.java
similarity index 98%
rename from src/java/org/lwjgl/generator/AutoType.java
rename to src/java/org/lwjgl/util/generator/AutoType.java
index 69eceb77..d0d35ef7 100644
--- a/src/java/org/lwjgl/generator/AutoType.java
+++ b/src/java/org/lwjgl/util/generator/AutoType.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/util/generator/BufferKind.java b/src/java/org/lwjgl/util/generator/BufferKind.java
new file mode 100644
index 00000000..754c2714
--- /dev/null
+++ b/src/java/org/lwjgl/util/generator/BufferKind.java
@@ -0,0 +1,15 @@
+package org.lwjgl.util.generator;
+
+/**
+ * $Id$
+ *
+ * @author elias_naur <elias_naur@users.sourceforge.net>
+ * @version $Revision$
+ */
+
+public enum BufferKind {
+	UnpackPBO,
+	PackPBO,
+	ElementVBO,
+	ArrayVBO
+}
diff --git a/src/java/org/lwjgl/generator/BufferObject.java b/src/java/org/lwjgl/util/generator/BufferObject.java
similarity index 98%
rename from src/java/org/lwjgl/generator/BufferObject.java
rename to src/java/org/lwjgl/util/generator/BufferObject.java
index bb20868c..f7f458dc 100644
--- a/src/java/org/lwjgl/generator/BufferObject.java
+++ b/src/java/org/lwjgl/util/generator/BufferObject.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/CachedResult.java b/src/java/org/lwjgl/util/generator/CachedResult.java
similarity index 98%
rename from src/java/org/lwjgl/generator/CachedResult.java
rename to src/java/org/lwjgl/util/generator/CachedResult.java
index f41e3ac5..9b5abf3b 100644
--- a/src/java/org/lwjgl/generator/CachedResult.java
+++ b/src/java/org/lwjgl/util/generator/CachedResult.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/Check.java b/src/java/org/lwjgl/util/generator/Check.java
similarity index 98%
rename from src/java/org/lwjgl/generator/Check.java
rename to src/java/org/lwjgl/util/generator/Check.java
index 23f95bf1..0aef7409 100644
--- a/src/java/org/lwjgl/generator/Check.java
+++ b/src/java/org/lwjgl/util/generator/Check.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/Code.java b/src/java/org/lwjgl/util/generator/Code.java
similarity index 98%
rename from src/java/org/lwjgl/generator/Code.java
rename to src/java/org/lwjgl/util/generator/Code.java
index 958aba7c..692c2dc1 100644
--- a/src/java/org/lwjgl/generator/Code.java
+++ b/src/java/org/lwjgl/util/generator/Code.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/Const.java b/src/java/org/lwjgl/util/generator/Const.java
similarity index 98%
rename from src/java/org/lwjgl/generator/Const.java
rename to src/java/org/lwjgl/util/generator/Const.java
index 59fe7c31..9b0abdfe 100644
--- a/src/java/org/lwjgl/generator/Const.java
+++ b/src/java/org/lwjgl/util/generator/Const.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/Constant.java b/src/java/org/lwjgl/util/generator/Constant.java
similarity index 98%
rename from src/java/org/lwjgl/generator/Constant.java
rename to src/java/org/lwjgl/util/generator/Constant.java
index c10a3812..75921cf6 100644
--- a/src/java/org/lwjgl/generator/Constant.java
+++ b/src/java/org/lwjgl/util/generator/Constant.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/ContextCapabilitiesGenerator.java b/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
similarity index 99%
rename from src/java/org/lwjgl/generator/ContextCapabilitiesGenerator.java
rename to src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
index 146e4ad9..8f767da2 100644
--- a/src/java/org/lwjgl/generator/ContextCapabilitiesGenerator.java
+++ b/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.lwjgl.generator;
+package org.lwjgl.util.generator;
 
 import com.sun.mirror.apt.*;
 import com.sun.mirror.declaration.*;
diff --git a/src/java/org/lwjgl/generator/ContextGeneratorProcessorFactory.java b/src/java/org/lwjgl/util/generator/ContextGeneratorProcessorFactory.java
similarity index 99%
rename from src/java/org/lwjgl/generator/ContextGeneratorProcessorFactory.java
rename to src/java/org/lwjgl/util/generator/ContextGeneratorProcessorFactory.java
index a865855b..39ae683f 100644
--- a/src/java/org/lwjgl/generator/ContextGeneratorProcessorFactory.java
+++ b/src/java/org/lwjgl/util/generator/ContextGeneratorProcessorFactory.java
@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.lwjgl.generator;
+package org.lwjgl.util.generator;
 
 import com.sun.mirror.apt.*;
 import com.sun.mirror.declaration.*;
diff --git a/src/java/org/lwjgl/generator/Extension.java b/src/java/org/lwjgl/util/generator/Extension.java
similarity index 98%
rename from src/java/org/lwjgl/generator/Extension.java
rename to src/java/org/lwjgl/util/generator/Extension.java
index 9565a4dd..67beec89 100644
--- a/src/java/org/lwjgl/generator/Extension.java
+++ b/src/java/org/lwjgl/util/generator/Extension.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/FieldsGenerator.java b/src/java/org/lwjgl/util/generator/FieldsGenerator.java
similarity index 98%
rename from src/java/org/lwjgl/generator/FieldsGenerator.java
rename to src/java/org/lwjgl/util/generator/FieldsGenerator.java
index 0157bb22..166475ec 100644
--- a/src/java/org/lwjgl/generator/FieldsGenerator.java
+++ b/src/java/org/lwjgl/util/generator/FieldsGenerator.java
@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.lwjgl.generator;
+package org.lwjgl.util.generator;
 
 import com.sun.mirror.declaration.*;
 import com.sun.mirror.type.*;
diff --git a/src/java/org/lwjgl/generator/GLTypeMap.java b/src/java/org/lwjgl/util/generator/GLTypeMap.java
similarity index 99%
rename from src/java/org/lwjgl/generator/GLTypeMap.java
rename to src/java/org/lwjgl/util/generator/GLTypeMap.java
index 2171fbc6..ea530c43 100644
--- a/src/java/org/lwjgl/generator/GLTypeMap.java
+++ b/src/java/org/lwjgl/util/generator/GLTypeMap.java
@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.lwjgl.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GLbitfield.java b/src/java/org/lwjgl/util/generator/GLbitfield.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GLbitfield.java
rename to src/java/org/lwjgl/util/generator/GLbitfield.java
index 5d03e474..82ded433 100644
--- a/src/java/org/lwjgl/generator/GLbitfield.java
+++ b/src/java/org/lwjgl/util/generator/GLbitfield.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GLboolean.java b/src/java/org/lwjgl/util/generator/GLboolean.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GLboolean.java
rename to src/java/org/lwjgl/util/generator/GLboolean.java
index 55e1bd80..d11475f4 100644
--- a/src/java/org/lwjgl/generator/GLboolean.java
+++ b/src/java/org/lwjgl/util/generator/GLboolean.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GLbyte.java b/src/java/org/lwjgl/util/generator/GLbyte.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GLbyte.java
rename to src/java/org/lwjgl/util/generator/GLbyte.java
index d9afa296..1438ebc4 100644
--- a/src/java/org/lwjgl/generator/GLbyte.java
+++ b/src/java/org/lwjgl/util/generator/GLbyte.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GLchar.java b/src/java/org/lwjgl/util/generator/GLchar.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GLchar.java
rename to src/java/org/lwjgl/util/generator/GLchar.java
index 79e9317c..9bd95c8f 100644
--- a/src/java/org/lwjgl/generator/GLchar.java
+++ b/src/java/org/lwjgl/util/generator/GLchar.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GLcharARB.java b/src/java/org/lwjgl/util/generator/GLcharARB.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GLcharARB.java
rename to src/java/org/lwjgl/util/generator/GLcharARB.java
index 37928e0b..becf0072 100644
--- a/src/java/org/lwjgl/generator/GLcharARB.java
+++ b/src/java/org/lwjgl/util/generator/GLcharARB.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GLclampd.java b/src/java/org/lwjgl/util/generator/GLclampd.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GLclampd.java
rename to src/java/org/lwjgl/util/generator/GLclampd.java
index ee072ecb..e2d36173 100644
--- a/src/java/org/lwjgl/generator/GLclampd.java
+++ b/src/java/org/lwjgl/util/generator/GLclampd.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GLclampf.java b/src/java/org/lwjgl/util/generator/GLclampf.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GLclampf.java
rename to src/java/org/lwjgl/util/generator/GLclampf.java
index 67030491..09808ca0 100644
--- a/src/java/org/lwjgl/generator/GLclampf.java
+++ b/src/java/org/lwjgl/util/generator/GLclampf.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GLdouble.java b/src/java/org/lwjgl/util/generator/GLdouble.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GLdouble.java
rename to src/java/org/lwjgl/util/generator/GLdouble.java
index 496f7112..a0527c88 100644
--- a/src/java/org/lwjgl/generator/GLdouble.java
+++ b/src/java/org/lwjgl/util/generator/GLdouble.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GLenum.java b/src/java/org/lwjgl/util/generator/GLenum.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GLenum.java
rename to src/java/org/lwjgl/util/generator/GLenum.java
index f3d1ffbc..5f3108a0 100644
--- a/src/java/org/lwjgl/generator/GLenum.java
+++ b/src/java/org/lwjgl/util/generator/GLenum.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GLfloat.java b/src/java/org/lwjgl/util/generator/GLfloat.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GLfloat.java
rename to src/java/org/lwjgl/util/generator/GLfloat.java
index d9f2daaa..3cc66b8b 100644
--- a/src/java/org/lwjgl/generator/GLfloat.java
+++ b/src/java/org/lwjgl/util/generator/GLfloat.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GLhalf.java b/src/java/org/lwjgl/util/generator/GLhalf.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GLhalf.java
rename to src/java/org/lwjgl/util/generator/GLhalf.java
index a1eec92f..ab7b0bc8 100644
--- a/src/java/org/lwjgl/generator/GLhalf.java
+++ b/src/java/org/lwjgl/util/generator/GLhalf.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GLhandleARB.java b/src/java/org/lwjgl/util/generator/GLhandleARB.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GLhandleARB.java
rename to src/java/org/lwjgl/util/generator/GLhandleARB.java
index fd23ec11..7dbbc94b 100644
--- a/src/java/org/lwjgl/generator/GLhandleARB.java
+++ b/src/java/org/lwjgl/util/generator/GLhandleARB.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GLint.java b/src/java/org/lwjgl/util/generator/GLint.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GLint.java
rename to src/java/org/lwjgl/util/generator/GLint.java
index bd6a9997..2b9f1719 100644
--- a/src/java/org/lwjgl/generator/GLint.java
+++ b/src/java/org/lwjgl/util/generator/GLint.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GLintptr.java b/src/java/org/lwjgl/util/generator/GLintptr.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GLintptr.java
rename to src/java/org/lwjgl/util/generator/GLintptr.java
index d199a80a..6efcab95 100644
--- a/src/java/org/lwjgl/generator/GLintptr.java
+++ b/src/java/org/lwjgl/util/generator/GLintptr.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GLintptrARB.java b/src/java/org/lwjgl/util/generator/GLintptrARB.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GLintptrARB.java
rename to src/java/org/lwjgl/util/generator/GLintptrARB.java
index e46986e7..721f4908 100644
--- a/src/java/org/lwjgl/generator/GLintptrARB.java
+++ b/src/java/org/lwjgl/util/generator/GLintptrARB.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GLshort.java b/src/java/org/lwjgl/util/generator/GLshort.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GLshort.java
rename to src/java/org/lwjgl/util/generator/GLshort.java
index 2e27a183..f6bafed1 100644
--- a/src/java/org/lwjgl/generator/GLshort.java
+++ b/src/java/org/lwjgl/util/generator/GLshort.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GLsizei.java b/src/java/org/lwjgl/util/generator/GLsizei.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GLsizei.java
rename to src/java/org/lwjgl/util/generator/GLsizei.java
index c29bcaa9..29912885 100644
--- a/src/java/org/lwjgl/generator/GLsizei.java
+++ b/src/java/org/lwjgl/util/generator/GLsizei.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GLsizeiptr.java b/src/java/org/lwjgl/util/generator/GLsizeiptr.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GLsizeiptr.java
rename to src/java/org/lwjgl/util/generator/GLsizeiptr.java
index 973a8ebc..0f5fc96e 100644
--- a/src/java/org/lwjgl/generator/GLsizeiptr.java
+++ b/src/java/org/lwjgl/util/generator/GLsizeiptr.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GLsizeiptrARB.java b/src/java/org/lwjgl/util/generator/GLsizeiptrARB.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GLsizeiptrARB.java
rename to src/java/org/lwjgl/util/generator/GLsizeiptrARB.java
index cf81112a..c798dd69 100644
--- a/src/java/org/lwjgl/generator/GLsizeiptrARB.java
+++ b/src/java/org/lwjgl/util/generator/GLsizeiptrARB.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GLubyte.java b/src/java/org/lwjgl/util/generator/GLubyte.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GLubyte.java
rename to src/java/org/lwjgl/util/generator/GLubyte.java
index 2af1edf7..4e5d137b 100644
--- a/src/java/org/lwjgl/generator/GLubyte.java
+++ b/src/java/org/lwjgl/util/generator/GLubyte.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GLuint.java b/src/java/org/lwjgl/util/generator/GLuint.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GLuint.java
rename to src/java/org/lwjgl/util/generator/GLuint.java
index d835d68a..12671d6d 100644
--- a/src/java/org/lwjgl/generator/GLuint.java
+++ b/src/java/org/lwjgl/util/generator/GLuint.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GLushort.java b/src/java/org/lwjgl/util/generator/GLushort.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GLushort.java
rename to src/java/org/lwjgl/util/generator/GLushort.java
index 17b5ca0e..c5c18a24 100644
--- a/src/java/org/lwjgl/generator/GLushort.java
+++ b/src/java/org/lwjgl/util/generator/GLushort.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GLvoid.java b/src/java/org/lwjgl/util/generator/GLvoid.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GLvoid.java
rename to src/java/org/lwjgl/util/generator/GLvoid.java
index 89a59bcb..f2f0e690 100644
--- a/src/java/org/lwjgl/generator/GLvoid.java
+++ b/src/java/org/lwjgl/util/generator/GLvoid.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GenerateAutos.java b/src/java/org/lwjgl/util/generator/GenerateAutos.java
similarity index 98%
rename from src/java/org/lwjgl/generator/GenerateAutos.java
rename to src/java/org/lwjgl/util/generator/GenerateAutos.java
index 328fb248..39117370 100644
--- a/src/java/org/lwjgl/generator/GenerateAutos.java
+++ b/src/java/org/lwjgl/util/generator/GenerateAutos.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/GeneratorProcessorFactory.java b/src/java/org/lwjgl/util/generator/GeneratorProcessorFactory.java
similarity index 99%
rename from src/java/org/lwjgl/generator/GeneratorProcessorFactory.java
rename to src/java/org/lwjgl/util/generator/GeneratorProcessorFactory.java
index 103f8c74..db8abba2 100644
--- a/src/java/org/lwjgl/generator/GeneratorProcessorFactory.java
+++ b/src/java/org/lwjgl/util/generator/GeneratorProcessorFactory.java
@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.lwjgl.generator;
+package org.lwjgl.util.generator;
 
 import com.sun.mirror.apt.*;
 import com.sun.mirror.declaration.*;
diff --git a/src/java/org/lwjgl/generator/GeneratorVisitor.java b/src/java/org/lwjgl/util/generator/GeneratorVisitor.java
similarity index 99%
rename from src/java/org/lwjgl/generator/GeneratorVisitor.java
rename to src/java/org/lwjgl/util/generator/GeneratorVisitor.java
index c4bed80a..9ca02562 100644
--- a/src/java/org/lwjgl/generator/GeneratorVisitor.java
+++ b/src/java/org/lwjgl/util/generator/GeneratorVisitor.java
@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.lwjgl.generator;
+package org.lwjgl.util.generator;
 
 import com.sun.mirror.apt.*;
 import com.sun.mirror.declaration.*;
diff --git a/src/java/org/lwjgl/generator/Indirect.java b/src/java/org/lwjgl/util/generator/Indirect.java
similarity index 98%
rename from src/java/org/lwjgl/generator/Indirect.java
rename to src/java/org/lwjgl/util/generator/Indirect.java
index 11312ba4..2b13c64e 100644
--- a/src/java/org/lwjgl/generator/Indirect.java
+++ b/src/java/org/lwjgl/util/generator/Indirect.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/JNITypeTranslator.java b/src/java/org/lwjgl/util/generator/JNITypeTranslator.java
similarity index 99%
rename from src/java/org/lwjgl/generator/JNITypeTranslator.java
rename to src/java/org/lwjgl/util/generator/JNITypeTranslator.java
index 557510c2..d64894a5 100644
--- a/src/java/org/lwjgl/generator/JNITypeTranslator.java
+++ b/src/java/org/lwjgl/util/generator/JNITypeTranslator.java
@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.lwjgl.generator;
+package org.lwjgl.util.generator;
 
 import com.sun.mirror.type.*;
 import com.sun.mirror.util.*;
diff --git a/src/java/org/lwjgl/generator/JavaMethodsGenerator.java b/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
similarity index 99%
rename from src/java/org/lwjgl/generator/JavaMethodsGenerator.java
rename to src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
index b2d43556..3d0a4e22 100644
--- a/src/java/org/lwjgl/generator/JavaMethodsGenerator.java
+++ b/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.lwjgl.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/JavaTypeTranslator.java b/src/java/org/lwjgl/util/generator/JavaTypeTranslator.java
similarity index 99%
rename from src/java/org/lwjgl/generator/JavaTypeTranslator.java
rename to src/java/org/lwjgl/util/generator/JavaTypeTranslator.java
index 7265fecd..5490ef8a 100644
--- a/src/java/org/lwjgl/generator/JavaTypeTranslator.java
+++ b/src/java/org/lwjgl/util/generator/JavaTypeTranslator.java
@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.lwjgl.generator;
+package org.lwjgl.util.generator;
 
 import com.sun.mirror.type.*;
 import com.sun.mirror.util.*;
diff --git a/src/java/org/lwjgl/util/generator/Mode.java b/src/java/org/lwjgl/util/generator/Mode.java
new file mode 100644
index 00000000..4c1421fa
--- /dev/null
+++ b/src/java/org/lwjgl/util/generator/Mode.java
@@ -0,0 +1,7 @@
+package org.lwjgl.util.generator;
+
+public enum Mode {
+	BUFFEROBJECT,
+	AUTOS,
+	NORMAL
+}
diff --git a/src/java/org/lwjgl/generator/NativeMethodStubsGenerator.java b/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java
similarity index 99%
rename from src/java/org/lwjgl/generator/NativeMethodStubsGenerator.java
rename to src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java
index 98ca5e7e..5c564a7b 100644
--- a/src/java/org/lwjgl/generator/NativeMethodStubsGenerator.java
+++ b/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java
@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.lwjgl.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/NativeType.java b/src/java/org/lwjgl/util/generator/NativeType.java
similarity index 98%
rename from src/java/org/lwjgl/generator/NativeType.java
rename to src/java/org/lwjgl/util/generator/NativeType.java
index 593ef44d..666f0beb 100644
--- a/src/java/org/lwjgl/generator/NativeType.java
+++ b/src/java/org/lwjgl/util/generator/NativeType.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/NativeTypeTranslator.java b/src/java/org/lwjgl/util/generator/NativeTypeTranslator.java
similarity index 99%
rename from src/java/org/lwjgl/generator/NativeTypeTranslator.java
rename to src/java/org/lwjgl/util/generator/NativeTypeTranslator.java
index 8c75c3cd..8c405bf0 100644
--- a/src/java/org/lwjgl/generator/NativeTypeTranslator.java
+++ b/src/java/org/lwjgl/util/generator/NativeTypeTranslator.java
@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.lwjgl.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/NoErrorCheck.java b/src/java/org/lwjgl/util/generator/NoErrorCheck.java
similarity index 98%
rename from src/java/org/lwjgl/generator/NoErrorCheck.java
rename to src/java/org/lwjgl/util/generator/NoErrorCheck.java
index 3fb52751..bcc6323d 100644
--- a/src/java/org/lwjgl/generator/NoErrorCheck.java
+++ b/src/java/org/lwjgl/util/generator/NoErrorCheck.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/NullTerminated.java b/src/java/org/lwjgl/util/generator/NullTerminated.java
similarity index 98%
rename from src/java/org/lwjgl/generator/NullTerminated.java
rename to src/java/org/lwjgl/util/generator/NullTerminated.java
index 82a0d428..7f575c74 100644
--- a/src/java/org/lwjgl/generator/NullTerminated.java
+++ b/src/java/org/lwjgl/util/generator/NullTerminated.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/util/generator/Platform.java b/src/java/org/lwjgl/util/generator/Platform.java
new file mode 100644
index 00000000..14380fbf
--- /dev/null
+++ b/src/java/org/lwjgl/util/generator/Platform.java
@@ -0,0 +1,62 @@
+package org.lwjgl.util.generator;
+
+/**
+ * $Id$
+ *
+ * @author elias_naur <elias_naur@users.sourceforge.net>
+ * @version $Revision$
+ */
+
+import java.io.PrintWriter;
+
+public enum Platform {
+	WGL,
+	GLX,
+	ALL;
+	
+	public void printPrologue(PrintWriter writer) {
+		if (this == ALL)
+			return;
+		writer.print("#ifdef ");
+		switch (this) {
+			case WGL:
+				writer.println("_WIN32");
+				break;
+			case GLX:
+				writer.println("_X11");
+				break;
+			default:
+				throw new RuntimeException(this + " is not supported");
+		}
+	}
+
+	public void printEpilogue(PrintWriter writer) {
+		if (this == ALL)
+			return;
+		writer.println("#endif");
+	}
+	
+	public String getOSPrefix() {
+		switch (this) {
+			case WGL:
+				return "Windows";
+			case GLX:
+				return "Linux";
+			default:
+				throw new RuntimeException(this + " has no OS specific prefix");
+		}
+	}
+	
+	public String getPrefix() {
+		switch (this) {
+			case WGL:
+				return "wgl";
+			case GLX:
+				return "glX";
+			case ALL:
+				return "gl";
+			default:
+				throw new RuntimeException(this + " is not supported");
+		}
+	}
+}
diff --git a/src/java/org/lwjgl/generator/PlatformDependent.java b/src/java/org/lwjgl/util/generator/PlatformDependent.java
similarity index 98%
rename from src/java/org/lwjgl/generator/PlatformDependent.java
rename to src/java/org/lwjgl/util/generator/PlatformDependent.java
index ee6f2423..cbc9f559 100644
--- a/src/java/org/lwjgl/generator/PlatformDependent.java
+++ b/src/java/org/lwjgl/util/generator/PlatformDependent.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/PostfixTranslator.java b/src/java/org/lwjgl/util/generator/PostfixTranslator.java
similarity index 99%
rename from src/java/org/lwjgl/generator/PostfixTranslator.java
rename to src/java/org/lwjgl/util/generator/PostfixTranslator.java
index 516463fb..a958b148 100644
--- a/src/java/org/lwjgl/generator/PostfixTranslator.java
+++ b/src/java/org/lwjgl/util/generator/PostfixTranslator.java
@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.lwjgl.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/RegisterStubsGenerator.java b/src/java/org/lwjgl/util/generator/RegisterStubsGenerator.java
similarity index 99%
rename from src/java/org/lwjgl/generator/RegisterStubsGenerator.java
rename to src/java/org/lwjgl/util/generator/RegisterStubsGenerator.java
index 978b5ae5..1258325f 100644
--- a/src/java/org/lwjgl/generator/RegisterStubsGenerator.java
+++ b/src/java/org/lwjgl/util/generator/RegisterStubsGenerator.java
@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.lwjgl.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/Result.java b/src/java/org/lwjgl/util/generator/Result.java
similarity index 98%
rename from src/java/org/lwjgl/generator/Result.java
rename to src/java/org/lwjgl/util/generator/Result.java
index 64cb6bcd..229c6704 100644
--- a/src/java/org/lwjgl/generator/Result.java
+++ b/src/java/org/lwjgl/util/generator/Result.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/SignatureTranslator.java b/src/java/org/lwjgl/util/generator/SignatureTranslator.java
similarity index 99%
rename from src/java/org/lwjgl/generator/SignatureTranslator.java
rename to src/java/org/lwjgl/util/generator/SignatureTranslator.java
index 172e608a..6bde2e08 100644
--- a/src/java/org/lwjgl/generator/SignatureTranslator.java
+++ b/src/java/org/lwjgl/util/generator/SignatureTranslator.java
@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.lwjgl.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/util/generator/Signedness.java b/src/java/org/lwjgl/util/generator/Signedness.java
new file mode 100644
index 00000000..4e57f239
--- /dev/null
+++ b/src/java/org/lwjgl/util/generator/Signedness.java
@@ -0,0 +1,15 @@
+package org.lwjgl.util.generator;
+
+/**
+ * $Id$
+ *
+ * @author elias_naur <elias_naur@users.sourceforge.net>
+ * @version $Revision$
+ */
+
+public enum Signedness {
+	SIGNED,
+	UNSIGNED,
+	NONE,
+	BOTH
+}
diff --git a/src/java/org/lwjgl/generator/StripPostfix.java b/src/java/org/lwjgl/util/generator/StripPostfix.java
similarity index 98%
rename from src/java/org/lwjgl/generator/StripPostfix.java
rename to src/java/org/lwjgl/util/generator/StripPostfix.java
index c00268b1..82e78753 100644
--- a/src/java/org/lwjgl/generator/StripPostfix.java
+++ b/src/java/org/lwjgl/util/generator/StripPostfix.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/TypeInfo.java b/src/java/org/lwjgl/util/generator/TypeInfo.java
similarity index 99%
rename from src/java/org/lwjgl/generator/TypeInfo.java
rename to src/java/org/lwjgl/util/generator/TypeInfo.java
index 103803a6..b8d629df 100644
--- a/src/java/org/lwjgl/generator/TypeInfo.java
+++ b/src/java/org/lwjgl/util/generator/TypeInfo.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/TypeMap.java b/src/java/org/lwjgl/util/generator/TypeMap.java
similarity index 98%
rename from src/java/org/lwjgl/generator/TypeMap.java
rename to src/java/org/lwjgl/util/generator/TypeMap.java
index cd14fb71..ab83deac 100644
--- a/src/java/org/lwjgl/generator/TypeMap.java
+++ b/src/java/org/lwjgl/util/generator/TypeMap.java
@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.lwjgl.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/TypedefsGenerator.java b/src/java/org/lwjgl/util/generator/TypedefsGenerator.java
similarity index 99%
rename from src/java/org/lwjgl/generator/TypedefsGenerator.java
rename to src/java/org/lwjgl/util/generator/TypedefsGenerator.java
index 5b915a61..7d8b3ef4 100644
--- a/src/java/org/lwjgl/generator/TypedefsGenerator.java
+++ b/src/java/org/lwjgl/util/generator/TypedefsGenerator.java
@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.lwjgl.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$
diff --git a/src/java/org/lwjgl/generator/Utils.java b/src/java/org/lwjgl/util/generator/Utils.java
similarity index 99%
rename from src/java/org/lwjgl/generator/Utils.java
rename to src/java/org/lwjgl/util/generator/Utils.java
index 5010ee22..a400197e 100644
--- a/src/java/org/lwjgl/generator/Utils.java
+++ b/src/java/org/lwjgl/util/generator/Utils.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.generator;
+package org.lwjgl.util.generator;
 
 /**
  * $Id$