diff --git a/build.gradle b/build.gradle
index d9a266478..06de4672f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -245,8 +245,8 @@ project(':cleanroom') {
         // Do not change the order unless it is required so
         lwjglLibraries = [
             [
-                'lwjgl3-glfw', 'lwjgl3-jemalloc', 'lwjgl3-openal',
-                'lwjgl3-opengl', 'lwjgl3-stb', 'lwjgl3-tinyfd', 'lwjgl3'
+                'lwjgl-glfw', 'lwjgl-jemalloc', 'lwjgl-openal',
+                'lwjgl-opengl', 'lwjgl-stb', 'lwjgl-tinyfd', 'lwjgl'
             ],
 
             [
@@ -290,7 +290,7 @@ project(':cleanroom') {
                 environment 'FORGE_GROUP', project.group
                 environment 'FORGE_VERSION', props.last_forge_version
 
-                jvmArgs jvm_arguments + '-Dmixin.debug.export=true' + '-Dmixin.checks.interfaces=true' + '-Djava.system.class.loader=net.minecraft.launchwrapper.LaunchClassLoader'
+                jvmArgs jvm_arguments + '-Dmixin.debug.export=true' + '-Dmixin.checks.interfaces=true'
                 //jvmArgs jvm_arguments
 
                 // Lazily supply the Mappings target, createSrg2Mcp.getMappings() doesn't get populated until later
@@ -417,11 +417,11 @@ project(':cleanroom') {
 
     dependencies {
         lwjglLibraries[0].each {
-            installer "org.lwjgl3:$it:$props.lwjgl_version"
-            runtimeOnly "org.lwjgl3:$it::$lwjglArch"
+            installer "org.lwjgl:$it:$props.lwjgl_version"
+            runtimeOnly "org.lwjgl:$it::$lwjglArch"
 
             lwjglLibraries[1].each { arch ->
-                lwjglNatives "org.lwjgl3:$it:$props.lwjgl_version:$arch"
+                lwjglNatives "org.lwjgl:$it:$props.lwjgl_version:$arch"
             }
         }
 
diff --git a/gradle.properties b/gradle.properties
index 0c0078d54..5e97db920 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,7 @@ installer_tools_version = 1.4.1
 asm_version = 9.7.1
 asm_deprecated = 7.1
 netty_version = 4.1.114.Final
-lwjgl_version = 3.3.4-27-CLEANROOM
+lwjgl_version = 3.3.5
 
 # Sets default memory used for Gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch
index 2da0f8e2f..6299c3f94 100644
--- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch
+++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch
@@ -1,13 +1,12 @@
 --- before/net/minecraft/client/Minecraft.java
 +++ after/net/minecraft/client/Minecraft.java
-@@ -19,13 +19,14 @@
+@@ -19,13 +19,13 @@
  import java.io.InputStream;
  import java.net.Proxy;
  import java.net.SocketAddress;
 -import java.nio.Buffer;
  import java.nio.ByteBuffer;
  import java.nio.ByteOrder;
-+import java.nio.IntBuffer;
  import java.text.DecimalFormat;
  import java.text.SimpleDateFormat;
  import java.util.Collections;
@@ -16,25 +15,49 @@
  import java.util.List;
  import java.util.Locale;
  import java.util.Queue;
-@@ -34,6 +35,9 @@
- import java.util.concurrent.Callable;
- import java.util.concurrent.Executors;
- import java.util.concurrent.FutureTask;
-+import java.util.function.Consumer;
-+import java.util.function.Function;
-+import java.util.function.Predicate;
+@@ -37,9 +37,8 @@
  import java.util.stream.Collectors;
  import javax.annotation.Nullable;
  import javax.imageio.ImageIO;
-@@ -145,7 +149,6 @@
+-import net.minecraft.block.Block;
++
+ import net.minecraft.block.material.Material;
+-import net.minecraft.block.state.IBlockState;
+ import net.minecraft.client.audio.MusicTicker;
+ import net.minecraft.client.audio.SoundHandler;
+ import net.minecraft.client.entity.EntityPlayerSP;
+@@ -66,7 +65,6 @@
+ import net.minecraft.client.gui.recipebook.RecipeList;
+ import net.minecraft.client.gui.toasts.GuiToast;
+ import net.minecraft.client.main.GameConfiguration;
+-import net.minecraft.client.multiplayer.GuiConnecting;
+ import net.minecraft.client.multiplayer.PlayerControllerMP;
+ import net.minecraft.client.multiplayer.ServerData;
+ import net.minecraft.client.multiplayer.WorldClient;
+@@ -130,22 +128,11 @@
+ import net.minecraft.crash.ICrashReportDetail;
+ import net.minecraft.creativetab.CreativeTabs;
+ import net.minecraft.entity.Entity;
+-import net.minecraft.entity.EntityLeashKnot;
+-import net.minecraft.entity.EntityList;
+-import net.minecraft.entity.item.EntityArmorStand;
+-import net.minecraft.entity.item.EntityBoat;
+-import net.minecraft.entity.item.EntityEnderCrystal;
+-import net.minecraft.entity.item.EntityItemFrame;
+-import net.minecraft.entity.item.EntityMinecart;
+-import net.minecraft.entity.item.EntityPainting;
+ import net.minecraft.entity.player.EntityPlayer;
+-import net.minecraft.entity.player.InventoryPlayer;
+ import net.minecraft.init.Bootstrap;
+ import net.minecraft.init.Items;
  import net.minecraft.item.Item;
- import net.minecraft.item.ItemMonsterPlacer;
+-import net.minecraft.item.ItemMonsterPlacer;
  import net.minecraft.item.ItemStack;
 -import net.minecraft.item.crafting.IRecipe;
  import net.minecraft.nbt.NBTTagCompound;
  import net.minecraft.nbt.NBTTagList;
  import net.minecraft.nbt.NBTTagString;
-@@ -184,6 +187,7 @@
+@@ -184,6 +171,7 @@
  import net.minecraft.util.math.BlockPos;
  import net.minecraft.util.math.MathHelper;
  import net.minecraft.util.math.RayTraceResult;
@@ -42,7 +65,36 @@
  import net.minecraft.util.text.Style;
  import net.minecraft.util.text.TextComponentKeybind;
  import net.minecraft.util.text.TextComponentString;
-@@ -297,7 +301,7 @@
+@@ -204,17 +192,17 @@
+ import org.apache.commons.lang3.Validate;
+ import org.apache.logging.log4j.LogManager;
+ import org.apache.logging.log4j.Logger;
+-import org.lwjgl.LWJGLException;
+-import org.lwjgl.Sys;
+-import org.lwjgl.input.Keyboard;
+-import org.lwjgl.input.Mouse;
+-import org.lwjgl.opengl.ContextCapabilities;
+-import org.lwjgl.opengl.Display;
+-import org.lwjgl.opengl.DisplayMode;
+-import org.lwjgl.opengl.GLContext;
+-import org.lwjgl.opengl.OpenGLException;
+-import org.lwjgl.opengl.PixelFormat;
+-import org.lwjgl.util.glu.GLU;
++import org.lwjglx.LWJGLException;
++import org.lwjglx.Sys;
++import org.lwjglx.input.Keyboard;
++import org.lwjglx.input.Mouse;
++import org.lwjglx.opengl.ContextCapabilities;
++import org.lwjglx.opengl.Display;
++import org.lwjglx.opengl.DisplayMode;
++import org.lwjglx.opengl.GLContext;
++import org.lwjglx.opengl.OpenGLException;
++import org.lwjglx.opengl.PixelFormat;
++import org.lwjglx.util.glu.GLU;
+ 
+ @SideOnly(Side.CLIENT)
+ public class Minecraft implements IThreadListener, ISnooperInfo
+@@ -297,7 +285,7 @@
      private long field_83002_am = -1L;
      private IReloadableResourceManager field_110451_am;
      private final MetadataSerializer field_110452_an = new MetadataSerializer();
@@ -51,7 +103,7 @@
      public final DefaultResourcePack field_110450_ap;
      private ResourcePackRepository field_110448_aq;
      private LanguageManager field_135017_as;
-@@ -310,7 +314,7 @@
+@@ -310,7 +298,7 @@
      private ResourceLocation field_152354_ay;
      private final MinecraftSessionService field_152355_az;
      private SkinManager field_152350_aA;
@@ -60,7 +112,7 @@
      private final Thread field_152352_aC = Thread.currentThread();
      private ModelManager field_175617_aL;
      private BlockRendererDispatcher field_175618_aM;
-@@ -328,6 +332,7 @@
+@@ -328,6 +316,7 @@
      public Minecraft(GameConfiguration p_i45547_1_)
      {
          field_71432_P = this;
@@ -68,7 +120,7 @@
          this.field_71412_D = p_i45547_1_.field_178744_c.field_178760_a;
          this.field_110446_Y = p_i45547_1_.field_178744_c.field_178759_c;
          this.field_130070_K = p_i45547_1_.field_178744_c.field_178758_b;
-@@ -337,10 +342,9 @@
+@@ -337,10 +326,9 @@
          this.field_181038_N = p_i45547_1_.field_178745_a.field_181172_c;
          this.field_110450_ap = new DefaultResourcePack(p_i45547_1_.field_178744_c.func_187052_a());
          this.field_110453_aa = p_i45547_1_.field_178745_a.field_178751_c == null ? Proxy.NO_PROXY : p_i45547_1_.field_178745_a.field_178751_c;
@@ -81,7 +133,7 @@
          this.field_71459_aj = p_i45547_1_.field_178741_d.field_178756_a;
          this.field_71443_c = p_i45547_1_.field_178743_b.field_178764_a > 0 ? p_i45547_1_.field_178743_b.field_178764_a : 1;
          this.field_71440_d = p_i45547_1_.field_178743_b.field_178762_b > 0 ? p_i45547_1_.field_178743_b.field_178762_b : 1;
-@@ -381,36 +385,34 @@
+@@ -381,36 +369,34 @@
              return;
          }
  
@@ -127,7 +179,7 @@
              }
              catch (ReportedException reportedexception)
              {
-@@ -418,6 +420,7 @@
+@@ -418,6 +404,7 @@
                  this.func_71398_f();
                  field_147123_G.fatal("Reported exception thrown!", (Throwable)reportedexception);
                  this.func_71377_b(reportedexception.func_71575_a());
@@ -135,7 +187,7 @@
              }
              catch (Throwable throwable1)
              {
-@@ -425,11 +428,14 @@
+@@ -425,11 +412,14 @@
                  this.func_71398_f();
                  field_147123_G.fatal("Unreported exception thrown!", throwable1);
                  this.func_71377_b(crashreport1);
@@ -155,7 +207,7 @@
          }
      }
  
-@@ -446,7 +452,7 @@
+@@ -446,7 +436,7 @@
              this.field_71440_d = this.field_71474_y.field_92119_C;
          }
  
@@ -164,7 +216,7 @@
          this.func_175594_ao();
          this.func_175605_an();
          this.func_175609_am();
-@@ -454,16 +460,14 @@
+@@ -454,16 +444,14 @@
          this.field_147124_at = new Framebuffer(this.field_71443_c, this.field_71440_d, true);
          this.field_147124_at.func_147604_a(0.0F, 0.0F, 0.0F, 0.0F);
          this.func_175608_ak();
@@ -184,7 +236,7 @@
          this.field_152350_aA = new SkinManager(this.field_71446_o, new File(this.field_110446_Y, "skins"), this.field_152355_az);
          this.field_71469_aa = new AnvilSaveConverter(new File(this.field_71412_D, "saves"), this.field_184131_U);
          this.field_147127_av = new SoundHandler(this.field_110451_am, this.field_71474_y);
-@@ -483,10 +487,12 @@
+@@ -483,10 +471,12 @@
          this.field_110451_am.func_110542_a(new GrassColorReloadListener());
          this.field_110451_am.func_110542_a(new FoliageColorReloadListener());
          this.field_71417_B = new MouseHelper();
@@ -198,7 +250,7 @@
          GlStateManager.func_179126_j();
          GlStateManager.func_179143_c(515);
          GlStateManager.func_179141_d();
-@@ -496,19 +502,24 @@
+@@ -496,19 +486,24 @@
          GlStateManager.func_179096_D();
          GlStateManager.func_179128_n(5888);
          this.func_71361_d("Startup");
@@ -223,7 +275,7 @@
          this.field_71460_t = new EntityRenderer(this, this.field_110451_am);
          this.field_110451_am.func_110542_a(this.field_71460_t);
          this.field_175618_aM = new BlockRendererDispatcher(this.field_175617_aL.func_174954_c(), this.field_184127_aH);
-@@ -519,23 +530,27 @@
+@@ -519,23 +514,27 @@
          this.field_110451_am.func_110542_a(this.field_193995_ae);
          GlStateManager.func_179083_b(0, 0, this.field_71443_c, this.field_71440_d);
          this.field_71452_i = new ParticleManager(this.field_71441_e, this.field_71446_o);
@@ -254,7 +306,7 @@
          if (this.field_71474_y.field_74353_u && !this.field_71431_Q)
          {
              this.func_71352_k();
-@@ -545,7 +560,7 @@
+@@ -545,7 +544,7 @@
          {
              Display.setVSyncEnabled(this.field_71474_y.field_74352_v);
          }
@@ -263,7 +315,7 @@
          {
              this.field_71474_y.field_74352_v = false;
              this.field_71474_y.func_74303_b();
-@@ -556,16 +571,16 @@
+@@ -556,16 +555,16 @@
  
      public void func_193986_ar()
      {
@@ -290,7 +342,7 @@
  
          for (Item item : Item.field_150901_e)
          {
-@@ -573,19 +588,19 @@
+@@ -573,19 +572,19 @@
          }
  
          nonnulllist.forEach(searchtree::func_194043_a);
@@ -323,7 +375,7 @@
          RecipeBookClient.field_194087_f.forEach(searchtree1::func_194043_a);
          this.field_193995_ae.func_194009_a(SearchTreeManager.field_194011_a, searchtree);
          this.field_193995_ae.func_194009_a(SearchTreeManager.field_194012_b, searchtree1);
-@@ -600,34 +615,13 @@
+@@ -600,34 +599,13 @@
          this.field_110452_an.func_110504_a(new LanguageMetadataSectionSerializer(), LanguageMetadataSection.class);
      }
  
@@ -363,7 +415,7 @@
      }
  
      private void func_175605_an() throws LWJGLException
-@@ -712,7 +706,6 @@
+@@ -712,7 +690,6 @@
      {
          Thread thread = new Thread("Timer hack thread")
          {
@@ -371,7 +423,7 @@
              public void run()
              {
                  while (Minecraft.this.field_71425_J)
-@@ -721,8 +714,9 @@
+@@ -721,8 +698,9 @@
                      {
                          Thread.sleep(2147483647L);
                      }
@@ -382,7 +434,7 @@
                      }
                  }
              }
-@@ -740,24 +734,26 @@
+@@ -740,24 +718,26 @@
      public void func_71377_b(CrashReport p_71377_1_)
      {
          File file1 = new File(func_71410_x().field_71412_D, "crash-reports");
@@ -413,7 +465,7 @@
      }
  
      public boolean func_152349_b()
-@@ -765,6 +761,7 @@
+@@ -765,6 +745,7 @@
          return this.field_135017_as.func_135042_a() || this.field_71474_y.field_151455_aw;
      }
  
@@ -421,7 +473,7 @@
      public void func_110436_a()
      {
          List<IResourcePack> list = Lists.newArrayList(this.field_110449_ao);
-@@ -811,35 +808,35 @@
+@@ -811,35 +792,35 @@
      private ByteBuffer func_152340_a(InputStream p_152340_1_) throws IOException
      {
          BufferedImage bufferedimage = ImageIO.read(p_152340_1_);
@@ -464,7 +516,7 @@
                      {
                          flag = false;
                          break;
-@@ -848,16 +845,25 @@
+@@ -848,16 +829,25 @@
  
                  if (!flag)
                  {
@@ -496,7 +548,7 @@
                  }
              }
          }
-@@ -875,7 +881,7 @@
+@@ -875,7 +865,7 @@
          framebuffer.func_147610_a(false);
          GlStateManager.func_179128_n(5889);
          GlStateManager.func_179096_D();
@@ -505,7 +557,7 @@
          GlStateManager.func_179128_n(5888);
          GlStateManager.func_179096_D();
          GlStateManager.func_179109_b(0.0F, 0.0F, -2000.0F);
-@@ -903,13 +909,10 @@
+@@ -903,13 +893,10 @@
          Tessellator tessellator = Tessellator.func_178181_a();
          BufferBuilder bufferbuilder = tessellator.func_178180_c();
          bufferbuilder.func_181668_a(7, DefaultVertexFormats.field_181709_i);
@@ -523,7 +575,7 @@
          tessellator.func_78381_a();
          GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, 1.0F);
          int j = 256;
-@@ -924,39 +927,16 @@
+@@ -924,39 +911,16 @@
          this.func_175601_h();
      }
  
@@ -568,7 +620,7 @@
          Tessellator.func_178181_a().func_78381_a();
      }
  
-@@ -967,18 +947,24 @@
+@@ -967,18 +931,24 @@
  
      public void func_147108_a(@Nullable GuiScreen p_147108_1_)
      {
@@ -599,7 +651,7 @@
          }
  
          if (p_147108_1_ instanceof GuiMainMenu || p_147108_1_ instanceof GuiMultiplayer)
-@@ -996,10 +982,12 @@
+@@ -996,10 +966,12 @@
  
              while (Mouse.next())
              {
@@ -612,7 +664,7 @@
              }
  
              ScaledResolution scaledresolution = new ScaledResolution(this);
-@@ -1023,8 +1011,8 @@
+@@ -1023,8 +995,8 @@
          {
              String s = GLU.gluErrorString(i);
              field_147123_G.error("########## GL ERROR ##########");
@@ -623,7 +675,7 @@
          }
      }
  
-@@ -1036,10 +1024,11 @@
+@@ -1036,10 +1008,11 @@
  
              try
              {
@@ -637,7 +689,7 @@
              }
  
              this.field_147127_av.func_147685_d();
-@@ -1091,7 +1080,7 @@
+@@ -1091,7 +1064,7 @@
          long i1 = System.nanoTime() - l;
          this.func_71361_d("Pre render");
          this.field_71424_I.func_76318_c("sound");
@@ -646,7 +698,7 @@
          this.field_71424_I.func_76319_b();
          this.field_71424_I.func_76320_a("render");
          GlStateManager.func_179094_E();
-@@ -1103,11 +1092,13 @@
+@@ -1103,11 +1076,13 @@
  
          if (!this.field_71454_w)
          {
@@ -660,7 +712,7 @@
          }
  
          this.field_71424_I.func_76319_b();
-@@ -1164,17 +1155,7 @@
+@@ -1164,17 +1139,7 @@
          while (func_71386_F() >= this.field_71419_L + 1000L)
          {
              field_71470_ab = this.field_71420_M;
@@ -679,7 +731,7 @@
              RenderChunk.field_178592_a = 0;
              this.field_71419_L += 1000L;
              this.field_71420_M = 0;
-@@ -1247,17 +1228,19 @@
+@@ -1247,17 +1212,19 @@
              field_71444_a = new byte[0];
              this.field_71438_f.func_72728_f();
          }
@@ -702,7 +754,7 @@
          }
  
          System.gc();
-@@ -1287,14 +1270,14 @@
+@@ -1287,14 +1254,14 @@
              {
                  --p_71383_1_;
  
@@ -719,7 +771,7 @@
                  }
              }
          }
-@@ -1310,7 +1293,7 @@
+@@ -1310,7 +1277,7 @@
              GlStateManager.func_179128_n(5889);
              GlStateManager.func_179142_g();
              GlStateManager.func_179096_D();
@@ -728,7 +780,7 @@
              GlStateManager.func_179128_n(5888);
              GlStateManager.func_179096_D();
              GlStateManager.func_179109_b(0.0F, 0.0F, -2000.0F);
-@@ -1323,31 +1306,31 @@
+@@ -1323,31 +1290,31 @@
              int k = this.field_71440_d - 320;
              GlStateManager.func_179147_l();
              bufferbuilder.func_181668_a(7, DefaultVertexFormats.field_181706_f);
@@ -772,7 +824,7 @@
                  }
  
                  tessellator.func_78381_a();
-@@ -1355,13 +1338,11 @@
+@@ -1355,13 +1322,11 @@
  
                  for (int i3 = i1; i3 >= 0; --i3)
                  {
@@ -789,7 +841,7 @@
                  }
  
                  tessellator.func_78381_a();
-@@ -1408,11 +1389,9 @@
+@@ -1408,11 +1373,9 @@
                  String s1 = stringbuilder.append(profiler$result2.field_76331_c).toString();
                  this.field_71466_p.func_175063_a(s1, (float)(j - 160), (float)(k + 80 + k2 * 8 + 20), profiler$result2.func_76329_a());
                  s1 = decimalformat.format(profiler$result2.field_76332_a) + "%";
@@ -803,7 +855,7 @@
              }
          }
      }
-@@ -1435,7 +1414,7 @@
+@@ -1435,7 +1398,7 @@
  
                  this.field_71415_G = true;
                  this.field_71417_B.func_74372_a();
@@ -812,7 +864,7 @@
                  this.field_71429_W = 10000;
              }
          }
-@@ -1476,10 +1455,9 @@
+@@ -1476,10 +1439,9 @@
              {
                  BlockPos blockpos = this.field_71476_x.func_178782_a();
  
@@ -825,7 +877,7 @@
                      this.field_71439_g.func_184609_a(EnumHand.MAIN_HAND);
                  }
              }
-@@ -1513,7 +1491,7 @@
+@@ -1513,7 +1475,7 @@
                      case BLOCK:
                          BlockPos blockpos = this.field_71476_x.func_178782_a();
  
@@ -834,7 +886,7 @@
                          {
                              this.field_71442_b.func_180511_b(blockpos, this.field_71476_x.field_178784_b);
                              break;
-@@ -1527,6 +1505,7 @@
+@@ -1527,6 +1489,7 @@
                          }
  
                          this.field_71439_g.func_184821_cY();
@@ -842,7 +894,7 @@
                  }
  
                  this.field_71439_g.func_184609_a(EnumHand.MAIN_HAND);
-@@ -1558,8 +1537,7 @@
+@@ -1558,8 +1521,7 @@
                          {
                              case ENTITY:
  
@@ -852,7 +904,7 @@
                                  {
                                      return;
                                  }
-@@ -1576,15 +1554,7 @@
+@@ -1576,15 +1538,7 @@
                                  if (this.field_71441_e.func_180495_p(blockpos).func_185904_a() != Material.field_151579_a)
                                  {
                                      int i = itemstack.func_190916_E();
@@ -869,7 +921,7 @@
  
                                      if (enumactionresult == EnumActionResult.SUCCESS)
                                      {
-@@ -1601,8 +1571,8 @@
+@@ -1601,8 +1555,8 @@
                          }
                      }
  
@@ -880,7 +932,7 @@
                      {
                          this.field_71460_t.field_78516_c.func_187460_a(enumhand);
                          return;
-@@ -1614,6 +1584,10 @@
+@@ -1614,6 +1568,10 @@
  
      public void func_71352_k()
      {
@@ -891,7 +943,7 @@
          try
          {
              this.field_71431_Q = !this.field_71431_Q;
-@@ -1662,6 +1636,11 @@
+@@ -1662,6 +1620,11 @@
              }
  
              Display.setFullscreen(this.field_71431_Q);
@@ -903,7 +955,7 @@
              Display.setVSyncEnabled(this.field_71474_y.field_74352_v);
              this.func_175601_h();
          }
-@@ -1708,6 +1687,8 @@
+@@ -1708,6 +1671,8 @@
              --this.field_71467_ac;
          }
  
@@ -912,7 +964,7 @@
          this.field_71424_I.func_76320_a("gui");
  
          if (!this.field_71445_n)
-@@ -1736,7 +1717,7 @@
+@@ -1736,7 +1701,7 @@
          {
              if (this.field_71439_g.func_110143_aJ() <= 0.0F && !(this.field_71462_r instanceof GuiGameOver))
              {
@@ -921,7 +973,7 @@
              }
              else if (this.field_71439_g.func_70608_bn() && this.field_71441_e != null)
              {
-@@ -1745,7 +1726,7 @@
+@@ -1745,7 +1710,7 @@
          }
          else if (this.field_71462_r != null && this.field_71462_r instanceof GuiSleepMP && !this.field_71439_g.func_70608_bn())
          {
@@ -930,7 +982,7 @@
          }
  
          if (this.field_71462_r != null)
-@@ -1892,12 +1873,7 @@
+@@ -1892,12 +1857,7 @@
  
              if (!this.field_71445_n && this.field_71441_e != null)
              {
@@ -944,7 +996,7 @@
              }
  
              this.field_71424_I.func_76318_c("particles");
-@@ -1914,6 +1890,7 @@
+@@ -1914,6 +1874,7 @@
          }
  
          this.field_71424_I.func_76319_b();
@@ -952,7 +1004,7 @@
          this.field_71423_H = func_71386_F();
      }
  
-@@ -2019,6 +1996,7 @@
+@@ -2019,6 +1980,7 @@
                      }
                  }
              }
@@ -960,7 +1012,7 @@
          }
  
          this.func_184117_aA();
-@@ -2095,16 +2073,16 @@
+@@ -2095,16 +2057,16 @@
          {
              this.func_190521_a("debug.help.message");
              GuiNewChat guinewchat = this.field_71456_v.func_146158_b();
@@ -987,7 +1039,7 @@
              return true;
          }
          else if (p_184122_1_ == 20)
-@@ -2136,7 +2114,7 @@
+@@ -2136,7 +2098,7 @@
              }
              else if (this.field_71474_y.field_74320_O == 1)
              {
@@ -996,7 +1048,7 @@
              }
          }
  
-@@ -2223,16 +2201,27 @@
+@@ -2223,16 +2185,27 @@
                  this.field_71442_b.func_78766_c(this.field_71439_g);
              }
  
@@ -1034,7 +1086,7 @@
              }
          }
          else
-@@ -2265,6 +2254,8 @@
+@@ -2265,6 +2238,8 @@
      {
          while (Mouse.next())
          {
@@ -1043,7 +1095,7 @@
              int i = Mouse.getEventButton();
              KeyBinding.func_74510_a(i - 100, Mouse.getEventButtonState());
  
-@@ -2320,24 +2311,19 @@
+@@ -2320,24 +2295,19 @@
                      this.field_71462_r.func_146274_d();
                  }
              }
@@ -1072,7 +1124,7 @@
          System.gc();
          ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false);
          WorldInfo worldinfo = isavehandler.func_75757_d();
-@@ -2358,15 +2344,11 @@
+@@ -2358,15 +2328,11 @@
              YggdrasilAuthenticationService yggdrasilauthenticationservice = new YggdrasilAuthenticationService(this.field_110453_aa, UUID.randomUUID().toString());
              MinecraftSessionService minecraftsessionservice = yggdrasilauthenticationservice.createMinecraftSessionService();
              GameProfileRepository gameprofilerepository = yggdrasilauthenticationservice.createProfileRepository();
@@ -1090,7 +1142,7 @@
              this.field_71437_Z.func_71256_s();
              this.field_71455_al = true;
          }
-@@ -2383,6 +2365,12 @@
+@@ -2383,6 +2349,12 @@
  
          while (!this.field_71437_Z.func_71200_ad())
          {
@@ -1103,7 +1155,7 @@
              String s = this.field_71437_Z.func_71195_b_();
  
              if (s != null)
-@@ -2398,17 +2386,24 @@
+@@ -2398,17 +2370,24 @@
              {
                  Thread.sleep(200L);
              }
@@ -1132,7 +1184,7 @@
          this.field_71453_ak = networkmanager;
      }
  
-@@ -2419,6 +2414,8 @@
+@@ -2419,6 +2398,8 @@
  
      public void func_71353_a(@Nullable WorldClient p_71353_1_, String p_71353_2_)
      {
@@ -1141,7 +1193,7 @@
          if (p_71353_1_ == null)
          {
              NetHandlerPlayClient nethandlerplayclient = this.func_147114_u();
-@@ -2431,6 +2428,18 @@
+@@ -2431,6 +2412,18 @@
              if (this.field_71437_Z != null && this.field_71437_Z.func_175578_N())
              {
                  this.field_71437_Z.func_71263_m();
@@ -1160,7 +1212,7 @@
              }
  
              this.field_71437_Z = null;
-@@ -2452,8 +2461,9 @@
+@@ -2452,8 +2445,9 @@
          {
              this.field_110448_aq.func_148529_f();
              this.field_71456_v.func_181029_i();
@@ -1171,7 +1223,7 @@
          }
  
          this.field_147127_av.func_147690_c();
-@@ -2470,6 +2480,7 @@
+@@ -2470,6 +2464,7 @@
          }
  
          TileEntityRendererDispatcher.field_147556_a.func_147543_a(p_71353_1_);
@@ -1179,7 +1231,7 @@
  
          if (p_71353_1_ != null)
          {
-@@ -2478,9 +2489,7 @@
+@@ -2478,9 +2473,7 @@
                  AuthenticationService authenticationservice = new YggdrasilAuthenticationService(this.field_110453_aa, UUID.randomUUID().toString());
                  MinecraftSessionService minecraftsessionservice = authenticationservice.createMinecraftSessionService();
                  GameProfileRepository gameprofilerepository = authenticationservice.createProfileRepository();
@@ -1190,7 +1242,7 @@
                  TileEntitySkull.func_184293_a(playerprofilecache);
                  TileEntitySkull.func_184294_a(minecraftsessionservice);
                  PlayerProfileCache.func_187320_a(false);
-@@ -2524,13 +2533,9 @@
+@@ -2524,13 +2517,9 @@
  
          this.field_175622_Z = null;
          EntityPlayerSP entityplayersp = this.field_71439_g;
@@ -1206,7 +1258,7 @@
          this.field_71439_g.field_71093_bK = p_71354_1_;
          this.field_175622_Z = this.field_71439_g;
          this.field_71439_g.func_70065_x();
-@@ -2544,7 +2549,7 @@
+@@ -2544,7 +2533,7 @@
  
          if (this.field_71462_r instanceof GuiGameOver)
          {
@@ -1215,7 +1267,7 @@
          }
      }
  
-@@ -2578,159 +2583,8 @@
+@@ -2578,159 +2567,8 @@
      {
          if (this.field_71476_x != null && this.field_71476_x.field_72313_a != RayTraceResult.Type.MISS)
          {
@@ -1377,7 +1429,7 @@
          }
      }
  
-@@ -2778,7 +2632,14 @@
+@@ -2778,7 +2616,14 @@
          {
              public String call()
              {
@@ -1393,7 +1445,7 @@
              }
          });
          p_71396_1_.func_85056_g().func_189529_a("GL Caps", new ICrashReportDetail<String>()
-@@ -2795,10 +2656,7 @@
+@@ -2795,10 +2640,7 @@
                  return Minecraft.this.field_71474_y.field_178881_t ? "Yes" : "No";
              }
          });
@@ -1405,7 +1457,7 @@
          {
              public String call() throws Exception
              {
-@@ -2810,13 +2668,10 @@
+@@ -2810,13 +2652,10 @@
                  }
                  else
                  {
@@ -1421,7 +1473,7 @@
          p_71396_1_.func_85056_g().func_189529_a("Type", new ICrashReportDetail<String>()
          {
              public String call() throws Exception
-@@ -2883,11 +2738,11 @@
+@@ -2883,11 +2722,11 @@
          return field_71432_P;
      }
  
@@ -1434,7 +1486,7 @@
              public void run()
              {
                  Minecraft.this.func_110436_a();
-@@ -2895,21 +2750,20 @@
+@@ -2895,21 +2734,20 @@
          });
      }
  
@@ -1462,7 +1514,7 @@
          int i = 0;
  
          for (ResourcePackRepository.Entry resourcepackrepository$entry : this.field_110448_aq.func_110613_c())
-@@ -2939,7 +2793,6 @@
+@@ -2939,7 +2777,6 @@
          }
      }
  
@@ -1470,7 +1522,7 @@
      public void func_70001_b(Snooper p_70001_1_)
      {
          p_70001_1_.func_152767_b("opengl_version", GlStateManager.func_187416_u(7938));
-@@ -2947,110 +2800,110 @@
+@@ -2947,110 +2784,110 @@
          p_70001_1_.func_152767_b("client_brand", ClientBrandRetriever.getClientModName());
          p_70001_1_.func_152767_b("launched_version", this.field_110447_Z);
          ContextCapabilities contextcapabilities = GLContext.getCapabilities();
@@ -1685,7 +1737,7 @@
          GameProfile gameprofile = this.field_71449_j.func_148256_e();
  
          if (gameprofile != null && gameprofile.getId() != null)
-@@ -3061,21 +2914,10 @@
+@@ -3061,21 +2898,10 @@
  
      public static int func_71369_N()
      {
@@ -1709,7 +1761,7 @@
      public boolean func_70002_Q()
      {
          return this.field_71474_y.field_74355_t;
-@@ -3205,6 +3047,9 @@
+@@ -3205,6 +3031,9 @@
          }
          else if (this.field_71439_g != null)
          {
@@ -1719,7 +1771,7 @@
              if (this.field_71439_g.field_70170_p.field_73011_w instanceof WorldProviderHell)
              {
                  return MusicTicker.MusicType.NETHER;
-@@ -3215,9 +3060,7 @@
+@@ -3215,9 +3044,7 @@
              }
              else
              {
@@ -1730,7 +1782,7 @@
              }
          }
          else
-@@ -3236,19 +3079,15 @@
+@@ -3236,19 +3063,15 @@
              {
                  if (Keyboard.getEventKeyState())
                  {
@@ -1754,7 +1806,7 @@
                      {
                          this.field_71474_y.func_74306_a(GameSettings.Options.NARRATOR, 1);
  
-@@ -3258,6 +3097,7 @@
+@@ -3258,6 +3081,7 @@
                          }
                      }
                  }
@@ -1762,7 +1814,7 @@
              }
          }
      }
-@@ -3292,16 +3132,16 @@
+@@ -3292,16 +3116,16 @@
          {
              try
              {
@@ -1782,7 +1834,7 @@
  
              synchronized (this.field_152351_aB)
              {
-@@ -3311,14 +3151,12 @@
+@@ -3311,14 +3135,12 @@
          }
      }
  
@@ -1798,7 +1850,7 @@
      public boolean func_152345_ab()
      {
          return Thread.currentThread() == this.field_152352_aC;
-@@ -3346,7 +3184,7 @@
+@@ -3346,7 +3168,7 @@
  
      public <T> ISearchTree<T> func_193987_a(SearchTreeManager.Key<T> p_193987_1_)
      {
@@ -1807,7 +1859,7 @@
      }
  
      public static int func_175610_ah()
-@@ -3389,6 +3227,12 @@
+@@ -3389,6 +3211,12 @@
          return this.field_184127_aH;
      }
  
@@ -1820,7 +1872,7 @@
      public boolean func_189648_am()
      {
          return this.field_71439_g != null && this.field_71439_g.func_175140_cp() || this.field_71474_y.field_178879_v;
-@@ -3402,5 +3246,10 @@
+@@ -3402,5 +3230,10 @@
      public Tutorial func_193032_ao()
      {
          return this.field_193035_aW;
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiChat.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiChat.java.patch
new file mode 100644
index 000000000..15a3811b8
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/gui/GuiChat.java.patch
@@ -0,0 +1,13 @@
+--- before/net/minecraft/client/gui/GuiChat.java
++++ after/net/minecraft/client/gui/GuiChat.java
+@@ -14,8 +14,8 @@
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ import org.apache.logging.log4j.LogManager;
+ import org.apache.logging.log4j.Logger;
+-import org.lwjgl.input.Keyboard;
+-import org.lwjgl.input.Mouse;
++import org.lwjglx.input.Keyboard;
++import org.lwjglx.input.Mouse;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GuiChat extends GuiScreen implements ITabCompleter
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiClickableScrolledSelectionListProxy.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiClickableScrolledSelectionListProxy.java.patch
new file mode 100644
index 000000000..e2621a5a0
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/gui/GuiClickableScrolledSelectionListProxy.java.patch
@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/gui/GuiClickableScrolledSelectionListProxy.java
++++ after/net/minecraft/client/gui/GuiClickableScrolledSelectionListProxy.java
+@@ -5,7 +5,7 @@
+ import net.minecraft.realms.Tezzelator;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Mouse;
++import org.lwjglx.input.Mouse;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GuiClickableScrolledSelectionListProxy extends GuiSlot
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiCommandBlock.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiCommandBlock.java.patch
new file mode 100644
index 000000000..b73bb8d14
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/gui/GuiCommandBlock.java.patch
@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/gui/GuiCommandBlock.java
++++ after/net/minecraft/client/gui/GuiCommandBlock.java
+@@ -13,7 +13,7 @@
+ import net.minecraft.util.math.BlockPos;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GuiCommandBlock extends GuiScreen implements ITabCompleter
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch
index 177a79d87..4abecbf19 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch
@@ -1,5 +1,14 @@
 --- before/net/minecraft/client/gui/GuiCreateWorld.java
 +++ after/net/minecraft/client/gui/GuiCreateWorld.java
+@@ -12,7 +12,7 @@
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ import org.apache.commons.lang3.StringUtils;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GuiCreateWorld extends GuiScreen
 @@ -43,33 +43,7 @@
      private String field_146330_J;
      private int field_146331_K;
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiEnchantment.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiEnchantment.java.patch
index a6fc4e15a..04bfa2488 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiEnchantment.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiEnchantment.java.patch
@@ -8,6 +8,15 @@
  import net.minecraft.entity.player.InventoryPlayer;
  import net.minecraft.inventory.ContainerEnchantment;
  import net.minecraft.item.ItemStack;
+@@ -21,7 +22,7 @@
+ import net.minecraft.world.World;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.util.glu.Project;
++import org.lwjglx.util.glu.Project;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GuiEnchantment extends GuiContainer
 @@ -50,21 +51,18 @@
          this.field_175380_I = p_i45502_3_;
      }
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiFlatPresets.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiFlatPresets.java.patch
new file mode 100644
index 000000000..a19c81420
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/gui/GuiFlatPresets.java.patch
@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/gui/GuiFlatPresets.java
++++ after/net/minecraft/client/gui/GuiFlatPresets.java
+@@ -23,7 +23,7 @@
+ import net.minecraft.world.gen.FlatLayerInfo;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GuiFlatPresets extends GuiScreen
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch
index 82e4141fb..d36054ee0 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch
@@ -8,7 +8,29 @@
  import java.io.IOException;
  import java.io.InputStreamReader;
  import java.net.URI;
-@@ -57,35 +58,30 @@
+@@ -20,8 +21,6 @@
+ import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+ import net.minecraft.client.resources.I18n;
+ import net.minecraft.client.resources.IResource;
+-import net.minecraft.client.settings.GameSettings;
+-import net.minecraft.realms.RealmsBridge;
+ import net.minecraft.util.ResourceLocation;
+ import net.minecraft.util.StringUtils;
+ import net.minecraft.util.math.MathHelper;
+@@ -34,9 +33,9 @@
+ import org.apache.commons.io.IOUtils;
+ import org.apache.logging.log4j.LogManager;
+ import org.apache.logging.log4j.Logger;
+-import org.lwjgl.input.Mouse;
+-import org.lwjgl.opengl.GLContext;
+-import org.lwjgl.util.glu.Project;
++import org.lwjglx.input.Mouse;
++import org.lwjglx.opengl.GLContext;
++import org.lwjglx.util.glu.Project;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GuiMainMenu extends GuiScreen
+@@ -57,35 +56,30 @@
      private int field_92020_v;
      private int field_92019_w;
      private String field_92025_p;
@@ -50,7 +72,7 @@
              iresource = Minecraft.func_71410_x().func_110442_L().func_110536_a(field_110353_x);
              BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(iresource.func_110527_b(), StandardCharsets.UTF_8));
              String s;
-@@ -102,19 +98,24 @@
+@@ -102,19 +96,24 @@
  
              if (!list.isEmpty())
              {
@@ -79,7 +101,7 @@
          }
  
          this.field_73974_b = field_175374_h.nextFloat();
-@@ -130,30 +131,18 @@
+@@ -130,30 +129,18 @@
  
      private boolean func_183501_a()
      {
@@ -113,7 +135,7 @@
      public void func_73866_w_()
      {
          this.field_73977_n = new DynamicTexture(256, 256);
-@@ -198,40 +187,27 @@
+@@ -198,40 +185,27 @@
              this.field_92024_r = this.field_146289_q.func_78256_a(this.field_146972_A);
              int k = Math.max(this.field_92023_s, this.field_92024_r);
              this.field_92022_t = (this.field_146294_l - k) / 2;
@@ -158,7 +180,7 @@
          ISaveFormat isaveformat = this.field_146297_k.func_71359_d();
          WorldInfo worldinfo = isaveformat.func_75803_c("Demo_World");
  
-@@ -241,7 +217,6 @@
+@@ -241,7 +215,6 @@
          }
      }
  
@@ -166,7 +188,7 @@
      protected void func_146284_a(GuiButton p_146284_1_) throws IOException
      {
          if (p_146284_1_.field_146127_k == 0)
-@@ -264,16 +239,16 @@
+@@ -264,16 +237,16 @@
              this.field_146297_k.func_147108_a(new GuiMultiplayer(this));
          }
  
@@ -188,7 +210,7 @@
          if (p_146284_1_.field_146127_k == 11)
          {
              this.field_146297_k.func_71371_a("Demo_World", "Demo_World", WorldServerDemo.field_73071_a);
-@@ -286,28 +261,15 @@
+@@ -286,28 +259,15 @@
  
              if (worldinfo != null)
              {
@@ -218,7 +240,7 @@
      public void func_73878_a(boolean p_73878_1_, int p_73878_2_)
      {
          if (p_73878_1_ && p_73878_2_ == 12)
-@@ -328,7 +290,7 @@
+@@ -328,7 +288,7 @@
                  try
                  {
                      Class<?> oclass = Class.forName("java.awt.Desktop");
@@ -227,7 +249,7 @@
                      oclass.getMethod("browse", URI.class).invoke(object, new URI(this.field_104024_v));
                  }
                  catch (Throwable throwable)
-@@ -359,9 +321,7 @@
+@@ -359,9 +319,7 @@
          GlStateManager.func_179118_c();
          GlStateManager.func_179129_p();
          GlStateManager.func_179132_a(false);
@@ -238,7 +260,7 @@
          int i = 8;
  
          for (int j = 0; j < 64; ++j)
-@@ -407,10 +367,10 @@
+@@ -407,10 +365,10 @@
                  bufferbuilder.func_181668_a(7, DefaultVertexFormats.field_181709_i);
                  int l = 255 / (j + 1);
                  float f3 = 0.0F;
@@ -253,7 +275,7 @@
                  tessellator.func_78381_a();
                  GlStateManager.func_179121_F();
              }
-@@ -419,7 +379,7 @@
+@@ -419,7 +377,7 @@
              GlStateManager.func_179135_a(true, true, true, false);
          }
  
@@ -262,7 +284,7 @@
          GlStateManager.func_179135_a(true, true, true, true);
          GlStateManager.func_179128_n(5889);
          GlStateManager.func_179121_F();
-@@ -437,9 +397,7 @@
+@@ -437,9 +395,7 @@
          GlStateManager.func_187421_b(3553, 10240, 9729);
          GlStateManager.func_187443_a(3553, 0, 0, 0, 0, 0, 256, 256);
          GlStateManager.func_179147_l();
@@ -273,7 +295,7 @@
          GlStateManager.func_179135_a(true, true, true, false);
          Tessellator tessellator = Tessellator.func_178181_a();
          BufferBuilder bufferbuilder = tessellator.func_178180_c();
-@@ -453,22 +411,10 @@
+@@ -453,22 +409,10 @@
              int k = this.field_146294_l;
              int l = this.field_146295_m;
              float f1 = (float)(j - 1) / 256.0F;
@@ -300,7 +322,7 @@
          }
  
          tessellator.func_78381_a();
-@@ -498,26 +444,13 @@
+@@ -498,26 +442,13 @@
          Tessellator tessellator = Tessellator.func_178181_a();
          BufferBuilder bufferbuilder = tessellator.func_178180_c();
          bufferbuilder.func_181668_a(7, DefaultVertexFormats.field_181709_i);
@@ -331,7 +353,7 @@
      public void func_73863_a(int p_73863_1_, int p_73863_2_, float p_73863_3_)
      {
          this.field_73979_m += p_73863_3_;
-@@ -532,7 +465,7 @@
+@@ -532,7 +463,7 @@
          this.field_146297_k.func_110434_K().func_110577_a(field_110352_y);
          GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, 1.0F);
  
@@ -340,7 +362,7 @@
          {
              this.func_73729_b(j + 0, 30, 0, 0, 99, 44);
              this.func_73729_b(j + 99, 30, 129, 0, 27, 44);
-@@ -548,10 +481,13 @@
+@@ -548,10 +479,13 @@
  
          this.field_146297_k.func_110434_K().func_110577_a(field_194400_H);
          func_146110_a(j + 88, 67, 0.0F, 0.0F, 98, 14, 128.0F, 16.0F);
@@ -355,7 +377,7 @@
          f = f * 100.0F / (float)(this.field_146289_q.func_78256_a(this.field_73975_c) + 32);
          GlStateManager.func_179152_a(f, f, f);
          this.func_73732_a(this.field_146289_q, this.field_73975_c, 0, -8, -256);
-@@ -567,14 +503,19 @@
+@@ -567,14 +501,19 @@
              s = s + ("release".equalsIgnoreCase(this.field_146297_k.func_184123_d()) ? "" : "/" + this.field_146297_k.func_184123_d());
          }
  
@@ -381,7 +403,7 @@
          {
              func_73734_a(this.field_193979_N, this.field_146295_m - 1, this.field_193979_N + this.field_193978_M, this.field_146295_m, -1);
          }
-@@ -583,32 +524,21 @@
+@@ -583,32 +522,21 @@
          {
              func_73734_a(this.field_92022_t - 2, this.field_92021_u - 2, this.field_92020_v + 2, this.field_92019_w - 1, 1428160512);
              this.func_73731_b(this.field_146289_q, this.field_92025_p, this.field_92022_t, this.field_92021_u, -1);
@@ -417,7 +439,7 @@
              {
                  GuiConfirmOpenLink guiconfirmopenlink = new GuiConfirmOpenLink(this, this.field_104024_v, 13, true);
                  guiconfirmopenlink.func_146358_g();
-@@ -616,26 +546,10 @@
+@@ -616,26 +544,10 @@
              }
          }
  
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.java.patch
index 5015b527e..aa8250fa7 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.java.patch
@@ -1,5 +1,23 @@
 --- before/net/minecraft/client/gui/GuiMultiplayer.java
 +++ after/net/minecraft/client/gui/GuiMultiplayer.java
+@@ -4,7 +4,7 @@
+ import com.google.common.collect.Lists;
+ import java.io.IOException;
+ import java.util.List;
+-import net.minecraft.client.multiplayer.GuiConnecting;
++
+ import net.minecraft.client.multiplayer.ServerData;
+ import net.minecraft.client.multiplayer.ServerList;
+ import net.minecraft.client.network.LanServerDetector;
+@@ -15,7 +15,7 @@
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ import org.apache.logging.log4j.LogManager;
+ import org.apache.logging.log4j.Logger;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GuiMultiplayer extends GuiScreen
 @@ -41,9 +41,9 @@
      public GuiMultiplayer(GuiScreen p_i1040_1_)
      {
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch
index cd0ca5a5c..fead9e847 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch
@@ -8,14 +8,16 @@
  import java.util.List;
  import java.util.Map.Entry;
  import net.minecraft.block.Block;
-@@ -25,6 +26,7 @@
+@@ -25,7 +26,8 @@
  import net.minecraft.world.chunk.Chunk;
  import net.minecraftforge.fml.relauncher.Side;
  import net.minecraftforge.fml.relauncher.SideOnly;
-+import org.lwjgl.Sys;
- import org.lwjgl.opengl.Display;
+-import org.lwjgl.opengl.Display;
++import org.lwjglx.Sys;
++import org.lwjglx.opengl.Display;
  
  @SideOnly(Side.CLIENT)
+ public class GuiOverlayDebug extends Gui
 @@ -59,12 +61,7 @@
      {
          List<String> list = this.call();
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiRepair.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiRepair.java.patch
new file mode 100644
index 000000000..8ca33e9d8
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/gui/GuiRepair.java.patch
@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/gui/GuiRepair.java
++++ after/net/minecraft/client/gui/GuiRepair.java
+@@ -20,7 +20,7 @@
+ import net.minecraft.world.World;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GuiRepair extends GuiContainer implements IContainerListener
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreen.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiScreen.java.patch
index 396c38d71..5d550a76e 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiScreen.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiScreen.java.patch
@@ -8,6 +8,17 @@
  import java.awt.datatransfer.DataFlavor;
  import java.awt.datatransfer.StringSelection;
  import java.awt.datatransfer.Transferable;
+@@ -37,8 +38,8 @@
+ import org.apache.commons.lang3.StringUtils;
+ import org.apache.logging.log4j.LogManager;
+ import org.apache.logging.log4j.Logger;
+-import org.lwjgl.input.Keyboard;
+-import org.lwjgl.input.Mouse;
++import org.lwjglx.input.Keyboard;
++import org.lwjglx.input.Mouse;
+ 
+ @SideOnly(Side.CLIENT)
+ public abstract class GuiScreen extends Gui implements GuiYesNoCallback
 @@ -50,8 +51,8 @@
      protected RenderItem field_146296_j;
      public int field_146294_l;
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreenAddServer.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiScreenAddServer.java.patch
new file mode 100644
index 000000000..520c8ffc1
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/gui/GuiScreenAddServer.java.patch
@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/gui/GuiScreenAddServer.java
++++ after/net/minecraft/client/gui/GuiScreenAddServer.java
+@@ -9,7 +9,7 @@
+ import net.minecraft.util.StringUtils;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GuiScreenAddServer extends GuiScreen
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreenBook.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiScreenBook.java.patch
index d143ad47f..1d2d5c7af 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiScreenBook.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiScreenBook.java.patch
@@ -1,5 +1,14 @@
 --- before/net/minecraft/client/gui/GuiScreenBook.java
 +++ after/net/minecraft/client/gui/GuiScreenBook.java
+@@ -27,7 +27,7 @@
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ import org.apache.logging.log4j.LogManager;
+ import org.apache.logging.log4j.Logger;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GuiScreenBook extends GuiScreen
 @@ -69,6 +69,7 @@
  
              if (this.field_146476_w < 1)
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreenCustomizePresets.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiScreenCustomizePresets.java.patch
new file mode 100644
index 000000000..2d8cbec33
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/gui/GuiScreenCustomizePresets.java.patch
@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/gui/GuiScreenCustomizePresets.java
++++ after/net/minecraft/client/gui/GuiScreenCustomizePresets.java
+@@ -12,7 +12,7 @@
+ import net.minecraft.world.gen.ChunkGeneratorSettings;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GuiScreenCustomizePresets extends GuiScreen
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreenServerList.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiScreenServerList.java.patch
new file mode 100644
index 000000000..f409a72b2
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/gui/GuiScreenServerList.java.patch
@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/gui/GuiScreenServerList.java
++++ after/net/minecraft/client/gui/GuiScreenServerList.java
+@@ -5,7 +5,7 @@
+ import net.minecraft.client.resources.I18n;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GuiScreenServerList extends GuiScreen
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch
index 971880646..a25afeba8 100644
--- a/patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/GuiSlot.java.patch
@@ -1,5 +1,14 @@
 --- before/net/minecraft/client/gui/GuiSlot.java
 +++ after/net/minecraft/client/gui/GuiSlot.java
+@@ -8,7 +8,7 @@
+ import net.minecraft.util.math.MathHelper;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Mouse;
++import org.lwjglx.input.Mouse;
+ 
+ @SideOnly(Side.CLIENT)
+ public abstract class GuiSlot
 @@ -92,9 +92,7 @@
      {
      }
diff --git a/patches/minecraft/net/minecraft/client/gui/GuiWorldEdit.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiWorldEdit.java.patch
new file mode 100644
index 000000000..7db7031bc
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/gui/GuiWorldEdit.java.patch
@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/gui/GuiWorldEdit.java
++++ after/net/minecraft/client/gui/GuiWorldEdit.java
+@@ -8,7 +8,7 @@
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ import org.apache.commons.io.FileUtils;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GuiWorldEdit extends GuiScreen
diff --git a/patches/minecraft/net/minecraft/client/gui/achievement/GuiStats.java.patch b/patches/minecraft/net/minecraft/client/gui/achievement/GuiStats.java.patch
new file mode 100644
index 000000000..5ff040a47
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/gui/achievement/GuiStats.java.patch
@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/gui/achievement/GuiStats.java
++++ after/net/minecraft/client/gui/achievement/GuiStats.java
+@@ -29,7 +29,7 @@
+ import net.minecraft.stats.StatisticsManager;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Mouse;
++import org.lwjglx.input.Mouse;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GuiStats extends GuiScreen implements IProgressMeter
diff --git a/patches/minecraft/net/minecraft/client/gui/advancements/GuiScreenAdvancements.java.patch b/patches/minecraft/net/minecraft/client/gui/advancements/GuiScreenAdvancements.java.patch
index 4ba4f19cb..b1dc5c3d5 100644
--- a/patches/minecraft/net/minecraft/client/gui/advancements/GuiScreenAdvancements.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/advancements/GuiScreenAdvancements.java.patch
@@ -1,5 +1,14 @@
 --- before/net/minecraft/client/gui/advancements/GuiScreenAdvancements.java
 +++ after/net/minecraft/client/gui/advancements/GuiScreenAdvancements.java
+@@ -16,7 +16,7 @@
+ import net.minecraft.util.ResourceLocation;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Mouse;
++import org.lwjglx.input.Mouse;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GuiScreenAdvancements extends GuiScreen implements ClientAdvancementManager.IListener
 @@ -24,18 +24,18 @@
      private static final ResourceLocation field_191943_f = new ResourceLocation("textures/gui/advancements/window.png");
      private static final ResourceLocation field_191945_g = new ResourceLocation("textures/gui/advancements/tabs.png");
diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch
index 8a9764462..d396c4a0d 100644
--- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch
@@ -1,6 +1,23 @@
 --- before/net/minecraft/client/gui/inventory/GuiContainer.java
 +++ after/net/minecraft/client/gui/inventory/GuiContainer.java
-@@ -42,7 +42,7 @@
+@@ -9,7 +9,6 @@
+ import net.minecraft.client.renderer.OpenGlHelper;
+ import net.minecraft.client.renderer.RenderHelper;
+ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+-import net.minecraft.client.renderer.texture.TextureMap;
+ import net.minecraft.entity.player.InventoryPlayer;
+ import net.minecraft.inventory.ClickType;
+ import net.minecraft.inventory.Container;
+@@ -20,7 +19,7 @@
+ import net.minecraft.util.text.TextFormatting;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+ 
+ @SideOnly(Side.CLIENT)
+ public abstract class GuiContainer extends GuiScreen
+@@ -42,7 +41,7 @@
      private ItemStack field_146991_C = ItemStack.field_190927_a;
      private Slot field_146985_D;
      private long field_146986_E;
@@ -9,7 +26,7 @@
      protected boolean field_147007_t;
      private int field_146987_F;
      private int field_146988_G;
-@@ -60,7 +60,6 @@
+@@ -60,7 +59,6 @@
          this.field_146995_H = true;
      }
  
@@ -17,7 +34,7 @@
      public void func_73866_w_()
      {
          super.func_73866_w_();
-@@ -69,7 +68,6 @@
+@@ -69,7 +67,6 @@
          this.field_147009_r = (this.field_146295_m - this.field_147000_g) / 2;
      }
  
@@ -25,7 +42,7 @@
      public void func_73863_a(int p_73863_1_, int p_73863_2_, float p_73863_3_)
      {
          int i = this.field_147003_i;
-@@ -118,6 +116,7 @@
+@@ -118,6 +115,7 @@
          RenderHelper.func_74518_a();
          this.func_146979_b(p_73863_1_, p_73863_2_);
          RenderHelper.func_74520_c();
@@ -33,7 +50,7 @@
          InventoryPlayer inventoryplayer = this.field_146297_k.field_71439_g.field_71071_by;
          ItemStack itemstack = this.field_147012_x.func_190926_b() ? inventoryplayer.func_70445_o() : this.field_147012_x;
  
-@@ -160,7 +159,7 @@
+@@ -160,7 +158,7 @@
              int i3 = this.field_146989_A.field_75221_f - this.field_147010_z;
              int l1 = this.field_147011_y + (int)((float)l2 * f);
              int i2 = this.field_147010_z + (int)((float)i3 * f);
@@ -42,7 +59,7 @@
          }
  
          GlStateManager.func_179121_F();
-@@ -182,9 +181,10 @@
+@@ -182,9 +180,10 @@
          GlStateManager.func_179109_b(0.0F, 0.0F, 32.0F);
          this.field_73735_i = 200.0F;
          this.field_146296_j.field_77023_b = 200.0F;
@@ -55,7 +72,7 @@
          this.field_73735_i = 0.0F;
          this.field_146296_j.field_77023_b = 0.0F;
      }
-@@ -221,9 +221,7 @@
+@@ -221,9 +220,7 @@
              {
                  itemstack = itemstack1.func_77946_l();
                  flag = true;
@@ -66,7 +83,7 @@
                  int k = Math.min(itemstack.func_77976_d(), p_146977_1_.func_178170_b(itemstack));
  
                  if (itemstack.func_190916_E() > k)
-@@ -244,13 +242,12 @@
+@@ -244,13 +241,12 @@
  
          if (itemstack.func_190926_b() && p_146977_1_.func_111238_b())
          {
@@ -83,7 +100,7 @@
                  this.func_175175_a(i, j, textureatlassprite, 16, 16);
                  GlStateManager.func_179145_e();
                  flag1 = true;
-@@ -321,11 +318,10 @@
+@@ -321,11 +317,10 @@
          return null;
      }
  
@@ -96,7 +113,7 @@
          Slot slot = this.func_146975_c(p_73864_1_, p_73864_2_);
          long i = Minecraft.func_71386_F();
          this.field_146993_M = this.field_146998_K == slot && i - this.field_146997_J < 250L && this.field_146992_L == p_73864_3_;
-@@ -336,6 +332,7 @@
+@@ -336,6 +331,7 @@
              int j = this.field_147003_i;
              int k = this.field_147009_r;
              boolean flag1 = this.func_193983_c(p_73864_1_, p_73864_2_, j, k);
@@ -104,7 +121,7 @@
              int l = -1;
  
              if (slot != null)
-@@ -350,7 +347,7 @@
+@@ -350,7 +346,7 @@
  
              if (this.field_146297_k.field_71474_y.field_85185_A && flag1 && this.field_146297_k.field_71439_g.field_71071_by.func_70445_o().func_190926_b())
              {
@@ -113,7 +130,7 @@
                  return;
              }
  
-@@ -373,7 +370,7 @@
+@@ -373,7 +369,7 @@
                  {
                      if (this.field_146297_k.field_71439_g.field_71071_by.func_70445_o().func_190926_b())
                      {
@@ -122,7 +139,7 @@
                          {
                              this.func_184098_a(slot, l, p_73864_3_, ClickType.CLONE);
                          }
-@@ -411,7 +408,7 @@
+@@ -411,7 +407,7 @@
                          {
                              this.field_146987_F = 1;
                          }
@@ -131,7 +148,7 @@
                          {
                              this.field_146987_F = 2;
                          }
-@@ -427,13 +424,9 @@
+@@ -427,13 +423,9 @@
  
      protected boolean func_193983_c(int p_193983_1_, int p_193983_2_, int p_193983_3_, int p_193983_4_)
      {
@@ -146,7 +163,7 @@
      protected void func_146273_a(int p_146273_1_, int p_146273_2_, int p_146273_3_, long p_146273_4_)
      {
          Slot slot = this.func_146975_c(p_146273_1_, p_146273_2_);
-@@ -473,26 +466,21 @@
+@@ -473,26 +465,21 @@
                  }
              }
          }
@@ -176,7 +193,7 @@
          int k = -1;
  
          if (slot != null)
-@@ -513,11 +501,7 @@
+@@ -513,11 +500,7 @@
                  {
                      for (Slot slot2 : this.field_147002_h.field_75151_b)
                      {
@@ -189,7 +206,7 @@
                          {
                              this.func_184098_a(slot2, slot2.field_75222_d, p_146286_3_, ClickType.QUICK_MOVE);
                          }
-@@ -593,18 +577,18 @@
+@@ -593,18 +576,18 @@
              }
              else if (this.field_147007_t && !this.field_147008_s.isEmpty())
              {
@@ -211,7 +228,7 @@
                  {
                      this.func_184098_a(slot, k, p_146286_3_, ClickType.CLONE);
                  }
-@@ -639,12 +623,9 @@
+@@ -639,12 +622,9 @@
      {
          int i = this.field_147003_i;
          int j = this.field_147009_r;
@@ -227,7 +244,7 @@
      }
  
      protected void func_184098_a(Slot p_184098_1_, int p_184098_2_, int p_184098_3_, ClickType p_184098_4_)
-@@ -654,15 +635,12 @@
+@@ -654,15 +634,12 @@
              p_184098_2_ = p_184098_1_.field_75222_d;
          }
  
@@ -245,7 +262,7 @@
          {
              this.field_146297_k.field_71439_g.func_71053_j();
          }
-@@ -671,11 +649,11 @@
+@@ -671,11 +648,11 @@
  
          if (this.field_147006_u != null && this.field_147006_u.func_75216_d())
          {
@@ -259,7 +276,7 @@
              {
                  this.func_184098_a(this.field_147006_u, this.field_147006_u.field_75222_d, func_146271_m() ? 1 : 0, ClickType.THROW);
              }
-@@ -688,7 +666,7 @@
+@@ -688,7 +665,7 @@
          {
              for (int i = 0; i < 9; ++i)
              {
@@ -268,7 +285,7 @@
                  {
                      this.func_184098_a(this.field_147006_u, this.field_147006_u.field_75222_d, i, ClickType.SWAP);
                      return true;
-@@ -699,7 +677,6 @@
+@@ -699,7 +676,6 @@
          return false;
      }
  
@@ -276,7 +293,7 @@
      public void func_146281_b()
      {
          if (this.field_146297_k.field_71439_g != null)
-@@ -708,13 +685,11 @@
+@@ -708,13 +684,11 @@
          }
      }
  
@@ -290,7 +307,7 @@
      public void func_73876_c()
      {
          super.func_73876_c();
-@@ -724,4 +699,18 @@
+@@ -724,4 +698,18 @@
              this.field_146297_k.field_71439_g.func_71053_j();
          }
      }
diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch
index 7cf0fb2f4..32b8e54a1 100644
--- a/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch
@@ -1,5 +1,16 @@
 --- before/net/minecraft/client/gui/inventory/GuiContainerCreative.java
 +++ after/net/minecraft/client/gui/inventory/GuiContainerCreative.java
+@@ -40,8 +40,8 @@
+ import net.minecraft.util.text.TextFormatting;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Keyboard;
+-import org.lwjgl.input.Mouse;
++import org.lwjglx.input.Keyboard;
++import org.lwjglx.input.Mouse;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GuiContainerCreative extends InventoryEffectRenderer
 @@ -57,6 +57,8 @@
      private Slot field_147064_C;
      private boolean field_147057_D;
diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiEditCommandBlockMinecart.java.patch b/patches/minecraft/net/minecraft/client/gui/inventory/GuiEditCommandBlockMinecart.java.patch
new file mode 100644
index 000000000..ebd9bd047
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiEditCommandBlockMinecart.java.patch
@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/gui/inventory/GuiEditCommandBlockMinecart.java
++++ after/net/minecraft/client/gui/inventory/GuiEditCommandBlockMinecart.java
+@@ -15,7 +15,7 @@
+ import net.minecraft.util.math.BlockPos;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GuiEditCommandBlockMinecart extends GuiScreen implements ITabCompleter
diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiEditSign.java.patch b/patches/minecraft/net/minecraft/client/gui/inventory/GuiEditSign.java.patch
new file mode 100644
index 000000000..76b304099
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiEditSign.java.patch
@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/gui/inventory/GuiEditSign.java
++++ after/net/minecraft/client/gui/inventory/GuiEditSign.java
+@@ -15,7 +15,7 @@
+ import net.minecraft.util.text.TextComponentString;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GuiEditSign extends GuiScreen
diff --git a/patches/minecraft/net/minecraft/client/gui/inventory/GuiEditStructure.java.patch b/patches/minecraft/net/minecraft/client/gui/inventory/GuiEditStructure.java.patch
new file mode 100644
index 000000000..b506cc245
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/gui/inventory/GuiEditStructure.java.patch
@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/gui/inventory/GuiEditStructure.java
++++ after/net/minecraft/client/gui/inventory/GuiEditStructure.java
+@@ -22,7 +22,7 @@
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ import org.apache.logging.log4j.LogManager;
+ import org.apache.logging.log4j.Logger;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GuiEditStructure extends GuiScreen
diff --git a/patches/minecraft/net/minecraft/client/gui/recipebook/GuiRecipeBook.java.patch b/patches/minecraft/net/minecraft/client/gui/recipebook/GuiRecipeBook.java.patch
index 796a119b0..842eeaeb1 100644
--- a/patches/minecraft/net/minecraft/client/gui/recipebook/GuiRecipeBook.java.patch
+++ b/patches/minecraft/net/minecraft/client/gui/recipebook/GuiRecipeBook.java.patch
@@ -1,15 +1,21 @@
 --- before/net/minecraft/client/gui/recipebook/GuiRecipeBook.java
 +++ after/net/minecraft/client/gui/recipebook/GuiRecipeBook.java
-@@ -6,6 +6,8 @@
- import java.util.Iterator;
- import java.util.List;
- import java.util.Locale;
-+import java.util.function.Consumer;
-+import java.util.function.Predicate;
- import javax.annotation.Nullable;
- import net.minecraft.client.Minecraft;
- import net.minecraft.client.gui.Gui;
-@@ -43,13 +45,7 @@
+@@ -27,13 +27,12 @@
+ import net.minecraft.item.ItemStack;
+ import net.minecraft.item.crafting.IRecipe;
+ import net.minecraft.item.crafting.Ingredient;
+-import net.minecraft.item.crafting.ShapedRecipes;
+ import net.minecraft.network.play.client.CPacketRecipeInfo;
+ import net.minecraft.stats.RecipeBook;
+ import net.minecraft.util.ResourceLocation;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GuiRecipeBook extends Gui implements IRecipeUpdateListener
+@@ -43,13 +42,7 @@
      private int field_191904_o;
      private int field_191905_p;
      private final GhostRecipe field_191915_z = new GhostRecipe();
@@ -24,7 +30,7 @@
      private GuiButtonRecipeTab field_191913_x;
      private GuiButtonToggle field_193960_m;
      private InventoryCrafting field_193961_o;
-@@ -159,28 +155,37 @@
+@@ -159,28 +152,37 @@
  
      private void func_193003_g(boolean p_193003_1_)
      {
@@ -75,7 +81,7 @@
          }
  
          this.field_193022_s.func_194192_a(list1, p_193003_1_);
-@@ -265,11 +270,11 @@
+@@ -265,11 +267,11 @@
  
              if (this.field_193960_m.func_146115_a())
              {
@@ -89,7 +95,7 @@
                  }
              }
  
-@@ -308,10 +313,7 @@
+@@ -308,10 +310,7 @@
      {
          if (this.func_191878_b() && !this.field_191888_F.field_71439_g.func_175149_v())
          {
@@ -101,7 +107,7 @@
              {
                  IRecipe irecipe = this.field_193022_s.func_194193_a();
                  RecipeList recipelist = this.field_193022_s.func_194199_b();
-@@ -324,11 +326,7 @@
+@@ -324,11 +323,7 @@
                      }
  
                      this.field_191915_z.func_192682_a();
@@ -114,7 +120,7 @@
  
                      if (!this.func_191880_f() && p_191862_3_ == 0)
                      {
-@@ -392,10 +390,7 @@
+@@ -392,10 +387,7 @@
          }
          else
          {
@@ -126,7 +132,7 @@
              boolean flag1 = p_193955_3_ - 147 < p_193955_1_ && p_193955_1_ < p_193955_3_ && p_193955_4_ < p_193955_2_ && p_193955_2_ < p_193955_4_ + p_193955_6_;
              return flag && !flag1 && !this.field_191913_x.func_146116_c(this.field_191888_F, p_193955_1_, p_193955_2_);
          }
-@@ -403,35 +398,38 @@
+@@ -403,35 +395,38 @@
  
      public boolean func_191859_a(char p_191859_1_, int p_191859_2_)
      {
@@ -192,7 +198,7 @@
              return false;
          }
      }
-@@ -450,10 +448,8 @@
+@@ -450,10 +445,8 @@
  
              languagemanager.func_135045_a(language);
              this.field_191888_F.field_71474_y.field_74363_ab = language.func_135034_a();
@@ -205,7 +211,7 @@
              this.field_191888_F.field_71466_p.func_78275_b(languagemanager.func_135044_b());
              this.field_191888_F.field_71474_y.func_74303_b();
          }
-@@ -474,7 +470,6 @@
+@@ -474,7 +467,6 @@
          }
      }
  
@@ -213,7 +219,7 @@
      public void func_193001_a(List<IRecipe> p_193001_1_)
      {
          for (IRecipe irecipe : p_193001_1_)
-@@ -487,10 +482,10 @@
+@@ -487,10 +479,10 @@
      {
          ItemStack itemstack = p_193951_1_.func_77571_b();
          this.field_191915_z.func_192685_a(p_193951_1_);
@@ -226,7 +232,7 @@
          int l = 1;
          Iterator<Ingredient> iterator = p_193951_1_.func_192400_c().iterator();
  
-@@ -505,7 +500,7 @@
+@@ -505,7 +497,7 @@
  
                  Ingredient ingredient = iterator.next();
  
diff --git a/patches/minecraft/net/minecraft/client/renderer/ActiveRenderInfo.java.patch b/patches/minecraft/net/minecraft/client/renderer/ActiveRenderInfo.java.patch
index d06654e1a..14f52ed36 100644
--- a/patches/minecraft/net/minecraft/client/renderer/ActiveRenderInfo.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/ActiveRenderInfo.java.patch
@@ -1,5 +1,14 @@
 --- before/net/minecraft/client/renderer/ActiveRenderInfo.java
 +++ after/net/minecraft/client/renderer/ActiveRenderInfo.java
+@@ -12,7 +12,7 @@
+ import net.minecraft.world.World;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.util.glu.GLU;
++import org.lwjglx.util.glu.GLU;
+ 
+ @SideOnly(Side.CLIENT)
+ public class ActiveRenderInfo
 @@ -21,7 +21,7 @@
      private static final FloatBuffer field_178812_b = GLAllocation.func_74529_h(16);
      private static final FloatBuffer field_178813_c = GLAllocation.func_74529_h(16);
diff --git a/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch
index e8abfac2d..d0e93864d 100644
--- a/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch
@@ -1,6 +1,6 @@
 --- before/net/minecraft/client/renderer/EntityRenderer.java
 +++ after/net/minecraft/client/renderer/EntityRenderer.java
-@@ -5,8 +5,8 @@
+@@ -5,15 +5,14 @@
  import com.google.gson.JsonSyntaxException;
  import java.awt.Graphics;
  import java.awt.image.BufferedImage;
@@ -10,7 +10,14 @@
  import java.nio.FloatBuffer;
  import java.util.List;
  import java.util.Random;
-@@ -52,6 +52,7 @@
+ import javax.annotation.Nullable;
+ import javax.imageio.ImageIO;
+ import net.minecraft.block.Block;
+-import net.minecraft.block.BlockBed;
+ import net.minecraft.block.material.Material;
+ import net.minecraft.block.state.IBlockState;
+ import net.minecraft.client.Minecraft;
+@@ -52,6 +51,7 @@
  import net.minecraft.item.ItemStack;
  import net.minecraft.util.BlockRenderLayer;
  import net.minecraft.util.EntitySelectors;
@@ -18,7 +25,22 @@
  import net.minecraft.util.EnumParticleTypes;
  import net.minecraft.util.MouseFilter;
  import net.minecraft.util.ReportedException;
-@@ -127,7 +128,7 @@
+@@ -70,10 +70,10 @@
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ import org.apache.logging.log4j.LogManager;
+ import org.apache.logging.log4j.Logger;
+-import org.lwjgl.input.Mouse;
+-import org.lwjgl.opengl.Display;
+-import org.lwjgl.opengl.GLContext;
+-import org.lwjgl.util.glu.Project;
++import org.lwjglx.input.Mouse;
++import org.lwjglx.opengl.Display;
++import org.lwjglx.opengl.GLContext;
++import org.lwjglx.util.glu.Project;
+ 
+ @SideOnly(Side.CLIENT)
+ public class EntityRenderer implements IResourceManagerReloadListener
+@@ -127,7 +127,7 @@
      private float field_78539_ae;
      private int field_175079_V;
      private boolean field_175078_W;
@@ -27,7 +49,7 @@
      private double field_78502_W;
      private double field_78509_X;
      private ItemStack field_190566_ab;
-@@ -135,40 +136,15 @@
+@@ -135,40 +135,15 @@
      private float field_190568_ad;
      private float field_190569_ae;
      private ShaderGroup field_147707_d;
@@ -71,7 +93,7 @@
          this.field_78531_r = p_i45076_1_;
          this.field_147711_ac = p_i45076_2_;
          this.field_78516_c = p_i45076_1_.func_175597_ag();
-@@ -235,6 +211,7 @@
+@@ -235,6 +210,7 @@
              {
                  this.func_175069_a(new ResourceLocation("shaders/post/invert.json"));
              }
@@ -79,7 +101,7 @@
          }
      }
  
-@@ -260,7 +237,6 @@
+@@ -260,7 +236,6 @@
          }
      }
  
@@ -87,7 +109,7 @@
      public void func_110549_a(IResourceManager p_110549_1_)
      {
          if (this.field_147707_d != null)
-@@ -315,7 +291,7 @@
+@@ -315,7 +290,7 @@
              this.field_78531_r.func_175607_a(this.field_78531_r.field_71439_g);
          }
  
@@ -96,7 +118,7 @@
          float f4 = (float)this.field_78531_r.field_71474_y.field_151451_c / 32.0F;
          float f2 = f3 * (1.0F - f4) + f4;
          this.field_78539_ae += (f2 - this.field_78539_ae) * 0.1F;
-@@ -386,12 +362,12 @@
+@@ -386,12 +361,12 @@
  
                  if (this.field_78531_r.field_71442_b.func_78749_i())
                  {
@@ -111,7 +133,7 @@
                      {
                          flag = true;
                      }
-@@ -407,21 +383,13 @@
+@@ -407,21 +382,13 @@
                  this.field_78528_u = null;
                  Vec3d vec3d3 = null;
                  float f = 1.0F;
@@ -135,7 +157,7 @@
                  double d2 = d1;
  
                  for (int j = 0; j < list.size(); ++j)
-@@ -432,22 +400,22 @@
+@@ -432,22 +399,22 @@
  
                      if (axisalignedbb.func_72318_a(vec3d))
                      {
@@ -163,7 +185,7 @@
                                  {
                                      this.field_78528_u = entity1;
                                      vec3d3 = raytraceresult.field_72307_f;
-@@ -463,10 +431,10 @@
+@@ -463,10 +430,10 @@
                      }
                  }
  
@@ -176,7 +198,7 @@
                  }
  
                  if (this.field_78528_u != null && (d2 < d1 || this.field_78531_r.field_71476_x == null))
-@@ -522,7 +490,7 @@
+@@ -522,7 +489,7 @@
              if (p_78481_2_)
              {
                  f = this.field_78531_r.field_71474_y.field_74334_X;
@@ -185,7 +207,7 @@
              }
  
              if (entity instanceof EntityLivingBase && ((EntityLivingBase)entity).func_110143_aJ() <= 0.0F)
-@@ -538,7 +506,7 @@
+@@ -538,7 +505,7 @@
                  f = f * 60.0F / 70.0F;
              }
  
@@ -194,7 +216,7 @@
          }
      }
  
-@@ -560,8 +528,8 @@
+@@ -560,8 +527,8 @@
                  return;
              }
  
@@ -205,7 +227,7 @@
              float f2 = entitylivingbase.field_70739_aP;
              GlStateManager.func_179114_b(-f2, 0.0F, 1.0F, 0.0F);
              GlStateManager.func_179114_b(-f * 14.0F, 0.0F, 0.0F, 1.0F);
-@@ -578,11 +546,9 @@
+@@ -578,11 +545,9 @@
              float f1 = -(entityplayer.field_70140_Q + f * p_78475_1_);
              float f2 = entityplayer.field_71107_bF + (entityplayer.field_71109_bG - entityplayer.field_71107_bF) * p_78475_1_;
              float f3 = entityplayer.field_70727_aS + (entityplayer.field_70726_aT - entityplayer.field_70727_aS) * p_78475_1_;
@@ -220,7 +242,7 @@
              GlStateManager.func_179114_b(f3, 1.0F, 0.0F, 0.0F);
          }
      }
-@@ -597,20 +563,14 @@
+@@ -597,20 +562,14 @@
  
          if (entity instanceof EntityLivingBase && ((EntityLivingBase)entity).func_70608_bn())
          {
@@ -243,7 +265,7 @@
  
                  GlStateManager.func_179114_b(entity.field_70126_B + (entity.field_70177_z - entity.field_70126_B) * p_78467_1_ + 180.0F, 0.0F, -1.0F, 0.0F);
                  GlStateManager.func_179114_b(entity.field_70127_C + (entity.field_70125_A - entity.field_70127_C) * p_78467_1_, -1.0F, 0.0F, 0.0F);
-@@ -634,24 +594,19 @@
+@@ -634,24 +593,19 @@
                      f2 += 180.0F;
                  }
  
@@ -275,7 +297,7 @@
  
                      if (raytraceresult != null)
                      {
-@@ -683,19 +638,20 @@
+@@ -683,19 +637,20 @@
  
          if (!this.field_78531_r.field_71474_y.field_74325_U)
          {
@@ -306,7 +328,7 @@
          }
  
          GlStateManager.func_179109_b(0.0F, -f, 0.0F);
-@@ -717,18 +673,13 @@
+@@ -717,18 +672,13 @@
              GlStateManager.func_179109_b((float)(-(p_78479_2_ * 2 - 1)) * 0.07F, 0.0F, 0.0F);
          }
  
@@ -328,7 +350,7 @@
          GlStateManager.func_179128_n(5888);
          GlStateManager.func_179096_D();
  
-@@ -744,8 +695,7 @@
+@@ -744,8 +694,7 @@
              this.func_78475_f(p_78479_1_);
          }
  
@@ -338,7 +360,7 @@
  
          if (f1 > 0.0F)
          {
-@@ -757,7 +707,7 @@
+@@ -757,7 +706,7 @@
              }
  
              float f2 = 5.0F / (f1 * f1 + 5.0F) - f1 * 0.04F;
@@ -347,7 +369,7 @@
              GlStateManager.func_179114_b(((float)this.field_78529_t + p_78479_1_) * (float)i, 0.0F, 1.0F, 1.0F);
              GlStateManager.func_179152_a(1.0F / f2, 1.0F, 1.0F);
              GlStateManager.func_179114_b(-((float)this.field_78529_t + p_78479_1_) * (float)i, 0.0F, 1.0F, 1.0F);
-@@ -800,12 +750,7 @@
+@@ -800,12 +749,7 @@
                  GlStateManager.func_179109_b((float)(-(p_78476_2_ * 2 - 1)) * 0.07F, 0.0F, 0.0F);
              }
  
@@ -361,7 +383,7 @@
              GlStateManager.func_179128_n(5888);
              GlStateManager.func_179096_D();
  
-@@ -822,13 +767,10 @@
+@@ -822,13 +766,10 @@
                  this.func_78475_f(p_78476_1_);
              }
  
@@ -378,7 +400,7 @@
              {
                  this.func_180436_i();
                  this.field_78516_c.func_78440_a(p_78476_1_);
-@@ -879,7 +821,7 @@
+@@ -879,7 +820,7 @@
      private void func_78470_f()
      {
          this.field_175075_L = (float)((double)this.field_175075_L + (Math.random() - Math.random()) * Math.random() * Math.random());
@@ -387,7 +409,7 @@
          this.field_78514_e += this.field_175075_L - this.field_78514_e;
          this.field_78536_aa = true;
      }
-@@ -932,6 +874,15 @@
+@@ -932,6 +873,15 @@
                          f10 = 0.25F + f7 * 0.75F;
                      }
  
@@ -403,7 +425,7 @@
                      if (this.field_78531_r.field_71439_g.func_70644_a(MobEffects.field_76439_r))
                      {
                          float f15 = this.func_180438_a(this.field_78531_r.field_71439_g, p_78472_1_);
-@@ -1015,7 +966,7 @@
+@@ -1015,7 +965,7 @@
                      int k = (int)(f8 * 255.0F);
                      int l = (int)(f9 * 255.0F);
                      int i1 = (int)(f10 * 255.0F);
@@ -412,7 +434,7 @@
                  }
  
                  this.field_78513_d.func_110564_a();
-@@ -1028,7 +979,7 @@
+@@ -1028,7 +978,7 @@
      private float func_180438_a(EntityLivingBase p_180438_1_, float p_180438_2_)
      {
          int i = p_180438_1_.func_70660_b(MobEffects.field_76439_r).func_76459_b();
@@ -421,7 +443,7 @@
      }
  
      public void func_181560_a(float p_181560_1_, long p_181560_2_)
-@@ -1158,6 +1109,10 @@
+@@ -1158,6 +1108,10 @@
                  GlStateManager.func_179096_D();
                  this.func_78478_c();
                  this.field_78510_Z = System.nanoTime();
@@ -432,7 +454,7 @@
              }
  
              if (this.field_78531_r.field_71462_r != null)
-@@ -1166,7 +1121,7 @@
+@@ -1166,7 +1120,7 @@
  
                  try
                  {
@@ -441,7 +463,7 @@
                  }
                  catch (Throwable throwable)
                  {
-@@ -1186,23 +1141,13 @@
+@@ -1186,23 +1140,13 @@
                              return String.format("Scaled: (%d, %d). Absolute: (%d, %d)", k1, l1, Mouse.getX(), Mouse.getY());
                          }
                      });
@@ -468,7 +490,7 @@
                      throw new ReportedException(crashreport);
                  }
              }
-@@ -1211,13 +1156,9 @@
+@@ -1211,13 +1155,9 @@
  
      private void func_184373_n()
      {
@@ -484,7 +506,7 @@
              int i = bufferedimage.getWidth();
              int j = bufferedimage.getHeight();
              int k = 0;
-@@ -1237,7 +1178,7 @@
+@@ -1237,7 +1177,7 @@
              {
                  BufferedImage bufferedimage1 = new BufferedImage(64, 64, 1);
                  Graphics graphics = bufferedimage1.createGraphics();
@@ -493,7 +515,7 @@
                  graphics.dispose();
                  ImageIO.write(bufferedimage1, "png", this.field_78531_r.func_71401_C().func_184109_z());
              }
-@@ -1275,7 +1216,7 @@
+@@ -1275,7 +1215,7 @@
  
                      if (this.field_78531_r.field_71442_b.func_178889_l() == GameType.SPECTATOR)
                      {
@@ -502,7 +524,7 @@
                      }
                      else
                      {
-@@ -1333,7 +1274,7 @@
+@@ -1333,7 +1273,7 @@
          GlStateManager.func_179086_m(16640);
          this.field_78531_r.field_71424_I.func_76318_c("camera");
          this.func_78479_a(p_175068_2_, p_175068_1_);
@@ -511,7 +533,7 @@
          this.field_78531_r.field_71424_I.func_76318_c("frustum");
          ClippingHelperImpl.func_78558_a();
          this.field_78531_r.field_71424_I.func_76318_c("culling");
-@@ -1350,29 +1291,19 @@
+@@ -1350,29 +1290,19 @@
              this.field_78531_r.field_71424_I.func_76318_c("sky");
              GlStateManager.func_179128_n(5889);
              GlStateManager.func_179096_D();
@@ -544,7 +566,7 @@
          {
              this.func_180437_a(renderglobal, p_175068_2_, p_175068_1_, d0, d1, d2);
          }
-@@ -1396,7 +1327,9 @@
+@@ -1396,7 +1326,9 @@
          GlStateManager.func_179118_c();
          renderglobal.func_174977_a(BlockRenderLayer.SOLID, (double)p_175068_2_, p_175068_1_, entity);
          GlStateManager.func_179141_d();
@@ -554,7 +576,7 @@
          this.field_78531_r.func_110434_K().func_110581_b(TextureMap.field_110575_b).func_174936_b(false, false);
          renderglobal.func_174977_a(BlockRenderLayer.CUTOUT, (double)p_175068_2_, p_175068_1_, entity);
          this.field_78531_r.func_110434_K().func_110581_b(TextureMap.field_110575_b).func_174935_a();
-@@ -1410,7 +1343,9 @@
+@@ -1410,7 +1342,9 @@
              GlStateManager.func_179094_E();
              RenderHelper.func_74519_b();
              this.field_78531_r.field_71424_I.func_76318_c("entities");
@@ -564,7 +586,7 @@
              RenderHelper.func_74518_a();
              this.func_175072_h();
          }
-@@ -1423,6 +1358,7 @@
+@@ -1423,6 +1357,7 @@
              EntityPlayer entityplayer = (EntityPlayer)entity;
              GlStateManager.func_179118_c();
              this.field_78531_r.field_71424_I.func_76318_c("outline");
@@ -572,7 +594,7 @@
              renderglobal.func_72731_b(entityplayer, this.field_78531_r.field_71476_x, 0, p_175068_2_);
              GlStateManager.func_179141_d();
          }
-@@ -1434,9 +1370,7 @@
+@@ -1434,9 +1369,7 @@
  
          this.field_78531_r.field_71424_I.func_76318_c("destroyProgress");
          GlStateManager.func_179147_l();
@@ -583,7 +605,7 @@
          this.field_78531_r.func_110434_K().func_110581_b(TextureMap.field_110575_b).func_174936_b(false, false);
          renderglobal.func_174981_a(Tessellator.func_178181_a(), Tessellator.func_178181_a().func_178180_c(), entity, p_175068_2_);
          this.field_78531_r.func_110434_K().func_110581_b(TextureMap.field_110575_b).func_174935_a();
-@@ -1462,9 +1396,7 @@
+@@ -1462,9 +1395,7 @@
          renderglobal.func_180449_a(entity, p_175068_2_);
          GlStateManager.func_179084_k();
          GlStateManager.func_179089_o();
@@ -594,7 +616,7 @@
          GlStateManager.func_179092_a(516, 0.1F);
          this.func_78468_a(0, p_175068_2_);
          GlStateManager.func_179147_l();
-@@ -1473,18 +1405,32 @@
+@@ -1473,18 +1404,32 @@
          GlStateManager.func_179103_j(7425);
          this.field_78531_r.field_71424_I.func_76318_c("translucent");
          renderglobal.func_174977_a(BlockRenderLayer.TRANSLUCENT, (double)p_175068_2_, p_175068_1_, entity);
@@ -628,7 +650,7 @@
          this.field_78531_r.field_71424_I.func_76318_c("hand");
  
          if (this.field_175074_C)
-@@ -1501,12 +1447,7 @@
+@@ -1501,12 +1446,7 @@
              this.field_78531_r.field_71424_I.func_76318_c("clouds");
              GlStateManager.func_179128_n(5889);
              GlStateManager.func_179096_D();
@@ -642,7 +664,7 @@
              GlStateManager.func_179128_n(5888);
              GlStateManager.func_179094_E();
              this.func_78468_a(0, p_180437_2_);
-@@ -1515,12 +1456,7 @@
+@@ -1515,12 +1455,7 @@
              GlStateManager.func_179121_F();
              GlStateManager.func_179128_n(5889);
              GlStateManager.func_179096_D();
@@ -656,7 +678,7 @@
              GlStateManager.func_179128_n(5888);
          }
      }
-@@ -1541,9 +1477,9 @@
+@@ -1541,9 +1476,9 @@
              World world = this.field_78531_r.field_71441_e;
              BlockPos blockpos = new BlockPos(entity);
              int i = 10;
@@ -669,7 +691,7 @@
              int j = 0;
              int k = (int)(100.0F * f * f);
  
-@@ -1558,60 +1494,36 @@
+@@ -1558,60 +1493,36 @@
  
              for (int l = 0; l < k; ++l)
              {
@@ -749,7 +771,7 @@
                      }
                  }
              }
-@@ -1620,8 +1532,7 @@
+@@ -1620,8 +1531,7 @@
              {
                  this.field_78534_ac = 0;
  
@@ -759,7 +781,7 @@
                  {
                      this.field_78531_r.field_71441_e.func_184134_a(d0, d1, d2, SoundEvents.field_187919_gs, SoundCategory.WEATHER, 0.1F, 0.5F, false);
                  }
-@@ -1635,9 +1546,16 @@
+@@ -1635,9 +1545,16 @@
  
      protected void func_78474_d(float p_78474_1_)
      {
@@ -777,7 +799,7 @@
          {
              this.func_180436_i();
              Entity entity = this.field_78531_r.func_175606_aa();
-@@ -1650,12 +1568,7 @@
+@@ -1650,12 +1567,7 @@
              GlStateManager.func_179129_p();
              GlStateManager.func_187432_a(0.0F, 1.0F, 0.0F);
              GlStateManager.func_179147_l();
@@ -791,7 +813,7 @@
              GlStateManager.func_179092_a(516, 0.1F);
              double d0 = entity.field_70142_S + (entity.field_70165_t - entity.field_70142_S) * (double)p_78474_1_;
              double d1 = entity.field_70137_T + (entity.field_70163_u - entity.field_70137_T) * (double)p_78474_1_;
-@@ -1679,8 +1592,8 @@
+@@ -1679,8 +1591,8 @@
                  for (int l1 = i - i1; l1 <= i + i1; ++l1)
                  {
                      int i2 = (k1 - k + 16) * 32 + l1 - i + 16;
@@ -802,7 +824,7 @@
                      blockpos$mutableblockpos.func_181079_c(l1, 0, k1);
                      Biome biome = world.func_180494_b(blockpos$mutableblockpos);
  
-@@ -1727,9 +1640,7 @@
+@@ -1727,9 +1639,7 @@
                                      bufferbuilder.func_181668_a(7, DefaultVertexFormats.field_181704_d);
                                  }
  
@@ -813,7 +835,7 @@
                                  double d6 = (double)((float)l1 + 0.5F) - entity.field_70165_t;
                                  double d7 = (double)((float)k1 + 0.5F) - entity.field_70161_v;
                                  float f3 = MathHelper.func_76133_a(d6 * d6 + d7 * d7) / (float)i1;
-@@ -1738,26 +1649,10 @@
+@@ -1738,26 +1648,10 @@
                                  int j3 = world.func_175626_b(blockpos$mutableblockpos, 0);
                                  int k3 = j3 >> 16 & 65535;
                                  int l3 = j3 & 65535;
@@ -844,7 +866,7 @@
                              }
                              else
                              {
-@@ -1774,8 +1669,8 @@
+@@ -1774,8 +1668,8 @@
                                  }
  
                                  double d8 = (double)(-((float)(this.field_78529_t & 511) + p_78474_1_) / 512.0F);
@@ -855,7 +877,7 @@
                                  double d11 = (double)((float)l1 + 0.5F) - entity.field_70165_t;
                                  double d12 = (double)((float)k1 + 0.5F) - entity.field_70161_v;
                                  float f6 = MathHelper.func_76133_a(d11 * d11 + d12 * d12) / (float)i1;
-@@ -1784,26 +1679,10 @@
+@@ -1784,26 +1678,10 @@
                                  int i4 = (world.func_175626_b(blockpos$mutableblockpos, 0) * 3 + 15728880) / 4;
                                  int j4 = i4 >> 16 & 65535;
                                  int k4 = i4 & 65535;
@@ -886,7 +908,7 @@
                              }
                          }
                      }
-@@ -1815,7 +1694,7 @@
+@@ -1815,7 +1693,7 @@
                  tessellator.func_78381_a();
              }
  
@@ -895,7 +917,7 @@
              GlStateManager.func_179089_o();
              GlStateManager.func_179084_k();
              GlStateManager.func_179092_a(516, 0.1F);
-@@ -1829,7 +1708,7 @@
+@@ -1829,7 +1707,7 @@
          GlStateManager.func_179086_m(256);
          GlStateManager.func_179128_n(5889);
          GlStateManager.func_179096_D();
@@ -904,7 +926,7 @@
          GlStateManager.func_179128_n(5888);
          GlStateManager.func_179096_D();
          GlStateManager.func_179109_b(0.0F, 0.0F, -2000.0F);
-@@ -1840,7 +1719,7 @@
+@@ -1840,7 +1718,7 @@
          World world = this.field_78531_r.field_71441_e;
          Entity entity = this.field_78531_r.func_175606_aa();
          float f = 0.25F + 0.75F * (float)this.field_78531_r.field_71474_y.field_151451_c / 32.0F;
@@ -913,7 +935,7 @@
          Vec3d vec3d = world.func_72833_a(this.field_78531_r.func_175606_aa(), p_78466_1_);
          float f1 = (float)vec3d.field_72450_a;
          float f2 = (float)vec3d.field_72448_b;
-@@ -1852,8 +1731,8 @@
+@@ -1852,8 +1730,8 @@
  
          if (this.field_78531_r.field_71474_y.field_151451_c >= 4)
          {
@@ -924,7 +946,7 @@
              float f5 = (float)entity.func_70676_i(p_78466_1_).func_72430_b(vec3d2);
  
              if (f5 < 0.0F)
-@@ -1867,7 +1746,7 @@
+@@ -1867,7 +1745,7 @@
  
                  if (afloat != null)
                  {
@@ -933,7 +955,7 @@
                      this.field_175080_Q = this.field_175080_Q * (1.0F - f5) + afloat[0] * f5;
                      this.field_175082_R = this.field_175082_R * (1.0F - f5) + afloat[1] * f5;
                      this.field_175081_S = this.field_175081_S * (1.0F - f5) + afloat[2] * f5;
-@@ -1908,29 +1787,16 @@
+@@ -1908,29 +1786,16 @@
              this.field_175082_R = (float)vec3d3.field_72448_b;
              this.field_175081_S = (float)vec3d3.field_72449_c;
          }
@@ -973,7 +995,7 @@
          }
  
          float f13 = this.field_78535_ad + (this.field_78539_ae - this.field_78535_ad) * p_78466_1_;
-@@ -1949,18 +1815,18 @@
+@@ -1949,18 +1814,18 @@
              }
              else
              {
@@ -997,7 +1019,7 @@
              this.field_175080_Q = (float)((double)this.field_175080_Q * d1);
              this.field_175082_R = (float)((double)this.field_175082_R * d1);
              this.field_175081_S = (float)((double)this.field_175081_S * d1);
-@@ -1989,6 +1855,9 @@
+@@ -1989,6 +1854,9 @@
                  f6 = 1.0F / this.field_175081_S;
              }
  
@@ -1007,7 +1029,7 @@
              this.field_175080_Q = this.field_175080_Q * (1.0F - f15) + this.field_175080_Q * f6 * f15;
              this.field_175082_R = this.field_175082_R * (1.0F - f15) + this.field_175082_R * f6 * f15;
              this.field_175081_S = this.field_175081_S * (1.0F - f15) + this.field_175081_S * f6 * f15;
-@@ -2004,6 +1873,13 @@
+@@ -2004,6 +1872,13 @@
              this.field_175081_S = f7;
          }
  
@@ -1021,7 +1043,7 @@
          GlStateManager.func_179082_a(this.field_175080_Q, this.field_175082_R, this.field_175081_S, 0.0F);
      }
  
-@@ -2014,7 +1890,9 @@
+@@ -2014,7 +1889,9 @@
          GlStateManager.func_187432_a(0.0F, -1.0F, 0.0F);
          GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, 1.0F);
          IBlockState iblockstate = ActiveRenderInfo.func_186703_a(this.field_78531_r.field_71441_e, entity, p_78468_2_);
@@ -1032,7 +1054,7 @@
          if (entity instanceof EntityLivingBase && ((EntityLivingBase)entity).func_70644_a(MobEffects.field_76440_q))
          {
              float f1 = 5.0F;
-@@ -2094,12 +1972,12 @@
+@@ -2094,12 +1971,12 @@
                  GlStateManager.func_187412_c(34138, 34139);
              }
  
@@ -1047,7 +1069,7 @@
          }
  
          GlStateManager.func_179142_g();
-@@ -2121,9 +1999,9 @@
+@@ -2121,9 +1998,9 @@
  
      private FloatBuffer func_78469_a(float p_78469_1_, float p_78469_2_, float p_78469_3_, float p_78469_4_)
      {
@@ -1059,7 +1081,7 @@
          return this.field_78521_m;
      }
  
-@@ -2138,18 +2016,7 @@
+@@ -2138,18 +2015,7 @@
          return this.field_147709_v;
      }
  
@@ -1079,7 +1101,7 @@
      {
          GlStateManager.func_179094_E();
          GlStateManager.func_179109_b(p_189692_2_, p_189692_3_, p_189692_4_);
-@@ -2166,18 +2033,16 @@
+@@ -2166,18 +2032,16 @@
          }
  
          GlStateManager.func_179147_l();
@@ -1103,7 +1125,7 @@
          tessellator.func_78381_a();
          GlStateManager.func_179098_w();
  
-@@ -2212,7 +2077,7 @@
+@@ -2212,7 +2076,7 @@
              float f1 = f * f;
              float f2 = f * f1;
              float f3 = 10.25F * f2 * f1 + -24.95F * f1 * f1 + 25.5F * f2 + -13.8F * f1 + 4.0F * f;
@@ -1112,7 +1134,7 @@
              float f5 = this.field_190568_ad * (float)(p_190563_1_ / 4);
              float f6 = this.field_190569_ae * (float)(p_190563_2_ / 4);
              GlStateManager.func_179141_d();
-@@ -2221,11 +2086,7 @@
+@@ -2221,11 +2085,7 @@
              GlStateManager.func_179126_j();
              GlStateManager.func_179129_p();
              RenderHelper.func_74519_b();
diff --git a/patches/minecraft/net/minecraft/client/renderer/GLAllocation.java.patch b/patches/minecraft/net/minecraft/client/renderer/GLAllocation.java.patch
new file mode 100644
index 000000000..6c3284f85
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/renderer/GLAllocation.java.patch
@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/renderer/GLAllocation.java
++++ after/net/minecraft/client/renderer/GLAllocation.java
+@@ -6,7 +6,7 @@
+ import java.nio.IntBuffer;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.util.glu.GLU;
++import org.lwjglx.util.glu.GLU;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GLAllocation
diff --git a/patches/minecraft/net/minecraft/client/renderer/GlStateManager.java.patch b/patches/minecraft/net/minecraft/client/renderer/GlStateManager.java.patch
new file mode 100644
index 000000000..da6de5bfb
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/renderer/GlStateManager.java.patch
@@ -0,0 +1,92 @@
+--- before/net/minecraft/client/renderer/GlStateManager.java
++++ after/net/minecraft/client/renderer/GlStateManager.java
+@@ -7,11 +7,11 @@
+ import javax.annotation.Nullable;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.BufferUtils;
+-import org.lwjgl.opengl.GL11;
+-import org.lwjgl.opengl.GL14;
+-import org.lwjgl.opengl.GLContext;
+-import org.lwjgl.util.vector.Quaternion;
++import org.lwjglx.BufferUtils;
++import org.lwjglx.opengl.GL11;
++import org.lwjglx.opengl.GL14;
++import org.lwjglx.opengl.GLContext;
++import org.lwjglx.util.vector.Quaternion;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GlStateManager
+@@ -667,41 +667,41 @@
+         GL11.glMultMatrix(p_179110_0_);
+     }
+ 
+-    public static void func_187444_a(Quaternion p_187444_0_)
++    public static void rotate(Quaternion quaternionIn)
+     {
+-        func_179110_a(func_187418_a(field_187450_a, p_187444_0_));
++        func_179110_a(quatToGlMatrix(field_187450_a, quaternionIn));
+     }
+ 
+-    public static FloatBuffer func_187418_a(FloatBuffer p_187418_0_, Quaternion p_187418_1_)
++    public static FloatBuffer quatToGlMatrix(FloatBuffer buffer, Quaternion quaternionIn)
+     {
+-        ((Buffer)p_187418_0_).clear();
+-        float f = p_187418_1_.x * p_187418_1_.x;
+-        float f1 = p_187418_1_.x * p_187418_1_.y;
+-        float f2 = p_187418_1_.x * p_187418_1_.z;
+-        float f3 = p_187418_1_.x * p_187418_1_.w;
+-        float f4 = p_187418_1_.y * p_187418_1_.y;
+-        float f5 = p_187418_1_.y * p_187418_1_.z;
+-        float f6 = p_187418_1_.y * p_187418_1_.w;
+-        float f7 = p_187418_1_.z * p_187418_1_.z;
+-        float f8 = p_187418_1_.z * p_187418_1_.w;
+-        p_187418_0_.put(1.0F - 2.0F * (f4 + f7));
+-        p_187418_0_.put(2.0F * (f1 + f8));
+-        p_187418_0_.put(2.0F * (f2 - f6));
+-        p_187418_0_.put(0.0F);
+-        p_187418_0_.put(2.0F * (f1 - f8));
+-        p_187418_0_.put(1.0F - 2.0F * (f + f7));
+-        p_187418_0_.put(2.0F * (f5 + f3));
+-        p_187418_0_.put(0.0F);
+-        p_187418_0_.put(2.0F * (f2 + f6));
+-        p_187418_0_.put(2.0F * (f5 - f3));
+-        p_187418_0_.put(1.0F - 2.0F * (f + f4));
+-        p_187418_0_.put(0.0F);
+-        p_187418_0_.put(0.0F);
+-        p_187418_0_.put(0.0F);
+-        p_187418_0_.put(0.0F);
+-        p_187418_0_.put(1.0F);
+-        ((Buffer)p_187418_0_).rewind();
+-        return p_187418_0_;
++        ((Buffer)buffer).clear();
++        float f = quaternionIn.x * quaternionIn.x;
++        float f1 = quaternionIn.x * quaternionIn.y;
++        float f2 = quaternionIn.x * quaternionIn.z;
++        float f3 = quaternionIn.x * quaternionIn.w;
++        float f4 = quaternionIn.y * quaternionIn.y;
++        float f5 = quaternionIn.y * quaternionIn.z;
++        float f6 = quaternionIn.y * quaternionIn.w;
++        float f7 = quaternionIn.z * quaternionIn.z;
++        float f8 = quaternionIn.z * quaternionIn.w;
++        buffer.put(1.0F - 2.0F * (f4 + f7));
++        buffer.put(2.0F * (f1 + f8));
++        buffer.put(2.0F * (f2 - f6));
++        buffer.put(0.0F);
++        buffer.put(2.0F * (f1 - f8));
++        buffer.put(1.0F - 2.0F * (f + f7));
++        buffer.put(2.0F * (f5 + f3));
++        buffer.put(0.0F);
++        buffer.put(2.0F * (f2 + f6));
++        buffer.put(2.0F * (f5 - f3));
++        buffer.put(1.0F - 2.0F * (f + f4));
++        buffer.put(0.0F);
++        buffer.put(0.0F);
++        buffer.put(0.0F);
++        buffer.put(0.0F);
++        buffer.put(1.0F);
++        ((Buffer)buffer).rewind();
++        return buffer;
+     }
+ 
+     public static void func_179131_c(float p_179131_0_, float p_179131_1_, float p_179131_2_, float p_179131_3_)
diff --git a/patches/minecraft/net/minecraft/client/renderer/Matrix4f.java.patch b/patches/minecraft/net/minecraft/client/renderer/Matrix4f.java.patch
new file mode 100644
index 000000000..2c127396c
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/renderer/Matrix4f.java.patch
@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/renderer/Matrix4f.java
++++ after/net/minecraft/client/renderer/Matrix4f.java
+@@ -4,7 +4,7 @@
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ 
+ @SideOnly(Side.CLIENT)
+-public class Matrix4f extends org.lwjgl.util.vector.Matrix4f
++public class Matrix4f extends org.lwjglx.util.vector.Matrix4f
+ {
+     public Matrix4f(float[] p_i46413_1_)
+     {
diff --git a/patches/minecraft/net/minecraft/client/renderer/OpenGlHelper.java.patch b/patches/minecraft/net/minecraft/client/renderer/OpenGlHelper.java.patch
index 573396086..60cd3a312 100644
--- a/patches/minecraft/net/minecraft/client/renderer/OpenGlHelper.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/OpenGlHelper.java.patch
@@ -13,10 +13,11 @@
  import net.minecraft.client.Minecraft;
  import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
  import net.minecraft.client.settings.GameSettings;
-@@ -16,23 +9,17 @@
+@@ -15,24 +8,20 @@
+ import net.minecraftforge.fml.relauncher.SideOnly;
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
- import org.lwjgl.Sys;
+-import org.lwjgl.Sys;
 -import org.lwjgl.opengl.ARBFramebufferObject;
 -import org.lwjgl.opengl.ARBMultitexture;
 -import org.lwjgl.opengl.ARBShaderObjects;
@@ -32,7 +33,10 @@
 -import org.lwjgl.opengl.GL20;
 -import org.lwjgl.opengl.GL30;
 -import org.lwjgl.opengl.GLContext;
-+import org.lwjgl.opengl.*;
++import org.lwjglx.Sys;
++import org.lwjglx.opengl.ContextCapabilities;
++import org.lwjglx.opengl.GL15;
++import org.lwjglx.opengl.GLContext;
  import oshi.SystemInfo;
 -import oshi.hardware.Processor;
 +import oshi.hardware.CentralProcessor;
@@ -47,7 +51,7 @@
  
  @SideOnly(Side.CLIENT)
  public class OpenGlHelper
-@@ -93,6 +80,10 @@
+@@ -93,6 +82,10 @@
      public static int field_176089_P;
      public static int field_148826_e;
  
@@ -58,7 +62,7 @@
      public static void func_77474_a()
      {
          ContextCapabilities contextcapabilities = GLContext.getCapabilities();
-@@ -163,8 +154,7 @@
+@@ -163,8 +156,7 @@
  
          field_153211_u = contextcapabilities.GL_EXT_blend_func_separate && !contextcapabilities.OpenGL14;
          field_148828_i = contextcapabilities.OpenGL14 || contextcapabilities.GL_EXT_blend_func_separate;
@@ -68,7 +72,7 @@
  
          if (field_148823_f)
          {
-@@ -224,8 +214,7 @@
+@@ -224,8 +216,7 @@
          }
  
          field_148827_a = contextcapabilities.OpenGL21;
@@ -78,7 +82,16 @@
          field_153196_B = field_153196_B + "Shaders are " + (field_153213_x ? "" : "not ") + "available because ";
  
          if (field_153213_x)
-@@ -296,11 +285,12 @@
+@@ -258,7 +249,7 @@
+         }
+ 
+         field_148824_g = field_148823_f && field_153213_x;
+-        String s = GL11.glGetString(GL11.GL_VENDOR).toLowerCase(Locale.ROOT);
++        String s = org.lwjglx.opengl.GL11.glGetString(org.lwjglx.opengl.GL11.GL_VENDOR).toLowerCase(Locale.ROOT);
+         field_153197_d = s.contains("nvidia");
+         field_176090_Y = !contextcapabilities.OpenGL15 && contextcapabilities.GL_ARB_vertex_buffer_object;
+         field_176083_O = contextcapabilities.OpenGL15 || field_176090_Y;
+@@ -296,11 +287,12 @@
  
          try
          {
@@ -94,54 +107,643 @@
          }
      }
  
-@@ -854,6 +844,12 @@
+@@ -316,18 +308,18 @@
+ 
+     public static int func_153175_a(int p_153175_0_, int p_153175_1_)
+     {
+-        return field_153214_y ? ARBShaderObjects.glGetObjectParameteriARB(p_153175_0_, p_153175_1_) : GL20.glGetProgrami(p_153175_0_, p_153175_1_);
++        return field_153214_y ? org.lwjglx.opengl.ARBShaderObjects.glGetObjectParameteriARB(p_153175_0_, p_153175_1_) : org.lwjglx.opengl.GL20.glGetProgrami(p_153175_0_, p_153175_1_);
+     }
+ 
+     public static void func_153178_b(int p_153178_0_, int p_153178_1_)
+     {
+         if (field_153214_y)
+         {
+-            ARBShaderObjects.glAttachObjectARB(p_153178_0_, p_153178_1_);
++            org.lwjglx.opengl.ARBShaderObjects.glAttachObjectARB(p_153178_0_, p_153178_1_);
+         }
+         else
+         {
+-            GL20.glAttachShader(p_153178_0_, p_153178_1_);
++            org.lwjglx.opengl.GL20.glAttachShader(p_153178_0_, p_153178_1_);
+         }
+     }
+ 
+@@ -335,28 +327,28 @@
+     {
+         if (field_153214_y)
+         {
+-            ARBShaderObjects.glDeleteObjectARB(p_153180_0_);
++            org.lwjglx.opengl.ARBShaderObjects.glDeleteObjectARB(p_153180_0_);
+         }
+         else
+         {
+-            GL20.glDeleteShader(p_153180_0_);
++            org.lwjglx.opengl.GL20.glDeleteShader(p_153180_0_);
+         }
+     }
+ 
+     public static int func_153195_b(int p_153195_0_)
+     {
+-        return field_153214_y ? ARBShaderObjects.glCreateShaderObjectARB(p_153195_0_) : GL20.glCreateShader(p_153195_0_);
++        return field_153214_y ? org.lwjglx.opengl.ARBShaderObjects.glCreateShaderObjectARB(p_153195_0_) : org.lwjglx.opengl.GL20.glCreateShader(p_153195_0_);
+     }
+ 
+     public static void func_153169_a(int p_153169_0_, ByteBuffer p_153169_1_)
+     {
+         if (field_153214_y)
+         {
+-            ARBShaderObjects.glShaderSourceARB(p_153169_0_, p_153169_1_);
++            org.lwjglx.opengl.ARBShaderObjects.glShaderSourceARB(p_153169_0_, p_153169_1_);
+         }
+         else
+         {
+-            GL20.glShaderSource(p_153169_0_, p_153169_1_);
++            org.lwjglx.opengl.GL20.glShaderSource(p_153169_0_, p_153169_1_);
+         }
+     }
+ 
+@@ -364,55 +356,55 @@
+     {
+         if (field_153214_y)
+         {
+-            ARBShaderObjects.glCompileShaderARB(p_153170_0_);
++            org.lwjglx.opengl.ARBShaderObjects.glCompileShaderARB(p_153170_0_);
+         }
+         else
+         {
+-            GL20.glCompileShader(p_153170_0_);
++            org.lwjglx.opengl.GL20.glCompileShader(p_153170_0_);
+         }
+     }
+ 
+     public static int func_153157_c(int p_153157_0_, int p_153157_1_)
+     {
+-        return field_153214_y ? ARBShaderObjects.glGetObjectParameteriARB(p_153157_0_, p_153157_1_) : GL20.glGetShaderi(p_153157_0_, p_153157_1_);
++        return field_153214_y ? org.lwjglx.opengl.ARBShaderObjects.glGetObjectParameteriARB(p_153157_0_, p_153157_1_) : org.lwjglx.opengl.GL20.glGetShaderi(p_153157_0_, p_153157_1_);
+     }
+ 
+     public static String func_153158_d(int p_153158_0_, int p_153158_1_)
+     {
+-        return field_153214_y ? ARBShaderObjects.glGetInfoLogARB(p_153158_0_, p_153158_1_) : GL20.glGetShaderInfoLog(p_153158_0_, p_153158_1_);
++        return field_153214_y ? org.lwjglx.opengl.ARBShaderObjects.glGetInfoLogARB(p_153158_0_, p_153158_1_) : org.lwjglx.opengl.GL20.glGetShaderInfoLog(p_153158_0_, p_153158_1_);
+     }
+ 
+     public static String func_153166_e(int p_153166_0_, int p_153166_1_)
+     {
+-        return field_153214_y ? ARBShaderObjects.glGetInfoLogARB(p_153166_0_, p_153166_1_) : GL20.glGetProgramInfoLog(p_153166_0_, p_153166_1_);
++        return field_153214_y ? org.lwjglx.opengl.ARBShaderObjects.glGetInfoLogARB(p_153166_0_, p_153166_1_) : org.lwjglx.opengl.GL20.glGetProgramInfoLog(p_153166_0_, p_153166_1_);
+     }
+ 
+     public static void func_153161_d(int p_153161_0_)
+     {
+         if (field_153214_y)
+         {
+-            ARBShaderObjects.glUseProgramObjectARB(p_153161_0_);
++            org.lwjglx.opengl.ARBShaderObjects.glUseProgramObjectARB(p_153161_0_);
+         }
+         else
+         {
+-            GL20.glUseProgram(p_153161_0_);
++            org.lwjglx.opengl.GL20.glUseProgram(p_153161_0_);
+         }
+     }
+ 
+     public static int func_153183_d()
+     {
+-        return field_153214_y ? ARBShaderObjects.glCreateProgramObjectARB() : GL20.glCreateProgram();
++        return field_153214_y ? org.lwjglx.opengl.ARBShaderObjects.glCreateProgramObjectARB() : org.lwjglx.opengl.GL20.glCreateProgram();
+     }
+ 
+     public static void func_153187_e(int p_153187_0_)
+     {
+         if (field_153214_y)
+         {
+-            ARBShaderObjects.glDeleteObjectARB(p_153187_0_);
++            org.lwjglx.opengl.ARBShaderObjects.glDeleteObjectARB(p_153187_0_);
+         }
+         else
          {
-             GL13.glMultiTexCoord2f(p_77475_0_, p_77475_1_, p_77475_2_);
+-            GL20.glDeleteProgram(p_153187_0_);
++            org.lwjglx.opengl.GL20.glDeleteProgram(p_153187_0_);
          }
+     }
+ 
+@@ -420,28 +412,28 @@
+     {
+         if (field_153214_y)
+         {
+-            ARBShaderObjects.glLinkProgramARB(p_153179_0_);
++            org.lwjglx.opengl.ARBShaderObjects.glLinkProgramARB(p_153179_0_);
+         }
+         else
+         {
+-            GL20.glLinkProgram(p_153179_0_);
++            org.lwjglx.opengl.GL20.glLinkProgram(p_153179_0_);
+         }
+     }
+ 
+     public static int func_153194_a(int p_153194_0_, CharSequence p_153194_1_)
+     {
+-        return field_153214_y ? ARBShaderObjects.glGetUniformLocationARB(p_153194_0_, p_153194_1_) : GL20.glGetUniformLocation(p_153194_0_, p_153194_1_);
++        return field_153214_y ? org.lwjglx.opengl.ARBShaderObjects.glGetUniformLocationARB(p_153194_0_, p_153194_1_) : org.lwjglx.opengl.GL20.glGetUniformLocation(p_153194_0_, p_153194_1_);
+     }
+ 
+     public static void func_153181_a(int p_153181_0_, IntBuffer p_153181_1_)
+     {
+         if (field_153214_y)
+         {
+-            ARBShaderObjects.glUniform1ARB(p_153181_0_, p_153181_1_);
++            org.lwjglx.opengl.ARBShaderObjects.glUniform1ARB(p_153181_0_, p_153181_1_);
+         }
+         else
+         {
+-            GL20.glUniform1(p_153181_0_, p_153181_1_);
++            org.lwjglx.opengl.GL20.glUniform1(p_153181_0_, p_153181_1_);
+         }
+     }
+ 
+@@ -449,11 +441,11 @@
+     {
+         if (field_153214_y)
+         {
+-            ARBShaderObjects.glUniform1iARB(p_153163_0_, p_153163_1_);
++            org.lwjglx.opengl.ARBShaderObjects.glUniform1iARB(p_153163_0_, p_153163_1_);
+         }
+         else
+         {
+-            GL20.glUniform1i(p_153163_0_, p_153163_1_);
++            org.lwjglx.opengl.GL20.glUniform1i(p_153163_0_, p_153163_1_);
+         }
+     }
+ 
+@@ -461,11 +453,11 @@
+     {
+         if (field_153214_y)
+         {
+-            ARBShaderObjects.glUniform1ARB(p_153168_0_, p_153168_1_);
++            org.lwjglx.opengl.ARBShaderObjects.glUniform1ARB(p_153168_0_, p_153168_1_);
+         }
+         else
+         {
+-            GL20.glUniform1(p_153168_0_, p_153168_1_);
++            org.lwjglx.opengl.GL20.glUniform1(p_153168_0_, p_153168_1_);
+         }
+     }
+ 
+@@ -473,11 +465,11 @@
+     {
+         if (field_153214_y)
+         {
+-            ARBShaderObjects.glUniform2ARB(p_153182_0_, p_153182_1_);
++            org.lwjglx.opengl.ARBShaderObjects.glUniform2ARB(p_153182_0_, p_153182_1_);
+         }
+         else
+         {
+-            GL20.glUniform2(p_153182_0_, p_153182_1_);
++            org.lwjglx.opengl.GL20.glUniform2(p_153182_0_, p_153182_1_);
+         }
+     }
+ 
+@@ -485,11 +477,11 @@
+     {
+         if (field_153214_y)
+         {
+-            ARBShaderObjects.glUniform2ARB(p_153177_0_, p_153177_1_);
++            org.lwjglx.opengl.ARBShaderObjects.glUniform2ARB(p_153177_0_, p_153177_1_);
+         }
+         else
+         {
+-            GL20.glUniform2(p_153177_0_, p_153177_1_);
++            org.lwjglx.opengl.GL20.glUniform2(p_153177_0_, p_153177_1_);
+         }
+     }
+ 
+@@ -497,11 +489,11 @@
+     {
+         if (field_153214_y)
+         {
+-            ARBShaderObjects.glUniform3ARB(p_153192_0_, p_153192_1_);
++            org.lwjglx.opengl.ARBShaderObjects.glUniform3ARB(p_153192_0_, p_153192_1_);
+         }
+         else
+         {
+-            GL20.glUniform3(p_153192_0_, p_153192_1_);
++            org.lwjglx.opengl.GL20.glUniform3(p_153192_0_, p_153192_1_);
+         }
+     }
+ 
+@@ -509,11 +501,11 @@
+     {
+         if (field_153214_y)
+         {
+-            ARBShaderObjects.glUniform3ARB(p_153191_0_, p_153191_1_);
++            org.lwjglx.opengl.ARBShaderObjects.glUniform3ARB(p_153191_0_, p_153191_1_);
+         }
+         else
+         {
+-            GL20.glUniform3(p_153191_0_, p_153191_1_);
++            org.lwjglx.opengl.GL20.glUniform3(p_153191_0_, p_153191_1_);
+         }
+     }
+ 
+@@ -521,11 +513,11 @@
+     {
+         if (field_153214_y)
+         {
+-            ARBShaderObjects.glUniform4ARB(p_153162_0_, p_153162_1_);
++            org.lwjglx.opengl.ARBShaderObjects.glUniform4ARB(p_153162_0_, p_153162_1_);
+         }
+         else
+         {
+-            GL20.glUniform4(p_153162_0_, p_153162_1_);
++            org.lwjglx.opengl.GL20.glUniform4(p_153162_0_, p_153162_1_);
+         }
+     }
+ 
+@@ -533,11 +525,11 @@
+     {
+         if (field_153214_y)
+         {
+-            ARBShaderObjects.glUniform4ARB(p_153159_0_, p_153159_1_);
++            org.lwjglx.opengl.ARBShaderObjects.glUniform4ARB(p_153159_0_, p_153159_1_);
+         }
+         else
+         {
+-            GL20.glUniform4(p_153159_0_, p_153159_1_);
++            org.lwjglx.opengl.GL20.glUniform4(p_153159_0_, p_153159_1_);
+         }
+     }
+ 
+@@ -545,11 +537,11 @@
+     {
+         if (field_153214_y)
+         {
+-            ARBShaderObjects.glUniformMatrix2ARB(p_153173_0_, p_153173_1_, p_153173_2_);
++            org.lwjglx.opengl.ARBShaderObjects.glUniformMatrix2ARB(p_153173_0_, p_153173_1_, p_153173_2_);
+         }
+         else
+         {
+-            GL20.glUniformMatrix2(p_153173_0_, p_153173_1_, p_153173_2_);
++            org.lwjglx.opengl.GL20.glUniformMatrix2(p_153173_0_, p_153173_1_, p_153173_2_);
+         }
+     }
+ 
+@@ -557,11 +549,11 @@
+     {
+         if (field_153214_y)
+         {
+-            ARBShaderObjects.glUniformMatrix3ARB(p_153189_0_, p_153189_1_, p_153189_2_);
++            org.lwjglx.opengl.ARBShaderObjects.glUniformMatrix3ARB(p_153189_0_, p_153189_1_, p_153189_2_);
+         }
+         else
+         {
+-            GL20.glUniformMatrix3(p_153189_0_, p_153189_1_, p_153189_2_);
++            org.lwjglx.opengl.GL20.glUniformMatrix3(p_153189_0_, p_153189_1_, p_153189_2_);
+         }
+     }
+ 
+@@ -569,33 +561,33 @@
+     {
+         if (field_153214_y)
+         {
+-            ARBShaderObjects.glUniformMatrix4ARB(p_153160_0_, p_153160_1_, p_153160_2_);
++            org.lwjglx.opengl.ARBShaderObjects.glUniformMatrix4ARB(p_153160_0_, p_153160_1_, p_153160_2_);
+         }
+         else
+         {
+-            GL20.glUniformMatrix4(p_153160_0_, p_153160_1_, p_153160_2_);
++            org.lwjglx.opengl.GL20.glUniformMatrix4(p_153160_0_, p_153160_1_, p_153160_2_);
+         }
+     }
+ 
+     public static int func_153164_b(int p_153164_0_, CharSequence p_153164_1_)
+     {
+-        return field_153214_y ? ARBVertexShader.glGetAttribLocationARB(p_153164_0_, p_153164_1_) : GL20.glGetAttribLocation(p_153164_0_, p_153164_1_);
++        return field_153214_y ? org.lwjglx.opengl.ARBVertexShader.glGetAttribLocationARB(p_153164_0_, p_153164_1_) : org.lwjglx.opengl.GL20.glGetAttribLocation(p_153164_0_, p_153164_1_);
+     }
+ 
+     public static int func_176073_e()
+     {
+-        return field_176090_Y ? ARBVertexBufferObject.glGenBuffersARB() : GL15.glGenBuffers();
++        return field_176090_Y ? org.lwjglx.opengl.ARBVertexBufferObject.glGenBuffersARB() : org.lwjglx.opengl.GL15.glGenBuffers();
+     }
+ 
+     public static void func_176072_g(int p_176072_0_, int p_176072_1_)
+     {
+         if (field_176090_Y)
+         {
+-            ARBVertexBufferObject.glBindBufferARB(p_176072_0_, p_176072_1_);
++            org.lwjglx.opengl.ARBVertexBufferObject.glBindBufferARB(p_176072_0_, p_176072_1_);
+         }
+         else
+         {
+-            GL15.glBindBuffer(p_176072_0_, p_176072_1_);
++            org.lwjglx.opengl.GL15.glBindBuffer(p_176072_0_, p_176072_1_);
+         }
+     }
+ 
+@@ -603,11 +595,11 @@
+     {
+         if (field_176090_Y)
+         {
+-            ARBVertexBufferObject.glBufferDataARB(p_176071_0_, p_176071_1_, p_176071_2_);
++            org.lwjglx.opengl.ARBVertexBufferObject.glBufferDataARB(p_176071_0_, p_176071_1_, p_176071_2_);
+         }
+         else
+         {
+-            GL15.glBufferData(p_176071_0_, p_176071_1_, p_176071_2_);
++            org.lwjglx.opengl.GL15.glBufferData(p_176071_0_, p_176071_1_, p_176071_2_);
+         }
+     }
+ 
+@@ -615,7 +607,7 @@
+     {
+         if (field_176090_Y)
+         {
+-            ARBVertexBufferObject.glDeleteBuffersARB(p_176074_0_);
++            org.lwjglx.opengl.ARBVertexBufferObject.glDeleteBuffersARB(p_176074_0_);
+         }
+         else
+         {
+@@ -635,13 +627,13 @@
+             switch (field_153212_w)
+             {
+                 case BASE:
+-                    GL30.glBindFramebuffer(p_153171_0_, p_153171_1_);
++                    org.lwjglx.opengl.GL30.glBindFramebuffer(p_153171_0_, p_153171_1_);
+                     break;
+                 case ARB:
+-                    ARBFramebufferObject.glBindFramebuffer(p_153171_0_, p_153171_1_);
++                    org.lwjglx.opengl.ARBFramebufferObject.glBindFramebuffer(p_153171_0_, p_153171_1_);
+                     break;
+                 case EXT:
+-                    EXTFramebufferObject.glBindFramebufferEXT(p_153171_0_, p_153171_1_);
++                    org.lwjglx.opengl.EXTFramebufferObject.glBindFramebufferEXT(p_153171_0_, p_153171_1_);
+             }
+         }
+     }
+@@ -653,13 +645,13 @@
+             switch (field_153212_w)
+             {
+                 case BASE:
+-                    GL30.glBindRenderbuffer(p_153176_0_, p_153176_1_);
++                    org.lwjglx.opengl.GL30.glBindRenderbuffer(p_153176_0_, p_153176_1_);
+                     break;
+                 case ARB:
+-                    ARBFramebufferObject.glBindRenderbuffer(p_153176_0_, p_153176_1_);
++                    org.lwjglx.opengl.ARBFramebufferObject.glBindRenderbuffer(p_153176_0_, p_153176_1_);
+                     break;
+                 case EXT:
+-                    EXTFramebufferObject.glBindRenderbufferEXT(p_153176_0_, p_153176_1_);
++                    org.lwjglx.opengl.EXTFramebufferObject.glBindRenderbufferEXT(p_153176_0_, p_153176_1_);
+             }
+         }
+     }
+@@ -671,13 +663,13 @@
+             switch (field_153212_w)
+             {
+                 case BASE:
+-                    GL30.glDeleteRenderbuffers(p_153184_0_);
++                    org.lwjglx.opengl.GL30.glDeleteRenderbuffers(p_153184_0_);
+                     break;
+                 case ARB:
+-                    ARBFramebufferObject.glDeleteRenderbuffers(p_153184_0_);
++                    org.lwjglx.opengl.ARBFramebufferObject.glDeleteRenderbuffers(p_153184_0_);
+                     break;
+                 case EXT:
+-                    EXTFramebufferObject.glDeleteRenderbuffersEXT(p_153184_0_);
++                    org.lwjglx.opengl.EXTFramebufferObject.glDeleteRenderbuffersEXT(p_153184_0_);
+             }
+         }
+     }
+@@ -689,13 +681,13 @@
+             switch (field_153212_w)
+             {
+                 case BASE:
+-                    GL30.glDeleteFramebuffers(p_153174_0_);
++                    org.lwjglx.opengl.GL30.glDeleteFramebuffers(p_153174_0_);
+                     break;
+                 case ARB:
+-                    ARBFramebufferObject.glDeleteFramebuffers(p_153174_0_);
++                    org.lwjglx.opengl.ARBFramebufferObject.glDeleteFramebuffers(p_153174_0_);
+                     break;
+                 case EXT:
+-                    EXTFramebufferObject.glDeleteFramebuffersEXT(p_153174_0_);
++                    org.lwjglx.opengl.EXTFramebufferObject.glDeleteFramebuffersEXT(p_153174_0_);
+             }
+         }
+     }
+@@ -711,11 +703,11 @@
+             switch (field_153212_w)
+             {
+                 case BASE:
+-                    return GL30.glGenFramebuffers();
++                    return org.lwjglx.opengl.GL30.glGenFramebuffers();
+                 case ARB:
+-                    return ARBFramebufferObject.glGenFramebuffers();
++                    return org.lwjglx.opengl.ARBFramebufferObject.glGenFramebuffers();
+                 case EXT:
+-                    return EXTFramebufferObject.glGenFramebuffersEXT();
++                    return org.lwjglx.opengl.EXTFramebufferObject.glGenFramebuffersEXT();
+                 default:
+                     return -1;
+             }
+@@ -733,11 +725,11 @@
+             switch (field_153212_w)
+             {
+                 case BASE:
+-                    return GL30.glGenRenderbuffers();
++                    return org.lwjglx.opengl.GL30.glGenRenderbuffers();
+                 case ARB:
+-                    return ARBFramebufferObject.glGenRenderbuffers();
++                    return org.lwjglx.opengl.ARBFramebufferObject.glGenRenderbuffers();
+                 case EXT:
+-                    return EXTFramebufferObject.glGenRenderbuffersEXT();
++                    return org.lwjglx.opengl.EXTFramebufferObject.glGenRenderbuffersEXT();
+                 default:
+                     return -1;
+             }
+@@ -751,13 +743,13 @@
+             switch (field_153212_w)
+             {
+                 case BASE:
+-                    GL30.glRenderbufferStorage(p_153186_0_, p_153186_1_, p_153186_2_, p_153186_3_);
++                    org.lwjglx.opengl.GL30.glRenderbufferStorage(p_153186_0_, p_153186_1_, p_153186_2_, p_153186_3_);
+                     break;
+                 case ARB:
+-                    ARBFramebufferObject.glRenderbufferStorage(p_153186_0_, p_153186_1_, p_153186_2_, p_153186_3_);
++                    org.lwjglx.opengl.ARBFramebufferObject.glRenderbufferStorage(p_153186_0_, p_153186_1_, p_153186_2_, p_153186_3_);
+                     break;
+                 case EXT:
+-                    EXTFramebufferObject.glRenderbufferStorageEXT(p_153186_0_, p_153186_1_, p_153186_2_, p_153186_3_);
++                    org.lwjglx.opengl.EXTFramebufferObject.glRenderbufferStorageEXT(p_153186_0_, p_153186_1_, p_153186_2_, p_153186_3_);
+             }
+         }
+     }
+@@ -769,13 +761,13 @@
+             switch (field_153212_w)
+             {
+                 case BASE:
+-                    GL30.glFramebufferRenderbuffer(p_153190_0_, p_153190_1_, p_153190_2_, p_153190_3_);
++                    org.lwjglx.opengl.GL30.glFramebufferRenderbuffer(p_153190_0_, p_153190_1_, p_153190_2_, p_153190_3_);
+                     break;
+                 case ARB:
+-                    ARBFramebufferObject.glFramebufferRenderbuffer(p_153190_0_, p_153190_1_, p_153190_2_, p_153190_3_);
++                    org.lwjglx.opengl.ARBFramebufferObject.glFramebufferRenderbuffer(p_153190_0_, p_153190_1_, p_153190_2_, p_153190_3_);
+                     break;
+                 case EXT:
+-                    EXTFramebufferObject.glFramebufferRenderbufferEXT(p_153190_0_, p_153190_1_, p_153190_2_, p_153190_3_);
++                    org.lwjglx.opengl.EXTFramebufferObject.glFramebufferRenderbufferEXT(p_153190_0_, p_153190_1_, p_153190_2_, p_153190_3_);
+             }
+         }
+     }
+@@ -791,11 +783,11 @@
+             switch (field_153212_w)
+             {
+                 case BASE:
+-                    return GL30.glCheckFramebufferStatus(p_153167_0_);
++                    return org.lwjglx.opengl.GL30.glCheckFramebufferStatus(p_153167_0_);
+                 case ARB:
+-                    return ARBFramebufferObject.glCheckFramebufferStatus(p_153167_0_);
++                    return org.lwjglx.opengl.ARBFramebufferObject.glCheckFramebufferStatus(p_153167_0_);
+                 case EXT:
+-                    return EXTFramebufferObject.glCheckFramebufferStatusEXT(p_153167_0_);
++                    return org.lwjglx.opengl.EXTFramebufferObject.glCheckFramebufferStatusEXT(p_153167_0_);
+                 default:
+                     return -1;
+             }
+@@ -809,13 +801,13 @@
+             switch (field_153212_w)
+             {
+                 case BASE:
+-                    GL30.glFramebufferTexture2D(p_153188_0_, p_153188_1_, p_153188_2_, p_153188_3_, p_153188_4_);
++                    org.lwjglx.opengl.GL30.glFramebufferTexture2D(p_153188_0_, p_153188_1_, p_153188_2_, p_153188_3_, p_153188_4_);
+                     break;
+                 case ARB:
+-                    ARBFramebufferObject.glFramebufferTexture2D(p_153188_0_, p_153188_1_, p_153188_2_, p_153188_3_, p_153188_4_);
++                    org.lwjglx.opengl.ARBFramebufferObject.glFramebufferTexture2D(p_153188_0_, p_153188_1_, p_153188_2_, p_153188_3_, p_153188_4_);
+                     break;
+                 case EXT:
+-                    EXTFramebufferObject.glFramebufferTexture2DEXT(p_153188_0_, p_153188_1_, p_153188_2_, p_153188_3_, p_153188_4_);
++                    org.lwjglx.opengl.EXTFramebufferObject.glFramebufferTexture2DEXT(p_153188_0_, p_153188_1_, p_153188_2_, p_153188_3_, p_153188_4_);
+             }
+         }
+     }
+@@ -824,11 +816,11 @@
+     {
+         if (field_153215_z)
+         {
+-            ARBMultitexture.glActiveTextureARB(p_77473_0_);
++            org.lwjglx.opengl.ARBMultitexture.glActiveTextureARB(p_77473_0_);
+         }
+         else
+         {
+-            GL13.glActiveTexture(p_77473_0_);
++            org.lwjglx.opengl.GL13.glActiveTexture(p_77473_0_);
+         }
+     }
+ 
+@@ -836,11 +828,11 @@
+     {
+         if (field_153215_z)
+         {
+-            ARBMultitexture.glClientActiveTextureARB(p_77472_0_);
++            org.lwjglx.opengl.ARBMultitexture.glClientActiveTextureARB(p_77472_0_);
+         }
+         else
+         {
+-            GL13.glClientActiveTexture(p_77472_0_);
++            org.lwjglx.opengl.GL13.glClientActiveTexture(p_77472_0_);
+         }
+     }
+ 
+@@ -848,11 +840,17 @@
+     {
+         if (field_153215_z)
+         {
+-            ARBMultitexture.glMultiTexCoord2fARB(p_77475_0_, p_77475_1_, p_77475_2_);
++            org.lwjglx.opengl.ARBMultitexture.glMultiTexCoord2fARB(p_77475_0_, p_77475_1_, p_77475_2_);
+         }
+         else
+         {
+-            GL13.glMultiTexCoord2f(p_77475_0_, p_77475_1_, p_77475_2_);
++            org.lwjglx.opengl.GL13.glMultiTexCoord2f(p_77475_0_, p_77475_1_, p_77475_2_);
++        }
 +
 +        if (p_77475_0_ == field_77476_b)
 +        {
 +            lastBrightnessX = p_77475_1_;
 +            lastBrightnessY = p_77475_2_;
-+        }
+         }
      }
  
-     public static void func_148821_a(int p_148821_0_, int p_148821_1_, int p_148821_2_, int p_148821_3_)
-@@ -893,21 +889,21 @@
+@@ -862,16 +860,16 @@
+         {
+             if (field_153211_u)
+             {
+-                EXTBlendFuncSeparate.glBlendFuncSeparateEXT(p_148821_0_, p_148821_1_, p_148821_2_, p_148821_3_);
++                org.lwjglx.opengl.EXTBlendFuncSeparate.glBlendFuncSeparateEXT(p_148821_0_, p_148821_1_, p_148821_2_, p_148821_3_);
+             }
+             else
+             {
+-                GL14.glBlendFuncSeparate(p_148821_0_, p_148821_1_, p_148821_2_, p_148821_3_);
++                org.lwjglx.opengl.GL14.glBlendFuncSeparate(p_148821_0_, p_148821_1_, p_148821_2_, p_148821_3_);
+             }
+         }
+         else
+         {
+-            GL11.glBlendFunc(p_148821_0_, p_148821_1_);
++            org.lwjglx.opengl.GL11.glBlendFunc(p_148821_0_, p_148821_1_);
+         }
+     }
+ 
+@@ -891,25 +889,25 @@
+         GlStateManager.func_179132_a(false);
+         Tessellator tessellator = Tessellator.func_178181_a();
          BufferBuilder bufferbuilder = tessellator.func_178180_c();
-         GL11.glLineWidth(4.0F);
-         bufferbuilder.func_181668_a(1, DefaultVertexFormats.field_181706_f);
+-        GL11.glLineWidth(4.0F);
+-        bufferbuilder.func_181668_a(1, DefaultVertexFormats.field_181706_f);
 -        bufferbuilder.func_181662_b(0.0, 0.0, 0.0).func_181669_b(0, 0, 0, 255).func_181675_d();
 -        bufferbuilder.func_181662_b((double)p_188785_0_, 0.0, 0.0).func_181669_b(0, 0, 0, 255).func_181675_d();
 -        bufferbuilder.func_181662_b(0.0, 0.0, 0.0).func_181669_b(0, 0, 0, 255).func_181675_d();
 -        bufferbuilder.func_181662_b(0.0, (double)p_188785_0_, 0.0).func_181669_b(0, 0, 0, 255).func_181675_d();
 -        bufferbuilder.func_181662_b(0.0, 0.0, 0.0).func_181669_b(0, 0, 0, 255).func_181675_d();
 -        bufferbuilder.func_181662_b(0.0, 0.0, (double)p_188785_0_).func_181669_b(0, 0, 0, 255).func_181675_d();
-+        bufferbuilder.func_181662_b(0.0D, 0.0D, 0.0D).func_181669_b(0, 0, 0, 255).func_181675_d();
-+        bufferbuilder.func_181662_b((double)p_188785_0_, 0.0D, 0.0D).func_181669_b(0, 0, 0, 255).func_181675_d();
-+        bufferbuilder.func_181662_b(0.0D, 0.0D, 0.0D).func_181669_b(0, 0, 0, 255).func_181675_d();
-+        bufferbuilder.func_181662_b(0.0D, (double)p_188785_0_, 0.0D).func_181669_b(0, 0, 0, 255).func_181675_d();
-+        bufferbuilder.func_181662_b(0.0D, 0.0D, 0.0D).func_181669_b(0, 0, 0, 255).func_181675_d();
-+        bufferbuilder.func_181662_b(0.0D, 0.0D, (double)p_188785_0_).func_181669_b(0, 0, 0, 255).func_181675_d();
-         tessellator.func_78381_a();
-         GL11.glLineWidth(2.0F);
-         bufferbuilder.func_181668_a(1, DefaultVertexFormats.field_181706_f);
+-        tessellator.func_78381_a();
+-        GL11.glLineWidth(2.0F);
+-        bufferbuilder.func_181668_a(1, DefaultVertexFormats.field_181706_f);
 -        bufferbuilder.func_181662_b(0.0, 0.0, 0.0).func_181669_b(255, 0, 0, 255).func_181675_d();
 -        bufferbuilder.func_181662_b((double)p_188785_0_, 0.0, 0.0).func_181669_b(255, 0, 0, 255).func_181675_d();
 -        bufferbuilder.func_181662_b(0.0, 0.0, 0.0).func_181669_b(0, 255, 0, 255).func_181675_d();
 -        bufferbuilder.func_181662_b(0.0, (double)p_188785_0_, 0.0).func_181669_b(0, 255, 0, 255).func_181675_d();
 -        bufferbuilder.func_181662_b(0.0, 0.0, 0.0).func_181669_b(127, 127, 255, 255).func_181675_d();
 -        bufferbuilder.func_181662_b(0.0, 0.0, (double)p_188785_0_).func_181669_b(127, 127, 255, 255).func_181675_d();
+-        tessellator.func_78381_a();
+-        GL11.glLineWidth(1.0F);
++        org.lwjglx.opengl.GL11.glLineWidth(4.0F);
++        bufferbuilder.func_181668_a(1, DefaultVertexFormats.field_181706_f);
++        bufferbuilder.func_181662_b(0.0D, 0.0D, 0.0D).func_181669_b(0, 0, 0, 255).func_181675_d();
++        bufferbuilder.func_181662_b((double)p_188785_0_, 0.0D, 0.0D).func_181669_b(0, 0, 0, 255).func_181675_d();
++        bufferbuilder.func_181662_b(0.0D, 0.0D, 0.0D).func_181669_b(0, 0, 0, 255).func_181675_d();
++        bufferbuilder.func_181662_b(0.0D, (double)p_188785_0_, 0.0D).func_181669_b(0, 0, 0, 255).func_181675_d();
++        bufferbuilder.func_181662_b(0.0D, 0.0D, 0.0D).func_181669_b(0, 0, 0, 255).func_181675_d();
++        bufferbuilder.func_181662_b(0.0D, 0.0D, (double)p_188785_0_).func_181669_b(0, 0, 0, 255).func_181675_d();
++        tessellator.func_78381_a();
++        org.lwjglx.opengl.GL11.glLineWidth(2.0F);
++        bufferbuilder.func_181668_a(1, DefaultVertexFormats.field_181706_f);
 +        bufferbuilder.func_181662_b(0.0D, 0.0D, 0.0D).func_181669_b(255, 0, 0, 255).func_181675_d();
 +        bufferbuilder.func_181662_b((double)p_188785_0_, 0.0D, 0.0D).func_181669_b(255, 0, 0, 255).func_181675_d();
 +        bufferbuilder.func_181662_b(0.0D, 0.0D, 0.0D).func_181669_b(0, 255, 0, 255).func_181675_d();
 +        bufferbuilder.func_181662_b(0.0D, (double)p_188785_0_, 0.0D).func_181669_b(0, 255, 0, 255).func_181675_d();
 +        bufferbuilder.func_181662_b(0.0D, 0.0D, 0.0D).func_181669_b(127, 127, 255, 255).func_181675_d();
 +        bufferbuilder.func_181662_b(0.0D, 0.0D, (double)p_188785_0_).func_181669_b(127, 127, 255, 255).func_181675_d();
-         tessellator.func_78381_a();
-         GL11.glLineWidth(1.0F);
++        tessellator.func_78381_a();
++        org.lwjglx.opengl.GL11.glLineWidth(1.0F);
          GlStateManager.func_179132_a(true);
-@@ -951,7 +947,7 @@
+         GlStateManager.func_179098_w();
+     }
+@@ -951,7 +949,7 @@
          try
          {
              Class<?> oclass = Class.forName("java.awt.Desktop");
diff --git a/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch b/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch
index f0d040125..55c5ca52b 100644
--- a/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch
@@ -1,14 +1,17 @@
 --- before/net/minecraft/client/renderer/RenderGlobal.java
 +++ after/net/minecraft/client/renderer/RenderGlobal.java
-@@ -13,6 +13,7 @@
- import java.util.Queue;
- import java.util.Random;
- import java.util.Set;
-+import java.util.function.Supplier;
- import javax.annotation.Nullable;
- import net.minecraft.block.Block;
- import net.minecraft.block.BlockChest;
-@@ -103,9 +104,9 @@
+@@ -87,8 +87,8 @@
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ import org.apache.logging.log4j.LogManager;
+ import org.apache.logging.log4j.Logger;
+-import org.lwjgl.util.vector.Vector3f;
+-import org.lwjgl.util.vector.Vector4f;
++import org.lwjglx.util.vector.Vector3f;
++import org.lwjglx.util.vector.Vector4f;
+ 
+ @SideOnly(Side.CLIENT)
+ public class RenderGlobal implements IWorldEventListener, IResourceManagerReloadListener
+@@ -103,9 +103,9 @@
      private final TextureManager field_72770_i;
      private final RenderManager field_175010_j;
      private WorldClient field_72769_h;
@@ -21,7 +24,7 @@
      private ViewFrustum field_175008_n;
      private int field_72772_v = -1;
      private int field_72771_w = -1;
-@@ -115,8 +116,8 @@
+@@ -115,8 +115,8 @@
      private VertexBuffer field_175012_t;
      private VertexBuffer field_175011_u;
      private int field_72773_u;
@@ -32,7 +35,7 @@
      private final TextureAtlasSprite[] field_94141_F = new TextureAtlasSprite[10];
      private Framebuffer field_175015_z;
      private ShaderGroup field_174991_A;
-@@ -149,7 +150,7 @@
+@@ -149,7 +149,7 @@
      private double field_147602_h;
      private boolean field_147595_R = true;
      private boolean field_184386_ad;
@@ -41,7 +44,7 @@
  
      public RenderGlobal(Minecraft p_i1249_1_)
      {
-@@ -181,7 +182,6 @@
+@@ -181,7 +181,6 @@
          this.func_174964_o();
      }
  
@@ -49,7 +52,7 @@
      public void func_110549_a(IResourceManager p_110549_1_)
      {
          this.func_174971_n();
-@@ -210,9 +210,7 @@
+@@ -210,9 +209,7 @@
  
              try
              {
@@ -60,7 +63,7 @@
                  this.field_174991_A.func_148026_a(this.field_72777_q.field_71443_c, this.field_72777_q.field_71440_d);
                  this.field_175015_z = this.field_174991_A.func_177066_a("final");
              }
-@@ -241,12 +239,7 @@
+@@ -241,12 +238,7 @@
          if (this.func_174985_d())
          {
              GlStateManager.func_179147_l();
@@ -74,7 +77,7 @@
              this.field_175015_z.func_178038_a(this.field_72777_q.field_71443_c, this.field_72777_q.field_71440_d, false);
              GlStateManager.func_179084_k();
          }
-@@ -401,35 +394,35 @@
+@@ -401,35 +393,35 @@
              double d3 = (double)(0.15F + random.nextFloat() * 0.1F);
              double d4 = d0 * d0 + d1 * d1 + d2 * d2;
  
@@ -123,7 +126,7 @@
                      double d25 = d24 * d9 - d22 * d10;
                      double d26 = d22 * d9 + d24 * d10;
                      p_180444_1_.func_181662_b(d5 + d25, d6 + d23, d7 + d26).func_181675_d();
-@@ -560,8 +553,10 @@
+@@ -560,8 +552,10 @@
  
      public void func_180446_a(Entity p_180446_1_, ICamera p_180446_2_, float p_180446_3_)
      {
@@ -134,7 +137,7 @@
              --this.field_72740_G;
          }
          else
-@@ -570,27 +565,14 @@
+@@ -570,27 +564,14 @@
              double d1 = p_180446_1_.field_70167_r + (p_180446_1_.field_70163_u - p_180446_1_.field_70167_r) * (double)p_180446_3_;
              double d2 = p_180446_1_.field_70166_s + (p_180446_1_.field_70161_v - p_180446_1_.field_70166_s) * (double)p_180446_3_;
              this.field_72769_h.field_72984_F.func_76320_a("prepare");
@@ -167,7 +170,7 @@
              Entity entity = this.field_72777_q.func_175606_aa();
              double d3 = entity.field_70142_S + (entity.field_70165_t - entity.field_70142_S) * (double)p_180446_3_;
              double d4 = entity.field_70137_T + (entity.field_70163_u - entity.field_70137_T) * (double)p_180446_3_;
-@@ -602,11 +584,15 @@
+@@ -602,11 +583,15 @@
              this.field_72777_q.field_71460_t.func_180436_i();
              this.field_72769_h.field_72984_F.func_76318_c("global");
              List<Entity> list = this.field_72769_h.func_72910_y();
@@ -183,7 +186,7 @@
                  ++this.field_72749_I;
  
                  if (entity1.func_145770_h(d0, d1, d2))
-@@ -616,36 +602,27 @@
+@@ -616,36 +601,27 @@
              }
  
              this.field_72769_h.field_72984_F.func_76318_c("entities");
@@ -226,7 +229,7 @@
                              {
                                  ++this.field_72749_I;
                                  this.field_175010_j.func_188388_a(entity2, p_180446_3_, false);
-@@ -675,6 +652,7 @@
+@@ -675,6 +651,7 @@
                  }
              }
  
@@ -234,7 +237,7 @@
              if (this.func_174985_d() && (!list1.isEmpty() || this.field_184386_ad))
              {
                  this.field_72769_h.field_72984_F.func_76318_c("entityOutlines");
-@@ -714,6 +692,7 @@
+@@ -714,6 +691,7 @@
              this.field_72769_h.field_72984_F.func_76318_c("blockentities");
              RenderHelper.func_74519_b();
  
@@ -242,7 +245,7 @@
              for (RenderGlobal.ContainerLocalRenderInformation renderglobal$containerlocalrenderinformation1 : this.field_72755_R)
              {
                  List<TileEntity> list3 = renderglobal$containerlocalrenderinformation1.field_178036_a.func_178571_g().func_178485_b();
-@@ -722,6 +701,7 @@
+@@ -722,6 +700,7 @@
                  {
                      for (TileEntity tileentity2 : list3)
                      {
@@ -250,7 +253,7 @@
                          TileEntityRendererDispatcher.field_147556_a.func_180546_a(tileentity2, p_180446_3_, -1);
                      }
                  }
-@@ -731,9 +711,11 @@
+@@ -731,9 +710,11 @@
              {
                  for (TileEntity tileentity : this.field_181024_n)
                  {
@@ -262,7 +265,7 @@
  
              this.func_180443_s();
  
-@@ -788,13 +770,9 @@
+@@ -788,13 +769,9 @@
          {
              return true;
          }
@@ -278,7 +281,7 @@
          }
          else
          {
-@@ -806,15 +784,7 @@
+@@ -806,15 +783,7 @@
      {
          int i = this.field_175008_n.field_178164_f.length;
          int j = this.func_184382_g();
@@ -295,7 +298,7 @@
      }
  
      protected int func_184382_g()
-@@ -851,10 +821,7 @@
+@@ -851,10 +820,7 @@
          double d1 = p_174970_1_.field_70163_u - this.field_174993_C;
          double d2 = p_174970_1_.field_70161_v - this.field_174987_D;
  
@@ -307,7 +310,7 @@
          {
              this.field_174992_B = p_174970_1_.field_70165_t;
              this.field_174993_C = p_174970_1_.field_70163_u;
-@@ -882,16 +849,8 @@
+@@ -882,16 +848,8 @@
          this.field_72777_q.field_71424_I.func_76318_c("culling");
          BlockPos blockpos1 = new BlockPos(d3, d4 + (double)p_174970_1_.func_70047_e(), d5);
          RenderChunk renderchunk = this.field_175008_n.func_178161_a(blockpos1);
@@ -326,7 +329,7 @@
          this.field_174997_H = p_174970_1_.field_70165_t;
          this.field_174998_I = p_174970_1_.field_70163_u;
          this.field_174999_J = p_174970_1_.field_70161_v;
-@@ -903,17 +862,15 @@
+@@ -903,22 +861,20 @@
          if (!flag && this.field_147595_R)
          {
              this.field_147595_R = false;
@@ -348,7 +351,13 @@
                  Set<EnumFacing> set1 = this.func_174978_c(blockpos1);
  
                  if (set1.size() == 1)
-@@ -953,10 +910,10 @@
+                 {
+-                    Vector3f vector3f = this.func_174962_a(p_174970_1_, p_174970_2_);
++                    Vector3f vector3f = this.getViewVector(p_174970_1_, p_174970_2_);
+                     EnumFacing enumfacing = EnumFacing.func_176737_a(vector3f.x, vector3f.y, vector3f.z).func_176734_d();
+                     set1.remove(enumfacing);
+                 }
+@@ -953,10 +909,10 @@
                      {
                          RenderChunk renderchunk1 = this.field_175008_n.func_178161_a(new BlockPos((j << 4) + 8, i, (k << 4) + 8));
  
@@ -361,7 +370,7 @@
                          }
                      }
                  }
-@@ -975,15 +932,9 @@
+@@ -975,15 +931,9 @@
                  {
                      RenderChunk renderchunk2 = this.func_181562_a(blockpos, renderchunk3, enumfacing1);
  
@@ -379,7 +388,7 @@
                          renderglobal$containerlocalrenderinformation.func_189561_a(renderglobal$containerlocalrenderinformation1.field_178035_c, enumfacing1);
                          queue.add(renderglobal$containerlocalrenderinformation);
                      }
-@@ -1003,7 +954,7 @@
+@@ -1003,7 +953,7 @@
  
          this.field_72777_q.field_71424_I.func_76318_c("rebuildNear");
          Set<RenderChunk> set = this.field_175009_l;
@@ -388,7 +397,7 @@
  
          for (RenderGlobal.ContainerLocalRenderInformation renderglobal$containerlocalrenderinformation2 : this.field_72755_R)
          {
-@@ -1013,9 +964,9 @@
+@@ -1013,9 +963,9 @@
              {
                  this.field_147595_R = true;
                  BlockPos blockpos2 = renderchunk4.func_178568_j().func_177982_a(8, 8, 8);
@@ -400,7 +409,7 @@
                  {
                      this.field_175009_l.add(renderchunk4);
                  }
-@@ -1059,15 +1010,13 @@
+@@ -1059,15 +1009,13 @@
          {
              return null;
          }
@@ -419,7 +428,20 @@
          }
      }
  
-@@ -1114,10 +1063,10 @@
+@@ -1104,20 +1052,20 @@
+         }
+     }
+ 
+-    protected Vector3f func_174962_a(Entity p_174962_1_, double p_174962_2_)
++    protected Vector3f getViewVector(Entity entityIn, double partialTicks)
+     {
+-        float f = (float)((double)p_174962_1_.field_70127_C + (double)(p_174962_1_.field_70125_A - p_174962_1_.field_70127_C) * p_174962_2_);
+-        float f1 = (float)((double)p_174962_1_.field_70126_B + (double)(p_174962_1_.field_70177_z - p_174962_1_.field_70126_B) * p_174962_2_);
++        float f = (float)((double)entityIn.field_70127_C + (double)(entityIn.field_70125_A - entityIn.field_70127_C) * partialTicks);
++        float f1 = (float)((double)entityIn.field_70126_B + (double)(entityIn.field_70177_z - entityIn.field_70126_B) * partialTicks);
+ 
+         if (Minecraft.func_71410_x().field_71474_y.field_74320_O == 2)
+         {
              f += 180.0F;
          }
  
@@ -434,7 +456,7 @@
          return new Vector3f(f3 * f4, f5, f2 * f4);
      }
  
-@@ -1132,7 +1081,7 @@
+@@ -1132,7 +1080,7 @@
              double d1 = p_174977_5_.field_70163_u - this.field_147597_g;
              double d2 = p_174977_5_.field_70161_v - this.field_147602_h;
  
@@ -443,7 +465,7 @@
              {
                  this.field_147596_f = p_174977_5_.field_70165_t;
                  this.field_147597_g = p_174977_5_.field_70163_u;
-@@ -1160,7 +1109,7 @@
+@@ -1160,7 +1108,7 @@
  
          for (int j = i1; j != i; j += j1)
          {
@@ -452,7 +474,7 @@
  
              if (!renderchunk.func_178571_g().func_178491_b(p_174977_1_))
              {
-@@ -1169,7 +1118,10 @@
+@@ -1169,7 +1117,10 @@
              }
          }
  
@@ -464,7 +486,7 @@
          this.func_174982_a(p_174977_1_);
          this.field_72777_q.field_71424_I.func_76319_b();
          return l;
-@@ -1198,7 +1150,7 @@
+@@ -1198,7 +1149,7 @@
              for (VertexFormatElement vertexformatelement : DefaultVertexFormats.field_176600_a.func_177343_g())
              {
                  VertexFormatElement.EnumUsage vertexformatelement$enumusage = vertexformatelement.func_177375_c();
@@ -473,7 +495,7 @@
  
                  switch (vertexformatelement$enumusage)
                  {
-@@ -1206,7 +1158,7 @@
+@@ -1206,7 +1157,7 @@
                          GlStateManager.func_187429_p(32884);
                          break;
                      case UV:
@@ -482,7 +504,7 @@
                          GlStateManager.func_187429_p(32888);
                          OpenGlHelper.func_77472_b(OpenGlHelper.field_77478_a);
                          break;
-@@ -1225,9 +1177,9 @@
+@@ -1225,9 +1176,9 @@
          while (p_174965_1_.hasNext())
          {
              DestroyBlockProgress destroyblockprogress = p_174965_1_.next();
@@ -494,7 +516,7 @@
              {
                  p_174965_1_.remove();
              }
-@@ -1251,10 +1203,10 @@
+@@ -1251,10 +1202,10 @@
              {
                  BlockPos blockpos = iterator.next();
                  iterator.remove();
@@ -509,7 +531,7 @@
              }
          }
      }
-@@ -1264,49 +1216,47 @@
+@@ -1264,49 +1215,47 @@
          GlStateManager.func_179106_n();
          GlStateManager.func_179118_c();
          GlStateManager.func_179147_l();
@@ -570,7 +592,7 @@
              tessellator.func_78381_a();
              GlStateManager.func_179121_F();
          }
-@@ -1318,6 +1268,13 @@
+@@ -1318,6 +1267,13 @@
  
      public void func_174976_a(float p_174976_1_, int p_174976_2_)
      {
@@ -584,7 +606,7 @@
          if (this.field_72777_q.field_71441_e.field_73011_w.func_186058_p().func_186068_a() == 1)
          {
              this.func_180448_r();
-@@ -1364,12 +1321,7 @@
+@@ -1364,12 +1320,7 @@
              GlStateManager.func_179106_n();
              GlStateManager.func_179118_c();
              GlStateManager.func_179147_l();
@@ -598,7 +620,7 @@
              RenderHelper.func_74518_a();
              float[] afloat = this.field_72769_h.field_73011_w.func_76560_a(this.field_72769_h.func_72826_c(p_174976_1_), p_174976_1_);
  
-@@ -1396,17 +1348,15 @@
+@@ -1396,17 +1347,15 @@
                  }
  
                  bufferbuilder.func_181668_a(6, DefaultVertexFormats.field_181706_f);
@@ -621,7 +643,7 @@
                  }
  
                  tessellator.func_78381_a();
-@@ -1415,9 +1365,7 @@
+@@ -1415,9 +1364,7 @@
              }
  
              GlStateManager.func_179098_w();
@@ -632,7 +654,7 @@
              GlStateManager.func_179094_E();
              float f16 = 1.0F - this.field_72769_h.func_72867_j(p_174976_1_);
              GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, f16);
-@@ -1426,25 +1374,25 @@
+@@ -1426,25 +1373,25 @@
              float f17 = 30.0F;
              this.field_72770_i.func_110577_a(field_110928_i);
              bufferbuilder.func_181668_a(7, DefaultVertexFormats.field_181707_g);
@@ -673,7 +695,7 @@
              tessellator.func_78381_a();
              GlStateManager.func_179090_x();
              float f15 = this.field_72769_h.func_72880_h(p_174976_1_) * f16;
-@@ -1475,9 +1423,9 @@
+@@ -1475,9 +1422,9 @@
              GlStateManager.func_179121_F();
              GlStateManager.func_179090_x();
              GlStateManager.func_179124_c(0.0F, 0.0F, 0.0F);
@@ -685,7 +707,7 @@
              {
                  GlStateManager.func_179094_E();
                  GlStateManager.func_179109_b(0.0F, 12.0F, 0.0F);
-@@ -1498,29 +1446,29 @@
+@@ -1498,29 +1445,29 @@
  
                  GlStateManager.func_179121_F();
                  float f18 = 1.0F;
@@ -736,7 +758,7 @@
                  tessellator.func_78381_a();
              }
  
-@@ -1534,7 +1482,7 @@
+@@ -1534,7 +1481,7 @@
              }
  
              GlStateManager.func_179094_E();
@@ -745,7 +767,7 @@
              GlStateManager.func_179148_o(this.field_72781_x);
              GlStateManager.func_179121_F();
              GlStateManager.func_179098_w();
-@@ -1544,6 +1492,7 @@
+@@ -1544,6 +1491,7 @@
  
      public void func_180447_b(float p_180447_1_, int p_180447_2_, double p_180447_3_, double p_180447_5_, double p_180447_7_)
      {
@@ -753,7 +775,7 @@
          if (this.field_72777_q.field_71441_e.field_73011_w.func_76569_d())
          {
              if (this.field_72777_q.field_71474_y.func_181147_e() == 2)
-@@ -1553,18 +1502,13 @@
+@@ -1553,18 +1501,13 @@
              else
              {
                  GlStateManager.func_179129_p();
@@ -775,7 +797,7 @@
                  Vec3d vec3d = this.field_72769_h.func_72824_f(p_180447_1_);
                  float f = (float)vec3d.field_72450_a;
                  float f1 = (float)vec3d.field_72448_b;
-@@ -1581,37 +1525,25 @@
+@@ -1581,37 +1524,25 @@
                  }
  
                  float f9 = 4.8828125E-4F;
@@ -827,7 +849,7 @@
                      }
                  }
  
-@@ -1635,19 +1567,17 @@
+@@ -1635,19 +1566,17 @@
          BufferBuilder bufferbuilder = tessellator.func_178180_c();
          float f = 12.0F;
          float f1 = 4.0F;
@@ -855,7 +877,7 @@
          Vec3d vec3d = this.field_72769_h.func_72824_f(p_180445_1_);
          float f3 = (float)vec3d.field_72450_a;
          float f4 = (float)vec3d.field_72448_b;
-@@ -1673,18 +1603,18 @@
+@@ -1673,18 +1602,18 @@
          float f13 = f4 * 0.8F;
          float f14 = f5 * 0.8F;
          float f15 = 0.00390625F;
@@ -882,7 +904,7 @@
              {
                  GlStateManager.func_179135_a(false, false, false, false);
              }
-@@ -1703,169 +1633,73 @@
+@@ -1703,169 +1632,73 @@
                  }
              }
  
@@ -1107,7 +1129,7 @@
                          }
                      }
  
-@@ -1889,28 +1723,28 @@
+@@ -1889,28 +1722,28 @@
  
              while (iterator.hasNext())
              {
@@ -1145,7 +1167,7 @@
                  {
                      break;
                  }
-@@ -1923,30 +1757,25 @@
+@@ -1923,30 +1756,25 @@
          Tessellator tessellator = Tessellator.func_178181_a();
          BufferBuilder bufferbuilder = tessellator.func_178180_c();
          WorldBorder worldborder = this.field_72769_h.func_175723_af();
@@ -1189,7 +1211,7 @@
              GlStateManager.func_179136_a(-3.0F, -3.0F);
              GlStateManager.func_179088_q();
              GlStateManager.func_179092_a(516, 0.1F);
-@@ -1957,95 +1786,79 @@
+@@ -1957,95 +1785,79 @@
              float f5 = 0.0F;
              float f6 = 128.0F;
              bufferbuilder.func_181668_a(7, DefaultVertexFormats.field_181707_g);
@@ -1327,7 +1349,7 @@
              GlStateManager.func_179089_o();
              GlStateManager.func_179118_c();
              GlStateManager.func_179136_a(0.0F, 0.0F);
-@@ -2059,12 +1872,11 @@
+@@ -2059,12 +1871,11 @@
  
      private void func_180443_s()
      {
@@ -1343,7 +1365,7 @@
          GlStateManager.func_179088_q();
          GlStateManager.func_179092_a(516, 0.1F);
          GlStateManager.func_179141_d();
-@@ -2083,16 +1895,16 @@
+@@ -2083,16 +1894,16 @@
  
      public void func_174981_a(Tessellator p_174981_1_, BufferBuilder p_174981_2_, Entity p_174981_3_, float p_174981_4_)
      {
@@ -1364,7 +1386,7 @@
              p_174981_2_.func_78914_f();
              Iterator<DestroyBlockProgress> iterator = this.field_72738_E.values().iterator();
  
-@@ -2100,14 +1912,17 @@
+@@ -2100,14 +1911,17 @@
              {
                  DestroyBlockProgress destroyblockprogress = iterator.next();
                  BlockPos blockpos = destroyblockprogress.func_180246_b();
@@ -1387,7 +1409,7 @@
                      {
                          iterator.remove();
                      }
-@@ -2117,8 +1932,8 @@
+@@ -2117,8 +1931,8 @@
  
                          if (iblockstate.func_185904_a() != Material.field_151579_a)
                          {
@@ -1398,7 +1420,7 @@
                              BlockRendererDispatcher blockrendererdispatcher = this.field_72777_q.func_175602_ab();
                              blockrendererdispatcher.func_175020_a(iblockstate, blockpos, textureatlassprite, this.field_72769_h);
                          }
-@@ -2127,7 +1942,7 @@
+@@ -2127,7 +1941,7 @@
              }
  
              p_174981_1_.func_78381_a();
@@ -1407,7 +1429,7 @@
              this.func_174969_t();
          }
      }
-@@ -2137,12 +1952,7 @@
+@@ -2137,12 +1951,7 @@
          if (p_72731_3_ == 0 && p_72731_2_.field_72313_a == RayTraceResult.Type.BLOCK)
          {
              GlStateManager.func_179147_l();
@@ -1421,7 +1443,7 @@
              GlStateManager.func_187441_d(2.0F);
              GlStateManager.func_179090_x();
              GlStateManager.func_179132_a(false);
-@@ -2151,10 +1961,10 @@
+@@ -2151,10 +1960,10 @@
  
              if (iblockstate.func_185904_a() != Material.field_151579_a && this.field_72769_h.func_175723_af().func_177746_a(blockpos))
              {
@@ -1436,7 +1458,7 @@
              }
  
              GlStateManager.func_179132_a(true);
-@@ -2165,55 +1975,19 @@
+@@ -2165,55 +1974,19 @@
  
      public static void func_189697_a(AxisAlignedBB p_189697_0_, float p_189697_1_, float p_189697_2_, float p_189697_3_, float p_189697_4_)
      {
@@ -1496,7 +1518,7 @@
      {
          p_189698_0_.func_181662_b(p_189698_1_, p_189698_3_, p_189698_5_).func_181666_a(p_189698_13_, p_189698_14_, p_189698_15_, 0.0F).func_181675_d();
          p_189698_0_.func_181662_b(p_189698_1_, p_189698_3_, p_189698_5_).func_181666_a(p_189698_13_, p_189698_14_, p_189698_15_, p_189698_16_).func_181675_d();
-@@ -2237,55 +2011,19 @@
+@@ -2237,55 +2010,19 @@
  
      public static void func_189696_b(AxisAlignedBB p_189696_0_, float p_189696_1_, float p_189696_2_, float p_189696_3_, float p_189696_4_)
      {
@@ -1556,7 +1578,7 @@
      {
          p_189693_0_.func_181662_b(p_189693_1_, p_189693_3_, p_189693_5_).func_181666_a(p_189693_13_, p_189693_14_, p_189693_15_, p_189693_16_).func_181675_d();
          p_189693_0_.func_181662_b(p_189693_1_, p_189693_3_, p_189693_5_).func_181666_a(p_189693_13_, p_189693_14_, p_189693_15_, p_189693_16_).func_181675_d();
-@@ -2324,28 +2062,24 @@
+@@ -2324,28 +2061,24 @@
          this.field_175008_n.func_187474_a(p_184385_1_, p_184385_2_, p_184385_3_, p_184385_4_, p_184385_5_, p_184385_6_, p_184385_7_);
      }
  
@@ -1589,7 +1611,7 @@
      public void func_184377_a(@Nullable SoundEvent p_184377_1_, BlockPos p_184377_2_)
      {
          ISound isound = this.field_147593_P.get(p_184377_2_);
-@@ -2365,9 +2099,7 @@
+@@ -2365,9 +2098,7 @@
                  this.field_72777_q.field_71456_v.func_73833_a(itemrecord.func_150927_i());
              }
  
@@ -1600,7 +1622,7 @@
              this.field_147593_P.put(p_184377_2_, positionedsoundrecord);
              this.field_72777_q.func_147118_V().func_147682_a(positionedsoundrecord);
          }
-@@ -2377,67 +2109,32 @@
+@@ -2377,67 +2108,32 @@
  
      private void func_193054_a(World p_193054_1_, BlockPos p_193054_2_, boolean p_193054_3_)
      {
@@ -1674,7 +1696,7 @@
  
              if (p_190570_16_ != null)
              {
-@@ -2455,78 +2152,40 @@
+@@ -2455,78 +2151,40 @@
          }
      }
  
@@ -1764,7 +1786,7 @@
              }
          }
          else
-@@ -2537,27 +2196,25 @@
+@@ -2537,27 +2195,25 @@
  
      private int func_190572_a(boolean p_190572_1_)
      {
@@ -1805,7 +1827,7 @@
      public void func_72709_b(Entity p_72709_1_)
      {
      }
-@@ -2566,7 +2223,6 @@
+@@ -2566,7 +2222,6 @@
      {
      }
  
@@ -1813,7 +1835,7 @@
      public void func_180440_a(int p_180440_1_, BlockPos p_180440_2_, int p_180440_3_)
      {
          switch (p_180440_1_)
-@@ -2578,38 +2234,39 @@
+@@ -2578,38 +2233,39 @@
  
                  if (entity != null)
                  {
@@ -1868,7 +1890,7 @@
      public void func_180439_a(EntityPlayer p_180439_1_, int p_180439_2_, BlockPos p_180439_3_, int p_180439_4_)
      {
          Random random = this.field_72769_h.field_73012_v;
-@@ -2632,34 +2289,19 @@
+@@ -2632,34 +2288,19 @@
                  this.field_72769_h.func_184156_a(p_180439_3_, SoundEvents.field_187634_bp, SoundCategory.NEUTRAL, 1.0F, 1.2F, false);
                  break;
              case 1005:
@@ -1908,7 +1930,7 @@
                  break;
              case 1010:
  
-@@ -2669,128 +2311,69 @@
+@@ -2669,128 +2310,69 @@
                  }
                  else
                  {
@@ -2058,7 +2080,7 @@
                  break;
              case 1033:
                  this.field_72769_h.func_184156_a(p_180439_3_, SoundEvents.field_187542_ac, SoundCategory.BLOCKS, 1.0F, 1.0F, false);
-@@ -2802,169 +2385,119 @@
+@@ -2802,169 +2384,119 @@
                  this.field_72769_h.func_184156_a(p_180439_3_, SoundEvents.field_187621_J, SoundCategory.BLOCKS, 1.0F, 1.0F, false);
                  break;
              case 1036:
@@ -2294,7 +2316,7 @@
  
                      if (particle != null)
                      {
-@@ -2972,56 +2505,27 @@
+@@ -2972,56 +2504,27 @@
                      }
                  }
  
@@ -2358,7 +2380,7 @@
              }
  
              destroyblockprogress.func_73107_a(p_180441_3_);
-@@ -3029,7 +2533,7 @@
+@@ -3029,7 +2532,7 @@
          }
          else
          {
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPart.java.patch b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPart.java.patch
new file mode 100644
index 000000000..0e920ac7b
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPart.java.patch
@@ -0,0 +1,102 @@
+--- before/net/minecraft/client/renderer/block/model/BlockPart.java
++++ after/net/minecraft/client/renderer/block/model/BlockPart.java
+@@ -17,7 +17,7 @@
+ import net.minecraft.util.math.MathHelper;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.util.vector.Vector3f;
++import org.lwjglx.util.vector.Vector3f;
+ 
+ @SideOnly(Side.CLIENT)
+ public class BlockPart
+@@ -29,14 +29,14 @@
+     public final boolean field_178238_e;
+ 
+     public BlockPart(
+-        Vector3f p_i46231_1_, Vector3f p_i46231_2_, Map<EnumFacing, BlockPartFace> p_i46231_3_, @Nullable BlockPartRotation p_i46231_4_, boolean p_i46231_5_
++        Vector3f positionFromIn, Vector3f positionToIn, Map<EnumFacing, BlockPartFace> mapFacesIn, @Nullable BlockPartRotation partRotationIn, boolean shadeIn
+     )
+     {
+-        this.field_178241_a = p_i46231_1_;
+-        this.field_178239_b = p_i46231_2_;
+-        this.field_178240_c = p_i46231_3_;
+-        this.field_178237_d = p_i46231_4_;
+-        this.field_178238_e = p_i46231_5_;
++        this.field_178241_a = positionFromIn;
++        this.field_178239_b = positionToIn;
++        this.field_178240_c = mapFacesIn;
++        this.field_178237_d = partRotationIn;
++        this.field_178238_e = shadeIn;
+         this.func_178235_a();
+     }
+ 
+@@ -75,8 +75,8 @@
+             public BlockPart deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_) throws JsonParseException
+             {
+                 JsonObject jsonobject = p_deserialize_1_.getAsJsonObject();
+-                Vector3f vector3f = this.func_178249_e(jsonobject);
+-                Vector3f vector3f1 = this.func_178247_d(jsonobject);
++                Vector3f vector3f = this.parsePositionFrom(jsonobject);
++                Vector3f vector3f1 = this.parsePositionTo(jsonobject);
+                 BlockPartRotation blockpartrotation = this.func_178256_a(jsonobject);
+                 Map<EnumFacing, BlockPartFace> map = this.func_178250_a(p_deserialize_3_, jsonobject);
+ 
+@@ -99,7 +99,7 @@
+                 if (p_178256_1_.has("rotation"))
+                 {
+                     JsonObject jsonobject = JsonUtils.func_152754_s(p_178256_1_, "rotation");
+-                    Vector3f vector3f = this.func_178251_a(jsonobject, "origin");
++                    Vector3f vector3f = this.parsePosition(jsonobject, "origin");
+                     vector3f.scale(0.0625F);
+                     EnumFacing.Axis enumfacing$axis = this.func_178252_c(jsonobject);
+                     float f = this.func_178255_b(jsonobject);
+@@ -181,9 +181,9 @@
+                 }
+             }
+ 
+-            private Vector3f func_178247_d(JsonObject p_178247_1_)
++            private Vector3f parsePositionTo(JsonObject object)
+             {
+-                Vector3f vector3f = this.func_178251_a(p_178247_1_, "to");
++                Vector3f vector3f = this.parsePosition(object, "to");
+ 
+                 if (!(vector3f.x < -16.0F)
+                         && !(vector3f.y < -16.0F)
+@@ -200,9 +200,9 @@
+                 }
+             }
+ 
+-            private Vector3f func_178249_e(JsonObject p_178249_1_)
++            private Vector3f parsePositionFrom(JsonObject object)
+             {
+-                Vector3f vector3f = this.func_178251_a(p_178249_1_, "from");
++                Vector3f vector3f = this.parsePosition(object, "from");
+ 
+                 if (!(vector3f.x < -16.0F)
+                         && !(vector3f.y < -16.0F)
+@@ -219,13 +219,13 @@
+                 }
+             }
+ 
+-            private Vector3f func_178251_a(JsonObject p_178251_1_, String p_178251_2_)
++            private Vector3f parsePosition(JsonObject object, String memberName)
+             {
+-                JsonArray jsonarray = JsonUtils.func_151214_t(p_178251_1_, p_178251_2_);
++                JsonArray jsonarray = JsonUtils.func_151214_t(object, memberName);
+ 
+                 if (jsonarray.size() != 3)
+                 {
+-                    throw new JsonParseException("Expected 3 " + p_178251_2_ + " values, found: " + jsonarray.size());
++                    throw new JsonParseException("Expected 3 " + memberName + " values, found: " + jsonarray.size());
+                 }
+                 else
+                 {
+@@ -233,7 +233,7 @@
+ 
+                     for (int i = 0; i < afloat.length; ++i)
+                     {
+-                        afloat[i] = JsonUtils.func_151220_d(jsonarray.get(i), p_178251_2_ + "[" + i + "]");
++                        afloat[i] = JsonUtils.func_151220_d(jsonarray.get(i), memberName + "[" + i + "]");
+                     }
+ 
+                     return new Vector3f(afloat[0], afloat[1], afloat[2]);
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartRotation.java.patch b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartRotation.java.patch
new file mode 100644
index 000000000..83a0242e2
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockPartRotation.java.patch
@@ -0,0 +1,28 @@
+--- before/net/minecraft/client/renderer/block/model/BlockPartRotation.java
++++ after/net/minecraft/client/renderer/block/model/BlockPartRotation.java
+@@ -3,7 +3,7 @@
+ import net.minecraft.util.EnumFacing;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.util.vector.Vector3f;
++import org.lwjglx.util.vector.Vector3f;
+ 
+ @SideOnly(Side.CLIENT)
+ public class BlockPartRotation
+@@ -13,11 +13,11 @@
+     public final float field_178343_c;
+     public final boolean field_178341_d;
+ 
+-    public BlockPartRotation(Vector3f p_i46229_1_, EnumFacing.Axis p_i46229_2_, float p_i46229_3_, boolean p_i46229_4_)
++    public BlockPartRotation(Vector3f originIn, EnumFacing.Axis axisIn, float angleIn, boolean rescaleIn)
+     {
+-        this.field_178344_a = p_i46229_1_;
+-        this.field_178342_b = p_i46229_2_;
+-        this.field_178343_c = p_i46229_3_;
+-        this.field_178341_d = p_i46229_4_;
++        this.field_178344_a = originIn;
++        this.field_178342_b = axisIn;
++        this.field_178343_c = angleIn;
++        this.field_178341_d = rescaleIn;
+     }
+ }
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java.patch b/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java.patch
index 75116321a..6ef96f751 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java.patch
@@ -1,6 +1,16 @@
 --- before/net/minecraft/client/renderer/block/model/FaceBakery.java
 +++ after/net/minecraft/client/renderer/block/model/FaceBakery.java
-@@ -15,12 +15,11 @@
+@@ -8,19 +8,18 @@
+ import net.minecraft.util.math.Vec3i;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.util.vector.Matrix4f;
+-import org.lwjgl.util.vector.Vector3f;
+-import org.lwjgl.util.vector.Vector4f;
++import org.lwjglx.util.vector.Matrix4f;
++import org.lwjglx.util.vector.Vector3f;
++import org.lwjglx.util.vector.Vector4f;
+ 
  @SideOnly(Side.CLIENT)
  public class FaceBakery
  {
@@ -31,7 +41,7 @@
          BlockFaceUV func_188007_a(float p_188007_1_, float p_188007_2_, float p_188007_3_, float p_188007_4_)
          {
              return new BlockFaceUV(new float[] {16.0F - p_188007_1_, 16.0F - p_188007_2_, 16.0F - p_188007_3_, 16.0F - p_188007_4_}, 0);
-@@ -44,35 +41,27 @@
+@@ -44,43 +41,36 @@
      };
      private static final FaceBakery.Rotation field_188020_g = new FaceBakery.Rotation()
      {
@@ -53,35 +63,40 @@
 -        boolean p_178414_8_,
 -        boolean p_178414_9_
 -    )
-+    public BakedQuad func_178414_a(Vector3f p_178414_1_, Vector3f p_178414_2_, BlockPartFace p_178414_3_, TextureAtlasSprite p_178414_4_, EnumFacing p_178414_5_, ModelRotation p_178414_6_, @Nullable BlockPartRotation p_178414_7_, boolean p_178414_8_, boolean p_178414_9_)
+-    {
+-        BlockFaceUV blockfaceuv = p_178414_3_.field_178243_e;
+-
+-        if (p_178414_8_)
++    public BakedQuad makeBakedQuad(Vector3f posFrom, Vector3f posTo, BlockPartFace face, TextureAtlasSprite sprite, EnumFacing facing, ModelRotation modelRotationIn, @Nullable BlockPartRotation partRotation, boolean uvLocked, boolean shade)
 +    {
-+        return makeBakedQuad(p_178414_1_, p_178414_2_, p_178414_3_, p_178414_4_, p_178414_5_, (net.minecraftforge.common.model.ITransformation)p_178414_6_, p_178414_7_, p_178414_8_, p_178414_9_);
++        return makeBakedQuad(posFrom, posTo, face, sprite, facing, (net.minecraftforge.common.model.ITransformation)modelRotationIn, partRotation, uvLocked, shade);
 +    }
 +
-+    public BakedQuad makeBakedQuad(Vector3f p_178414_1_, Vector3f p_178414_2_, BlockPartFace p_178414_3_, TextureAtlasSprite p_178414_4_, EnumFacing p_178414_5_, net.minecraftforge.common.model.ITransformation p_178414_6_, BlockPartRotation p_178414_7_, boolean p_178414_8_, boolean p_178414_9_)
-     {
-         BlockFaceUV blockfaceuv = p_178414_3_.field_178243_e;
- 
-         if (p_178414_8_)
++    public BakedQuad makeBakedQuad(Vector3f posFrom, Vector3f posTo, BlockPartFace face, TextureAtlasSprite sprite, EnumFacing facing, net.minecraftforge.common.model.ITransformation modelRotationIn, BlockPartRotation partRotation, boolean uvLocked, boolean shade)
++    {
++        BlockFaceUV blockfaceuv = face.field_178243_e;
++
++        if (uvLocked)
          {
 -            blockfaceuv = this.func_188010_a(p_178414_3_.field_178243_e, p_178414_5_, p_178414_6_);
-+            blockfaceuv = net.minecraftforge.client.ForgeHooksClient.applyUVLock(p_178414_3_.field_178243_e, p_178414_5_, p_178414_6_);
++            blockfaceuv = net.minecraftforge.client.ForgeHooksClient.applyUVLock(face.field_178243_e, facing, modelRotationIn);
          }
  
 -        int[] aint = this.func_188012_a(
 -                         blockfaceuv, p_178414_4_, p_178414_5_, this.func_178403_a(p_178414_1_, p_178414_2_), p_178414_6_, p_178414_7_, p_178414_9_
 -                     );
-+        int[] aint = this.makeQuadVertexData(blockfaceuv, p_178414_4_, p_178414_5_, this.func_178403_a(p_178414_1_, p_178414_2_), p_178414_6_, p_178414_7_, false);
++        int[] aint = this.makeQuadVertexData(blockfaceuv, sprite, facing, this.getPositionsDiv16(posFrom, posTo), modelRotationIn, partRotation, false);
          EnumFacing enumfacing = func_178410_a(aint);
  
-         if (p_178414_7_ == null)
-@@ -80,7 +69,8 @@
+-        if (p_178414_7_ == null)
++        if (partRotation == null)
+         {
              this.func_178408_a(aint, enumfacing);
          }
  
 -        return new BakedQuad(aint, p_178414_3_.field_178245_c, enumfacing, p_178414_4_);
 +        net.minecraftforge.client.ForgeHooksClient.fillNormal(aint, enumfacing);
-+        return new BakedQuad(aint, p_178414_3_.field_178245_c, enumfacing, p_178414_4_, p_178414_9_, net.minecraft.client.renderer.vertex.DefaultVertexFormats.field_176599_b);
++        return new BakedQuad(aint, face.field_178245_c, enumfacing, sprite, shade, net.minecraft.client.renderer.vertex.DefaultVertexFormats.field_176599_b);
      }
  
      private BlockFaceUV func_188010_a(BlockFaceUV p_188010_1_, EnumFacing p_188010_2_, ModelRotation p_188010_3_)
@@ -123,7 +138,26 @@
      }
  
      private float func_178412_b(EnumFacing p_178412_1_)
-@@ -146,42 +133,31 @@
+@@ -134,81 +121,70 @@
+         }
+     }
+ 
+-    private float[] func_178403_a(Vector3f p_178403_1_, Vector3f p_178403_2_)
++    private float[] getPositionsDiv16(Vector3f pos1, Vector3f pos2)
+     {
+         float[] afloat = new float[EnumFacing.values().length];
+-        afloat[EnumFaceDirection.Constants.field_179176_f] = p_178403_1_.x / 16.0F;
+-        afloat[EnumFaceDirection.Constants.field_179178_e] = p_178403_1_.y / 16.0F;
+-        afloat[EnumFaceDirection.Constants.field_179177_d] = p_178403_1_.z / 16.0F;
+-        afloat[EnumFaceDirection.Constants.field_179180_c] = p_178403_2_.x / 16.0F;
+-        afloat[EnumFaceDirection.Constants.field_179179_b] = p_178403_2_.y / 16.0F;
+-        afloat[EnumFaceDirection.Constants.field_179181_a] = p_178403_2_.z / 16.0F;
++        afloat[EnumFaceDirection.Constants.field_179176_f] = pos1.x / 16.0F;
++        afloat[EnumFaceDirection.Constants.field_179178_e] = pos1.y / 16.0F;
++        afloat[EnumFaceDirection.Constants.field_179177_d] = pos1.z / 16.0F;
++        afloat[EnumFaceDirection.Constants.field_179180_c] = pos2.x / 16.0F;
++        afloat[EnumFaceDirection.Constants.field_179179_b] = pos2.y / 16.0F;
++        afloat[EnumFaceDirection.Constants.field_179181_a] = pos2.z / 16.0F;
          return afloat;
      }
  
@@ -155,61 +189,99 @@
 -            p_188015_5_[enumfacedirection$vertexinformation.field_179182_b],
 -            p_188015_5_[enumfacedirection$vertexinformation.field_179183_c]
 -        );
-+        Vector3f vector3f = new Vector3f(p_188015_5_[enumfacedirection$vertexinformation.field_179184_a], p_188015_5_[enumfacedirection$vertexinformation.field_179182_b], p_188015_5_[enumfacedirection$vertexinformation.field_179183_c]);
-         this.func_178407_a(vector3f, p_188015_8_);
+-        this.func_178407_a(vector3f, p_188015_8_);
 -        int j = this.func_188011_a(vector3f, p_188015_3_, p_188015_2_, p_188015_7_);
-+        int j = this.rotateVertex(vector3f, p_188015_3_, p_188015_2_, p_188015_7_);
-         this.func_178404_a(p_188015_1_, j, p_188015_2_, vector3f, i, p_188015_6_, p_188015_4_);
-     }
- 
+-        this.func_178404_a(p_188015_1_, j, p_188015_2_, vector3f, i, p_188015_6_, p_188015_4_);
+-    }
+-
 -    private void func_178404_a(
 -        int[] p_178404_1_, int p_178404_2_, int p_178404_3_, Vector3f p_178404_4_, int p_178404_5_, TextureAtlasSprite p_178404_6_, BlockFaceUV p_178404_7_
 -    )
-+    private void func_178404_a(int[] p_178404_1_, int p_178404_2_, int p_178404_3_, Vector3f p_178404_4_, int p_178404_5_, TextureAtlasSprite p_178404_6_, BlockFaceUV p_178404_7_)
-     {
-         int i = p_178404_2_ * 7;
-         p_178404_1_[i] = Float.floatToRawIntBits(p_178404_4_.x);
-         p_178404_1_[i + 1] = Float.floatToRawIntBits(p_178404_4_.y);
-         p_178404_1_[i + 2] = Float.floatToRawIntBits(p_178404_4_.z);
-         p_178404_1_[i + 3] = p_178404_5_;
+-    {
+-        int i = p_178404_2_ * 7;
+-        p_178404_1_[i] = Float.floatToRawIntBits(p_178404_4_.x);
+-        p_178404_1_[i + 1] = Float.floatToRawIntBits(p_178404_4_.y);
+-        p_178404_1_[i + 2] = Float.floatToRawIntBits(p_178404_4_.z);
+-        p_178404_1_[i + 3] = p_178404_5_;
 -        p_178404_1_[i + 4] = Float.floatToRawIntBits(p_178404_6_.func_94214_a((double)p_178404_7_.func_178348_a(p_178404_3_)));
 -        p_178404_1_[i + 4 + 1] = Float.floatToRawIntBits(p_178404_6_.func_94207_b((double)p_178404_7_.func_178346_b(p_178404_3_)));
-+        p_178404_1_[i + 4] = Float.floatToRawIntBits(p_178404_6_.func_94214_a((double)p_178404_7_.func_178348_a(p_178404_3_) * .999 + p_178404_7_.func_178348_a((p_178404_3_ + 2) % 4) * .001));
-+        p_178404_1_[i + 4 + 1] = Float.floatToRawIntBits(p_178404_6_.func_94207_b((double)p_178404_7_.func_178346_b(p_178404_3_) * .999 + p_178404_7_.func_178346_b((p_178404_3_ + 2) % 4) * .001));
-     }
+-    }
+-
+-    private void func_178407_a(Vector3f p_178407_1_, @Nullable BlockPartRotation p_178407_2_)
+-    {
+-        if (p_178407_2_ != null)
++        Vector3f vector3f = new Vector3f(p_188015_5_[enumfacedirection$vertexinformation.field_179184_a], p_188015_5_[enumfacedirection$vertexinformation.field_179182_b], p_188015_5_[enumfacedirection$vertexinformation.field_179183_c]);
++        this.rotatePart(vector3f, p_188015_8_);
++        int j = this.rotateVertex(vector3f, p_188015_3_, p_188015_2_, p_188015_7_);
++        this.storeVertexData(p_188015_1_, j, p_188015_2_, vector3f, i, p_188015_6_, p_188015_4_);
++    }
++
++    private void storeVertexData(int[] faceData, int storeIndex, int vertexIndex, Vector3f position, int shadeColor, TextureAtlasSprite sprite, BlockFaceUV faceUV)
++    {
++        int i = storeIndex * 7;
++        faceData[i] = Float.floatToRawIntBits(position.x);
++        faceData[i + 1] = Float.floatToRawIntBits(position.y);
++        faceData[i + 2] = Float.floatToRawIntBits(position.z);
++        faceData[i + 3] = shadeColor;
++        faceData[i + 4] = Float.floatToRawIntBits(sprite.func_94214_a((double)faceUV.func_178348_a(vertexIndex) * .999 + faceUV.func_178348_a((vertexIndex + 2) % 4) * .001));
++        faceData[i + 4 + 1] = Float.floatToRawIntBits(sprite.func_94207_b((double)faceUV.func_178346_b(vertexIndex) * .999 + faceUV.func_178346_b((vertexIndex + 2) % 4) * .001));
++    }
++
++    private void rotatePart(Vector3f p_178407_1_, @Nullable BlockPartRotation partRotation)
++    {
++        if (partRotation != null)
+         {
+-            Matrix4f matrix4f = this.func_178411_a();
++            Matrix4f matrix4f = this.getMatrixIdentity();
+             Vector3f vector3f = new Vector3f(0.0F, 0.0F, 0.0F);
  
-     private void func_178407_a(Vector3f p_178407_1_, @Nullable BlockPartRotation p_178407_2_)
-@@ -194,15 +170,15 @@
-             switch (p_178407_2_.field_178342_b)
+-            switch (p_178407_2_.field_178342_b)
++            switch (partRotation.field_178342_b)
              {
                  case X:
 -                    Matrix4f.rotate(p_178407_2_.field_178343_c * (float)(Math.PI / 180.0), new Vector3f(1.0F, 0.0F, 0.0F), matrix4f, matrix4f);
-+                    Matrix4f.rotate(p_178407_2_.field_178343_c * 0.017453292F, new Vector3f(1.0F, 0.0F, 0.0F), matrix4f, matrix4f);
++                    Matrix4f.rotate(partRotation.field_178343_c * 0.017453292F, new Vector3f(1.0F, 0.0F, 0.0F), matrix4f, matrix4f);
                      vector3f.set(0.0F, 1.0F, 1.0F);
                      break;
                  case Y:
 -                    Matrix4f.rotate(p_178407_2_.field_178343_c * (float)(Math.PI / 180.0), new Vector3f(0.0F, 1.0F, 0.0F), matrix4f, matrix4f);
-+                    Matrix4f.rotate(p_178407_2_.field_178343_c * 0.017453292F, new Vector3f(0.0F, 1.0F, 0.0F), matrix4f, matrix4f);
++                    Matrix4f.rotate(partRotation.field_178343_c * 0.017453292F, new Vector3f(0.0F, 1.0F, 0.0F), matrix4f, matrix4f);
                      vector3f.set(1.0F, 0.0F, 1.0F);
                      break;
                  case Z:
 -                    Matrix4f.rotate(p_178407_2_.field_178343_c * (float)(Math.PI / 180.0), new Vector3f(0.0F, 0.0F, 1.0F), matrix4f, matrix4f);
-+                    Matrix4f.rotate(p_178407_2_.field_178343_c * 0.017453292F, new Vector3f(0.0F, 0.0F, 1.0F), matrix4f, matrix4f);
++                    Matrix4f.rotate(partRotation.field_178343_c * 0.017453292F, new Vector3f(0.0F, 0.0F, 1.0F), matrix4f, matrix4f);
                      vector3f.set(1.0F, 1.0F, 0.0F);
              }
  
-@@ -230,14 +206,19 @@
+-            if (p_178407_2_.field_178341_d)
++            if (partRotation.field_178341_d)
+             {
+-                if (Math.abs(p_178407_2_.field_178343_c) == 22.5F)
++                if (Math.abs(partRotation.field_178343_c) == 22.5F)
+                 {
+                     vector3f.scale(field_178418_a);
+                 }
+@@ -224,11 +200,16 @@
+                 vector3f.set(1.0F, 1.0F, 1.0F);
+             }
  
-     public int func_188011_a(Vector3f p_188011_1_, EnumFacing p_188011_2_, int p_188011_3_, ModelRotation p_188011_4_)
-     {
+-            this.func_178406_a(p_178407_1_, new Vector3f(p_178407_2_.field_178344_a), matrix4f, vector3f);
++            this.rotateScale(p_178407_1_, new Vector3f(partRotation.field_178344_a), matrix4f, vector3f);
+         }
+     }
+ 
+-    public int func_188011_a(Vector3f p_188011_1_, EnumFacing p_188011_2_, int p_188011_3_, ModelRotation p_188011_4_)
++    public int rotateVertex(Vector3f p_188011_1_, EnumFacing p_188011_2_, int p_188011_3_, ModelRotation p_188011_4_)
++    {
 +        return rotateVertex(p_188011_1_, p_188011_2_, p_188011_3_, (net.minecraftforge.common.model.ITransformation)p_188011_4_);
 +    }
 +
 +    public int rotateVertex(Vector3f p_188011_1_, EnumFacing p_188011_2_, int p_188011_3_, net.minecraftforge.common.model.ITransformation p_188011_4_)
-+    {
+     {
          if (p_188011_4_ == ModelRotation.X0_Y0)
          {
-             return p_188011_3_;
+@@ -236,22 +217,22 @@
          }
          else
          {
@@ -220,6 +292,28 @@
          }
      }
  
+-    private void func_178406_a(Vector3f p_178406_1_, Vector3f p_178406_2_, Matrix4f p_178406_3_, Vector3f p_178406_4_)
++    private void rotateScale(Vector3f position, Vector3f rotationOrigin, Matrix4f rotationMatrix, Vector3f scale)
+     {
+-        Vector4f vector4f = new Vector4f(p_178406_1_.x - p_178406_2_.x, p_178406_1_.y - p_178406_2_.y, p_178406_1_.z - p_178406_2_.z, 1.0F);
+-        Matrix4f.transform(p_178406_3_, vector4f, vector4f);
+-        vector4f.x *= p_178406_4_.x;
+-        vector4f.y *= p_178406_4_.y;
+-        vector4f.z *= p_178406_4_.z;
+-        p_178406_1_.set(vector4f.x + p_178406_2_.x, vector4f.y + p_178406_2_.y, vector4f.z + p_178406_2_.z);
++        Vector4f vector4f = new Vector4f(position.x - rotationOrigin.x, position.y - rotationOrigin.y, position.z - rotationOrigin.z, 1.0F);
++        Matrix4f.transform(rotationMatrix, vector4f, vector4f);
++        vector4f.x *= scale.x;
++        vector4f.y *= scale.y;
++        vector4f.z *= scale.z;
++        position.set(vector4f.x + rotationOrigin.x, vector4f.y + rotationOrigin.y, vector4f.z + rotationOrigin.z);
+     }
+ 
+-    private Matrix4f func_178411_a()
++    private Matrix4f getMatrixIdentity()
+     {
+         Matrix4f matrix4f = new Matrix4f();
+         matrix4f.setIdentity();
 @@ -289,7 +270,14 @@
              }
          }
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemCameraTransforms.java.patch b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemCameraTransforms.java.patch
index f0c6a4968..d1dd231c0 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemCameraTransforms.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemCameraTransforms.java.patch
@@ -1,8 +1,11 @@
 --- before/net/minecraft/client/renderer/block/model/ItemCameraTransforms.java
 +++ after/net/minecraft/client/renderer/block/model/ItemCameraTransforms.java
-@@ -12,6 +12,9 @@
+@@ -10,8 +10,11 @@
+ import net.minecraft.util.math.MathHelper;
+ import net.minecraftforge.fml.relauncher.Side;
  import net.minecraftforge.fml.relauncher.SideOnly;
- import org.lwjgl.util.vector.Quaternion;
+-import org.lwjgl.util.vector.Quaternion;
++import org.lwjglx.util.vector.Quaternion;
  
 +/*
 + * @deprecated use {@link net.minecraftforge.client.model.IPerspectiveAwareModel} instead
@@ -63,18 +66,21 @@
              float f = field_181693_e + p_188034_0_.field_178364_b.x;
              float f1 = field_181694_f + p_188034_0_.field_178364_b.y;
              float f2 = field_181695_g + p_188034_0_.field_178364_b.z;
-@@ -107,17 +90,15 @@
+@@ -106,18 +89,16 @@
+                 f2 = -f2;
              }
  
-             GlStateManager.func_187444_a(func_188035_a(f, f1, f2));
+-            GlStateManager.func_187444_a(func_188035_a(f, f1, f2));
 -            GlStateManager.func_179152_a(
 -                field_181696_h + p_188034_0_.field_178363_d.x, field_181697_i + p_188034_0_.field_178363_d.y, field_181698_j + p_188034_0_.field_178363_d.z
 -            );
++            GlStateManager.rotate(makeQuaternion(f, f1, f2));
 +            GlStateManager.func_179152_a(field_181696_h + p_188034_0_.field_178363_d.x, field_181697_i + p_188034_0_.field_178363_d.y, field_181698_j + p_188034_0_.field_178363_d.z);
          }
      }
  
-     private static Quaternion func_188035_a(float p_188035_0_, float p_188035_1_, float p_188035_2_)
+-    private static Quaternion func_188035_a(float p_188035_0_, float p_188035_1_, float p_188035_2_)
++    private static Quaternion makeQuaternion(float p_188035_0_, float p_188035_1_, float p_188035_2_)
      {
 -        float f = p_188035_0_ * (float)(Math.PI / 180.0);
 -        float f1 = p_188035_1_ * (float)(Math.PI / 180.0);
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemModelGenerator.java.patch b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemModelGenerator.java.patch
new file mode 100644
index 000000000..6d3278134
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemModelGenerator.java.patch
@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/renderer/block/model/ItemModelGenerator.java
++++ after/net/minecraft/client/renderer/block/model/ItemModelGenerator.java
+@@ -11,7 +11,7 @@
+ import net.minecraft.util.ResourceLocation;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.util.vector.Vector3f;
++import org.lwjglx.util.vector.Vector3f;
+ 
+ @SideOnly(Side.CLIENT)
+ public class ItemModelGenerator
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemTransformVec3f.java.patch b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemTransformVec3f.java.patch
index f92ac0394..39b6154fc 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/ItemTransformVec3f.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ItemTransformVec3f.java.patch
@@ -1,8 +1,11 @@
 --- before/net/minecraft/client/renderer/block/model/ItemTransformVec3f.java
 +++ after/net/minecraft/client/renderer/block/model/ItemTransformVec3f.java
-@@ -13,9 +13,14 @@
+@@ -11,24 +11,28 @@
+ import net.minecraft.util.math.MathHelper;
+ import net.minecraftforge.fml.relauncher.Side;
  import net.minecraftforge.fml.relauncher.SideOnly;
- import org.lwjgl.util.vector.Vector3f;
+-import org.lwjgl.util.vector.Vector3f;
++import org.lwjglx.util.vector.Vector3f;
  
 +/*
 + * @deprecated use {@link net.minecraftforge.client.model.IModelState} and {@link net.minecraftforge.client.model.TRSRTransformation}
@@ -16,8 +19,17 @@
      public static final ItemTransformVec3f field_178366_a = new ItemTransformVec3f(new Vector3f(), new Vector3f(), new Vector3f(1.0F, 1.0F, 1.0F));
      public final Vector3f field_178364_b;
      public final Vector3f field_178365_c;
-@@ -28,7 +33,6 @@
-         this.field_178363_d = new Vector3f(p_i46214_3_);
+     public final Vector3f field_178363_d;
+ 
+-    public ItemTransformVec3f(Vector3f p_i46214_1_, Vector3f p_i46214_2_, Vector3f p_i46214_3_)
++    public ItemTransformVec3f(Vector3f rotation, Vector3f translation, Vector3f scale)
+     {
+-        this.field_178364_b = new Vector3f(p_i46214_1_);
+-        this.field_178365_c = new Vector3f(p_i46214_2_);
+-        this.field_178363_d = new Vector3f(p_i46214_3_);
++        this.field_178364_b = new Vector3f(rotation);
++        this.field_178365_c = new Vector3f(translation);
++        this.field_178363_d = new Vector3f(scale);
      }
  
 -    @Override
@@ -46,3 +58,53 @@
      }
  
      @SideOnly(Side.CLIENT)
+@@ -66,32 +68,32 @@
+             public ItemTransformVec3f deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, JsonDeserializationContext p_deserialize_3_) throws JsonParseException
+             {
+                 JsonObject jsonobject = p_deserialize_1_.getAsJsonObject();
+-                Vector3f vector3f = this.func_178358_a(jsonobject, "rotation", field_178362_a);
+-                Vector3f vector3f1 = this.func_178358_a(jsonobject, "translation", field_178360_b);
++                Vector3f vector3f = this.parseVector3f(jsonobject, "rotation", field_178362_a);
++                Vector3f vector3f1 = this.parseVector3f(jsonobject, "translation", field_178360_b);
+                 vector3f1.scale(0.0625F);
+                 vector3f1.x = MathHelper.func_76131_a(vector3f1.x, -5.0F, 5.0F);
+                 vector3f1.y = MathHelper.func_76131_a(vector3f1.y, -5.0F, 5.0F);
+                 vector3f1.z = MathHelper.func_76131_a(vector3f1.z, -5.0F, 5.0F);
+-                Vector3f vector3f2 = this.func_178358_a(jsonobject, "scale", field_178361_c);
++                Vector3f vector3f2 = this.parseVector3f(jsonobject, "scale", field_178361_c);
+                 vector3f2.x = MathHelper.func_76131_a(vector3f2.x, -4.0F, 4.0F);
+                 vector3f2.y = MathHelper.func_76131_a(vector3f2.y, -4.0F, 4.0F);
+                 vector3f2.z = MathHelper.func_76131_a(vector3f2.z, -4.0F, 4.0F);
+                 return new ItemTransformVec3f(vector3f, vector3f1, vector3f2);
+             }
+ 
+-            private Vector3f func_178358_a(JsonObject p_178358_1_, String p_178358_2_, Vector3f p_178358_3_)
++            private Vector3f parseVector3f(JsonObject jsonObject, String key, Vector3f defaultValue)
+             {
+-                if (!p_178358_1_.has(p_178358_2_))
++                if (!jsonObject.has(key))
+                 {
+-                    return p_178358_3_;
++                    return defaultValue;
+                 }
+                 else
+                 {
+-                    JsonArray jsonarray = JsonUtils.func_151214_t(p_178358_1_, p_178358_2_);
++                    JsonArray jsonarray = JsonUtils.func_151214_t(jsonObject, key);
+ 
+                     if (jsonarray.size() != 3)
+                     {
+-                        throw new JsonParseException("Expected 3 " + p_178358_2_ + " values, found: " + jsonarray.size());
++                        throw new JsonParseException("Expected 3 " + key + " values, found: " + jsonarray.size());
+                     }
+                     else
+                     {
+@@ -99,7 +101,7 @@
+ 
+                         for (int i = 0; i < afloat.length; ++i)
+                         {
+-                            afloat[i] = JsonUtils.func_151220_d(jsonarray.get(i), p_178358_2_ + "[" + i + "]");
++                            afloat[i] = JsonUtils.func_151220_d(jsonarray.get(i), key + "[" + i + "]");
+                         }
+ 
+                         return new Vector3f(afloat[0], afloat[1], afloat[2]);
diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelRotation.java.patch b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelRotation.java.patch
index 4f61195ed..832e7e13f 100644
--- a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelRotation.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelRotation.java.patch
@@ -1,7 +1,13 @@
 --- before/net/minecraft/client/renderer/block/model/ModelRotation.java
 +++ after/net/minecraft/client/renderer/block/model/ModelRotation.java
-@@ -10,7 +10,7 @@
- import org.lwjgl.util.vector.Vector3f;
+@@ -6,11 +6,11 @@
+ import net.minecraft.util.math.MathHelper;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.util.vector.Matrix4f;
+-import org.lwjgl.util.vector.Vector3f;
++import org.lwjglx.util.vector.Matrix4f;
++import org.lwjglx.util.vector.Vector3f;
  
  @SideOnly(Side.CLIENT)
 -public enum ModelRotation
@@ -18,7 +24,7 @@
      private final int field_177545_r;
      private final Matrix4f field_177544_s;
      private final int field_177543_t;
-@@ -46,11 +46,11 @@
+@@ -46,16 +46,16 @@
          this.field_177544_s = new Matrix4f();
          Matrix4f matrix4f = new Matrix4f();
          matrix4f.setIdentity();
@@ -32,6 +38,12 @@
          this.field_177542_u = MathHelper.func_76130_a(p_i46087_4_ / 90);
          Matrix4f.mul(matrix4f1, matrix4f, this.field_177544_s);
      }
+ 
+-    public Matrix4f func_177525_a()
++    public Matrix4f matrix()
+     {
+         return this.field_177544_s;
+     }
 @@ -106,14 +106,19 @@
  
      public static ModelRotation func_177524_a(int p_177524_0_, int p_177524_1_)
diff --git a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java.patch b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java.patch
index 151c0ffc0..8cdb65895 100644
--- a/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java.patch
@@ -1,6 +1,11 @@
 --- before/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java
 +++ after/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java
-@@ -37,7 +37,7 @@
+@@ -33,11 +33,12 @@
+ import net.minecraft.world.World;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
++import org.lwjglx.opengl.GL11;
+ 
  @SideOnly(Side.CLIENT)
  public class TileEntityRendererDispatcher
  {
@@ -9,7 +14,7 @@
      public static TileEntityRendererDispatcher field_147556_a = new TileEntityRendererDispatcher();
      public FontRenderer field_147557_n;
      public static double field_147554_b;
-@@ -78,7 +78,7 @@
+@@ -78,7 +79,7 @@
  
      public <T extends TileEntity> TileEntitySpecialRenderer<T> func_147546_a(Class <? extends TileEntity > p_147546_1_)
      {
@@ -18,7 +23,7 @@
  
          if (tileentityspecialrenderer == null && p_147546_1_ != TileEntity.class)
          {
-@@ -86,18 +86,16 @@
+@@ -86,18 +87,16 @@
              this.field_147559_m.put(p_147546_1_, tileentityspecialrenderer);
          }
  
@@ -40,7 +45,7 @@
      {
          if (this.field_147550_f != p_190056_1_)
          {
-@@ -119,22 +117,18 @@
+@@ -119,22 +118,18 @@
      {
          if (p_180546_1_.func_145835_a(this.field_147560_j, this.field_147561_k, this.field_147558_l) < p_180546_1_.func_145833_n())
          {
@@ -68,7 +73,7 @@
          }
      }
  
-@@ -148,16 +142,17 @@
+@@ -148,16 +143,17 @@
          this.func_192854_a(p_192855_1_, p_192855_2_, p_192855_4_, p_192855_6_, p_192855_8_, -1, p_192855_9_);
      }
  
@@ -90,7 +95,7 @@
                  tileentityspecialrenderer.func_192841_a(p_192854_1_, p_192854_2_, p_192854_4_, p_192854_6_, p_192854_8_, p_192854_9_, p_192854_10_);
              }
              catch (Throwable throwable)
-@@ -183,5 +178,54 @@
+@@ -183,5 +179,54 @@
      public FontRenderer func_147548_a()
      {
          return this.field_147557_n;
@@ -109,7 +114,7 @@
 +     */
 +    public void preDrawBatch()
 +    {
-+        batchBuffer.func_178180_c().func_181668_a(org.lwjgl.opengl.GL11.GL_QUADS, net.minecraft.client.renderer.vertex.DefaultVertexFormats.field_176600_a);
++        batchBuffer.func_178180_c().func_181668_a(GL11.GL_QUADS, net.minecraft.client.renderer.vertex.DefaultVertexFormats.field_176600_a);
 +        drawingBatch = true;
 +    }
 +
@@ -121,17 +126,17 @@
 +    {
 +        field_147553_e.func_110577_a(net.minecraft.client.renderer.texture.TextureMap.field_110575_b);
 +        net.minecraft.client.renderer.RenderHelper.func_74518_a();
-+        GlStateManager.func_179112_b(org.lwjgl.opengl.GL11.GL_SRC_ALPHA, org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA);
++        GlStateManager.func_179112_b(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
 +        GlStateManager.func_179147_l();
 +        GlStateManager.func_179129_p();
 +
 +        if (net.minecraft.client.Minecraft.func_71379_u())
 +        {
-+            GlStateManager.func_179103_j(org.lwjgl.opengl.GL11.GL_SMOOTH);
++            GlStateManager.func_179103_j(GL11.GL_SMOOTH);
 +        }
 +        else
 +        {
-+            GlStateManager.func_179103_j(org.lwjgl.opengl.GL11.GL_FLAT);
++            GlStateManager.func_179103_j(GL11.GL_FLAT);
 +        }
 +
 +        if(pass > 0)
diff --git a/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch b/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch
index 8260ee67a..c69e9f8c7 100644
--- a/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch
+++ b/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch
@@ -1,5 +1,18 @@
 --- before/net/minecraft/client/settings/GameSettings.java
 +++ after/net/minecraft/client/settings/GameSettings.java
+@@ -41,9 +41,9 @@
+ import org.apache.commons.lang3.ArrayUtils;
+ import org.apache.logging.log4j.LogManager;
+ import org.apache.logging.log4j.Logger;
+-import org.lwjgl.input.Keyboard;
+-import org.lwjgl.input.Mouse;
+-import org.lwjgl.opengl.Display;
++import org.lwjglx.input.Keyboard;
++import org.lwjglx.input.Mouse;
++import org.lwjglx.opengl.Display;
+ 
+ @SideOnly(Side.CLIENT)
+ public class GameSettings
 @@ -52,35 +52,26 @@
      private static final Gson field_151450_ay = new Gson();
      private static final Type field_151449_az = new ParameterizedType()
diff --git a/patches/minecraft/net/minecraft/client/settings/KeyBinding.java.patch b/patches/minecraft/net/minecraft/client/settings/KeyBinding.java.patch
index 94d488a63..adcd0671d 100644
--- a/patches/minecraft/net/minecraft/client/settings/KeyBinding.java.patch
+++ b/patches/minecraft/net/minecraft/client/settings/KeyBinding.java.patch
@@ -1,6 +1,15 @@
 --- before/net/minecraft/client/settings/KeyBinding.java
 +++ after/net/minecraft/client/settings/KeyBinding.java
-@@ -14,10 +14,10 @@
+@@ -6,18 +6,17 @@
+ import java.util.Set;
+ import java.util.function.Supplier;
+ import net.minecraft.client.resources.I18n;
+-import net.minecraft.util.IntHashMap;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+ 
  @SideOnly(Side.CLIENT)
  public class KeyBinding implements Comparable<KeyBinding>
  {
@@ -15,7 +24,7 @@
      private final String field_74515_c;
      private final int field_151472_e;
      private final String field_151471_f;
-@@ -29,12 +29,7 @@
+@@ -29,12 +28,7 @@
      {
          if (p_74507_0_ != 0)
          {
@@ -29,7 +38,7 @@
          }
      }
  
-@@ -42,7 +37,7 @@
+@@ -42,7 +36,7 @@
      {
          if (p_74510_0_ != 0)
          {
@@ -38,7 +47,7 @@
  
              if (keybinding != null)
              {
-@@ -59,8 +54,9 @@
+@@ -59,8 +53,9 @@
              {
                  func_74510_a(keybinding.field_74512_d, keybinding.field_74512_d < 256 && Keyboard.isKeyDown(keybinding.field_74512_d));
              }
@@ -49,7 +58,7 @@
              }
          }
      }
-@@ -75,11 +71,11 @@
+@@ -75,11 +70,11 @@
  
      public static void func_74508_b()
      {
@@ -63,7 +72,7 @@
          }
      }
  
-@@ -95,13 +91,13 @@
+@@ -95,13 +90,13 @@
          this.field_151472_e = p_i45001_2_;
          this.field_151471_f = p_i45001_3_;
          field_74516_a.put(p_i45001_1_, this);
@@ -79,7 +88,7 @@
      }
  
      public String func_151466_e()
-@@ -150,25 +146,166 @@
+@@ -150,25 +145,166 @@
  
      public int compareTo(KeyBinding p_compareTo_1_)
      {
diff --git a/patches/minecraft/net/minecraft/client/shader/Framebuffer.java.patch b/patches/minecraft/net/minecraft/client/shader/Framebuffer.java.patch
index bc373418a..4dcc6fac4 100644
--- a/patches/minecraft/net/minecraft/client/shader/Framebuffer.java.patch
+++ b/patches/minecraft/net/minecraft/client/shader/Framebuffer.java.patch
@@ -7,7 +7,16 @@
  import net.minecraft.client.renderer.BufferBuilder;
  import net.minecraft.client.renderer.GlStateManager;
  import net.minecraft.client.renderer.OpenGlHelper;
-@@ -110,15 +111,24 @@
+@@ -8,6 +9,8 @@
+ import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
++import org.lwjglx.opengl.EXTFramebufferObject;
++import org.lwjglx.opengl.EXTPackedDepthStencil;
+ 
+ @SideOnly(Side.CLIENT)
+ public class Framebuffer
+@@ -110,15 +113,24 @@
  
              this.func_147607_a(9728);
              GlStateManager.func_179144_i(this.field_147617_g);
@@ -26,14 +35,14 @@
 +                }
 +                else
 +                {
-+                    OpenGlHelper.func_153186_a(OpenGlHelper.field_153199_f, org.lwjgl.opengl.EXTPackedDepthStencil.GL_DEPTH24_STENCIL8_EXT, this.field_147622_a, this.field_147620_b);
-+                    OpenGlHelper.func_153190_b(OpenGlHelper.field_153198_e, org.lwjgl.opengl.EXTFramebufferObject.GL_DEPTH_ATTACHMENT_EXT, OpenGlHelper.field_153199_f, this.field_147624_h);
-+                    OpenGlHelper.func_153190_b(OpenGlHelper.field_153198_e, org.lwjgl.opengl.EXTFramebufferObject.GL_STENCIL_ATTACHMENT_EXT, OpenGlHelper.field_153199_f, this.field_147624_h);
++                    OpenGlHelper.func_153186_a(OpenGlHelper.field_153199_f, EXTPackedDepthStencil.GL_DEPTH24_STENCIL8_EXT, this.field_147622_a, this.field_147620_b);
++                    OpenGlHelper.func_153190_b(OpenGlHelper.field_153198_e, EXTFramebufferObject.GL_DEPTH_ATTACHMENT_EXT, OpenGlHelper.field_153199_f, this.field_147624_h);
++                    OpenGlHelper.func_153190_b(OpenGlHelper.field_153198_e, EXTFramebufferObject.GL_STENCIL_ATTACHMENT_EXT, OpenGlHelper.field_153199_f, this.field_147624_h);
 +                }
              }
  
              this.func_147614_f();
-@@ -228,7 +238,7 @@
+@@ -228,7 +240,7 @@
              GlStateManager.func_179132_a(false);
              GlStateManager.func_179128_n(5889);
              GlStateManager.func_179096_D();
@@ -42,7 +51,7 @@
              GlStateManager.func_179128_n(5888);
              GlStateManager.func_179096_D();
              GlStateManager.func_179109_b(0.0F, 0.0F, -2000.0F);
-@@ -252,10 +262,10 @@
+@@ -252,10 +264,10 @@
              Tessellator tessellator = Tessellator.func_178181_a();
              BufferBuilder bufferbuilder = tessellator.func_178180_c();
              bufferbuilder.func_181668_a(7, DefaultVertexFormats.field_181709_i);
@@ -57,7 +66,7 @@
              tessellator.func_78381_a();
              this.func_147606_d();
              GlStateManager.func_179132_a(true);
-@@ -271,11 +281,43 @@
+@@ -271,11 +283,43 @@
  
          if (this.field_147619_e)
          {
diff --git a/patches/minecraft/net/minecraft/client/shader/Shader.java.patch b/patches/minecraft/net/minecraft/client/shader/Shader.java.patch
new file mode 100644
index 000000000..e5061d5d0
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/shader/Shader.java.patch
@@ -0,0 +1,32 @@
+--- before/net/minecraft/client/shader/Shader.java
++++ after/net/minecraft/client/shader/Shader.java
+@@ -12,7 +12,7 @@
+ import net.minecraft.client.util.JsonException;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.util.vector.Matrix4f;
++import org.lwjglx.util.vector.Matrix4f;
+ 
+ @SideOnly(Side.CLIENT)
+ public class Shader
+@@ -59,9 +59,9 @@
+         GlStateManager.func_179144_i(0);
+     }
+ 
+-    public void func_148045_a(Matrix4f p_148045_1_)
++    public void setProjectionMatrix(Matrix4f projectionMatrixIn)
+     {
+-        this.field_148053_h = p_148045_1_;
++        this.field_148053_h = projectionMatrixIn;
+     }
+ 
+     public void func_148042_a(float p_148042_1_)
+@@ -81,7 +81,7 @@
+             .func_148087_a((float)this.field_148046_f.get(i).intValue(), (float)this.field_148047_g.get(i).intValue());
+         }
+ 
+-        this.field_148051_c.func_147984_b("ProjMat").func_148088_a(this.field_148053_h);
++        this.field_148051_c.func_147984_b("ProjMat").set(this.field_148053_h);
+         this.field_148051_c.func_147984_b("InSize").func_148087_a((float)this.field_148052_a.field_147622_a, (float)this.field_148052_a.field_147620_b);
+         this.field_148051_c.func_147984_b("OutSize").func_148087_a(f, f1);
+         this.field_148051_c.func_147984_b("Time").func_148090_a(p_148042_1_);
diff --git a/patches/minecraft/net/minecraft/client/shader/ShaderDefault.java.patch b/patches/minecraft/net/minecraft/client/shader/ShaderDefault.java.patch
new file mode 100644
index 000000000..623800fa2
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/shader/ShaderDefault.java.patch
@@ -0,0 +1,20 @@
+--- before/net/minecraft/client/shader/ShaderDefault.java
++++ after/net/minecraft/client/shader/ShaderDefault.java
+@@ -2,7 +2,7 @@
+ 
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.util.vector.Matrix4f;
++import org.lwjglx.util.vector.Matrix4f;
+ 
+ @SideOnly(Side.CLIENT)
+ public class ShaderDefault extends ShaderUniform
+@@ -70,7 +70,7 @@
+     }
+ 
+     @Override
+-    public void func_148088_a(Matrix4f p_148088_1_)
++    public void set(Matrix4f matrix)
+     {
+     }
+ }
diff --git a/patches/minecraft/net/minecraft/client/shader/ShaderGroup.java.patch b/patches/minecraft/net/minecraft/client/shader/ShaderGroup.java.patch
index ef9d7d312..6cc42242a 100644
--- a/patches/minecraft/net/minecraft/client/shader/ShaderGroup.java.patch
+++ b/patches/minecraft/net/minecraft/client/shader/ShaderGroup.java.patch
@@ -8,6 +8,15 @@
  import java.io.FileNotFoundException;
  import java.io.IOException;
  import java.nio.charset.StandardCharsets;
+@@ -23,7 +24,7 @@
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ import org.apache.commons.io.IOUtils;
+-import org.lwjgl.util.vector.Matrix4f;
++import org.lwjglx.util.vector.Matrix4f;
+ 
+ @SideOnly(Side.CLIENT)
+ public class ShaderGroup
 @@ -31,9 +32,9 @@
      private final Framebuffer field_148035_a;
      private final IResourceManager field_148033_b;
@@ -102,6 +111,15 @@
  
          if (shaderuniform == null)
          {
+@@ -365,7 +367,7 @@
+ 
+         for (Shader shader : this.field_148031_d)
+         {
+-            shader.func_148045_a(this.field_148030_g);
++            shader.setProjectionMatrix(this.field_148030_g);
+         }
+ 
+         for (Framebuffer framebuffer : this.field_148029_f)
 @@ -386,11 +388,9 @@
              this.field_148036_j += p_148018_1_ - this.field_148037_k;
          }
diff --git a/patches/minecraft/net/minecraft/client/shader/ShaderLoader.java.patch b/patches/minecraft/net/minecraft/client/shader/ShaderLoader.java.patch
index 53d0f99dc..b4285bcbf 100644
--- a/patches/minecraft/net/minecraft/client/shader/ShaderLoader.java.patch
+++ b/patches/minecraft/net/minecraft/client/shader/ShaderLoader.java.patch
@@ -10,6 +10,15 @@
  import java.nio.ByteBuffer;
  import java.util.Map;
  import net.minecraft.client.renderer.OpenGlHelper;
+@@ -15,7 +15,7 @@
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ import org.apache.commons.io.IOUtils;
+ import org.apache.commons.lang3.StringUtils;
+-import org.lwjgl.BufferUtils;
++import org.lwjglx.BufferUtils;
+ 
+ @SideOnly(Side.CLIENT)
+ public class ShaderLoader
 @@ -56,11 +56,12 @@
  
      public static ShaderLoader func_148057_a(IResourceManager p_148057_0_, ShaderLoader.ShaderType p_148057_1_, String p_148057_2_) throws IOException
diff --git a/patches/minecraft/net/minecraft/client/shader/ShaderUniform.java.patch b/patches/minecraft/net/minecraft/client/shader/ShaderUniform.java.patch
new file mode 100644
index 000000000..2386ade75
--- /dev/null
+++ b/patches/minecraft/net/minecraft/client/shader/ShaderUniform.java.patch
@@ -0,0 +1,56 @@
+--- before/net/minecraft/client/shader/ShaderUniform.java
++++ after/net/minecraft/client/shader/ShaderUniform.java
+@@ -8,8 +8,8 @@
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ import org.apache.logging.log4j.LogManager;
+ import org.apache.logging.log4j.Logger;
+-import org.lwjgl.BufferUtils;
+-import org.lwjgl.util.vector.Matrix4f;
++import org.lwjglx.BufferUtils;
++import org.lwjglx.util.vector.Matrix4f;
+ 
+ @SideOnly(Side.CLIENT)
+ public class ShaderUniform
+@@ -240,25 +240,25 @@
+         this.func_148096_h();
+     }
+ 
+-    public void func_148088_a(Matrix4f p_148088_1_)
++    public void set(Matrix4f matrix)
+     {
+         this.func_148094_a(
+-            p_148088_1_.m00,
+-            p_148088_1_.m01,
+-            p_148088_1_.m02,
+-            p_148088_1_.m03,
+-            p_148088_1_.m10,
+-            p_148088_1_.m11,
+-            p_148088_1_.m12,
+-            p_148088_1_.m13,
+-            p_148088_1_.m20,
+-            p_148088_1_.m21,
+-            p_148088_1_.m22,
+-            p_148088_1_.m23,
+-            p_148088_1_.m30,
+-            p_148088_1_.m31,
+-            p_148088_1_.m32,
+-            p_148088_1_.m33
++            matrix.m00,
++            matrix.m01,
++            matrix.m02,
++            matrix.m03,
++            matrix.m10,
++            matrix.m11,
++            matrix.m12,
++            matrix.m13,
++            matrix.m20,
++            matrix.m21,
++            matrix.m22,
++            matrix.m23,
++            matrix.m30,
++            matrix.m31,
++            matrix.m32,
++            matrix.m33
+         );
+     }
+ 
diff --git a/patches/minecraft/net/minecraft/util/MouseHelper.java.patch b/patches/minecraft/net/minecraft/util/MouseHelper.java.patch
index 6d90da474..36e94dfca 100644
--- a/patches/minecraft/net/minecraft/util/MouseHelper.java.patch
+++ b/patches/minecraft/net/minecraft/util/MouseHelper.java.patch
@@ -1,5 +1,16 @@
 --- before/net/minecraft/util/MouseHelper.java
 +++ after/net/minecraft/util/MouseHelper.java
+@@ -2,8 +2,8 @@
+ 
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Mouse;
+-import org.lwjgl.opengl.Display;
++import org.lwjglx.input.Mouse;
++import org.lwjglx.opengl.Display;
+ 
+ @SideOnly(Side.CLIENT)
+ public class MouseHelper
 @@ -13,6 +13,7 @@
  
      public void func_74372_a()
diff --git a/patches/minecraft/net/minecraft/util/ScreenShotHelper.java.patch b/patches/minecraft/net/minecraft/util/ScreenShotHelper.java.patch
index 2f957f9f9..b77c0f3f4 100644
--- a/patches/minecraft/net/minecraft/util/ScreenShotHelper.java.patch
+++ b/patches/minecraft/net/minecraft/util/ScreenShotHelper.java.patch
@@ -8,6 +8,15 @@
  import java.nio.IntBuffer;
  import java.text.DateFormat;
  import java.text.SimpleDateFormat;
+@@ -21,7 +20,7 @@
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ import org.apache.logging.log4j.LogManager;
+ import org.apache.logging.log4j.Logger;
+-import org.lwjgl.BufferUtils;
++import org.lwjglx.BufferUtils;
+ 
+ @SideOnly(Side.CLIENT)
+ public class ScreenShotHelper
 @@ -33,7 +32,7 @@
  
      public static ITextComponent func_148260_a(File p_148260_0_, int p_148260_1_, int p_148260_2_, Framebuffer p_148260_3_)
diff --git a/src/main/java/net/minecraftforge/client/CloudRenderer.java b/src/main/java/net/minecraftforge/client/CloudRenderer.java
index 8f8911920..01bb8005f 100644
--- a/src/main/java/net/minecraftforge/client/CloudRenderer.java
+++ b/src/main/java/net/minecraftforge/client/CloudRenderer.java
@@ -25,7 +25,7 @@
 
 import net.minecraftforge.client.resource.IResourceType;
 import net.minecraftforge.client.resource.VanillaResourceType;
-import org.lwjgl.opengl.GL11;
+import org.lwjglx.opengl.GL11;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BufferBuilder;
diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java
index b080cf649..dd78c9683 100644
--- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java
+++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java
@@ -20,8 +20,6 @@
 package net.minecraftforge.client;
 
 import static net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType.BOSSINFO;
-import static net.minecraftforge.common.ForgeVersion.Status.BETA;
-import static net.minecraftforge.common.ForgeVersion.Status.BETA_OUTDATED;
 
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -81,7 +79,6 @@
 import net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUsage;
 import net.minecraft.client.resources.FoliageColorReloadListener;
 import net.minecraft.client.resources.GrassColorReloadListener;
-import net.minecraft.client.resources.I18n;
 import net.minecraft.client.resources.IResourceManagerReloadListener;
 import net.minecraft.client.resources.LanguageManager;
 import net.minecraft.client.settings.GameSettings;
@@ -103,7 +100,6 @@
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.registry.IRegistry;
-import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
@@ -130,8 +126,6 @@
 import net.minecraftforge.client.resource.VanillaResourceType;
 import net.minecraftforge.client.model.pipeline.QuadGatheringTransformer;
 import net.minecraftforge.common.ForgeModContainer;
-import net.minecraftforge.common.ForgeVersion;
-import net.minecraftforge.common.ForgeVersion.Status;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.model.IModelPart;
 import net.minecraftforge.common.model.ITransformation;
@@ -143,9 +137,9 @@
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.logging.log4j.core.async.ThreadNameCachingStrategy;
 import org.apache.logging.log4j.core.impl.ReusableLogEventFactory;
-import org.lwjgl.BufferUtils;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL20;
+import org.lwjglx.BufferUtils;
+import org.lwjglx.opengl.GL11;
+import org.lwjglx.opengl.GL20;
 
 import java.util.function.Predicate;
 
@@ -521,7 +515,7 @@ public static void postDraw(EnumUsage attrType, VertexFormat format, int element
         }
     }
 
-    public static void transform(org.lwjgl.util.vector.Vector3f vec, Matrix4f m)
+    public static void transform(org.lwjglx.util.vector.Vector3f vec, Matrix4f m)
     {
         Vector4f tmp = new Vector4f(vec.x, vec.y, vec.z, 1f);
         m.transform(tmp);
diff --git a/src/main/java/net/minecraftforge/client/GuiIngameForge.java b/src/main/java/net/minecraftforge/client/GuiIngameForge.java
index aa6269199..e4092d765 100644
--- a/src/main/java/net/minecraftforge/client/GuiIngameForge.java
+++ b/src/main/java/net/minecraftforge/client/GuiIngameForge.java
@@ -59,7 +59,7 @@
 import net.minecraftforge.common.ForgeHooks;
 import net.minecraftforge.common.MinecraftForge;
 
-import org.lwjgl.opengl.GL11;
+import org.lwjglx.opengl.GL11;
 
 /**
  * a REPLACEMENT of {@link net.minecraft.client.gui.GuiIngame}, there should be no need of using the original {@code GuiIngame}
diff --git a/src/main/java/net/minecraftforge/client/event/GuiScreenEvent.java b/src/main/java/net/minecraftforge/client/event/GuiScreenEvent.java
index 359395319..ce798b31a 100644
--- a/src/main/java/net/minecraftforge/client/event/GuiScreenEvent.java
+++ b/src/main/java/net/minecraftforge/client/event/GuiScreenEvent.java
@@ -24,7 +24,7 @@
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.InventoryEffectRenderer;
-import org.lwjgl.input.Mouse;
+import org.lwjglx.input.Mouse;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
diff --git a/src/main/java/net/minecraftforge/client/event/MouseEvent.java b/src/main/java/net/minecraftforge/client/event/MouseEvent.java
index 8c6ee0fa8..41688a039 100644
--- a/src/main/java/net/minecraftforge/client/event/MouseEvent.java
+++ b/src/main/java/net/minecraftforge/client/event/MouseEvent.java
@@ -19,7 +19,7 @@
 
 package net.minecraftforge.client.event;
 
-import org.lwjgl.input.Mouse;
+import org.lwjglx.input.Mouse;
 
 import net.minecraftforge.fml.common.eventhandler.Cancelable;
 import net.minecraftforge.fml.common.eventhandler.Event;
diff --git a/src/main/java/net/minecraftforge/client/model/ModelLoader.java b/src/main/java/net/minecraftforge/client/model/ModelLoader.java
index aaa4975c1..84b099fc5 100644
--- a/src/main/java/net/minecraftforge/client/model/ModelLoader.java
+++ b/src/main/java/net/minecraftforge/client/model/ModelLoader.java
@@ -108,6 +108,7 @@
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 import com.google.common.collect.Sets;
+import org.lwjglx.util.vector.Vector3f;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -466,7 +467,7 @@ private IBakedModel bakeNormal(ModelBlock model, IModelState perState, final IMo
                 {
                     transformation = transformation.compose(newTransforms.get(i));
                     BlockPartRotation rot = part.partRotation;
-                    if(rot == null) rot = new BlockPartRotation(new org.lwjgl.util.vector.Vector3f(), EnumFacing.Axis.Y, 0, false);
+                    if(rot == null) rot = new BlockPartRotation(new Vector3f(), EnumFacing.Axis.Y, 0, false);
                     part = new BlockPart(part.positionFrom, part.positionTo, part.mapFaces, rot, part.shade);
                 }
                 for(Map.Entry<EnumFacing, BlockPartFace> e : part.mapFaces.entrySet())
diff --git a/src/main/java/net/minecraftforge/client/model/animation/AnimationModelBase.java b/src/main/java/net/minecraftforge/client/model/animation/AnimationModelBase.java
index 893b2e303..5f46cfdd3 100644
--- a/src/main/java/net/minecraftforge/client/model/animation/AnimationModelBase.java
+++ b/src/main/java/net/minecraftforge/client/model/animation/AnimationModelBase.java
@@ -46,7 +46,7 @@
 
 import net.minecraftforge.common.model.animation.IAnimationStateMachine;
 import org.apache.commons.lang3.tuple.Pair;
-import org.lwjgl.opengl.GL11;
+import org.lwjglx.opengl.GL11;
 
 /**
  * ModelBase that works with the Forge model system and animations.
diff --git a/src/main/java/net/minecraftforge/client/model/animation/FastTESR.java b/src/main/java/net/minecraftforge/client/model/animation/FastTESR.java
index a1535d6e7..e2ef6ac2f 100644
--- a/src/main/java/net/minecraftforge/client/model/animation/FastTESR.java
+++ b/src/main/java/net/minecraftforge/client/model/animation/FastTESR.java
@@ -19,7 +19,7 @@
 
 package net.minecraftforge.client.model.animation;
 
-import org.lwjgl.opengl.GL11;
+import org.lwjglx.opengl.GL11;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
diff --git a/src/main/java/net/minecraftforge/client/settings/KeyModifier.java b/src/main/java/net/minecraftforge/client/settings/KeyModifier.java
index 46fd49968..6fd6f375f 100644
--- a/src/main/java/net/minecraftforge/client/settings/KeyModifier.java
+++ b/src/main/java/net/minecraftforge/client/settings/KeyModifier.java
@@ -25,7 +25,7 @@
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.client.settings.GameSettings;
-import org.lwjgl.input.Keyboard;
+import org.lwjglx.input.Keyboard;
 
 public enum KeyModifier {
     CONTROL {
diff --git a/src/main/java/net/minecraftforge/common/model/TRSRTransformation.java b/src/main/java/net/minecraftforge/common/model/TRSRTransformation.java
index 7300b1364..84be639c4 100644
--- a/src/main/java/net/minecraftforge/common/model/TRSRTransformation.java
+++ b/src/main/java/net/minecraftforge/common/model/TRSRTransformation.java
@@ -738,19 +738,19 @@ public boolean equals(Object obj)
     }
 
     @SideOnly(Side.CLIENT)
-    public static Vector3f toVecmath(org.lwjgl.util.vector.Vector3f vec)
+    public static Vector3f toVecmath(org.lwjglx.util.vector.Vector3f vec)
     {
         return new Vector3f(vec.x, vec.y, vec.z);
     }
 
     @SideOnly(Side.CLIENT)
-    public static Vector4f toVecmath(org.lwjgl.util.vector.Vector4f vec)
+    public static Vector4f toVecmath(org.lwjglx.util.vector.Vector4f vec)
     {
         return new Vector4f(vec.x, vec.y, vec.z, vec.w);
     }
 
     @SideOnly(Side.CLIENT)
-    public static Matrix4f toVecmath(org.lwjgl.util.vector.Matrix4f m)
+    public static Matrix4f toVecmath(org.lwjglx.util.vector.Matrix4f m)
     {
         return new Matrix4f(
             m.m00, m.m10, m.m20, m.m30,
@@ -760,21 +760,21 @@ public static Matrix4f toVecmath(org.lwjgl.util.vector.Matrix4f m)
     }
 
     @SideOnly(Side.CLIENT)
-    public static org.lwjgl.util.vector.Vector3f toLwjgl(Vector3f vec)
+    public static org.lwjglx.util.vector.Vector3f toLwjgl(Vector3f vec)
     {
-        return new org.lwjgl.util.vector.Vector3f(vec.x, vec.y, vec.z);
+        return new org.lwjglx.util.vector.Vector3f(vec.x, vec.y, vec.z);
     }
 
     @SideOnly(Side.CLIENT)
-    public static org.lwjgl.util.vector.Vector4f toLwjgl(Vector4f vec)
+    public static org.lwjglx.util.vector.Vector4f toLwjgl(Vector4f vec)
     {
-        return new org.lwjgl.util.vector.Vector4f(vec.x, vec.y, vec.z, vec.w);
+        return new org.lwjglx.util.vector.Vector4f(vec.x, vec.y, vec.z, vec.w);
     }
 
     @SideOnly(Side.CLIENT)
-    public static org.lwjgl.util.vector.Matrix4f toLwjgl(Matrix4f m)
+    public static org.lwjglx.util.vector.Matrix4f toLwjgl(Matrix4f m)
     {
-        org.lwjgl.util.vector.Matrix4f r = new org.lwjgl.util.vector.Matrix4f();
+        org.lwjglx.util.vector.Matrix4f r = new org.lwjglx.util.vector.Matrix4f();
         r.m00 = m.m00;
         r.m01 = m.m10;
         r.m02 = m.m20;
diff --git a/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java b/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
index f948621de..d4f37f801 100644
--- a/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
+++ b/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
@@ -118,10 +118,10 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.FormattedMessage;
-import org.lwjgl.LWJGLUtil;
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.input.Mouse;
-import org.lwjgl.opengl.Display;
+import org.lwjglx.LWJGLUtil;
+import org.lwjglx.input.Keyboard;
+import org.lwjglx.input.Mouse;
+import org.lwjglx.opengl.Display;
 
 import com.google.common.base.CharMatcher;
 import com.google.common.base.MoreObjects;
diff --git a/src/main/java/net/minecraftforge/fml/client/GuiModList.java b/src/main/java/net/minecraftforge/fml/client/GuiModList.java
index 354ad6bf6..8e1968889 100644
--- a/src/main/java/net/minecraftforge/fml/client/GuiModList.java
+++ b/src/main/java/net/minecraftforge/fml/client/GuiModList.java
@@ -61,10 +61,10 @@
 import net.minecraftforge.fml.common.versioning.ComparableVersion;
 import static net.minecraft.util.text.TextFormatting.*;
 
-import org.lwjgl.input.Mouse;
+import org.lwjglx.input.Mouse;
 
 import com.google.common.base.Strings;
-import org.lwjgl.opengl.GL11;
+import org.lwjglx.opengl.GL11;
 
 /**
  * @author cpw
diff --git a/src/main/java/net/minecraftforge/fml/client/GuiMultipleModsErrored.java b/src/main/java/net/minecraftforge/fml/client/GuiMultipleModsErrored.java
index a5460ea09..722b8873b 100644
--- a/src/main/java/net/minecraftforge/fml/client/GuiMultipleModsErrored.java
+++ b/src/main/java/net/minecraftforge/fml/client/GuiMultipleModsErrored.java
@@ -31,7 +31,7 @@
 import net.minecraftforge.fml.common.WrongMinecraftVersionException;
 import net.minecraftforge.fml.common.versioning.ArtifactVersion;
 import net.minecraftforge.fml.common.versioning.DefaultArtifactVersion;
-import org.lwjgl.input.Mouse;
+import org.lwjglx.input.Mouse;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/src/main/java/net/minecraftforge/fml/client/GuiScrollingList.java b/src/main/java/net/minecraftforge/fml/client/GuiScrollingList.java
index 7f2e6842b..233bf50c4 100644
--- a/src/main/java/net/minecraftforge/fml/client/GuiScrollingList.java
+++ b/src/main/java/net/minecraftforge/fml/client/GuiScrollingList.java
@@ -28,8 +28,8 @@
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraftforge.fml.client.config.GuiUtils;
-import org.lwjgl.input.Mouse;
-import org.lwjgl.opengl.GL11;
+import org.lwjglx.input.Mouse;
+import org.lwjglx.opengl.GL11;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/src/main/java/net/minecraftforge/fml/client/SplashProgress.java b/src/main/java/net/minecraftforge/fml/client/SplashProgress.java
index cd609923c..4d0fbb74e 100644
--- a/src/main/java/net/minecraftforge/fml/client/SplashProgress.java
+++ b/src/main/java/net/minecraftforge/fml/client/SplashProgress.java
@@ -19,8 +19,8 @@
 
 package net.minecraftforge.fml.client;
 
-import static org.lwjgl.opengl.GL11.*;
-import static org.lwjgl.opengl.GL12.*;
+import static org.lwjglx.opengl.GL11.*;
+import static org.lwjglx.opengl.GL12.*;
 
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -70,12 +70,12 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.lwjgl.BufferUtils;
-import org.lwjgl.LWJGLException;
-import org.lwjgl.opengl.Display;
-import org.lwjgl.opengl.Drawable;
-import org.lwjgl.opengl.SharedDrawable;
-import org.lwjgl.util.glu.GLU;
+import org.lwjglx.BufferUtils;
+import org.lwjglx.LWJGLException;
+import org.lwjglx.opengl.Display;
+import org.lwjglx.opengl.Drawable;
+import org.lwjglx.opengl.SharedDrawable;
+import org.lwjglx.util.glu.GLU;
 
 /**
  * Not a fully fleshed out API, may change in future MC versions.
diff --git a/src/main/java/net/minecraftforge/fml/client/config/GuiConfig.java b/src/main/java/net/minecraftforge/fml/client/config/GuiConfig.java
index c225331bd..7316c44c3 100644
--- a/src/main/java/net/minecraftforge/fml/client/config/GuiConfig.java
+++ b/src/main/java/net/minecraftforge/fml/client/config/GuiConfig.java
@@ -44,7 +44,7 @@
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.eventhandler.Event.Result;
 
-import org.lwjgl.input.Keyboard;
+import org.lwjglx.input.Keyboard;
 
 import javax.annotation.Nullable;
 
diff --git a/src/main/java/net/minecraftforge/fml/client/config/GuiConfigEntries.java b/src/main/java/net/minecraftforge/fml/client/config/GuiConfigEntries.java
index a9a705c7f..f213e53e6 100644
--- a/src/main/java/net/minecraftforge/fml/client/config/GuiConfigEntries.java
+++ b/src/main/java/net/minecraftforge/fml/client/config/GuiConfigEntries.java
@@ -39,7 +39,7 @@
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.ModContainer;
 
-import org.lwjgl.input.Keyboard;
+import org.lwjglx.input.Keyboard;
 
 /**
  * This class implements the scrolling list functionality of the config GUI screens. It also provides all the default control handlers
diff --git a/src/main/java/net/minecraftforge/fml/client/config/GuiEditArray.java b/src/main/java/net/minecraftforge/fml/client/config/GuiEditArray.java
index f6bc67b0c..c012be70c 100644
--- a/src/main/java/net/minecraftforge/fml/client/config/GuiEditArray.java
+++ b/src/main/java/net/minecraftforge/fml/client/config/GuiEditArray.java
@@ -34,7 +34,7 @@
 import static net.minecraftforge.fml.client.config.GuiUtils.UNDO_CHAR;
 
 import net.minecraftforge.fml.common.FMLLog;
-import org.lwjgl.input.Keyboard;
+import org.lwjglx.input.Keyboard;
 
 /**
  * This class is the base screen used for editing an array-type property. It provides a list of array entries for the user to edit.
diff --git a/src/main/java/net/minecraftforge/fml/client/config/GuiEditArrayEntries.java b/src/main/java/net/minecraftforge/fml/client/config/GuiEditArrayEntries.java
index 14d2346e2..40ba89c40 100644
--- a/src/main/java/net/minecraftforge/fml/client/config/GuiEditArrayEntries.java
+++ b/src/main/java/net/minecraftforge/fml/client/config/GuiEditArrayEntries.java
@@ -31,7 +31,7 @@
 import net.minecraftforge.fml.client.config.GuiConfigEntries.ArrayEntry;
 import net.minecraftforge.fml.common.FMLLog;
 
-import org.lwjgl.input.Keyboard;
+import org.lwjglx.input.Keyboard;
 
 import static net.minecraftforge.fml.client.config.GuiUtils.INVALID;
 import static net.minecraftforge.fml.client.config.GuiUtils.VALID;
diff --git a/src/main/java/net/minecraftforge/fml/client/config/GuiUtils.java b/src/main/java/net/minecraftforge/fml/client/config/GuiUtils.java
index bfeea94c2..7bf4e137e 100644
--- a/src/main/java/net/minecraftforge/fml/client/config/GuiUtils.java
+++ b/src/main/java/net/minecraftforge/fml/client/config/GuiUtils.java
@@ -31,7 +31,7 @@
 import net.minecraftforge.client.event.RenderTooltipEvent;
 import net.minecraftforge.common.MinecraftForge;
 
-import org.lwjgl.opengl.GL11;
+import org.lwjglx.opengl.GL11;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/net/minecraftforge/fml/common/asm/transformers/LWJGLTransformer.java b/src/main/java/net/minecraftforge/fml/common/asm/transformers/LWJGLTransformer.java
new file mode 100644
index 000000000..8a82829aa
--- /dev/null
+++ b/src/main/java/net/minecraftforge/fml/common/asm/transformers/LWJGLTransformer.java
@@ -0,0 +1,90 @@
+package net.minecraftforge.fml.common.asm.transformers;
+
+import net.minecraft.launchwrapper.IClassTransformer;
+import net.minecraft.launchwrapper.Launch;
+import net.minecraftforge.fml.common.FMLLog;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.commons.ClassRemapper;
+import org.objectweb.asm.commons.Remapper;
+import org.objectweb.asm.tree.ClassNode;
+
+import java.io.IOException;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class LWJGLTransformer implements IClassTransformer {
+    private static final LWJGLXRemapper INSTANCE = new LWJGLXRemapper();
+    @Override
+    public byte[] transform(String s, String s1, byte[] bytes) {
+        if (s1.startsWith("net.minecraft")) {
+            ClassReader reader = new ClassReader(bytes);
+            ClassWriter writer = new ClassWriter(0);
+            ClassVisitor visitor = new ClassRemapper(writer, new LWJGLXRemapper());
+            reader.accept(visitor, 0);
+            return writer.toByteArray();
+        }
+        if (!s1.startsWith("org.lwjgl")) {
+            return bytes;
+        }
+        String lwjglxName = s.replace("org.lwjgl", "org.lwjglx");
+        byte[] lwjglxBytes;
+        try {
+            lwjglxBytes = Launch.classLoader.testGetClassBytes(lwjglxName);
+        } catch (IOException e) {
+            return bytes;
+        }
+        if (lwjglxBytes == null) {
+            return bytes;
+        }
+        ClassReader lwjglxReader = new ClassReader(lwjglxBytes);
+        ClassWriter writer = new ClassWriter(0);
+        ClassVisitor classVisitor = new ClassRemapper(writer, new LWJGLXRemapper());
+        lwjglxReader.accept(classVisitor, 0);
+        lwjglxBytes = writer.toByteArray();
+        if (bytes == null) {
+            return lwjglxBytes;
+        }
+
+        ClassNode lwjglNode = new ClassNode();
+        ClassReader lwjglReader = new ClassReader(bytes);
+        lwjglReader.accept(lwjglNode, 0);
+
+        lwjglxReader = new ClassReader(lwjglxBytes);
+        ClassNode lwjglxNode = new ClassNode();
+        lwjglxReader.accept(lwjglxNode, 0);
+        Set<String> methods = lwjglNode.methods.stream().map(m -> m.desc).collect(Collectors.toSet());
+        lwjglxNode.methods.forEach(m -> {
+            if (!methods.contains(m.desc)) {
+                lwjglNode.methods.add(m);
+            }
+        });
+        Set<String> fields = lwjglNode.fields.stream().map(f -> f.desc).collect(Collectors.toSet());
+        lwjglxNode.fields.forEach(f -> {
+            if (!fields.contains(f.desc)) {
+                lwjglNode.fields.add(f);
+            }
+        });
+        ClassWriter out = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
+        lwjglNode.accept(out);
+        return out.toByteArray();
+    }
+
+    static class LWJGLXRemapper extends Remapper {
+
+        @Override
+        public String map(String typeName) {
+            if (typeName == null) {
+                return null;
+            }
+            if (typeName.startsWith("org/lwjglx")) {
+                return "org/lwjgl" + typeName.substring(10);
+            }
+
+            return typeName;
+        }
+
+    }
+
+}
diff --git a/src/main/java/net/minecraftforge/fml/relauncher/FMLCorePlugin.java b/src/main/java/net/minecraftforge/fml/relauncher/FMLCorePlugin.java
index 889d97815..8c3128a14 100644
--- a/src/main/java/net/minecraftforge/fml/relauncher/FMLCorePlugin.java
+++ b/src/main/java/net/minecraftforge/fml/relauncher/FMLCorePlugin.java
@@ -33,7 +33,7 @@ public String[] getASMTransformerClass()
                              "net.minecraftforge.fml.common.asm.transformers.EventSubscriptionTransformer",
                              "net.minecraftforge.fml.common.asm.transformers.EventSubscriberTransformer",
                              "net.minecraftforge.fml.common.asm.transformers.SoundEngineFixTransformer",
-                             //"net.minecraftforge.fml.common.asm.transformers.JavaxTransformer",
+                             "net.minecraftforge.fml.common.asm.transformers.LWJGLTransformer",
                             };
     }
 
diff --git a/src/main/java/org/lwjgl/openal/AL10.java b/src/main/java/org/lwjgl/openal/AL10.java
deleted file mode 100644
index f9e205d33..000000000
--- a/src/main/java/org/lwjgl/openal/AL10.java
+++ /dev/null
@@ -1,304 +0,0 @@
-package org.lwjgl.openal;
-
-public class AL10 {
-
-    public static final int AL_INVALID = org.lwjgl3.openal.AL10.AL_INVALID;
-    public static final int AL_NONE = org.lwjgl3.openal.AL10.AL_NONE;
-    public static final int AL_FALSE = org.lwjgl3.openal.AL10.AL_FALSE;
-    public static final int AL_TRUE = org.lwjgl3.openal.AL10.AL_TRUE;
-    public static final int AL_SOURCE_TYPE = org.lwjgl3.openal.AL10.AL_SOURCE_TYPE;
-    public static final int AL_SOURCE_ABSOLUTE = org.lwjgl3.openal.AL10.AL_SOURCE_ABSOLUTE;
-    public static final int AL_SOURCE_RELATIVE = org.lwjgl3.openal.AL10.AL_SOURCE_RELATIVE;
-    public static final int AL_CONE_INNER_ANGLE = org.lwjgl3.openal.AL10.AL_CONE_INNER_ANGLE;
-    public static final int AL_CONE_OUTER_ANGLE = org.lwjgl3.openal.AL10.AL_CONE_OUTER_ANGLE;
-    public static final int AL_PITCH = org.lwjgl3.openal.AL10.AL_PITCH;
-    public static final int AL_POSITION = org.lwjgl3.openal.AL10.AL_POSITION;
-    public static final int AL_DIRECTION = org.lwjgl3.openal.AL10.AL_DIRECTION;
-    public static final int AL_VELOCITY = org.lwjgl3.openal.AL10.AL_VELOCITY;
-    public static final int AL_LOOPING = org.lwjgl3.openal.AL10.AL_LOOPING;
-    public static final int AL_BUFFER = org.lwjgl3.openal.AL10.AL_BUFFER;
-    public static final int AL_GAIN = org.lwjgl3.openal.AL10.AL_GAIN;
-    public static final int AL_MIN_GAIN = org.lwjgl3.openal.AL10.AL_MIN_GAIN;
-    public static final int AL_MAX_GAIN = org.lwjgl3.openal.AL10.AL_MAX_GAIN;
-    public static final int AL_ORIENTATION = org.lwjgl3.openal.AL10.AL_ORIENTATION,
-            AL_REFERENCE_DISTANCE = org.lwjgl3.openal.AL10.AL_REFERENCE_DISTANCE;
-    public static final int AL_ROLLOFF_FACTOR = org.lwjgl3.openal.AL10.AL_ROLLOFF_FACTOR;
-    public static final int AL_CONE_OUTER_GAIN = org.lwjgl3.openal.AL10.AL_CONE_OUTER_GAIN;
-    public static final int AL_MAX_DISTANCE = org.lwjgl3.openal.AL10.AL_MAX_DISTANCE;
-    public static final int AL_CHANNEL_MASK = 0x3000;
-    public static final int AL_SOURCE_STATE = org.lwjgl3.openal.AL10.AL_SOURCE_STATE,
-            AL_INITIAL = org.lwjgl3.openal.AL10.AL_INITIAL,
-            AL_PLAYING = org.lwjgl3.openal.AL10.AL_PLAYING,
-            AL_PAUSED = org.lwjgl3.openal.AL10.AL_PAUSED,
-            AL_STOPPED = org.lwjgl3.openal.AL10.AL_STOPPED;
-    public static final int AL_BUFFERS_QUEUED = org.lwjgl3.openal.AL10.AL_BUFFERS_QUEUED,
-            AL_BUFFERS_PROCESSED = org.lwjgl3.openal.AL10.AL_BUFFERS_PROCESSED;
-    public static final int AL_FORMAT_MONO8 = org.lwjgl3.openal.AL10.AL_FORMAT_MONO8,
-            AL_FORMAT_MONO16 = org.lwjgl3.openal.AL10.AL_FORMAT_MONO16,
-            AL_FORMAT_STEREO8 = org.lwjgl3.openal.AL10.AL_FORMAT_STEREO8,
-            AL_FORMAT_STEREO16 = org.lwjgl3.openal.AL10.AL_FORMAT_STEREO16;
-    public static final int AL_FORMAT_VORBIS_EXT = 0x10003;
-    public static final int AL_FREQUENCY = org.lwjgl3.openal.AL10.AL_FREQUENCY;
-    public static final int AL_BITS = org.lwjgl3.openal.AL10.AL_BITS;
-    public static final int AL_CHANNELS = org.lwjgl3.openal.AL10.AL_CHANNELS;
-    public static final int AL_SIZE = org.lwjgl3.openal.AL10.AL_SIZE;
-    public static final int AL_DATA = 0x2005;
-    public static final int AL_UNUSED = org.lwjgl3.openal.AL10.AL_UNUSED,
-            AL_PENDING = org.lwjgl3.openal.AL10.AL_PENDING,
-            AL_PROCESSED = org.lwjgl3.openal.AL10.AL_PROCESSED;
-    public static final int AL_NO_ERROR = 0x0;
-    public static final int AL_INVALID_NAME = org.lwjgl3.openal.AL10.AL_INVALID_NAME;
-    public static final int AL_INVALID_ENUM = org.lwjgl3.openal.AL10.AL_INVALID_ENUM;
-    public static final int AL_INVALID_VALUE = org.lwjgl3.openal.AL10.AL_INVALID_VALUE;
-    public static final int AL_INVALID_OPERATION = org.lwjgl3.openal.AL10.AL_INVALID_OPERATION;
-    public static final int AL_OUT_OF_MEMORY = org.lwjgl3.openal.AL10.AL_OUT_OF_MEMORY;
-    public static final int AL_VENDOR = org.lwjgl3.openal.AL10.AL_VENDOR;
-    public static final int AL_VERSION = org.lwjgl3.openal.AL10.AL_VERSION;
-    public static final int AL_RENDERER = org.lwjgl3.openal.AL10.AL_RENDERER;
-    public static final int AL_EXTENSIONS = org.lwjgl3.openal.AL10.AL_EXTENSIONS;
-    public static final int AL_DOPPLER_FACTOR = org.lwjgl3.openal.AL10.AL_DOPPLER_FACTOR;
-    public static final int AL_DOPPLER_VELOCITY = org.lwjgl3.openal.AL10.AL_DOPPLER_FACTOR;
-    public static final int AL_DISTANCE_MODEL = org.lwjgl3.openal.AL10.AL_DISTANCE_MODEL;
-    public static final int AL_INVERSE_DISTANCE = org.lwjgl3.openal.AL10.AL_INVERSE_DISTANCE,
-            AL_INVERSE_DISTANCE_CLAMPED = org.lwjgl3.openal.AL10.AL_INVERSE_DISTANCE_CLAMPED;
-
-    public static void alBufferData(int buffer, int format, java.nio.ByteBuffer data, int freq) {
-        org.lwjgl3.openal.AL10.alBufferData(buffer, format, data, freq);
-    }
-
-    public static void alBufferData(int buffer, int format, java.nio.IntBuffer data, int freq) {
-        org.lwjgl3.openal.AL10.alBufferData(buffer, format, data, freq);
-    }
-
-    public static void alBufferData(int buffer, int format, java.nio.ShortBuffer data, int freq) {
-        org.lwjgl3.openal.AL10.alBufferData(buffer, format, data, freq);
-    }
-    public static void alcCloseDevice(ALCdevice alCdevice) {
-        org.lwjgl3.openal.ALC10.alcCloseDevice(alCdevice.device);
-    }
-    public static void alDeleteBuffers(int buffer) {
-        org.lwjgl3.openal.AL10.alDeleteBuffers(buffer);
-    }
-
-    public static void alDeleteBuffers(java.nio.IntBuffer buffers) {
-        org.lwjgl3.openal.AL10.alDeleteBuffers(buffers);
-    }
-
-    public static void alDeleteSources(int source) {
-        org.lwjgl3.openal.AL10.alDeleteSources(source);
-    }
-
-    public static void alDeleteSources(java.nio.IntBuffer sources) {
-        org.lwjgl3.openal.AL10.alDeleteSources(sources);
-    }
-
-    public static void alDisable(int capability) {
-        org.lwjgl3.openal.AL10.alDisable(capability);
-    }
-
-    public static void alDistanceModel(int value) {
-        org.lwjgl3.openal.AL10.alDistanceModel(value);
-    }
-
-    public static void alDopplerFactor(float value) {
-        org.lwjgl3.openal.AL10.alDopplerFactor(value);
-    }
-
-    public static void alDopplerVelocity(float value) {
-        org.lwjgl3.openal.AL10.alDopplerVelocity(value);
-    }
-
-    public static void alEnable(int capability) {
-        org.lwjgl3.openal.AL10.alEnable(capability);
-    }
-
-    public static int alGenBuffers() {
-        return org.lwjgl3.openal.AL10.alGenBuffers();
-    }
-
-    public static void alGenBuffers(java.nio.IntBuffer buffers) {
-        org.lwjgl3.openal.AL10.alGenBuffers(buffers);
-    }
-
-    public static int alGenSources() {
-        return org.lwjgl3.openal.AL10.alGenSources();
-    }
-
-    public static void alGenSources(java.nio.IntBuffer sources) {
-        org.lwjgl3.openal.AL10.alGenSources(sources);
-    }
-
-    public static boolean alGetBoolean(int pname) {
-        return org.lwjgl3.openal.AL10.alGetBoolean(pname);
-    }
-
-    public static float alGetBufferf(int buffer, int pname) {
-        return org.lwjgl3.openal.AL10.alGetBufferf(buffer, pname);
-    }
-
-    public static int alGetBufferi(int buffer, int pname) {
-        return org.lwjgl3.openal.AL10.alGetBufferi(buffer, pname);
-    }
-
-    public static double alGetDouble(int pname) {
-        return org.lwjgl3.openal.AL10.alGetDouble(pname);
-    }
-
-    public static void alGetDouble(int pname, java.nio.DoubleBuffer data) {
-        org.lwjgl3.openal.AL10.alGetDoublev(pname, data);
-    }
-
-    public static int alGetEnumValue(java.lang.String ename) {
-
-        int returnValue = org.lwjgl3.openal.AL10.alGetEnumValue(ename);
-
-        return returnValue;
-    }
-
-    public static int alGetError() {
-        return org.lwjgl3.openal.AL10.alGetError();
-    }
-
-    public static float alGetFloat(int pname) {
-        return org.lwjgl3.openal.AL10.alGetFloat(pname);
-    }
-
-    public static void alGetFloat(int pname, java.nio.FloatBuffer data) {
-        org.lwjgl3.openal.AL10.alGetFloatv(pname, data);
-    }
-
-    public static int alGetInteger(int pname) {
-        return org.lwjgl3.openal.AL10.alGetInteger(pname);
-    }
-
-    public static void alGetInteger(int pname, java.nio.IntBuffer data) {
-        org.lwjgl3.openal.AL10.alGetIntegerv(pname, data);
-    }
-
-    public static void alGetListener(int pname, java.nio.FloatBuffer floatdata) {
-        org.lwjgl3.openal.AL10.alGetListenerfv(pname, floatdata);
-    }
-
-    public static float alGetListenerf(int pname) {
-        return org.lwjgl3.openal.AL10.alGetListenerf(pname);
-    }
-
-    public static int alGetListeneri(int pname) {
-        return org.lwjgl3.openal.AL10.alGetListeneri(pname);
-    }
-
-    public static void alGetSource(int source, int pname, java.nio.FloatBuffer floatdata) {
-        org.lwjgl3.openal.AL10.alGetSourcefv(source, pname, floatdata);
-    }
-
-    public static float alGetSourcef(int source, int pname) {
-        return org.lwjgl3.openal.AL10.alGetSourcef(source, pname);
-    }
-
-    public static int alGetSourcei(int source, int pname) {
-        return org.lwjgl3.openal.AL10.alGetSourcei(source, pname);
-    }
-
-    public static java.lang.String alGetString(int pname) {
-        return org.lwjgl3.openal.AL10.alGetString(pname);
-    }
-
-    public static boolean alIsBuffer(int buffer) {
-        return org.lwjgl3.openal.AL10.alIsBuffer(buffer);
-    }
-
-    public static boolean alIsEnabled(int capability) {
-        return org.lwjgl3.openal.AL10.alIsEnabled(capability);
-    }
-
-    public static boolean alIsExtensionPresent(java.lang.String fname) {
-
-        boolean returnValue = org.lwjgl3.openal.AL10.alIsExtensionPresent(fname);
-
-        return returnValue;
-    }
-
-    public static boolean alIsSource(int id) {
-        return org.lwjgl3.openal.AL10.alIsSource(id);
-    }
-
-    public static void alListener3f(int pname, float v1, float v2, float v3) {
-        org.lwjgl3.openal.AL10.alListener3f(pname, v1, v2, v3);
-    }
-
-    public static void alListener(int pname, java.nio.FloatBuffer value) {
-        org.lwjgl3.openal.AL10.alListenerfv(pname, value);
-    }
-
-    public static void alListenerf(int pname, float value) {
-        org.lwjgl3.openal.AL10.alListenerf(pname, value);
-    }
-
-    public static void alListeneri(int pname, int value) {
-        org.lwjgl3.openal.AL10.alListeneri(pname, value);
-    }
-
-    public static void alSource3f(int source, int pname, float v1, float v2, float v3) {
-        org.lwjgl3.openal.AL10.alSource3f(source, pname, v1, v2, v3);
-    }
-
-    public static void alSource(int source, int pname, java.nio.FloatBuffer value) {
-        org.lwjgl3.openal.AL10.alSourcefv(source, pname, value);
-    }
-
-    public static void alSourcePause(int source) {
-        org.lwjgl3.openal.AL10.alSourcePause(source);
-    }
-
-    public static void alSourcePause(java.nio.IntBuffer sources) {
-        org.lwjgl3.openal.AL10.alSourcePausev(sources);
-    }
-
-    public static void alSourcePlay(int source) {
-        org.lwjgl3.openal.AL10.alSourcePlay(source);
-    }
-
-    public static void alSourcePlay(java.nio.IntBuffer sources) {
-        org.lwjgl3.openal.AL10.alSourcePlayv(sources);
-    }
-
-    public static void alSourceQueueBuffers(int source, int buffer) {
-        org.lwjgl3.openal.AL10.alSourceQueueBuffers(source, buffer);
-    }
-
-    public static void alSourceQueueBuffers(int source, java.nio.IntBuffer buffers) {
-        org.lwjgl3.openal.AL10.alSourceQueueBuffers(source, buffers);
-    }
-
-    public static void alSourceRewind(int source) {
-        org.lwjgl3.openal.AL10.alSourceRewind(source);
-    }
-
-    public static void alSourceRewind(java.nio.IntBuffer sources) {
-        org.lwjgl3.openal.AL10.alSourceRewindv(sources);
-    }
-
-    public static void alSourceStop(int source) {
-        org.lwjgl3.openal.AL10.alSourceStop(source);
-    }
-
-    public static void alSourceStop(java.nio.IntBuffer sources) {
-        org.lwjgl3.openal.AL10.alSourceStopv(sources);
-    }
-
-    public static int alSourceUnqueueBuffers(int source) {
-        return org.lwjgl3.openal.AL10.alSourceUnqueueBuffers(source);
-    }
-
-    public static void alSourceUnqueueBuffers(int source, java.nio.IntBuffer buffers) {
-        org.lwjgl3.openal.AL10.alSourceUnqueueBuffers(source, buffers);
-    }
-
-    public static void alSourcef(int source, int pname, float value) {
-        org.lwjgl3.openal.AL10.alSourcef(source, pname, value);
-    }
-
-    public static void alSourcei(int source, int pname, int value) {
-        org.lwjgl3.openal.AL10.alSourcei(source, pname, value);
-    }
-}
diff --git a/src/main/java/org/lwjgl/openal/ALC10.java b/src/main/java/org/lwjgl/openal/ALC10.java
deleted file mode 100644
index df4562008..000000000
--- a/src/main/java/org/lwjgl/openal/ALC10.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.lwjgl.openal;
-
-import org.lwjgl.MemoryUtil;
-
-import java.nio.ByteBuffer;
-
-public class ALC10 {
-
-    static ALCcontext alcContext;
-
-    public static final int ALC_FREQUENCY = org.lwjgl3.openal.ALC10.ALC_FREQUENCY;
-    public static final int ALC_REFRESH = org.lwjgl3.openal.ALC10.ALC_REFRESH;
-    public static final int ALC_SYNC = org.lwjgl3.openal.ALC10.ALC_SYNC;
-    public static final int ALC_NO_ERROR = org.lwjgl3.openal.ALC10.ALC_NO_ERROR;
-    public static final int ALC_DEFAULT_DEVICE_SPECIFIER = org.lwjgl3.openal.ALC10.ALC_DEFAULT_DEVICE_SPECIFIER;
-    public static final int ALC_DEVICE_SPECIFIER = org.lwjgl3.openal.ALC10.ALC_DEVICE_SPECIFIER;
-
-    public static int alcGetError(ALCdevice device) {
-        if (device == null) {
-            return org.lwjgl3.openal.ALC10.alcGetError(AL.alcDevice.device);
-        }
-
-        return org.lwjgl3.openal.ALC10.alcGetError(device.device);
-    }
-
-    public static java.lang.String alcGetString(ALCdevice device, int pname) {
-        if (device == null) {
-            return org.lwjgl3.openal.ALC10.alcGetString(AL.alcDevice.device, pname);
-        }
-
-        return org.lwjgl3.openal.ALC10.alcGetString(device.device, pname);
-    }
-
-    public static ALCdevice alcOpenDevice(String devicename) {
-        long device_address = org.lwjgl3.openal.ALC10.alcOpenDevice(devicename);
-        if(device_address != 0) {
-            return new ALCdevice(device_address);
-        }
-        return null;
-    }
-
-    public static boolean alcIsExtensionPresent(ALCdevice device, java.lang.String extName) {
-        if (device == null) {
-            return org.lwjgl3.openal.ALC10.alcIsExtensionPresent(AL.alcDevice.device, extName);
-        }
-
-        return org.lwjgl3.openal.ALC10.alcIsExtensionPresent(device.device, extName);
-    }
-
-    public static ALCcontext alcCreateContext(ALCdevice device, java.nio.IntBuffer attrList) {
-        long alContextHandle = org.lwjgl3.openal.ALC10.alcCreateContext(device.device, attrList);
-        alcContext = new ALCcontext(alContextHandle);
-        return alcContext;
-    }
-
-    public static boolean alcCloseDevice(ALCdevice alCdevice) {
-        return org.lwjgl3.openal.ALC10.alcCloseDevice(alCdevice.device);
-    }
-
-    public static ALCcontext alcGetCurrentContext() {
-        return alcContext;
-    }
-
-    public static ALCdevice alcGetContextsDevice(ALCcontext context) {
-        return AL.alcDevice;
-    }
-
-    public static void alcGetInteger(ALCdevice device, int pname, java.nio.IntBuffer integerdata) {
-        org.lwjgl3.openal.ALC10.alcGetIntegerv(device.device, pname, integerdata);
-    }
-}
diff --git a/src/main/java/org/lwjgl/openal/ALC11.java b/src/main/java/org/lwjgl/openal/ALC11.java
deleted file mode 100644
index 627afa178..000000000
--- a/src/main/java/org/lwjgl/openal/ALC11.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.lwjgl.openal;
-
-public class ALC11 {
-
-    public static final int ALC_ALL_DEVICES_SPECIFIER = (int) 4115;
-    public static final int ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER = (int) 785;
-    public static final int ALC_CAPTURE_DEVICE_SPECIFIER = (int) 784;
-    public static final int ALC_CAPTURE_SAMPLES = (int) 786;
-    public static final int ALC_DEFAULT_ALL_DEVICES_SPECIFIER = (int) 4114;
-    public static final int ALC_MONO_SOURCES = (int) 4112;
-    public static final int ALC_STEREO_SOURCES = (int) 4113;
-
-    public static boolean alcCaptureCloseDevice(org.lwjgl.openal.ALCdevice device) {
-
-        boolean returnValue = org.lwjgl3.openal.ALC11.alcCaptureCloseDevice(device.device);
-
-        return returnValue;
-    }
-
-    public static org.lwjgl.openal.ALCdevice alcCaptureOpenDevice(java.lang.String arg0, int arg1, int frequency,
-                                                                  int format) {
-
-        org.lwjgl.openal.ALCdevice returnValue = new org.lwjgl.openal.ALCdevice(
-                org.lwjgl3.openal.ALC11.alcCaptureOpenDevice(arg0, arg1, frequency, format));
-
-        return returnValue;
-    }
-
-    public static void alcCaptureSamples(org.lwjgl.openal.ALCdevice device, java.nio.ByteBuffer buffer, int samples) {
-
-        org.lwjgl3.openal.ALC11.alcCaptureSamples(device.device, buffer, samples);
-    }
-
-    public static void alcCaptureStart(org.lwjgl.openal.ALCdevice device) {
-
-        org.lwjgl3.openal.ALC11.alcCaptureStart(device.device);
-    }
-
-    public static void alcCaptureStop(org.lwjgl.openal.ALCdevice device) {
-
-        org.lwjgl3.openal.ALC11.alcCaptureStop(device.device);
-    }
-}
diff --git a/src/main/java/org/lwjgl/opengl/ARBTextureBarrier.java b/src/main/java/org/lwjgl/opengl/ARBTextureBarrier.java
deleted file mode 100644
index feea2173e..000000000
--- a/src/main/java/org/lwjgl/opengl/ARBTextureBarrier.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.lwjgl.opengl;
-
-public class ARBTextureBarrier {
-
-    public static void glTextureBarrier() {
-        org.lwjgl3.opengl.ARBTextureBarrier.glTextureBarrier();
-    }
-}
diff --git a/src/main/java/org/lwjgl/opengl/ARBVertexType2_10_10_10_REV.java b/src/main/java/org/lwjgl/opengl/ARBVertexType2_10_10_10_REV.java
deleted file mode 100644
index dd89a53d1..000000000
--- a/src/main/java/org/lwjgl/opengl/ARBVertexType2_10_10_10_REV.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.lwjgl.opengl;
-
-public class ARBVertexType2_10_10_10_REV {
-
-    public static final int GL_INT_2_10_10_10_REV = (int) 36255;
-    public static final int GL_UNSIGNED_INT_2_10_10_10_REV = (int) 33640;
-
-    public static void glColorP3ui(int type, int color) {
-        org.lwjgl3.opengl.ARBVertexType2_10_10_10_REV.glColorP3ui(type, color);
-    }
-
-    public static void glColorP4ui(int type, int color) {
-        org.lwjgl3.opengl.ARBVertexType2_10_10_10_REV.glColorP4ui(type, color);
-    }
-
-    public static void glMultiTexCoordP1ui(int texture, int type, int coords) {
-        org.lwjgl3.opengl.ARBVertexType2_10_10_10_REV.glMultiTexCoordP1ui(texture, type, coords);
-    }
-
-    public static void glMultiTexCoordP2ui(int texture, int type, int coords) {
-        org.lwjgl3.opengl.ARBVertexType2_10_10_10_REV.glMultiTexCoordP2ui(texture, type, coords);
-    }
-
-    public static void glMultiTexCoordP3ui(int texture, int type, int coords) {
-        org.lwjgl3.opengl.ARBVertexType2_10_10_10_REV.glMultiTexCoordP3ui(texture, type, coords);
-    }
-
-    public static void glMultiTexCoordP4ui(int texture, int type, int coords) {
-        org.lwjgl3.opengl.ARBVertexType2_10_10_10_REV.glMultiTexCoordP4ui(texture, type, coords);
-    }
-
-    public static void glNormalP3ui(int type, int coords) {
-        org.lwjgl3.opengl.ARBVertexType2_10_10_10_REV.glNormalP3ui(type, coords);
-    }
-
-    public static void glSecondaryColorP3ui(int type, int color) {
-        org.lwjgl3.opengl.ARBVertexType2_10_10_10_REV.glSecondaryColorP3ui(type, color);
-    }
-
-    public static void glTexCoordP1ui(int type, int coords) {
-        org.lwjgl3.opengl.ARBVertexType2_10_10_10_REV.glTexCoordP1ui(type, coords);
-    }
-
-    public static void glTexCoordP2ui(int type, int coords) {
-        org.lwjgl3.opengl.ARBVertexType2_10_10_10_REV.glTexCoordP2ui(type, coords);
-    }
-
-    public static void glTexCoordP3ui(int type, int coords) {
-        org.lwjgl3.opengl.ARBVertexType2_10_10_10_REV.glTexCoordP3ui(type, coords);
-    }
-
-    public static void glTexCoordP4ui(int type, int coords) {
-        org.lwjgl3.opengl.ARBVertexType2_10_10_10_REV.glTexCoordP4ui(type, coords);
-    }
-
-    public static void glVertexAttribP1ui(int index, int type, boolean normalized, int value) {
-        org.lwjgl3.opengl.ARBVertexType2_10_10_10_REV.glVertexAttribP1ui(index, type, normalized, value);
-    }
-
-    public static void glVertexAttribP2ui(int index, int type, boolean normalized, int value) {
-        org.lwjgl3.opengl.ARBVertexType2_10_10_10_REV.glVertexAttribP2ui(index, type, normalized, value);
-    }
-
-    public static void glVertexAttribP3ui(int index, int type, boolean normalized, int value) {
-        org.lwjgl3.opengl.ARBVertexType2_10_10_10_REV.glVertexAttribP3ui(index, type, normalized, value);
-    }
-
-    public static void glVertexAttribP4ui(int index, int type, boolean normalized, int value) {
-        org.lwjgl3.opengl.ARBVertexType2_10_10_10_REV.glVertexAttribP4ui(index, type, normalized, value);
-    }
-
-    public static void glVertexP2ui(int type, int value) {
-        org.lwjgl3.opengl.ARBVertexType2_10_10_10_REV.glVertexP2ui(type, value);
-    }
-
-    public static void glVertexP3ui(int type, int value) {
-        org.lwjgl3.opengl.ARBVertexType2_10_10_10_REV.glVertexP3ui(type, value);
-    }
-
-    public static void glVertexP4ui(int type, int value) {
-        org.lwjgl3.opengl.ARBVertexType2_10_10_10_REV.glVertexP4ui(type, value);
-    }
-}
diff --git a/src/main/java/org/lwjgl/opengl/GREMEDYFrameTerminator.java b/src/main/java/org/lwjgl/opengl/GREMEDYFrameTerminator.java
deleted file mode 100644
index 9cbfbe0e8..000000000
--- a/src/main/java/org/lwjgl/opengl/GREMEDYFrameTerminator.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.lwjgl.opengl;
-
-public class GREMEDYFrameTerminator {
-
-    public static void glFrameTerminatorGREMEDY() {
-        org.lwjgl3.opengl.GREMEDYFrameTerminator.glFrameTerminatorGREMEDY();
-    }
-}
diff --git a/src/main/java/org/lwjgl/opengl/NVTextureBarrier.java b/src/main/java/org/lwjgl/opengl/NVTextureBarrier.java
deleted file mode 100644
index 16e049598..000000000
--- a/src/main/java/org/lwjgl/opengl/NVTextureBarrier.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.lwjgl.opengl;
-
-public class NVTextureBarrier {
-
-    public static void glTextureBarrierNV() {
-        org.lwjgl3.opengl.NVTextureBarrier.glTextureBarrierNV();
-    }
-}
diff --git a/src/main/java/org/lwjgl/BufferChecks.java b/src/main/java/org/lwjglx/BufferChecks.java
similarity index 99%
rename from src/main/java/org/lwjgl/BufferChecks.java
rename to src/main/java/org/lwjglx/BufferChecks.java
index 31a11703e..6e42d514f 100644
--- a/src/main/java/org/lwjgl/BufferChecks.java
+++ b/src/main/java/org/lwjglx/BufferChecks.java
@@ -13,7 +13,7 @@
  * 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;
+package org.lwjglx;
 
 import java.nio.*;
 
diff --git a/src/main/java/org/lwjgl/BufferUtils.java b/src/main/java/org/lwjglx/BufferUtils.java
similarity index 94%
rename from src/main/java/org/lwjgl/BufferUtils.java
rename to src/main/java/org/lwjglx/BufferUtils.java
index 2fa8688ad..bff450653 100644
--- a/src/main/java/org/lwjgl/BufferUtils.java
+++ b/src/main/java/org/lwjglx/BufferUtils.java
@@ -13,7 +13,7 @@
  * 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;
+package org.lwjglx;
 
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
@@ -135,36 +135,36 @@ public static int getOffset(Buffer buffer) {
 
     /** Fill buffer with zeros from position to remaining */
     public static void zeroBuffer(ByteBuffer b) {
-        org.lwjgl3.BufferUtils.zeroBuffer(b);
+        org.lwjgl.BufferUtils.zeroBuffer(b);
     }
 
     /** Fill buffer with zeros from position to remaining */
     public static void zeroBuffer(ShortBuffer b) {
-        org.lwjgl3.BufferUtils.zeroBuffer(b);
+        org.lwjgl.BufferUtils.zeroBuffer(b);
     }
 
     /** Fill buffer with zeros from position to remaining */
     public static void zeroBuffer(CharBuffer b) {
-        org.lwjgl3.BufferUtils.zeroBuffer(b);
+        org.lwjgl.BufferUtils.zeroBuffer(b);
     }
 
     /** Fill buffer with zeros from position to remaining */
     public static void zeroBuffer(IntBuffer b) {
-        org.lwjgl3.BufferUtils.zeroBuffer(b);
+        org.lwjgl.BufferUtils.zeroBuffer(b);
     }
 
     /** Fill buffer with zeros from position to remaining */
     public static void zeroBuffer(FloatBuffer b) {
-        org.lwjgl3.BufferUtils.zeroBuffer(b);
+        org.lwjgl.BufferUtils.zeroBuffer(b);
     }
 
     /** Fill buffer with zeros from position to remaining */
     public static void zeroBuffer(LongBuffer b) {
-        org.lwjgl3.BufferUtils.zeroBuffer(b);
+        org.lwjgl.BufferUtils.zeroBuffer(b);
     }
 
     /** Fill buffer with zeros from position to remaining */
     public static void zeroBuffer(DoubleBuffer b) {
-        org.lwjgl3.BufferUtils.zeroBuffer(b);
+        org.lwjgl.BufferUtils.zeroBuffer(b);
     }
 }
diff --git a/src/main/java/org/lwjgl/LWJGLException.java b/src/main/java/org/lwjglx/LWJGLException.java
similarity index 99%
rename from src/main/java/org/lwjgl/LWJGLException.java
rename to src/main/java/org/lwjglx/LWJGLException.java
index 7184ac1c7..66ec18374 100644
--- a/src/main/java/org/lwjgl/LWJGLException.java
+++ b/src/main/java/org/lwjglx/LWJGLException.java
@@ -13,7 +13,7 @@
  * 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;
+package org.lwjglx;
 
 /**
  * <p>
diff --git a/src/main/java/org/lwjgl/LWJGLUtil.java b/src/main/java/org/lwjglx/LWJGLUtil.java
similarity index 99%
rename from src/main/java/org/lwjgl/LWJGLUtil.java
rename to src/main/java/org/lwjglx/LWJGLUtil.java
index f38c2beaa..c492d5e16 100644
--- a/src/main/java/org/lwjgl/LWJGLUtil.java
+++ b/src/main/java/org/lwjglx/LWJGLUtil.java
@@ -13,9 +13,9 @@
  * 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;
+package org.lwjglx;
 
-import org.lwjgl3.system.Platform;
+import org.lwjgl.system.Platform;
 
 import java.io.File;
 import java.lang.reflect.Field;
@@ -243,9 +243,9 @@ public class LWJGLUtil {
     public static final ByteBuffer LWJGLIcon32x32 = loadIcon(LWJGL_ICON_DATA_32x32);
 
     /** Debug flag. */
-    public static final boolean DEBUG = getPrivilegedBoolean("org.lwjgl3.util.Debug");
+    public static final boolean DEBUG = getPrivilegedBoolean("org.lwjgl.util.Debug");
 
-    public static final boolean CHECKS = !getPrivilegedBoolean("org.lwjgl3.util.NoChecks");
+    public static final boolean CHECKS = !getPrivilegedBoolean("org.lwjgl.util.NoChecks");
 
     private static final int PLATFORM;
 
@@ -333,7 +333,7 @@ public static String[] getLibraryPaths(String libname, String[] platform_lib_nam
             }
 
             // add Installer path
-            String alternative_path = getPrivilegedProperty("org.lwjgl3.librarypath");
+            String alternative_path = getPrivilegedProperty("org.lwjgl.librarypath");
             if (alternative_path != null) {
                 possible_paths.add(alternative_path + File.separator + platform_lib_name);
             }
diff --git a/src/main/java/org/lwjgl/MemoryUtil.java b/src/main/java/org/lwjglx/MemoryUtil.java
similarity index 73%
rename from src/main/java/org/lwjgl/MemoryUtil.java
rename to src/main/java/org/lwjglx/MemoryUtil.java
index f8c9bdb9e..76c0f7cdf 100644
--- a/src/main/java/org/lwjgl/MemoryUtil.java
+++ b/src/main/java/org/lwjglx/MemoryUtil.java
@@ -13,7 +13,7 @@
  * 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;
+package org.lwjglx;
 
 import java.nio.*;
 
@@ -36,91 +36,91 @@ private MemoryUtil() {}
      * @return the memory address
      */
     public static long getAddress0(Buffer buffer) {
-        return org.lwjgl3.system.MemoryUtil.memAddress(buffer);
+        return org.lwjgl.system.MemoryUtil.memAddress(buffer);
     }
 
     public static long getAddress0Safe(Buffer buffer) {
-        return buffer == null ? 0 : org.lwjgl3.system.MemoryUtil.memAddress(buffer);
+        return buffer == null ? 0 : org.lwjgl.system.MemoryUtil.memAddress(buffer);
     }
 
     public static long getAddress0(PointerBuffer buffer) {
-        return org.lwjgl3.system.MemoryUtil.memAddress(buffer);
+        return org.lwjgl.system.MemoryUtil.memAddress(buffer);
     }
 
     public static long getAddress0Safe(PointerBuffer buffer) {
-        return org.lwjgl3.system.MemoryUtil.memAddressSafe(buffer);
+        return org.lwjgl.system.MemoryUtil.memAddressSafe(buffer);
     }
 
     // --- [ API utilities ] ---
 
     public static long getAddress(ByteBuffer buffer) {
-        return org.lwjgl3.system.MemoryUtil.memAddress(buffer);
+        return org.lwjgl.system.MemoryUtil.memAddress(buffer);
     }
 
     public static long getAddress(ByteBuffer buffer, int position) {
-        return org.lwjgl3.system.MemoryUtil.memAddress(buffer, position);
+        return org.lwjgl.system.MemoryUtil.memAddress(buffer, position);
     }
 
     public static long getAddress(ShortBuffer buffer) {
-        return org.lwjgl3.system.MemoryUtil.memAddress(buffer);
+        return org.lwjgl.system.MemoryUtil.memAddress(buffer);
     }
 
     public static long getAddress(ShortBuffer buffer, int position) {
-        return org.lwjgl3.system.MemoryUtil.memAddress(buffer, position);
+        return org.lwjgl.system.MemoryUtil.memAddress(buffer, position);
     }
 
     public static long getAddress(CharBuffer buffer) {
-        return org.lwjgl3.system.MemoryUtil.memAddress(buffer);
+        return org.lwjgl.system.MemoryUtil.memAddress(buffer);
     }
 
     public static long getAddress(CharBuffer buffer, int position) {
-        return org.lwjgl3.system.MemoryUtil.memAddress(buffer, position);
+        return org.lwjgl.system.MemoryUtil.memAddress(buffer, position);
     }
 
     public static long getAddress(IntBuffer buffer) {
-        return org.lwjgl3.system.MemoryUtil.memAddress(buffer);
+        return org.lwjgl.system.MemoryUtil.memAddress(buffer);
     }
 
     public static long getAddress(IntBuffer buffer, int position) {
-        return org.lwjgl3.system.MemoryUtil.memAddress(buffer, position);
+        return org.lwjgl.system.MemoryUtil.memAddress(buffer, position);
     }
 
     public static long getAddress(FloatBuffer buffer) {
-        return org.lwjgl3.system.MemoryUtil.memAddress(buffer);
+        return org.lwjgl.system.MemoryUtil.memAddress(buffer);
     }
 
     public static long getAddress(FloatBuffer buffer, int position) {
-        return org.lwjgl3.system.MemoryUtil.memAddress(buffer, position);
+        return org.lwjgl.system.MemoryUtil.memAddress(buffer, position);
     }
 
     public static long getAddress(LongBuffer buffer) {
-        return org.lwjgl3.system.MemoryUtil.memAddress(buffer);
+        return org.lwjgl.system.MemoryUtil.memAddress(buffer);
     }
 
     public static long getAddress(LongBuffer buffer, int position) {
-        return org.lwjgl3.system.MemoryUtil.memAddress(buffer, position);
+        return org.lwjgl.system.MemoryUtil.memAddress(buffer, position);
     }
 
     public static long getAddress(DoubleBuffer buffer) {
-        return org.lwjgl3.system.MemoryUtil.memAddress(buffer);
+        return org.lwjgl.system.MemoryUtil.memAddress(buffer);
     }
 
     public static long getAddress(DoubleBuffer buffer, int position) {
-        return org.lwjgl3.system.MemoryUtil.memAddress(buffer, position);
+        return org.lwjgl.system.MemoryUtil.memAddress(buffer, position);
     }
 
     public static long getAddress(PointerBuffer buffer) {
-        return org.lwjgl3.system.MemoryUtil.memAddress(buffer);
+        return org.lwjgl.system.MemoryUtil.memAddress(buffer);
     }
 
     public static long getAddress(PointerBuffer buffer, int position) {
-        return org.lwjgl3.system.MemoryUtil.memAddress(buffer, position);
+        return org.lwjgl.system.MemoryUtil.memAddress(buffer, position);
     }
 
     // --- [ API utilities - Safe ] ---
 
     public static long getAddressSafe(ByteBuffer buffer) {
-        return org.lwjgl3.system.MemoryUtil.memAddressSafe(buffer);
+        return org.lwjgl.system.MemoryUtil.memAddressSafe(buffer);
     }
 
     public static long getAddressSafe(ByteBuffer buffer, int position) {
@@ -128,7 +128,7 @@ public static long getAddressSafe(ByteBuffer buffer, int position) {
     }
 
     public static long getAddressSafe(ShortBuffer buffer) {
-        return org.lwjgl3.system.MemoryUtil.memAddressSafe(buffer);
+        return org.lwjgl.system.MemoryUtil.memAddressSafe(buffer);
     }
 
     public static long getAddressSafe(ShortBuffer buffer, int position) {
@@ -136,7 +136,7 @@ public static long getAddressSafe(ShortBuffer buffer, int position) {
     }
 
     public static long getAddressSafe(CharBuffer buffer) {
-        return org.lwjgl3.system.MemoryUtil.memAddressSafe(buffer);
+        return org.lwjgl.system.MemoryUtil.memAddressSafe(buffer);
     }
 
     public static long getAddressSafe(CharBuffer buffer, int position) {
@@ -144,7 +144,7 @@ public static long getAddressSafe(CharBuffer buffer, int position) {
     }
 
     public static long getAddressSafe(IntBuffer buffer) {
-        return org.lwjgl3.system.MemoryUtil.memAddressSafe(buffer);
+        return org.lwjgl.system.MemoryUtil.memAddressSafe(buffer);
     }
 
     public static long getAddressSafe(IntBuffer buffer, int position) {
@@ -152,7 +152,7 @@ public static long getAddressSafe(IntBuffer buffer, int position) {
     }
 
     public static long getAddressSafe(FloatBuffer buffer) {
-        return org.lwjgl3.system.MemoryUtil.memAddressSafe(buffer);
+        return org.lwjgl.system.MemoryUtil.memAddressSafe(buffer);
     }
 
     public static long getAddressSafe(FloatBuffer buffer, int position) {
@@ -160,7 +160,7 @@ public static long getAddressSafe(FloatBuffer buffer, int position) {
     }
 
     public static long getAddressSafe(LongBuffer buffer) {
-        return org.lwjgl3.system.MemoryUtil.memAddressSafe(buffer);
+        return org.lwjgl.system.MemoryUtil.memAddressSafe(buffer);
     }
 
     public static long getAddressSafe(LongBuffer buffer, int position) {
@@ -168,7 +168,7 @@ public static long getAddressSafe(LongBuffer buffer, int position) {
     }
 
     public static long getAddressSafe(DoubleBuffer buffer) {
-        return org.lwjgl3.system.MemoryUtil.memAddressSafe(buffer);
+        return org.lwjgl.system.MemoryUtil.memAddressSafe(buffer);
     }
 
     public static long getAddressSafe(DoubleBuffer buffer, int position) {
@@ -176,7 +176,7 @@ public static long getAddressSafe(DoubleBuffer buffer, int position) {
     }
 
     public static long getAddressSafe(PointerBuffer buffer) {
-        return org.lwjgl3.system.MemoryUtil.memAddressSafe(buffer);
+        return org.lwjgl.system.MemoryUtil.memAddressSafe(buffer);
     }
 
     public static long getAddressSafe(PointerBuffer buffer, int position) {
@@ -196,7 +196,7 @@ public static long getAddressSafe(PointerBuffer buffer, int position) {
      * @see String#getBytes()
      */
     public static ByteBuffer encodeASCII(final CharSequence text) {
-        return org.lwjgl3.system.MemoryUtil.memASCII(text);
+        return org.lwjgl.system.MemoryUtil.memASCII(text);
     }
 
     /**
@@ -210,7 +210,7 @@ public static ByteBuffer encodeASCII(final CharSequence text) {
      * @see String#getBytes()
      */
     public static ByteBuffer encodeUTF8(final CharSequence text) {
-        return org.lwjgl3.system.MemoryUtil.memUTF8(text);
+        return org.lwjgl.system.MemoryUtil.memUTF8(text);
     }
 
     /**
@@ -222,18 +222,18 @@ public static ByteBuffer encodeUTF8(final CharSequence text) {
      * @return the encoded text
      */
     public static ByteBuffer encodeUTF16(final CharSequence text) {
-        return org.lwjgl3.system.MemoryUtil.memUTF16(text);
+        return org.lwjgl.system.MemoryUtil.memUTF16(text);
     }
 
     public static String decodeASCII(final ByteBuffer buffer) {
-        return org.lwjgl3.system.MemoryUtil.memASCII(buffer);
+        return org.lwjgl.system.MemoryUtil.memASCII(buffer);
     }
 
     public static String decodeUTF8(final ByteBuffer buffer) {
-        return org.lwjgl3.system.MemoryUtil.memUTF8(buffer);
+        return org.lwjgl.system.MemoryUtil.memUTF8(buffer);
     }
 
     public static String decodeUTF16(final ByteBuffer buffer) {
-        return org.lwjgl3.system.MemoryUtil.memUTF16(buffer);
+        return org.lwjgl.system.MemoryUtil.memUTF16(buffer);
     }
 }
diff --git a/src/main/java/org/lwjgl/PointerBuffer.java b/src/main/java/org/lwjglx/PointerBuffer.java
similarity index 86%
rename from src/main/java/org/lwjgl/PointerBuffer.java
rename to src/main/java/org/lwjglx/PointerBuffer.java
index c7653cfed..7bc81855e 100644
--- a/src/main/java/org/lwjgl/PointerBuffer.java
+++ b/src/main/java/org/lwjglx/PointerBuffer.java
@@ -13,19 +13,19 @@
  * 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;
+package org.lwjglx;
 
 import java.lang.reflect.Field;
 import java.nio.*;
 
 import javax.annotation.Nullable;
 
-public class PointerBuffer extends org.lwjgl3.PointerBuffer {
+public class PointerBuffer extends org.lwjgl.PointerBuffer {
 
     private static final Field containerAccess;
 
     static {
-        Class<org.lwjgl3.PointerBuffer> pbClass = org.lwjgl3.PointerBuffer.class;
+        Class<org.lwjgl.PointerBuffer> pbClass = org.lwjgl.PointerBuffer.class;
         try {
             containerAccess = pbClass.getDeclaredField("container");
         } catch (NoSuchFieldException e) {
@@ -33,7 +33,7 @@ public class PointerBuffer extends org.lwjgl3.PointerBuffer {
         }
     }
 
-    private static ByteBuffer getContainer(org.lwjgl3.PointerBuffer buffer) {
+    private static ByteBuffer getContainer(org.lwjgl.PointerBuffer buffer) {
         try {
             return (ByteBuffer) containerAccess.get(buffer);
         } catch (IllegalAccessException e) {
@@ -46,7 +46,7 @@ protected PointerBuffer(long address, @Nullable ByteBuffer container, int mark,
         super(address, container, mark, position, limit, capacity);
     }
 
-    protected PointerBuffer(org.lwjgl3.PointerBuffer ver3) {
+    protected PointerBuffer(org.lwjgl.PointerBuffer ver3) {
         super(ver3.address(), getContainer(ver3), ver3.position(), ver3.position(), ver3.limit(), ver3.capacity());
     }
 
@@ -64,7 +64,7 @@ protected PointerBuffer(org.lwjgl3.PointerBuffer ver3) {
      * @throws IllegalArgumentException If the {@code capacity} is a negative integer
      */
     public static PointerBuffer allocateDirect(int capacity) {
-        return new PointerBuffer(org.lwjgl3.PointerBuffer.allocateDirect(capacity));
+        return new PointerBuffer(org.lwjgl.PointerBuffer.allocateDirect(capacity));
     }
 
     /**
@@ -74,7 +74,7 @@ public static PointerBuffer allocateDirect(int capacity) {
      * @param capacity the buffer capacity, in number of pointers
      */
     public static PointerBuffer create(long address, int capacity) {
-        return new PointerBuffer(org.lwjgl3.PointerBuffer.create(address, capacity));
+        return new PointerBuffer(org.lwjgl.PointerBuffer.create(address, capacity));
     }
 
     /**
@@ -83,6 +83,6 @@ public static PointerBuffer create(long address, int capacity) {
      * @param source the source buffer
      */
     public static PointerBuffer create(ByteBuffer source) {
-        return new PointerBuffer(org.lwjgl3.PointerBuffer.create(source));
+        return new PointerBuffer(org.lwjgl.PointerBuffer.create(source));
     }
 }
diff --git a/src/main/java/org/lwjgl/PointerWrapper.java b/src/main/java/org/lwjglx/PointerWrapper.java
similarity index 97%
rename from src/main/java/org/lwjgl/PointerWrapper.java
rename to src/main/java/org/lwjglx/PointerWrapper.java
index 981b0ea2b..2329582b9 100644
--- a/src/main/java/org/lwjgl/PointerWrapper.java
+++ b/src/main/java/org/lwjglx/PointerWrapper.java
@@ -13,9 +13,9 @@
  * 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;
+package org.lwjglx;
 
-import org.lwjgl3.system.Pointer;
+import org.lwjgl.system.Pointer;
 
 /**
  * A common interface for classes that wrap pointer addresses.
diff --git a/src/main/java/org/lwjgl/PointerWrapperAbstract.java b/src/main/java/org/lwjglx/PointerWrapperAbstract.java
similarity index 97%
rename from src/main/java/org/lwjgl/PointerWrapperAbstract.java
rename to src/main/java/org/lwjglx/PointerWrapperAbstract.java
index dadeac868..36717fad2 100644
--- a/src/main/java/org/lwjgl/PointerWrapperAbstract.java
+++ b/src/main/java/org/lwjglx/PointerWrapperAbstract.java
@@ -13,7 +13,7 @@
  * 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;
+package org.lwjglx;
 
 /**
  * Base PointerWrapper implementation.
@@ -40,7 +40,7 @@ public boolean isValid() {
 
     /**
      * Checks if the pointer is valid and throws an IllegalStateException if it is not. This method is a NO-OP, unless
-     * the org.lwjgl3.util.Debug property has been set to true.
+     * the org.lwjgl.util.Debug property has been set to true.
      */
     public final void checkValid() {
         if (LWJGLUtil.DEBUG && !isValid())
diff --git a/src/main/java/org/lwjgl/Sys.java b/src/main/java/org/lwjglx/Sys.java
similarity index 92%
rename from src/main/java/org/lwjgl/Sys.java
rename to src/main/java/org/lwjglx/Sys.java
index 0adb5741a..fb275713a 100644
--- a/src/main/java/org/lwjgl/Sys.java
+++ b/src/main/java/org/lwjglx/Sys.java
@@ -1,6 +1,6 @@
-package org.lwjgl;
+package org.lwjglx;
 
-import static org.lwjgl3.glfw.GLFW.glfwInit;
+import static org.lwjgl.glfw.GLFW.glfwInit;
 
 import java.awt.*;
 import java.net.URI;
@@ -9,11 +9,11 @@
 import javax.swing.UIManager;
 
 import net.minecraftforge.common.ForgeEarlyConfig;
-import org.lwjgl3.Version;
-import org.lwjgl3.glfw.GLFW;
-import org.lwjgl3.system.Configuration;
-import org.lwjgl3.system.Platform;
-import org.lwjgl.opengl.Display;
+import org.lwjgl.Version;
+import org.lwjgl.glfw.GLFW;
+import org.lwjgl.system.Configuration;
+import org.lwjgl.system.Platform;
+import org.lwjglx.opengl.Display;
 
 public class Sys {
 
diff --git a/src/main/java/org/lwjgl/input/Controller.java b/src/main/java/org/lwjglx/input/Controller.java
similarity index 100%
rename from src/main/java/org/lwjgl/input/Controller.java
rename to src/main/java/org/lwjglx/input/Controller.java
diff --git a/src/main/java/org/lwjgl/input/Controllers.java b/src/main/java/org/lwjglx/input/Controllers.java
similarity index 100%
rename from src/main/java/org/lwjgl/input/Controllers.java
rename to src/main/java/org/lwjglx/input/Controllers.java
diff --git a/src/main/java/org/lwjgl/input/Cursor.java b/src/main/java/org/lwjglx/input/Cursor.java
similarity index 99%
rename from src/main/java/org/lwjgl/input/Cursor.java
rename to src/main/java/org/lwjglx/input/Cursor.java
index 03c647ea4..6ef4c2b9a 100644
--- a/src/main/java/org/lwjgl/input/Cursor.java
+++ b/src/main/java/org/lwjglx/input/Cursor.java
@@ -13,11 +13,11 @@
  * 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.input;
+package org.lwjglx.input;
 
 import java.nio.IntBuffer;
 
-import org.lwjgl.LWJGLException;
+import org.lwjglx.LWJGLException;
 
 /**
  *
diff --git a/src/main/java/org/lwjgl/input/EventQueue.java b/src/main/java/org/lwjglx/input/EventQueue.java
similarity index 98%
rename from src/main/java/org/lwjgl/input/EventQueue.java
rename to src/main/java/org/lwjglx/input/EventQueue.java
index e24c8e1c8..216bfab9b 100644
--- a/src/main/java/org/lwjgl/input/EventQueue.java
+++ b/src/main/java/org/lwjglx/input/EventQueue.java
@@ -1,4 +1,4 @@
-package org.lwjgl.input;
+package org.lwjglx.input;
 
 /**
  * Internal utility class to keep track of event positions in an array. When the array is full the position will wrap to
diff --git a/src/main/java/org/lwjgl/input/KeyCodes.java b/src/main/java/org/lwjglx/input/KeyCodes.java
similarity index 99%
rename from src/main/java/org/lwjgl/input/KeyCodes.java
rename to src/main/java/org/lwjglx/input/KeyCodes.java
index 05180f144..60714b131 100644
--- a/src/main/java/org/lwjgl/input/KeyCodes.java
+++ b/src/main/java/org/lwjglx/input/KeyCodes.java
@@ -1,6 +1,6 @@
-package org.lwjgl.input;
+package org.lwjglx.input;
 
-import org.lwjgl3.glfw.GLFW;
+import org.lwjgl.glfw.GLFW;
 
 public class KeyCodes {
 
diff --git a/src/main/java/org/lwjgl/input/KeyEvent.java b/src/main/java/org/lwjglx/input/KeyEvent.java
similarity index 91%
rename from src/main/java/org/lwjgl/input/KeyEvent.java
rename to src/main/java/org/lwjglx/input/KeyEvent.java
index 5ef3bb182..18d42bb2d 100644
--- a/src/main/java/org/lwjgl/input/KeyEvent.java
+++ b/src/main/java/org/lwjglx/input/KeyEvent.java
@@ -1,4 +1,4 @@
-package org.lwjgl.input;
+package org.lwjglx.input;
 
 public class KeyEvent {
 
diff --git a/src/main/java/org/lwjgl/input/KeyState.java b/src/main/java/org/lwjglx/input/KeyState.java
similarity index 88%
rename from src/main/java/org/lwjgl/input/KeyState.java
rename to src/main/java/org/lwjglx/input/KeyState.java
index 5bfe3ede6..855f66f2d 100644
--- a/src/main/java/org/lwjgl/input/KeyState.java
+++ b/src/main/java/org/lwjglx/input/KeyState.java
@@ -1,4 +1,4 @@
-package org.lwjgl.input;
+package org.lwjglx.input;
 
 public enum KeyState {
 
diff --git a/src/main/java/org/lwjgl/input/Keyboard.java b/src/main/java/org/lwjglx/input/Keyboard.java
similarity index 98%
rename from src/main/java/org/lwjgl/input/Keyboard.java
rename to src/main/java/org/lwjglx/input/Keyboard.java
index 6a66b9d1b..205c09dea 100644
--- a/src/main/java/org/lwjgl/input/Keyboard.java
+++ b/src/main/java/org/lwjglx/input/Keyboard.java
@@ -1,4 +1,4 @@
-package org.lwjgl.input;
+package org.lwjglx.input;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -8,10 +8,10 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.commons.lang3.StringUtils;
-import org.lwjgl3.glfw.GLFW;
-import org.lwjgl.LWJGLException;
-import org.lwjgl.Sys;
-import org.lwjgl.opengl.Display;
+import org.lwjgl.glfw.GLFW;
+import org.lwjglx.LWJGLException;
+import org.lwjglx.Sys;
+import org.lwjglx.opengl.Display;
 
 public class Keyboard {
 
diff --git a/src/main/java/org/lwjgl/input/Mouse.java b/src/main/java/org/lwjglx/input/Mouse.java
similarity index 98%
rename from src/main/java/org/lwjgl/input/Mouse.java
rename to src/main/java/org/lwjglx/input/Mouse.java
index 373e9ef60..6cc56f399 100644
--- a/src/main/java/org/lwjgl/input/Mouse.java
+++ b/src/main/java/org/lwjglx/input/Mouse.java
@@ -1,4 +1,4 @@
-package org.lwjgl.input;
+package org.lwjglx.input;
 
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
@@ -6,11 +6,11 @@
 import net.minecraftforge.common.ForgeEarlyConfig;
 
 import org.apache.commons.lang3.StringUtils;
-import org.lwjgl3.BufferUtils;
-import org.lwjgl3.glfw.GLFW;
-import org.lwjgl.LWJGLException;
-import org.lwjgl.Sys;
-import org.lwjgl.opengl.Display;
+import org.lwjgl.BufferUtils;
+import org.lwjgl.glfw.GLFW;
+import org.lwjglx.LWJGLException;
+import org.lwjglx.Sys;
+import org.lwjglx.opengl.Display;
 
 public class Mouse {
 
diff --git a/src/main/java/org/lwjgl/lwjgl3ify/BufferCasts.java b/src/main/java/org/lwjglx/lwjgl3ify/BufferCasts.java
similarity index 95%
rename from src/main/java/org/lwjgl/lwjgl3ify/BufferCasts.java
rename to src/main/java/org/lwjglx/lwjgl3ify/BufferCasts.java
index 5c453063f..ea46dd852 100644
--- a/src/main/java/org/lwjgl/lwjgl3ify/BufferCasts.java
+++ b/src/main/java/org/lwjglx/lwjgl3ify/BufferCasts.java
@@ -1,8 +1,8 @@
-package org.lwjgl.lwjgl3ify;
+package org.lwjglx.lwjgl3ify;
 
 import java.nio.*;
 
-import org.lwjgl3.system.MemoryUtil;
+import org.lwjgl.system.MemoryUtil;
 
 public class BufferCasts {
 
diff --git a/src/main/java/org/lwjgl/openal/AL.java b/src/main/java/org/lwjglx/openal/AL.java
similarity index 56%
rename from src/main/java/org/lwjgl/openal/AL.java
rename to src/main/java/org/lwjglx/openal/AL.java
index 4388ed222..e3e816cbd 100644
--- a/src/main/java/org/lwjgl/openal/AL.java
+++ b/src/main/java/org/lwjglx/openal/AL.java
@@ -1,14 +1,14 @@
-package org.lwjgl.openal;
+package org.lwjglx.openal;
 
 import net.minecraftforge.common.ForgeEarlyConfig;
 
 import java.nio.IntBuffer;
 
-import org.lwjgl3.openal.ALC10;
-import org.lwjgl3.openal.ALCCapabilities;
-import org.lwjgl.BufferUtils;
-import org.lwjgl.LWJGLException;
-import org.lwjgl.Sys;
+import org.lwjgl.openal.ALC10;
+import org.lwjgl.openal.ALCCapabilities;
+import org.lwjglx.BufferUtils;
+import org.lwjglx.LWJGLException;
+import org.lwjglx.Sys;
 
 public class AL {
 
@@ -34,45 +34,45 @@ public static void create(String deviceArguments, int contextFrequency, int cont
                               boolean contextSynchronized, boolean openDevice) throws LWJGLException {
         IntBuffer attribs = BufferUtils.createIntBuffer(16);
 
-        attribs.put(org.lwjgl3.openal.ALC10.ALC_FREQUENCY);
+        attribs.put(org.lwjgl.openal.ALC10.ALC_FREQUENCY);
         attribs.put(contextFrequency);
 
-        attribs.put(org.lwjgl3.openal.ALC10.ALC_REFRESH);
+        attribs.put(org.lwjgl.openal.ALC10.ALC_REFRESH);
         attribs.put(contextRefresh);
 
-        attribs.put(org.lwjgl3.openal.ALC10.ALC_SYNC);
-        attribs.put(contextSynchronized ? org.lwjgl3.openal.ALC10.ALC_TRUE : org.lwjgl3.openal.ALC10.ALC_FALSE);
+        attribs.put(org.lwjgl.openal.ALC10.ALC_SYNC);
+        attribs.put(contextSynchronized ? org.lwjgl.openal.ALC10.ALC_TRUE : org.lwjgl.openal.ALC10.ALC_FALSE);
 
         /////////////////////////////////////////////
         // HRTF
         if (!ForgeEarlyConfig.OPENAL_CONTEXT.ENABLE_HRTF) {
-            attribs.put(org.lwjgl3.openal.SOFTHRTF.ALC_HRTF_SOFT);
-            attribs.put(org.lwjgl3.openal.ALC10.ALC_FALSE);
-            attribs.put(org.lwjgl3.openal.SOFTHRTF.ALC_HRTF_ID_SOFT);
+            attribs.put(org.lwjgl.openal.SOFTHRTF.ALC_HRTF_SOFT);
+            attribs.put(org.lwjgl.openal.ALC10.ALC_FALSE);
+            attribs.put(org.lwjgl.openal.SOFTHRTF.ALC_HRTF_ID_SOFT);
             attribs.put(0);
         }
         /////////////////////////////////////////////
         
-        attribs.put(org.lwjgl3.openal.EXTEfx.ALC_MAX_AUXILIARY_SENDS);
+        attribs.put(org.lwjgl.openal.EXTEfx.ALC_MAX_AUXILIARY_SENDS);
         attribs.put(4);
 
         attribs.put(0);
         attribs.flip();
 
-        String defaultDevice = org.lwjgl3.openal.ALC10.alcGetString(0, ALC10.ALC_DEFAULT_DEVICE_SPECIFIER);
+        String defaultDevice = org.lwjgl.openal.ALC10.alcGetString(0, ALC10.ALC_DEFAULT_DEVICE_SPECIFIER);
 
-        long deviceHandle = org.lwjgl3.openal.ALC10.alcOpenDevice(defaultDevice);
+        long deviceHandle = org.lwjgl.openal.ALC10.alcOpenDevice(defaultDevice);
 
         if (deviceHandle == 0) throw new LWJGLException("Could not open ALC device");
 
         alcDevice = new ALCdevice(deviceHandle);
 
-        final ALCCapabilities deviceCaps = org.lwjgl3.openal.ALC.createCapabilities(deviceHandle);
+        final ALCCapabilities deviceCaps = org.lwjgl.openal.ALC.createCapabilities(deviceHandle);
 
-        long contextHandle = org.lwjgl3.openal.ALC10.alcCreateContext(AL.getDevice().device, attribs);
+        long contextHandle = org.lwjgl.openal.ALC10.alcCreateContext(AL.getDevice().device, attribs);
         alcContext = new ALCcontext(contextHandle);
-        org.lwjgl3.openal.ALC10.alcMakeContextCurrent(contextHandle);
-        org.lwjgl3.openal.AL.createCapabilities(deviceCaps);
+        org.lwjgl.openal.ALC10.alcMakeContextCurrent(contextHandle);
+        org.lwjgl.openal.AL.createCapabilities(deviceCaps);
 
         created = true;
     }
@@ -83,17 +83,17 @@ public static boolean isCreated() {
 
     public static void destroy() {
         if (alcContext != null) {
-            org.lwjgl3.openal.ALC10.alcDestroyContext(alcContext.context);
+            org.lwjgl.openal.ALC10.alcDestroyContext(alcContext.context);
             alcContext = null;
         }
         if (alcDevice != null) {
-            org.lwjgl3.openal.ALC10.alcCloseDevice(alcDevice.device);
+            org.lwjgl.openal.ALC10.alcCloseDevice(alcDevice.device);
             alcDevice = null;
         }
         created = false;
     }
 
-    public static org.lwjgl.openal.ALCcontext getContext() {
+    public static ALCcontext getContext() {
         return alcContext;
     }
 
diff --git a/src/main/java/org/lwjglx/openal/AL10.java b/src/main/java/org/lwjglx/openal/AL10.java
new file mode 100644
index 000000000..6eee263f9
--- /dev/null
+++ b/src/main/java/org/lwjglx/openal/AL10.java
@@ -0,0 +1,304 @@
+package org.lwjglx.openal;
+
+public class AL10 {
+
+    public static final int AL_INVALID = org.lwjgl.openal.AL10.AL_INVALID;
+    public static final int AL_NONE = org.lwjgl.openal.AL10.AL_NONE;
+    public static final int AL_FALSE = org.lwjgl.openal.AL10.AL_FALSE;
+    public static final int AL_TRUE = org.lwjgl.openal.AL10.AL_TRUE;
+    public static final int AL_SOURCE_TYPE = org.lwjgl.openal.AL10.AL_SOURCE_TYPE;
+    public static final int AL_SOURCE_ABSOLUTE = org.lwjgl.openal.AL10.AL_SOURCE_ABSOLUTE;
+    public static final int AL_SOURCE_RELATIVE = org.lwjgl.openal.AL10.AL_SOURCE_RELATIVE;
+    public static final int AL_CONE_INNER_ANGLE = org.lwjgl.openal.AL10.AL_CONE_INNER_ANGLE;
+    public static final int AL_CONE_OUTER_ANGLE = org.lwjgl.openal.AL10.AL_CONE_OUTER_ANGLE;
+    public static final int AL_PITCH = org.lwjgl.openal.AL10.AL_PITCH;
+    public static final int AL_POSITION = org.lwjgl.openal.AL10.AL_POSITION;
+    public static final int AL_DIRECTION = org.lwjgl.openal.AL10.AL_DIRECTION;
+    public static final int AL_VELOCITY = org.lwjgl.openal.AL10.AL_VELOCITY;
+    public static final int AL_LOOPING = org.lwjgl.openal.AL10.AL_LOOPING;
+    public static final int AL_BUFFER = org.lwjgl.openal.AL10.AL_BUFFER;
+    public static final int AL_GAIN = org.lwjgl.openal.AL10.AL_GAIN;
+    public static final int AL_MIN_GAIN = org.lwjgl.openal.AL10.AL_MIN_GAIN;
+    public static final int AL_MAX_GAIN = org.lwjgl.openal.AL10.AL_MAX_GAIN;
+    public static final int AL_ORIENTATION = org.lwjgl.openal.AL10.AL_ORIENTATION,
+            AL_REFERENCE_DISTANCE = org.lwjgl.openal.AL10.AL_REFERENCE_DISTANCE;
+    public static final int AL_ROLLOFF_FACTOR = org.lwjgl.openal.AL10.AL_ROLLOFF_FACTOR;
+    public static final int AL_CONE_OUTER_GAIN = org.lwjgl.openal.AL10.AL_CONE_OUTER_GAIN;
+    public static final int AL_MAX_DISTANCE = org.lwjgl.openal.AL10.AL_MAX_DISTANCE;
+    public static final int AL_CHANNEL_MASK = 0x3000;
+    public static final int AL_SOURCE_STATE = org.lwjgl.openal.AL10.AL_SOURCE_STATE,
+            AL_INITIAL = org.lwjgl.openal.AL10.AL_INITIAL,
+            AL_PLAYING = org.lwjgl.openal.AL10.AL_PLAYING,
+            AL_PAUSED = org.lwjgl.openal.AL10.AL_PAUSED,
+            AL_STOPPED = org.lwjgl.openal.AL10.AL_STOPPED;
+    public static final int AL_BUFFERS_QUEUED = org.lwjgl.openal.AL10.AL_BUFFERS_QUEUED,
+            AL_BUFFERS_PROCESSED = org.lwjgl.openal.AL10.AL_BUFFERS_PROCESSED;
+    public static final int AL_FORMAT_MONO8 = org.lwjgl.openal.AL10.AL_FORMAT_MONO8,
+            AL_FORMAT_MONO16 = org.lwjgl.openal.AL10.AL_FORMAT_MONO16,
+            AL_FORMAT_STEREO8 = org.lwjgl.openal.AL10.AL_FORMAT_STEREO8,
+            AL_FORMAT_STEREO16 = org.lwjgl.openal.AL10.AL_FORMAT_STEREO16;
+    public static final int AL_FORMAT_VORBIS_EXT = 0x10003;
+    public static final int AL_FREQUENCY = org.lwjgl.openal.AL10.AL_FREQUENCY;
+    public static final int AL_BITS = org.lwjgl.openal.AL10.AL_BITS;
+    public static final int AL_CHANNELS = org.lwjgl.openal.AL10.AL_CHANNELS;
+    public static final int AL_SIZE = org.lwjgl.openal.AL10.AL_SIZE;
+    public static final int AL_DATA = 0x2005;
+    public static final int AL_UNUSED = org.lwjgl.openal.AL10.AL_UNUSED,
+            AL_PENDING = org.lwjgl.openal.AL10.AL_PENDING,
+            AL_PROCESSED = org.lwjgl.openal.AL10.AL_PROCESSED;
+    public static final int AL_NO_ERROR = 0x0;
+    public static final int AL_INVALID_NAME = org.lwjgl.openal.AL10.AL_INVALID_NAME;
+    public static final int AL_INVALID_ENUM = org.lwjgl.openal.AL10.AL_INVALID_ENUM;
+    public static final int AL_INVALID_VALUE = org.lwjgl.openal.AL10.AL_INVALID_VALUE;
+    public static final int AL_INVALID_OPERATION = org.lwjgl.openal.AL10.AL_INVALID_OPERATION;
+    public static final int AL_OUT_OF_MEMORY = org.lwjgl.openal.AL10.AL_OUT_OF_MEMORY;
+    public static final int AL_VENDOR = org.lwjgl.openal.AL10.AL_VENDOR;
+    public static final int AL_VERSION = org.lwjgl.openal.AL10.AL_VERSION;
+    public static final int AL_RENDERER = org.lwjgl.openal.AL10.AL_RENDERER;
+    public static final int AL_EXTENSIONS = org.lwjgl.openal.AL10.AL_EXTENSIONS;
+    public static final int AL_DOPPLER_FACTOR = org.lwjgl.openal.AL10.AL_DOPPLER_FACTOR;
+    public static final int AL_DOPPLER_VELOCITY = org.lwjgl.openal.AL10.AL_DOPPLER_FACTOR;
+    public static final int AL_DISTANCE_MODEL = org.lwjgl.openal.AL10.AL_DISTANCE_MODEL;
+    public static final int AL_INVERSE_DISTANCE = org.lwjgl.openal.AL10.AL_INVERSE_DISTANCE,
+            AL_INVERSE_DISTANCE_CLAMPED = org.lwjgl.openal.AL10.AL_INVERSE_DISTANCE_CLAMPED;
+
+    public static void alBufferData(int buffer, int format, java.nio.ByteBuffer data, int freq) {
+        org.lwjgl.openal.AL10.alBufferData(buffer, format, data, freq);
+    }
+
+    public static void alBufferData(int buffer, int format, java.nio.IntBuffer data, int freq) {
+        org.lwjgl.openal.AL10.alBufferData(buffer, format, data, freq);
+    }
+
+    public static void alBufferData(int buffer, int format, java.nio.ShortBuffer data, int freq) {
+        org.lwjgl.openal.AL10.alBufferData(buffer, format, data, freq);
+    }
+    public static void alcCloseDevice(ALCdevice alCdevice) {
+        org.lwjgl.openal.ALC10.alcCloseDevice(alCdevice.device);
+    }
+    public static void alDeleteBuffers(int buffer) {
+        org.lwjgl.openal.AL10.alDeleteBuffers(buffer);
+    }
+
+    public static void alDeleteBuffers(java.nio.IntBuffer buffers) {
+        org.lwjgl.openal.AL10.alDeleteBuffers(buffers);
+    }
+
+    public static void alDeleteSources(int source) {
+        org.lwjgl.openal.AL10.alDeleteSources(source);
+    }
+
+    public static void alDeleteSources(java.nio.IntBuffer sources) {
+        org.lwjgl.openal.AL10.alDeleteSources(sources);
+    }
+
+    public static void alDisable(int capability) {
+        org.lwjgl.openal.AL10.alDisable(capability);
+    }
+
+    public static void alDistanceModel(int value) {
+        org.lwjgl.openal.AL10.alDistanceModel(value);
+    }
+
+    public static void alDopplerFactor(float value) {
+        org.lwjgl.openal.AL10.alDopplerFactor(value);
+    }
+
+    public static void alDopplerVelocity(float value) {
+        org.lwjgl.openal.AL10.alDopplerVelocity(value);
+    }
+
+    public static void alEnable(int capability) {
+        org.lwjgl.openal.AL10.alEnable(capability);
+    }
+
+    public static int alGenBuffers() {
+        return org.lwjgl.openal.AL10.alGenBuffers();
+    }
+
+    public static void alGenBuffers(java.nio.IntBuffer buffers) {
+        org.lwjgl.openal.AL10.alGenBuffers(buffers);
+    }
+
+    public static int alGenSources() {
+        return org.lwjgl.openal.AL10.alGenSources();
+    }
+
+    public static void alGenSources(java.nio.IntBuffer sources) {
+        org.lwjgl.openal.AL10.alGenSources(sources);
+    }
+
+    public static boolean alGetBoolean(int pname) {
+        return org.lwjgl.openal.AL10.alGetBoolean(pname);
+    }
+
+    public static float alGetBufferf(int buffer, int pname) {
+        return org.lwjgl.openal.AL10.alGetBufferf(buffer, pname);
+    }
+
+    public static int alGetBufferi(int buffer, int pname) {
+        return org.lwjgl.openal.AL10.alGetBufferi(buffer, pname);
+    }
+
+    public static double alGetDouble(int pname) {
+        return org.lwjgl.openal.AL10.alGetDouble(pname);
+    }
+
+    public static void alGetDouble(int pname, java.nio.DoubleBuffer data) {
+        org.lwjgl.openal.AL10.alGetDoublev(pname, data);
+    }
+
+    public static int alGetEnumValue(java.lang.String ename) {
+
+        int returnValue = org.lwjgl.openal.AL10.alGetEnumValue(ename);
+
+        return returnValue;
+    }
+
+    public static int alGetError() {
+        return org.lwjgl.openal.AL10.alGetError();
+    }
+
+    public static float alGetFloat(int pname) {
+        return org.lwjgl.openal.AL10.alGetFloat(pname);
+    }
+
+    public static void alGetFloat(int pname, java.nio.FloatBuffer data) {
+        org.lwjgl.openal.AL10.alGetFloatv(pname, data);
+    }
+
+    public static int alGetInteger(int pname) {
+        return org.lwjgl.openal.AL10.alGetInteger(pname);
+    }
+
+    public static void alGetInteger(int pname, java.nio.IntBuffer data) {
+        org.lwjgl.openal.AL10.alGetIntegerv(pname, data);
+    }
+
+    public static void alGetListener(int pname, java.nio.FloatBuffer floatdata) {
+        org.lwjgl.openal.AL10.alGetListenerfv(pname, floatdata);
+    }
+
+    public static float alGetListenerf(int pname) {
+        return org.lwjgl.openal.AL10.alGetListenerf(pname);
+    }
+
+    public static int alGetListeneri(int pname) {
+        return org.lwjgl.openal.AL10.alGetListeneri(pname);
+    }
+
+    public static void alGetSource(int source, int pname, java.nio.FloatBuffer floatdata) {
+        org.lwjgl.openal.AL10.alGetSourcefv(source, pname, floatdata);
+    }
+
+    public static float alGetSourcef(int source, int pname) {
+        return org.lwjgl.openal.AL10.alGetSourcef(source, pname);
+    }
+
+    public static int alGetSourcei(int source, int pname) {
+        return org.lwjgl.openal.AL10.alGetSourcei(source, pname);
+    }
+
+    public static java.lang.String alGetString(int pname) {
+        return org.lwjgl.openal.AL10.alGetString(pname);
+    }
+
+    public static boolean alIsBuffer(int buffer) {
+        return org.lwjgl.openal.AL10.alIsBuffer(buffer);
+    }
+
+    public static boolean alIsEnabled(int capability) {
+        return org.lwjgl.openal.AL10.alIsEnabled(capability);
+    }
+
+    public static boolean alIsExtensionPresent(java.lang.String fname) {
+
+        boolean returnValue = org.lwjgl.openal.AL10.alIsExtensionPresent(fname);
+
+        return returnValue;
+    }
+
+    public static boolean alIsSource(int id) {
+        return org.lwjgl.openal.AL10.alIsSource(id);
+    }
+
+    public static void alListener3f(int pname, float v1, float v2, float v3) {
+        org.lwjgl.openal.AL10.alListener3f(pname, v1, v2, v3);
+    }
+
+    public static void alListener(int pname, java.nio.FloatBuffer value) {
+        org.lwjgl.openal.AL10.alListenerfv(pname, value);
+    }
+
+    public static void alListenerf(int pname, float value) {
+        org.lwjgl.openal.AL10.alListenerf(pname, value);
+    }
+
+    public static void alListeneri(int pname, int value) {
+        org.lwjgl.openal.AL10.alListeneri(pname, value);
+    }
+
+    public static void alSource3f(int source, int pname, float v1, float v2, float v3) {
+        org.lwjgl.openal.AL10.alSource3f(source, pname, v1, v2, v3);
+    }
+
+    public static void alSource(int source, int pname, java.nio.FloatBuffer value) {
+        org.lwjgl.openal.AL10.alSourcefv(source, pname, value);
+    }
+
+    public static void alSourcePause(int source) {
+        org.lwjgl.openal.AL10.alSourcePause(source);
+    }
+
+    public static void alSourcePause(java.nio.IntBuffer sources) {
+        org.lwjgl.openal.AL10.alSourcePausev(sources);
+    }
+
+    public static void alSourcePlay(int source) {
+        org.lwjgl.openal.AL10.alSourcePlay(source);
+    }
+
+    public static void alSourcePlay(java.nio.IntBuffer sources) {
+        org.lwjgl.openal.AL10.alSourcePlayv(sources);
+    }
+
+    public static void alSourceQueueBuffers(int source, int buffer) {
+        org.lwjgl.openal.AL10.alSourceQueueBuffers(source, buffer);
+    }
+
+    public static void alSourceQueueBuffers(int source, java.nio.IntBuffer buffers) {
+        org.lwjgl.openal.AL10.alSourceQueueBuffers(source, buffers);
+    }
+
+    public static void alSourceRewind(int source) {
+        org.lwjgl.openal.AL10.alSourceRewind(source);
+    }
+
+    public static void alSourceRewind(java.nio.IntBuffer sources) {
+        org.lwjgl.openal.AL10.alSourceRewindv(sources);
+    }
+
+    public static void alSourceStop(int source) {
+        org.lwjgl.openal.AL10.alSourceStop(source);
+    }
+
+    public static void alSourceStop(java.nio.IntBuffer sources) {
+        org.lwjgl.openal.AL10.alSourceStopv(sources);
+    }
+
+    public static int alSourceUnqueueBuffers(int source) {
+        return org.lwjgl.openal.AL10.alSourceUnqueueBuffers(source);
+    }
+
+    public static void alSourceUnqueueBuffers(int source, java.nio.IntBuffer buffers) {
+        org.lwjgl.openal.AL10.alSourceUnqueueBuffers(source, buffers);
+    }
+
+    public static void alSourcef(int source, int pname, float value) {
+        org.lwjgl.openal.AL10.alSourcef(source, pname, value);
+    }
+
+    public static void alSourcei(int source, int pname, int value) {
+        org.lwjgl.openal.AL10.alSourcei(source, pname, value);
+    }
+}
diff --git a/src/main/java/org/lwjgl/openal/AL11.java b/src/main/java/org/lwjglx/openal/AL11.java
similarity index 66%
rename from src/main/java/org/lwjgl/openal/AL11.java
rename to src/main/java/org/lwjglx/openal/AL11.java
index 8cd3b221b..fe7507ada 100644
--- a/src/main/java/org/lwjgl/openal/AL11.java
+++ b/src/main/java/org/lwjglx/openal/AL11.java
@@ -1,6 +1,6 @@
-package org.lwjgl.openal;
+package org.lwjglx.openal;
 
-import org.lwjgl.lwjgl3ify.BufferCasts;
+import org.lwjglx.lwjgl3ify.BufferCasts;
 
 public class AL11 {
 
@@ -18,65 +18,65 @@ public class AL11 {
     public static final int AL_UNDETERMINED = (int) 4144;
 
     public static void alBuffer3f(int buffer, int pname, float v1, float v2, float v3) {
-        org.lwjgl3.openal.AL11.alBuffer3f(buffer, pname, v1, v2, v3);
+        org.lwjgl.openal.AL11.alBuffer3f(buffer, pname, v1, v2, v3);
     }
 
     public static void alBuffer3i(int buffer, int pname, int v1, int v2, int v3) {
-        org.lwjgl3.openal.AL11.alBuffer3i(buffer, pname, v1, v2, v3);
+        org.lwjgl.openal.AL11.alBuffer3i(buffer, pname, v1, v2, v3);
     }
 
     public static void alBuffer(int buffer, int pname, java.nio.FloatBuffer value) {
-        org.lwjgl3.openal.AL11.alBufferfv(buffer, pname, value);
+        org.lwjgl.openal.AL11.alBufferfv(buffer, pname, value);
     }
 
     public static void alBuffer(int buffer, int pname, java.nio.IntBuffer value) {
-        org.lwjgl3.openal.AL11.alBufferiv(buffer, pname, value);
+        org.lwjgl.openal.AL11.alBufferiv(buffer, pname, value);
     }
 
     public static void alBufferf(int buffer, int pname, float value) {
-        org.lwjgl3.openal.AL11.alBufferf(buffer, pname, value);
+        org.lwjgl.openal.AL11.alBufferf(buffer, pname, value);
     }
 
     public static void alBufferi(int buffer, int pname, int value) {
-        org.lwjgl3.openal.AL11.alBufferi(buffer, pname, value);
+        org.lwjgl.openal.AL11.alBufferi(buffer, pname, value);
     }
 
     public static void alGetBuffer(int buffer, int pname, java.nio.FloatBuffer values) {
-        org.lwjgl3.openal.AL11.alGetBufferfv(buffer, pname, values);
+        org.lwjgl.openal.AL11.alGetBufferfv(buffer, pname, values);
     }
 
     public static void alGetBuffer(int buffer, int pname, java.nio.IntBuffer values) {
-        org.lwjgl3.openal.AL11.alGetBufferiv(buffer, pname, values);
+        org.lwjgl.openal.AL11.alGetBufferiv(buffer, pname, values);
     }
 
     public static float alGetBufferf(int buffer, int pname) {
-        return org.lwjgl3.openal.AL11.alGetBufferf(buffer, pname);
+        return org.lwjgl.openal.AL11.alGetBufferf(buffer, pname);
     }
 
     public static int alGetBufferi(int buffer, int pname) {
-        return org.lwjgl3.openal.AL11.alGetBufferi(buffer, pname);
+        return org.lwjgl.openal.AL11.alGetBufferi(buffer, pname);
     }
 
     public static void alGetListeneri(int pname, java.nio.FloatBuffer intdata) {
         final java.nio.ByteBuffer wrappedArg1 = BufferCasts.toByteBuffer(intdata);
 
-        org.lwjgl3.openal.AL11.alGetListeneriv(pname, wrappedArg1.asIntBuffer());
+        org.lwjgl.openal.AL11.alGetListeneriv(pname, wrappedArg1.asIntBuffer());
         BufferCasts.updateBuffer(intdata, wrappedArg1);
     }
 
     public static void alListener3i(int pname, int v1, int v2, int v3) {
-        org.lwjgl3.openal.AL11.alListener3i(pname, v1, v2, v3);
+        org.lwjgl.openal.AL11.alListener3i(pname, v1, v2, v3);
     }
 
     public static void alSource3i(int source, int pname, int v1, int v2, int v3) {
-        org.lwjgl3.openal.AL11.alSource3i(source, pname, v1, v2, v3);
+        org.lwjgl.openal.AL11.alSource3i(source, pname, v1, v2, v3);
     }
 
     public static void alSource(int source, int pname, java.nio.IntBuffer value) {
-        org.lwjgl3.openal.AL11.alSourceiv(source, pname, value);
+        org.lwjgl.openal.AL11.alSourceiv(source, pname, value);
     }
 
     public static void alSpeedOfSound(float value) {
-        org.lwjgl3.openal.AL11.alSpeedOfSound(value);
+        org.lwjgl.openal.AL11.alSpeedOfSound(value);
     }
 }
diff --git a/src/main/java/org/lwjglx/openal/ALC10.java b/src/main/java/org/lwjglx/openal/ALC10.java
new file mode 100644
index 000000000..59fe0409a
--- /dev/null
+++ b/src/main/java/org/lwjglx/openal/ALC10.java
@@ -0,0 +1,67 @@
+package org.lwjglx.openal;
+
+public class ALC10 {
+
+    static ALCcontext alcContext;
+
+    public static final int ALC_FREQUENCY = org.lwjgl.openal.ALC10.ALC_FREQUENCY;
+    public static final int ALC_REFRESH = org.lwjgl.openal.ALC10.ALC_REFRESH;
+    public static final int ALC_SYNC = org.lwjgl.openal.ALC10.ALC_SYNC;
+    public static final int ALC_NO_ERROR = org.lwjgl.openal.ALC10.ALC_NO_ERROR;
+    public static final int ALC_DEFAULT_DEVICE_SPECIFIER = org.lwjgl.openal.ALC10.ALC_DEFAULT_DEVICE_SPECIFIER;
+    public static final int ALC_DEVICE_SPECIFIER = org.lwjgl.openal.ALC10.ALC_DEVICE_SPECIFIER;
+
+    public static int alcGetError(ALCdevice device) {
+        if (device == null) {
+            return org.lwjgl.openal.ALC10.alcGetError(AL.alcDevice.device);
+        }
+
+        return org.lwjgl.openal.ALC10.alcGetError(device.device);
+    }
+
+    public static java.lang.String alcGetString(ALCdevice device, int pname) {
+        if (device == null) {
+            return org.lwjgl.openal.ALC10.alcGetString(AL.alcDevice.device, pname);
+        }
+
+        return org.lwjgl.openal.ALC10.alcGetString(device.device, pname);
+    }
+
+    public static ALCdevice alcOpenDevice(String devicename) {
+        long device_address = org.lwjgl.openal.ALC10.alcOpenDevice(devicename);
+        if(device_address != 0) {
+            return new ALCdevice(device_address);
+        }
+        return null;
+    }
+
+    public static boolean alcIsExtensionPresent(ALCdevice device, java.lang.String extName) {
+        if (device == null) {
+            return org.lwjgl.openal.ALC10.alcIsExtensionPresent(AL.alcDevice.device, extName);
+        }
+
+        return org.lwjgl.openal.ALC10.alcIsExtensionPresent(device.device, extName);
+    }
+
+    public static ALCcontext alcCreateContext(ALCdevice device, java.nio.IntBuffer attrList) {
+        long alContextHandle = org.lwjgl.openal.ALC10.alcCreateContext(device.device, attrList);
+        alcContext = new ALCcontext(alContextHandle);
+        return alcContext;
+    }
+
+    public static boolean alcCloseDevice(ALCdevice alCdevice) {
+        return org.lwjgl.openal.ALC10.alcCloseDevice(alCdevice.device);
+    }
+
+    public static ALCcontext alcGetCurrentContext() {
+        return alcContext;
+    }
+
+    public static ALCdevice alcGetContextsDevice(ALCcontext context) {
+        return AL.alcDevice;
+    }
+
+    public static void alcGetInteger(ALCdevice device, int pname, java.nio.IntBuffer integerdata) {
+        org.lwjgl.openal.ALC10.alcGetIntegerv(device.device, pname, integerdata);
+    }
+}
diff --git a/src/main/java/org/lwjglx/openal/ALC11.java b/src/main/java/org/lwjglx/openal/ALC11.java
new file mode 100644
index 000000000..413934260
--- /dev/null
+++ b/src/main/java/org/lwjglx/openal/ALC11.java
@@ -0,0 +1,43 @@
+package org.lwjglx.openal;
+
+public class ALC11 {
+
+    public static final int ALC_ALL_DEVICES_SPECIFIER = (int) 4115;
+    public static final int ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER = (int) 785;
+    public static final int ALC_CAPTURE_DEVICE_SPECIFIER = (int) 784;
+    public static final int ALC_CAPTURE_SAMPLES = (int) 786;
+    public static final int ALC_DEFAULT_ALL_DEVICES_SPECIFIER = (int) 4114;
+    public static final int ALC_MONO_SOURCES = (int) 4112;
+    public static final int ALC_STEREO_SOURCES = (int) 4113;
+
+    public static boolean alcCaptureCloseDevice(ALCdevice device) {
+
+        boolean returnValue = org.lwjgl.openal.ALC11.alcCaptureCloseDevice(device.device);
+
+        return returnValue;
+    }
+
+    public static ALCdevice alcCaptureOpenDevice(java.lang.String arg0, int arg1, int frequency,
+                                                 int format) {
+
+        ALCdevice returnValue = new ALCdevice(
+                org.lwjgl.openal.ALC11.alcCaptureOpenDevice(arg0, arg1, frequency, format));
+
+        return returnValue;
+    }
+
+    public static void alcCaptureSamples(ALCdevice device, java.nio.ByteBuffer buffer, int samples) {
+
+        org.lwjgl.openal.ALC11.alcCaptureSamples(device.device, buffer, samples);
+    }
+
+    public static void alcCaptureStart(ALCdevice device) {
+
+        org.lwjgl.openal.ALC11.alcCaptureStart(device.device);
+    }
+
+    public static void alcCaptureStop(ALCdevice device) {
+
+        org.lwjgl.openal.ALC11.alcCaptureStop(device.device);
+    }
+}
diff --git a/src/main/java/org/lwjgl/openal/ALCcontext.java b/src/main/java/org/lwjglx/openal/ALCcontext.java
similarity index 98%
rename from src/main/java/org/lwjgl/openal/ALCcontext.java
rename to src/main/java/org/lwjglx/openal/ALCcontext.java
index 86754bbbb..45ea56285 100644
--- a/src/main/java/org/lwjgl/openal/ALCcontext.java
+++ b/src/main/java/org/lwjglx/openal/ALCcontext.java
@@ -13,11 +13,11 @@
  * 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.openal;
+package org.lwjglx.openal;
 
 import java.nio.IntBuffer;
 
-import org.lwjgl.BufferUtils;
+import org.lwjglx.BufferUtils;
 
 /**
  * The ALCcontext class represents a context opened in OpenAL space.
diff --git a/src/main/java/org/lwjgl/openal/ALCdevice.java b/src/main/java/org/lwjglx/openal/ALCdevice.java
similarity index 97%
rename from src/main/java/org/lwjgl/openal/ALCdevice.java
rename to src/main/java/org/lwjglx/openal/ALCdevice.java
index b10f7e39b..2d7258493 100644
--- a/src/main/java/org/lwjgl/openal/ALCdevice.java
+++ b/src/main/java/org/lwjglx/openal/ALCdevice.java
@@ -13,7 +13,7 @@
  * 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.openal;
+package org.lwjglx.openal;
 
 import java.util.HashMap;
 
@@ -51,7 +51,7 @@ public final class ALCdevice {
     }
 
     public static long alcOpenDevice(String deviceSpecifier) {
-        return org.lwjgl3.openal.ALC10.alcOpenDevice(deviceSpecifier);
+        return org.lwjgl.openal.ALC10.alcOpenDevice(deviceSpecifier);
     }
 
         /*
diff --git a/src/main/java/org/lwjgl/openal/EFX10.java b/src/main/java/org/lwjglx/openal/EFX10.java
similarity index 99%
rename from src/main/java/org/lwjgl/openal/EFX10.java
rename to src/main/java/org/lwjglx/openal/EFX10.java
index 0b351d110..e79da66ea 100644
--- a/src/main/java/org/lwjgl/openal/EFX10.java
+++ b/src/main/java/org/lwjglx/openal/EFX10.java
@@ -1,6 +1,6 @@
-package org.lwjgl.openal;
+package org.lwjglx.openal;
 
-import org.lwjgl3.openal.EXTEfx;
+import org.lwjgl.openal.EXTEfx;
 
 @SuppressWarnings("unused")
 public class EFX10 {
diff --git a/src/main/java/org/lwjgl/openal/EFXUtil.java b/src/main/java/org/lwjglx/openal/EFXUtil.java
similarity index 93%
rename from src/main/java/org/lwjgl/openal/EFXUtil.java
rename to src/main/java/org/lwjglx/openal/EFXUtil.java
index 9541d0187..3bb3c771f 100644
--- a/src/main/java/org/lwjgl/openal/EFXUtil.java
+++ b/src/main/java/org/lwjglx/openal/EFXUtil.java
@@ -1,12 +1,12 @@
 /*
  * Copyright LWJGL. All rights reserved. License terms: http://lwjgl.org/license.php
  */
-package org.lwjgl.openal;
+package org.lwjglx.openal;
 
-import static org.lwjgl3.openal.AL10.*;
-import static org.lwjgl3.openal.EXTEfx.*;
+import static org.lwjgl.openal.AL10.*;
+import static org.lwjgl.openal.EXTEfx.*;
 
-import org.lwjgl3.openal.ALC;
+import org.lwjgl.openal.ALC;
 
 /**
  * Utility class for the OpenAL extension AL_EXT_EFX. Provides functions to check for the extension and support of
@@ -31,7 +31,7 @@ private EFXUtil() {}
      *
      * @return True if AL_EXT_EFX is supported, false if not.
      *
-     * @throws org.lwjgl3.openal.OpenALException If OpenAL has not been created yet.
+     * @throws org.lwjgl.openal.OpenALException If OpenAL has not been created yet.
      */
     public static boolean isEfxSupported() {
         return ALC.getCapabilities().ALC_EXT_EFX;
@@ -45,7 +45,7 @@ public static boolean isEfxSupported() {
      *
      * @return True if it is supported, false if not.
      *
-     * @throws org.lwjgl3.openal.OpenALException If the request fails due to an AL_OUT_OF_MEMORY error or OpenAL has not
+     * @throws org.lwjgl.openal.OpenALException If the request fails due to an AL_OUT_OF_MEMORY error or OpenAL has not
      *                                          been created yet.
      * @throws IllegalArgumentException         effectType is not a valid effect type.
      */
@@ -82,7 +82,7 @@ public static boolean isEffectSupported(int effectType) {
      *
      * @return True if it is supported, false if not.
      *
-     * @throws org.lwjgl3.openal.OpenALException If the request fails due to an AL_OUT_OF_MEMORY error or OpenAL has not
+     * @throws org.lwjgl.openal.OpenALException If the request fails due to an AL_OUT_OF_MEMORY error or OpenAL has not
      *                                          been created yet.
      * @throws IllegalArgumentException         filterType is not a valid filter type.
      */
diff --git a/src/main/java/org/lwjgl/openal/OpenALException.java b/src/main/java/org/lwjglx/openal/OpenALException.java
similarity index 95%
rename from src/main/java/org/lwjgl/openal/OpenALException.java
rename to src/main/java/org/lwjglx/openal/OpenALException.java
index 44d07e13a..706a03032 100644
--- a/src/main/java/org/lwjgl/openal/OpenALException.java
+++ b/src/main/java/org/lwjglx/openal/OpenALException.java
@@ -13,7 +13,7 @@
  * 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.openal;
+package org.lwjglx.openal;
 
 /**
  * <br>
@@ -37,7 +37,7 @@ public OpenALException() {
      * Constructor that takes an AL error number
      */
     public OpenALException(int error_code) {
-        super("OpenAL error: " + org.lwjgl3.openal.AL10.alGetString(error_code) + " (" + error_code + ")");
+        super("OpenAL error: " + org.lwjgl.openal.AL10.alGetString(error_code) + " (" + error_code + ")");
     }
 
     /**
diff --git a/src/main/java/org/lwjgl/openal/Util.java b/src/main/java/org/lwjglx/openal/Util.java
similarity index 99%
rename from src/main/java/org/lwjgl/openal/Util.java
rename to src/main/java/org/lwjglx/openal/Util.java
index e0a443487..be914c15f 100644
--- a/src/main/java/org/lwjgl/openal/Util.java
+++ b/src/main/java/org/lwjglx/openal/Util.java
@@ -13,7 +13,7 @@
  * 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.openal;
+package org.lwjglx.openal;
 
 /**
  * Simple utility class for checking AL/ALC errors
diff --git a/src/main/java/org/lwjgl/opengl/AMDBlendMinmaxFactor.java b/src/main/java/org/lwjglx/opengl/AMDBlendMinmaxFactor.java
similarity index 85%
rename from src/main/java/org/lwjgl/opengl/AMDBlendMinmaxFactor.java
rename to src/main/java/org/lwjglx/opengl/AMDBlendMinmaxFactor.java
index f8c03320a..d7c160de6 100644
--- a/src/main/java/org/lwjgl/opengl/AMDBlendMinmaxFactor.java
+++ b/src/main/java/org/lwjglx/opengl/AMDBlendMinmaxFactor.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class AMDBlendMinmaxFactor {
 
diff --git a/src/main/java/org/lwjgl/opengl/AMDDebugOutput.java b/src/main/java/org/lwjglx/opengl/AMDDebugOutput.java
similarity index 82%
rename from src/main/java/org/lwjgl/opengl/AMDDebugOutput.java
rename to src/main/java/org/lwjglx/opengl/AMDDebugOutput.java
index a01687727..ebbdad479 100644
--- a/src/main/java/org/lwjgl/opengl/AMDDebugOutput.java
+++ b/src/main/java/org/lwjglx/opengl/AMDDebugOutput.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class AMDDebugOutput {
 
@@ -18,20 +18,20 @@ public class AMDDebugOutput {
     public static final int GL_MAX_DEBUG_MESSAGE_LENGTH_AMD = (int) 37187;
 
     public static void glDebugMessageEnableAMD(int category, int severity, java.nio.IntBuffer ids, boolean enabled) {
-        org.lwjgl3.opengl.AMDDebugOutput.glDebugMessageEnableAMD(category, severity, ids, enabled);
+        org.lwjgl.opengl.AMDDebugOutput.glDebugMessageEnableAMD(category, severity, ids, enabled);
     }
 
     public static void glDebugMessageInsertAMD(int category, int severity, int id, java.lang.CharSequence buf) {
-        org.lwjgl3.opengl.AMDDebugOutput.glDebugMessageInsertAMD(category, severity, id, buf);
+        org.lwjgl.opengl.AMDDebugOutput.glDebugMessageInsertAMD(category, severity, id, buf);
     }
 
     public static void glDebugMessageInsertAMD(int category, int severity, int id, java.nio.ByteBuffer buf) {
-        org.lwjgl3.opengl.AMDDebugOutput.glDebugMessageInsertAMD(category, severity, id, buf);
+        org.lwjgl.opengl.AMDDebugOutput.glDebugMessageInsertAMD(category, severity, id, buf);
     }
 
     public static int glGetDebugMessageLogAMD(int count, java.nio.IntBuffer categories, java.nio.IntBuffer severities,
             java.nio.IntBuffer ids, java.nio.IntBuffer lengths, java.nio.ByteBuffer messageLog) {
-        return org.lwjgl3.opengl.AMDDebugOutput
+        return org.lwjgl.opengl.AMDDebugOutput
                 .glGetDebugMessageLogAMD(count, categories, severities, ids, lengths, messageLog);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/AMDDepthClampSeparate.java b/src/main/java/org/lwjglx/opengl/AMDDepthClampSeparate.java
similarity index 86%
rename from src/main/java/org/lwjgl/opengl/AMDDepthClampSeparate.java
rename to src/main/java/org/lwjglx/opengl/AMDDepthClampSeparate.java
index d4296e26f..b3e17e84b 100644
--- a/src/main/java/org/lwjgl/opengl/AMDDepthClampSeparate.java
+++ b/src/main/java/org/lwjglx/opengl/AMDDepthClampSeparate.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class AMDDepthClampSeparate {
 
diff --git a/src/main/java/org/lwjgl/opengl/AMDDrawBuffersBlend.java b/src/main/java/org/lwjglx/opengl/AMDDrawBuffersBlend.java
similarity index 50%
rename from src/main/java/org/lwjgl/opengl/AMDDrawBuffersBlend.java
rename to src/main/java/org/lwjglx/opengl/AMDDrawBuffersBlend.java
index cd0006b89..5b2826c80 100644
--- a/src/main/java/org/lwjgl/opengl/AMDDrawBuffersBlend.java
+++ b/src/main/java/org/lwjglx/opengl/AMDDrawBuffersBlend.java
@@ -1,20 +1,20 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class AMDDrawBuffersBlend {
 
     public static void glBlendEquationIndexedAMD(int buf, int mode) {
-        org.lwjgl3.opengl.AMDDrawBuffersBlend.glBlendEquationIndexedAMD(buf, mode);
+        org.lwjgl.opengl.AMDDrawBuffersBlend.glBlendEquationIndexedAMD(buf, mode);
     }
 
     public static void glBlendEquationSeparateIndexedAMD(int buf, int modeRGB, int modeAlpha) {
-        org.lwjgl3.opengl.AMDDrawBuffersBlend.glBlendEquationSeparateIndexedAMD(buf, modeRGB, modeAlpha);
+        org.lwjgl.opengl.AMDDrawBuffersBlend.glBlendEquationSeparateIndexedAMD(buf, modeRGB, modeAlpha);
     }
 
     public static void glBlendFuncIndexedAMD(int buf, int src, int dst) {
-        org.lwjgl3.opengl.AMDDrawBuffersBlend.glBlendFuncIndexedAMD(buf, src, dst);
+        org.lwjgl.opengl.AMDDrawBuffersBlend.glBlendFuncIndexedAMD(buf, src, dst);
     }
 
     public static void glBlendFuncSeparateIndexedAMD(int buf, int srcRGB, int dstRGB, int srcAlpha, int dstAlpha) {
-        org.lwjgl3.opengl.AMDDrawBuffersBlend.glBlendFuncSeparateIndexedAMD(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+        org.lwjgl.opengl.AMDDrawBuffersBlend.glBlendFuncSeparateIndexedAMD(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/AMDInterleavedElements.java b/src/main/java/org/lwjglx/opengl/AMDInterleavedElements.java
similarity index 68%
rename from src/main/java/org/lwjgl/opengl/AMDInterleavedElements.java
rename to src/main/java/org/lwjglx/opengl/AMDInterleavedElements.java
index ff856dba9..57a73bec2 100644
--- a/src/main/java/org/lwjgl/opengl/AMDInterleavedElements.java
+++ b/src/main/java/org/lwjglx/opengl/AMDInterleavedElements.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class AMDInterleavedElements {
 
@@ -6,6 +6,6 @@ public class AMDInterleavedElements {
     public static final int GL_VERTEX_ID_SWIZZLE_AMD = (int) 37285;
 
     public static void glVertexAttribParameteriAMD(int index, int pname, int param) {
-        org.lwjgl3.opengl.AMDInterleavedElements.glVertexAttribParameteriAMD(index, pname, param);
+        org.lwjgl.opengl.AMDInterleavedElements.glVertexAttribParameteriAMD(index, pname, param);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/AMDPerformanceMonitor.java b/src/main/java/org/lwjglx/opengl/AMDPerformanceMonitor.java
similarity index 64%
rename from src/main/java/org/lwjgl/opengl/AMDPerformanceMonitor.java
rename to src/main/java/org/lwjglx/opengl/AMDPerformanceMonitor.java
index 73ae1773f..3af1114b1 100644
--- a/src/main/java/org/lwjgl/opengl/AMDPerformanceMonitor.java
+++ b/src/main/java/org/lwjglx/opengl/AMDPerformanceMonitor.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class AMDPerformanceMonitor {
 
@@ -11,66 +11,66 @@ public class AMDPerformanceMonitor {
     public static final int GL_UNSIGNED_INT64_AMD = (int) 35778;
 
     public static void glBeginPerfMonitorAMD(int monitor) {
-        org.lwjgl3.opengl.AMDPerformanceMonitor.glBeginPerfMonitorAMD(monitor);
+        org.lwjgl.opengl.AMDPerformanceMonitor.glBeginPerfMonitorAMD(monitor);
     }
 
     public static void glDeletePerfMonitorsAMD(int monitor) {
-        org.lwjgl3.opengl.AMDPerformanceMonitor.glDeletePerfMonitorsAMD(monitor);
+        org.lwjgl.opengl.AMDPerformanceMonitor.glDeletePerfMonitorsAMD(monitor);
     }
 
     public static void glDeletePerfMonitorsAMD(java.nio.IntBuffer monitors) {
-        org.lwjgl3.opengl.AMDPerformanceMonitor.glDeletePerfMonitorsAMD(monitors);
+        org.lwjgl.opengl.AMDPerformanceMonitor.glDeletePerfMonitorsAMD(monitors);
     }
 
     public static void glEndPerfMonitorAMD(int monitor) {
-        org.lwjgl3.opengl.AMDPerformanceMonitor.glEndPerfMonitorAMD(monitor);
+        org.lwjgl.opengl.AMDPerformanceMonitor.glEndPerfMonitorAMD(monitor);
     }
 
     public static int glGenPerfMonitorsAMD() {
-        return org.lwjgl3.opengl.AMDPerformanceMonitor.glGenPerfMonitorsAMD();
+        return org.lwjgl.opengl.AMDPerformanceMonitor.glGenPerfMonitorsAMD();
     }
 
     public static void glGenPerfMonitorsAMD(java.nio.IntBuffer monitors) {
-        org.lwjgl3.opengl.AMDPerformanceMonitor.glGenPerfMonitorsAMD(monitors);
+        org.lwjgl.opengl.AMDPerformanceMonitor.glGenPerfMonitorsAMD(monitors);
     }
 
     public static void glGetPerfMonitorCounterDataAMD(int monitor, int pname, java.nio.IntBuffer data,
             java.nio.IntBuffer bytesWritten) {
-        org.lwjgl3.opengl.AMDPerformanceMonitor.glGetPerfMonitorCounterDataAMD(monitor, pname, data, bytesWritten);
+        org.lwjgl.opengl.AMDPerformanceMonitor.glGetPerfMonitorCounterDataAMD(monitor, pname, data, bytesWritten);
     }
 
     public static void glGetPerfMonitorCounterInfoAMD(int group, int counter, int pname, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.AMDPerformanceMonitor.glGetPerfMonitorCounterInfoAMD(group, counter, pname, data);
+        org.lwjgl.opengl.AMDPerformanceMonitor.glGetPerfMonitorCounterInfoAMD(group, counter, pname, data);
     }
 
     public static void glGetPerfMonitorCounterStringAMD(int group, int counter, java.nio.IntBuffer length,
             java.nio.ByteBuffer counterString) {
-        org.lwjgl3.opengl.AMDPerformanceMonitor.glGetPerfMonitorCounterStringAMD(group, counter, length, counterString);
+        org.lwjgl.opengl.AMDPerformanceMonitor.glGetPerfMonitorCounterStringAMD(group, counter, length, counterString);
     }
 
     public static void glGetPerfMonitorCountersAMD(int group, java.nio.IntBuffer numCounters,
             java.nio.IntBuffer maxActiveCounters, java.nio.IntBuffer counters) {
-        org.lwjgl3.opengl.AMDPerformanceMonitor
+        org.lwjgl.opengl.AMDPerformanceMonitor
                 .glGetPerfMonitorCountersAMD(group, numCounters, maxActiveCounters, counters);
     }
 
     public static void glGetPerfMonitorGroupStringAMD(int group, java.nio.IntBuffer length,
             java.nio.ByteBuffer groupString) {
-        org.lwjgl3.opengl.AMDPerformanceMonitor.glGetPerfMonitorGroupStringAMD(group, length, groupString);
+        org.lwjgl.opengl.AMDPerformanceMonitor.glGetPerfMonitorGroupStringAMD(group, length, groupString);
     }
 
     public static void glGetPerfMonitorGroupsAMD(java.nio.IntBuffer numGroups, java.nio.IntBuffer groups) {
-        org.lwjgl3.opengl.AMDPerformanceMonitor.glGetPerfMonitorGroupsAMD(numGroups, groups);
+        org.lwjgl.opengl.AMDPerformanceMonitor.glGetPerfMonitorGroupsAMD(numGroups, groups);
     }
 
     public static void glSelectPerfMonitorCountersAMD(int monitor, boolean enable, int group, int counter) {
 
-        org.lwjgl3.opengl.AMDPerformanceMonitor
+        org.lwjgl.opengl.AMDPerformanceMonitor
                 .glSelectPerfMonitorCountersAMD(monitor, enable, group, new int[] { counter });
     }
 
     public static void glSelectPerfMonitorCountersAMD(int monitor, boolean enable, int group,
             java.nio.IntBuffer counterList) {
-        org.lwjgl3.opengl.AMDPerformanceMonitor.glSelectPerfMonitorCountersAMD(monitor, enable, group, counterList);
+        org.lwjgl.opengl.AMDPerformanceMonitor.glSelectPerfMonitorCountersAMD(monitor, enable, group, counterList);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/AMDPinnedMemory.java b/src/main/java/org/lwjglx/opengl/AMDPinnedMemory.java
similarity index 81%
rename from src/main/java/org/lwjgl/opengl/AMDPinnedMemory.java
rename to src/main/java/org/lwjglx/opengl/AMDPinnedMemory.java
index 434b6e939..58fb090c2 100644
--- a/src/main/java/org/lwjgl/opengl/AMDPinnedMemory.java
+++ b/src/main/java/org/lwjglx/opengl/AMDPinnedMemory.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class AMDPinnedMemory {
 
diff --git a/src/main/java/org/lwjgl/opengl/AMDQueryBufferObject.java b/src/main/java/org/lwjglx/opengl/AMDQueryBufferObject.java
similarity index 90%
rename from src/main/java/org/lwjgl/opengl/AMDQueryBufferObject.java
rename to src/main/java/org/lwjglx/opengl/AMDQueryBufferObject.java
index f96aff532..c544d40de 100644
--- a/src/main/java/org/lwjgl/opengl/AMDQueryBufferObject.java
+++ b/src/main/java/org/lwjglx/opengl/AMDQueryBufferObject.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class AMDQueryBufferObject {
 
diff --git a/src/main/java/org/lwjgl/opengl/AMDSamplePositions.java b/src/main/java/org/lwjglx/opengl/AMDSamplePositions.java
similarity index 64%
rename from src/main/java/org/lwjgl/opengl/AMDSamplePositions.java
rename to src/main/java/org/lwjglx/opengl/AMDSamplePositions.java
index 7cc6dce8c..64452878f 100644
--- a/src/main/java/org/lwjgl/opengl/AMDSamplePositions.java
+++ b/src/main/java/org/lwjglx/opengl/AMDSamplePositions.java
@@ -1,10 +1,10 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class AMDSamplePositions {
 
     public static final int GL_SUBSAMPLE_DISTANCE_AMD = (int) 34879;
 
     public static void glSetMultisampleAMD(int pname, int index, java.nio.FloatBuffer val) {
-        org.lwjgl3.opengl.AMDSamplePositions.glSetMultisamplefvAMD(pname, index, val);
+        org.lwjgl.opengl.AMDSamplePositions.glSetMultisamplefvAMD(pname, index, val);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/AMDSeamlessCubemapPerTexture.java b/src/main/java/org/lwjglx/opengl/AMDSeamlessCubemapPerTexture.java
similarity index 81%
rename from src/main/java/org/lwjgl/opengl/AMDSeamlessCubemapPerTexture.java
rename to src/main/java/org/lwjglx/opengl/AMDSeamlessCubemapPerTexture.java
index d949d60b9..6f01ebd23 100644
--- a/src/main/java/org/lwjgl/opengl/AMDSeamlessCubemapPerTexture.java
+++ b/src/main/java/org/lwjglx/opengl/AMDSeamlessCubemapPerTexture.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class AMDSeamlessCubemapPerTexture {
 
diff --git a/src/main/java/org/lwjgl/opengl/AMDSparseTexture.java b/src/main/java/org/lwjglx/opengl/AMDSparseTexture.java
similarity index 91%
rename from src/main/java/org/lwjgl/opengl/AMDSparseTexture.java
rename to src/main/java/org/lwjglx/opengl/AMDSparseTexture.java
index 4487bb69f..be32710f8 100644
--- a/src/main/java/org/lwjgl/opengl/AMDSparseTexture.java
+++ b/src/main/java/org/lwjglx/opengl/AMDSparseTexture.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class AMDSparseTexture {
 
@@ -14,13 +14,13 @@ public class AMDSparseTexture {
 
     public static void glTexStorageSparseAMD(int target, int internalFormat, int width, int height, int depth,
             int layers, int flags) {
-        org.lwjgl3.opengl.AMDSparseTexture
+        org.lwjgl.opengl.AMDSparseTexture
                 .glTexStorageSparseAMD(target, internalFormat, width, height, depth, layers, flags);
     }
 
     public static void glTextureStorageSparseAMD(int texture, int target, int internalFormat, int width, int height,
             int depth, int layers, int flags) {
-        org.lwjgl3.opengl.AMDSparseTexture
+        org.lwjgl.opengl.AMDSparseTexture
                 .glTextureStorageSparseAMD(texture, target, internalFormat, width, height, depth, layers, flags);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/AMDStencilOperationExtended.java b/src/main/java/org/lwjglx/opengl/AMDStencilOperationExtended.java
similarity index 76%
rename from src/main/java/org/lwjgl/opengl/AMDStencilOperationExtended.java
rename to src/main/java/org/lwjglx/opengl/AMDStencilOperationExtended.java
index 00ba024e7..72e1893ab 100644
--- a/src/main/java/org/lwjgl/opengl/AMDStencilOperationExtended.java
+++ b/src/main/java/org/lwjglx/opengl/AMDStencilOperationExtended.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class AMDStencilOperationExtended {
 
@@ -8,6 +8,6 @@ public class AMDStencilOperationExtended {
     public static final int GL_STENCIL_OP_VALUE_AMD = (int) 34636;
 
     public static void glStencilOpValueAMD(int face, int value) {
-        org.lwjgl3.opengl.AMDStencilOperationExtended.glStencilOpValueAMD(face, value);
+        org.lwjgl.opengl.AMDStencilOperationExtended.glStencilOpValueAMD(face, value);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/AMDVertexShaderTessellator.java b/src/main/java/org/lwjglx/opengl/AMDVertexShaderTessellator.java
similarity index 77%
rename from src/main/java/org/lwjgl/opengl/AMDVertexShaderTessellator.java
rename to src/main/java/org/lwjglx/opengl/AMDVertexShaderTessellator.java
index 6e736761b..b86839a34 100644
--- a/src/main/java/org/lwjgl/opengl/AMDVertexShaderTessellator.java
+++ b/src/main/java/org/lwjglx/opengl/AMDVertexShaderTessellator.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class AMDVertexShaderTessellator {
 
@@ -11,10 +11,10 @@ public class AMDVertexShaderTessellator {
     public static final int GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD = (int) 36867;
 
     public static void glTessellationFactorAMD(float factor) {
-        org.lwjgl3.opengl.AMDVertexShaderTessellator.glTessellationFactorAMD(factor);
+        org.lwjgl.opengl.AMDVertexShaderTessellator.glTessellationFactorAMD(factor);
     }
 
     public static void glTessellationModeAMD(int mode) {
-        org.lwjgl3.opengl.AMDVertexShaderTessellator.glTessellationModeAMD(mode);
+        org.lwjgl.opengl.AMDVertexShaderTessellator.glTessellationModeAMD(mode);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBBaseInstance.java b/src/main/java/org/lwjglx/opengl/ARBBaseInstance.java
similarity index 73%
rename from src/main/java/org/lwjgl/opengl/ARBBaseInstance.java
rename to src/main/java/org/lwjglx/opengl/ARBBaseInstance.java
index 1d65d810c..badc2ab57 100644
--- a/src/main/java/org/lwjgl/opengl/ARBBaseInstance.java
+++ b/src/main/java/org/lwjglx/opengl/ARBBaseInstance.java
@@ -1,15 +1,15 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBBaseInstance {
 
     public static void glDrawArraysInstancedBaseInstance(int mode, int first, int count, int primcount,
             int baseinstance) {
-        org.lwjgl3.opengl.ARBBaseInstance.glDrawArraysInstancedBaseInstance(mode, first, count, primcount, baseinstance);
+        org.lwjgl.opengl.ARBBaseInstance.glDrawArraysInstancedBaseInstance(mode, first, count, primcount, baseinstance);
     }
 
     public static void glDrawElementsInstancedBaseInstance(int mode, int indices_count, int type,
             long indices_buffer_offset, int primcount, int baseinstance) {
-        org.lwjgl3.opengl.ARBBaseInstance.glDrawElementsInstancedBaseInstance(
+        org.lwjgl.opengl.ARBBaseInstance.glDrawElementsInstancedBaseInstance(
                 mode,
                 indices_count,
                 type,
@@ -20,22 +20,22 @@ public static void glDrawElementsInstancedBaseInstance(int mode, int indices_cou
 
     public static void glDrawElementsInstancedBaseInstance(int mode, java.nio.ByteBuffer indices, int primcount,
             int baseinstance) {
-        org.lwjgl3.opengl.ARBBaseInstance.glDrawElementsInstancedBaseInstance(mode, indices, primcount, baseinstance);
+        org.lwjgl.opengl.ARBBaseInstance.glDrawElementsInstancedBaseInstance(mode, indices, primcount, baseinstance);
     }
 
     public static void glDrawElementsInstancedBaseInstance(int mode, java.nio.IntBuffer indices, int primcount,
             int baseinstance) {
-        org.lwjgl3.opengl.ARBBaseInstance.glDrawElementsInstancedBaseInstance(mode, indices, primcount, baseinstance);
+        org.lwjgl.opengl.ARBBaseInstance.glDrawElementsInstancedBaseInstance(mode, indices, primcount, baseinstance);
     }
 
     public static void glDrawElementsInstancedBaseInstance(int mode, java.nio.ShortBuffer indices, int primcount,
             int baseinstance) {
-        org.lwjgl3.opengl.ARBBaseInstance.glDrawElementsInstancedBaseInstance(mode, indices, primcount, baseinstance);
+        org.lwjgl.opengl.ARBBaseInstance.glDrawElementsInstancedBaseInstance(mode, indices, primcount, baseinstance);
     }
 
     public static void glDrawElementsInstancedBaseVertexBaseInstance(int mode, int indices_count, int type,
             long indices_buffer_offset, int primcount, int basevertex, int baseinstance) {
-        org.lwjgl3.opengl.ARBBaseInstance.glDrawElementsInstancedBaseVertexBaseInstance(
+        org.lwjgl.opengl.ARBBaseInstance.glDrawElementsInstancedBaseVertexBaseInstance(
                 mode,
                 indices_count,
                 type,
@@ -47,19 +47,19 @@ public static void glDrawElementsInstancedBaseVertexBaseInstance(int mode, int i
 
     public static void glDrawElementsInstancedBaseVertexBaseInstance(int mode, java.nio.ByteBuffer indices,
             int primcount, int basevertex, int baseinstance) {
-        org.lwjgl3.opengl.ARBBaseInstance
+        org.lwjgl.opengl.ARBBaseInstance
                 .glDrawElementsInstancedBaseVertexBaseInstance(mode, indices, primcount, basevertex, baseinstance);
     }
 
     public static void glDrawElementsInstancedBaseVertexBaseInstance(int mode, java.nio.IntBuffer indices,
             int primcount, int basevertex, int baseinstance) {
-        org.lwjgl3.opengl.ARBBaseInstance
+        org.lwjgl.opengl.ARBBaseInstance
                 .glDrawElementsInstancedBaseVertexBaseInstance(mode, indices, primcount, basevertex, baseinstance);
     }
 
     public static void glDrawElementsInstancedBaseVertexBaseInstance(int mode, java.nio.ShortBuffer indices,
             int primcount, int basevertex, int baseinstance) {
-        org.lwjgl3.opengl.ARBBaseInstance
+        org.lwjgl.opengl.ARBBaseInstance
                 .glDrawElementsInstancedBaseVertexBaseInstance(mode, indices, primcount, basevertex, baseinstance);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBBindlessTexture.java b/src/main/java/org/lwjglx/opengl/ARBBindlessTexture.java
similarity index 51%
rename from src/main/java/org/lwjgl/opengl/ARBBindlessTexture.java
rename to src/main/java/org/lwjglx/opengl/ARBBindlessTexture.java
index 1d540acd5..5e02714a4 100644
--- a/src/main/java/org/lwjgl/opengl/ARBBindlessTexture.java
+++ b/src/main/java/org/lwjglx/opengl/ARBBindlessTexture.java
@@ -1,70 +1,70 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBBindlessTexture {
 
     public static final int GL_UNSIGNED_INT64_ARB = (int) 5135;
 
     public static long glGetImageHandleARB(int texture, int level, boolean layered, int layer, int format) {
-        return org.lwjgl3.opengl.ARBBindlessTexture.glGetImageHandleARB(texture, level, layered, layer, format);
+        return org.lwjgl.opengl.ARBBindlessTexture.glGetImageHandleARB(texture, level, layered, layer, format);
     }
 
     public static long glGetTextureHandleARB(int texture) {
-        return org.lwjgl3.opengl.ARBBindlessTexture.glGetTextureHandleARB(texture);
+        return org.lwjgl.opengl.ARBBindlessTexture.glGetTextureHandleARB(texture);
     }
 
     public static long glGetTextureSamplerHandleARB(int texture, int sampler) {
-        return org.lwjgl3.opengl.ARBBindlessTexture.glGetTextureSamplerHandleARB(texture, sampler);
+        return org.lwjgl.opengl.ARBBindlessTexture.glGetTextureSamplerHandleARB(texture, sampler);
     }
 
     public static void glGetVertexAttribLuARB(int index, int pname, java.nio.LongBuffer params) {
-        org.lwjgl3.opengl.ARBBindlessTexture.glGetVertexAttribLui64vARB(index, pname, params);
+        org.lwjgl.opengl.ARBBindlessTexture.glGetVertexAttribLui64vARB(index, pname, params);
     }
 
     public static boolean glIsImageHandleResidentARB(long handle) {
-        return org.lwjgl3.opengl.ARBBindlessTexture.glIsImageHandleResidentARB(handle);
+        return org.lwjgl.opengl.ARBBindlessTexture.glIsImageHandleResidentARB(handle);
     }
 
     public static boolean glIsTextureHandleResidentARB(long handle) {
-        return org.lwjgl3.opengl.ARBBindlessTexture.glIsTextureHandleResidentARB(handle);
+        return org.lwjgl.opengl.ARBBindlessTexture.glIsTextureHandleResidentARB(handle);
     }
 
     public static void glMakeImageHandleNonResidentARB(long handle) {
-        org.lwjgl3.opengl.ARBBindlessTexture.glMakeImageHandleNonResidentARB(handle);
+        org.lwjgl.opengl.ARBBindlessTexture.glMakeImageHandleNonResidentARB(handle);
     }
 
     public static void glMakeImageHandleResidentARB(long handle, int access) {
-        org.lwjgl3.opengl.ARBBindlessTexture.glMakeImageHandleResidentARB(handle, access);
+        org.lwjgl.opengl.ARBBindlessTexture.glMakeImageHandleResidentARB(handle, access);
     }
 
     public static void glMakeTextureHandleNonResidentARB(long handle) {
-        org.lwjgl3.opengl.ARBBindlessTexture.glMakeTextureHandleNonResidentARB(handle);
+        org.lwjgl.opengl.ARBBindlessTexture.glMakeTextureHandleNonResidentARB(handle);
     }
 
     public static void glMakeTextureHandleResidentARB(long handle) {
-        org.lwjgl3.opengl.ARBBindlessTexture.glMakeTextureHandleResidentARB(handle);
+        org.lwjgl.opengl.ARBBindlessTexture.glMakeTextureHandleResidentARB(handle);
     }
 
     public static void glProgramUniformHandleuARB(int program, int location, java.nio.LongBuffer values) {
-        org.lwjgl3.opengl.ARBBindlessTexture.glProgramUniformHandleui64vARB(program, location, values);
+        org.lwjgl.opengl.ARBBindlessTexture.glProgramUniformHandleui64vARB(program, location, values);
     }
 
     public static void glProgramUniformHandleui64ARB(int program, int location, long value) {
-        org.lwjgl3.opengl.ARBBindlessTexture.glProgramUniformHandleui64ARB(program, location, value);
+        org.lwjgl.opengl.ARBBindlessTexture.glProgramUniformHandleui64ARB(program, location, value);
     }
 
     public static void glUniformHandleuARB(int location, java.nio.LongBuffer value) {
-        org.lwjgl3.opengl.ARBBindlessTexture.glUniformHandleui64vARB(location, value);
+        org.lwjgl.opengl.ARBBindlessTexture.glUniformHandleui64vARB(location, value);
     }
 
     public static void glUniformHandleui64ARB(int location, long value) {
-        org.lwjgl3.opengl.ARBBindlessTexture.glUniformHandleui64ARB(location, value);
+        org.lwjgl.opengl.ARBBindlessTexture.glUniformHandleui64ARB(location, value);
     }
 
     public static void glVertexAttribL1uARB(int index, java.nio.LongBuffer v) {
-        org.lwjgl3.opengl.ARBBindlessTexture.glVertexAttribL1ui64vARB(index, v);
+        org.lwjgl.opengl.ARBBindlessTexture.glVertexAttribL1ui64vARB(index, v);
     }
 
     public static void glVertexAttribL1ui64ARB(int index, long x) {
-        org.lwjgl3.opengl.ARBBindlessTexture.glVertexAttribL1ui64ARB(index, x);
+        org.lwjgl.opengl.ARBBindlessTexture.glVertexAttribL1ui64ARB(index, x);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBBlendFuncExtended.java b/src/main/java/org/lwjglx/opengl/ARBBlendFuncExtended.java
similarity index 65%
rename from src/main/java/org/lwjgl/opengl/ARBBlendFuncExtended.java
rename to src/main/java/org/lwjglx/opengl/ARBBlendFuncExtended.java
index 164e82f8e..a8447dbba 100644
--- a/src/main/java/org/lwjgl/opengl/ARBBlendFuncExtended.java
+++ b/src/main/java/org/lwjglx/opengl/ARBBlendFuncExtended.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBBlendFuncExtended {
 
@@ -10,19 +10,19 @@ public class ARBBlendFuncExtended {
 
     public static void glBindFragDataLocationIndexed(int program, int colorNumber, int index,
             java.lang.CharSequence name) {
-        org.lwjgl3.opengl.ARBBlendFuncExtended.glBindFragDataLocationIndexed(program, colorNumber, index, name);
+        org.lwjgl.opengl.ARBBlendFuncExtended.glBindFragDataLocationIndexed(program, colorNumber, index, name);
     }
 
     public static void glBindFragDataLocationIndexed(int program, int colorNumber, int index,
             java.nio.ByteBuffer name) {
-        org.lwjgl3.opengl.ARBBlendFuncExtended.glBindFragDataLocationIndexed(program, colorNumber, index, name);
+        org.lwjgl.opengl.ARBBlendFuncExtended.glBindFragDataLocationIndexed(program, colorNumber, index, name);
     }
 
     public static int glGetFragDataIndex(int program, java.lang.CharSequence name) {
-        return org.lwjgl3.opengl.ARBBlendFuncExtended.glGetFragDataIndex(program, name);
+        return org.lwjgl.opengl.ARBBlendFuncExtended.glGetFragDataIndex(program, name);
     }
 
     public static int glGetFragDataIndex(int program, java.nio.ByteBuffer name) {
-        return org.lwjgl3.opengl.ARBBlendFuncExtended.glGetFragDataIndex(program, name);
+        return org.lwjgl.opengl.ARBBlendFuncExtended.glGetFragDataIndex(program, name);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBBufferObject.java b/src/main/java/org/lwjglx/opengl/ARBBufferObject.java
similarity index 98%
rename from src/main/java/org/lwjgl/opengl/ARBBufferObject.java
rename to src/main/java/org/lwjglx/opengl/ARBBufferObject.java
index dae8b1ac0..36399aa25 100644
--- a/src/main/java/org/lwjgl/opengl/ARBBufferObject.java
+++ b/src/main/java/org/lwjglx/opengl/ARBBufferObject.java
@@ -1,6 +1,6 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
-import org.lwjgl3.opengl.ARBVertexBufferObject;
+import org.lwjgl.opengl.ARBVertexBufferObject;
 
 import java.nio.*;
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBBufferStorage.java b/src/main/java/org/lwjglx/opengl/ARBBufferStorage.java
similarity index 61%
rename from src/main/java/org/lwjgl/opengl/ARBBufferStorage.java
rename to src/main/java/org/lwjglx/opengl/ARBBufferStorage.java
index 790744b40..a66e8d21d 100644
--- a/src/main/java/org/lwjgl/opengl/ARBBufferStorage.java
+++ b/src/main/java/org/lwjglx/opengl/ARBBufferStorage.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBBufferStorage {
 
@@ -11,50 +11,50 @@ public class ARBBufferStorage {
     public static final int GL_MAP_PERSISTENT_BIT = (int) 64;
 
     public static void glBufferStorage(int target, long size, int flags) {
-        org.lwjgl3.opengl.ARBBufferStorage.glBufferStorage(target, size, flags);
+        org.lwjgl.opengl.ARBBufferStorage.glBufferStorage(target, size, flags);
     }
 
     public static void glBufferStorage(int target, java.nio.ByteBuffer data, int flags) {
-        org.lwjgl3.opengl.ARBBufferStorage.glBufferStorage(target, data, flags);
+        org.lwjgl.opengl.ARBBufferStorage.glBufferStorage(target, data, flags);
     }
 
     public static void glBufferStorage(int target, java.nio.DoubleBuffer data, int flags) {
-        org.lwjgl3.opengl.ARBBufferStorage.glBufferStorage(target, data, flags);
+        org.lwjgl.opengl.ARBBufferStorage.glBufferStorage(target, data, flags);
     }
 
     public static void glBufferStorage(int target, java.nio.FloatBuffer data, int flags) {
-        org.lwjgl3.opengl.ARBBufferStorage.glBufferStorage(target, data, flags);
+        org.lwjgl.opengl.ARBBufferStorage.glBufferStorage(target, data, flags);
     }
 
     public static void glBufferStorage(int target, java.nio.IntBuffer data, int flags) {
-        org.lwjgl3.opengl.ARBBufferStorage.glBufferStorage(target, data, flags);
+        org.lwjgl.opengl.ARBBufferStorage.glBufferStorage(target, data, flags);
     }
 
     public static void glBufferStorage(int target, java.nio.ShortBuffer data, int flags) {
-        org.lwjgl3.opengl.ARBBufferStorage.glBufferStorage(target, data, flags);
+        org.lwjgl.opengl.ARBBufferStorage.glBufferStorage(target, data, flags);
     }
 
     public static void glNamedBufferStorageEXT(int buffer, long size, int flags) {
-        org.lwjgl3.opengl.ARBBufferStorage.glNamedBufferStorageEXT(buffer, size, flags);
+        org.lwjgl.opengl.ARBBufferStorage.glNamedBufferStorageEXT(buffer, size, flags);
     }
 
     public static void glNamedBufferStorageEXT(int buffer, java.nio.ByteBuffer data, int flags) {
-        org.lwjgl3.opengl.ARBBufferStorage.glNamedBufferStorageEXT(buffer, data, flags);
+        org.lwjgl.opengl.ARBBufferStorage.glNamedBufferStorageEXT(buffer, data, flags);
     }
 
     public static void glNamedBufferStorageEXT(int buffer, java.nio.DoubleBuffer data, int flags) {
-        org.lwjgl3.opengl.ARBBufferStorage.glNamedBufferStorageEXT(buffer, data, flags);
+        org.lwjgl.opengl.ARBBufferStorage.glNamedBufferStorageEXT(buffer, data, flags);
     }
 
     public static void glNamedBufferStorageEXT(int buffer, java.nio.FloatBuffer data, int flags) {
-        org.lwjgl3.opengl.ARBBufferStorage.glNamedBufferStorageEXT(buffer, data, flags);
+        org.lwjgl.opengl.ARBBufferStorage.glNamedBufferStorageEXT(buffer, data, flags);
     }
 
     public static void glNamedBufferStorageEXT(int buffer, java.nio.IntBuffer data, int flags) {
-        org.lwjgl3.opengl.ARBBufferStorage.glNamedBufferStorageEXT(buffer, data, flags);
+        org.lwjgl.opengl.ARBBufferStorage.glNamedBufferStorageEXT(buffer, data, flags);
     }
 
     public static void glNamedBufferStorageEXT(int buffer, java.nio.ShortBuffer data, int flags) {
-        org.lwjgl3.opengl.ARBBufferStorage.glNamedBufferStorageEXT(buffer, data, flags);
+        org.lwjgl.opengl.ARBBufferStorage.glNamedBufferStorageEXT(buffer, data, flags);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBClearBufferObject.java b/src/main/java/org/lwjglx/opengl/ARBClearBufferObject.java
similarity index 71%
rename from src/main/java/org/lwjgl/opengl/ARBClearBufferObject.java
rename to src/main/java/org/lwjglx/opengl/ARBClearBufferObject.java
index 27e429e77..ca6568b20 100644
--- a/src/main/java/org/lwjgl/opengl/ARBClearBufferObject.java
+++ b/src/main/java/org/lwjglx/opengl/ARBClearBufferObject.java
@@ -1,26 +1,26 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBClearBufferObject {
 
     public static void glClearBufferData(int target, int internalformat, int format, int type,
             java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.ARBClearBufferObject.glClearBufferData(target, internalformat, format, type, data);
+        org.lwjgl.opengl.ARBClearBufferObject.glClearBufferData(target, internalformat, format, type, data);
     }
 
     public static void glClearBufferSubData(int target, int internalformat, long offset, long size, int format,
             int type, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.ARBClearBufferObject
+        org.lwjgl.opengl.ARBClearBufferObject
                 .glClearBufferSubData(target, internalformat, offset, size, format, type, data);
     }
 
     public static void glClearNamedBufferDataEXT(int buffer, int internalformat, int format, int type,
             java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.ARBClearBufferObject.glClearNamedBufferDataEXT(buffer, internalformat, format, type, data);
+        org.lwjgl.opengl.ARBClearBufferObject.glClearNamedBufferDataEXT(buffer, internalformat, format, type, data);
     }
 
     public static void glClearNamedBufferSubDataEXT(int buffer, int internalformat, long offset, long size, int format,
             int type, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.ARBClearBufferObject
+        org.lwjgl.opengl.ARBClearBufferObject
                 .glClearNamedBufferSubDataEXT(buffer, internalformat, offset, size, format, type, data);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBClearTexture.java b/src/main/java/org/lwjglx/opengl/ARBClearTexture.java
similarity index 79%
rename from src/main/java/org/lwjgl/opengl/ARBClearTexture.java
rename to src/main/java/org/lwjglx/opengl/ARBClearTexture.java
index c9070f93b..6a2209506 100644
--- a/src/main/java/org/lwjgl/opengl/ARBClearTexture.java
+++ b/src/main/java/org/lwjglx/opengl/ARBClearTexture.java
@@ -1,32 +1,32 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBClearTexture {
 
     public static final int GL_CLEAR_TEXTURE = (int) 37733;
 
     public static void glClearTexImage(int texture, int level, int format, int type, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.ARBClearTexture.glClearTexImage(texture, level, format, type, data);
+        org.lwjgl.opengl.ARBClearTexture.glClearTexImage(texture, level, format, type, data);
     }
 
     public static void glClearTexImage(int texture, int level, int format, int type, java.nio.DoubleBuffer data) {
-        org.lwjgl3.opengl.ARBClearTexture.glClearTexImage(texture, level, format, type, data);
+        org.lwjgl.opengl.ARBClearTexture.glClearTexImage(texture, level, format, type, data);
     }
 
     public static void glClearTexImage(int texture, int level, int format, int type, java.nio.FloatBuffer data) {
-        org.lwjgl3.opengl.ARBClearTexture.glClearTexImage(texture, level, format, type, data);
+        org.lwjgl.opengl.ARBClearTexture.glClearTexImage(texture, level, format, type, data);
     }
 
     public static void glClearTexImage(int texture, int level, int format, int type, java.nio.IntBuffer data) {
-        org.lwjgl3.opengl.ARBClearTexture.glClearTexImage(texture, level, format, type, data);
+        org.lwjgl.opengl.ARBClearTexture.glClearTexImage(texture, level, format, type, data);
     }
 
     public static void glClearTexImage(int texture, int level, int format, int type, java.nio.ShortBuffer data) {
-        org.lwjgl3.opengl.ARBClearTexture.glClearTexImage(texture, level, format, type, data);
+        org.lwjgl.opengl.ARBClearTexture.glClearTexImage(texture, level, format, type, data);
     }
 
     public static void glClearTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.ARBClearTexture.glClearTexSubImage(
+        org.lwjgl.opengl.ARBClearTexture.glClearTexSubImage(
                 texture,
                 level,
                 xoffset,
@@ -42,7 +42,7 @@ public static void glClearTexSubImage(int texture, int level, int xoffset, int y
 
     public static void glClearTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.DoubleBuffer data) {
-        org.lwjgl3.opengl.ARBClearTexture.glClearTexSubImage(
+        org.lwjgl.opengl.ARBClearTexture.glClearTexSubImage(
                 texture,
                 level,
                 xoffset,
@@ -58,7 +58,7 @@ public static void glClearTexSubImage(int texture, int level, int xoffset, int y
 
     public static void glClearTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.FloatBuffer data) {
-        org.lwjgl3.opengl.ARBClearTexture.glClearTexSubImage(
+        org.lwjgl.opengl.ARBClearTexture.glClearTexSubImage(
                 texture,
                 level,
                 xoffset,
@@ -74,7 +74,7 @@ public static void glClearTexSubImage(int texture, int level, int xoffset, int y
 
     public static void glClearTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.IntBuffer data) {
-        org.lwjgl3.opengl.ARBClearTexture.glClearTexSubImage(
+        org.lwjgl.opengl.ARBClearTexture.glClearTexSubImage(
                 texture,
                 level,
                 xoffset,
@@ -90,7 +90,7 @@ public static void glClearTexSubImage(int texture, int level, int xoffset, int y
 
     public static void glClearTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.ShortBuffer data) {
-        org.lwjgl3.opengl.ARBClearTexture.glClearTexSubImage(
+        org.lwjgl.opengl.ARBClearTexture.glClearTexSubImage(
                 texture,
                 level,
                 xoffset,
diff --git a/src/main/java/org/lwjgl/opengl/ARBClipControl.java b/src/main/java/org/lwjglx/opengl/ARBClipControl.java
similarity index 82%
rename from src/main/java/org/lwjgl/opengl/ARBClipControl.java
rename to src/main/java/org/lwjglx/opengl/ARBClipControl.java
index 881bc544a..85ca7167b 100644
--- a/src/main/java/org/lwjgl/opengl/ARBClipControl.java
+++ b/src/main/java/org/lwjglx/opengl/ARBClipControl.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBClipControl {
 
@@ -10,6 +10,6 @@ public class ARBClipControl {
     public static final int GL_ZERO_TO_ONE = (int) 37727;
 
     public static void glClipControl(int origin, int depth) {
-        org.lwjgl3.opengl.ARBClipControl.glClipControl(origin, depth);
+        org.lwjgl.opengl.ARBClipControl.glClipControl(origin, depth);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBColorBufferFloat.java b/src/main/java/org/lwjglx/opengl/ARBColorBufferFloat.java
similarity index 85%
rename from src/main/java/org/lwjgl/opengl/ARBColorBufferFloat.java
rename to src/main/java/org/lwjglx/opengl/ARBColorBufferFloat.java
index 623e6e505..cd0699894 100644
--- a/src/main/java/org/lwjgl/opengl/ARBColorBufferFloat.java
+++ b/src/main/java/org/lwjglx/opengl/ARBColorBufferFloat.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBColorBufferFloat {
 
@@ -12,6 +12,6 @@ public class ARBColorBufferFloat {
     public static final int WGL_TYPE_RGBA_FLOAT_ARB = (int) 8608;
 
     public static void glClampColorARB(int target, int clamp) {
-        org.lwjgl3.opengl.ARBColorBufferFloat.glClampColorARB(target, clamp);
+        org.lwjgl.opengl.ARBColorBufferFloat.glClampColorARB(target, clamp);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBCompressedTexturePixelStorage.java b/src/main/java/org/lwjglx/opengl/ARBCompressedTexturePixelStorage.java
similarity index 96%
rename from src/main/java/org/lwjgl/opengl/ARBCompressedTexturePixelStorage.java
rename to src/main/java/org/lwjglx/opengl/ARBCompressedTexturePixelStorage.java
index 94c1a5e3d..d9d87e426 100644
--- a/src/main/java/org/lwjgl/opengl/ARBCompressedTexturePixelStorage.java
+++ b/src/main/java/org/lwjglx/opengl/ARBCompressedTexturePixelStorage.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBCompressedTexturePixelStorage {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBComputeShader.java b/src/main/java/org/lwjglx/opengl/ARBComputeShader.java
similarity index 88%
rename from src/main/java/org/lwjgl/opengl/ARBComputeShader.java
rename to src/main/java/org/lwjglx/opengl/ARBComputeShader.java
index a20787bd3..3f4b6c185 100644
--- a/src/main/java/org/lwjgl/opengl/ARBComputeShader.java
+++ b/src/main/java/org/lwjglx/opengl/ARBComputeShader.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBComputeShader {
 
@@ -22,10 +22,10 @@ public class ARBComputeShader {
     public static final int GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER = (int) 37100;
 
     public static void glDispatchCompute(int num_groups_x, int num_groups_y, int num_groups_z) {
-        org.lwjgl3.opengl.ARBComputeShader.glDispatchCompute(num_groups_x, num_groups_y, num_groups_z);
+        org.lwjgl.opengl.ARBComputeShader.glDispatchCompute(num_groups_x, num_groups_y, num_groups_z);
     }
 
     public static void glDispatchComputeIndirect(long indirect) {
-        org.lwjgl3.opengl.ARBComputeShader.glDispatchComputeIndirect(indirect);
+        org.lwjgl.opengl.ARBComputeShader.glDispatchComputeIndirect(indirect);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBComputeVariableGroupSize.java b/src/main/java/org/lwjglx/opengl/ARBComputeVariableGroupSize.java
similarity index 87%
rename from src/main/java/org/lwjgl/opengl/ARBComputeVariableGroupSize.java
rename to src/main/java/org/lwjglx/opengl/ARBComputeVariableGroupSize.java
index 9ed5f2469..0ad805dfc 100644
--- a/src/main/java/org/lwjgl/opengl/ARBComputeVariableGroupSize.java
+++ b/src/main/java/org/lwjglx/opengl/ARBComputeVariableGroupSize.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBComputeVariableGroupSize {
 
@@ -9,7 +9,7 @@ public class ARBComputeVariableGroupSize {
 
     public static void glDispatchComputeGroupSizeARB(int num_groups_x, int num_groups_y, int num_groups_z,
             int group_size_x, int group_size_y, int group_size_z) {
-        org.lwjgl3.opengl.ARBComputeVariableGroupSize.glDispatchComputeGroupSizeARB(
+        org.lwjgl.opengl.ARBComputeVariableGroupSize.glDispatchComputeGroupSizeARB(
                 num_groups_x,
                 num_groups_y,
                 num_groups_z,
diff --git a/src/main/java/org/lwjgl/opengl/ARBConditionalRenderInverted.java b/src/main/java/org/lwjglx/opengl/ARBConditionalRenderInverted.java
similarity index 92%
rename from src/main/java/org/lwjgl/opengl/ARBConditionalRenderInverted.java
rename to src/main/java/org/lwjglx/opengl/ARBConditionalRenderInverted.java
index a013607d4..1b83d9ee0 100644
--- a/src/main/java/org/lwjgl/opengl/ARBConditionalRenderInverted.java
+++ b/src/main/java/org/lwjglx/opengl/ARBConditionalRenderInverted.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBConditionalRenderInverted {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBCopyBuffer.java b/src/main/java/org/lwjglx/opengl/ARBCopyBuffer.java
similarity index 67%
rename from src/main/java/org/lwjgl/opengl/ARBCopyBuffer.java
rename to src/main/java/org/lwjglx/opengl/ARBCopyBuffer.java
index 2d4efdba9..ffd94e00a 100644
--- a/src/main/java/org/lwjgl/opengl/ARBCopyBuffer.java
+++ b/src/main/java/org/lwjglx/opengl/ARBCopyBuffer.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBCopyBuffer {
 
@@ -7,6 +7,6 @@ public class ARBCopyBuffer {
 
     public static void glCopyBufferSubData(int readTarget, int writeTarget, long readOffset, long writeOffset,
             long size) {
-        org.lwjgl3.opengl.ARBCopyBuffer.glCopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
+        org.lwjgl.opengl.ARBCopyBuffer.glCopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBCopyImage.java b/src/main/java/org/lwjglx/opengl/ARBCopyImage.java
similarity index 88%
rename from src/main/java/org/lwjgl/opengl/ARBCopyImage.java
rename to src/main/java/org/lwjglx/opengl/ARBCopyImage.java
index 0693073e5..70a8865d3 100644
--- a/src/main/java/org/lwjgl/opengl/ARBCopyImage.java
+++ b/src/main/java/org/lwjglx/opengl/ARBCopyImage.java
@@ -1,11 +1,11 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBCopyImage {
 
     public static void glCopyImageSubData(int srcName, int srcTarget, int srcLevel, int srcX, int srcY, int srcZ,
             int dstName, int dstTarget, int dstLevel, int dstX, int dstY, int dstZ, int srcWidth, int srcHeight,
             int srcDepth) {
-        org.lwjgl3.opengl.ARBCopyImage.glCopyImageSubData(
+        org.lwjgl.opengl.ARBCopyImage.glCopyImageSubData(
                 srcName,
                 srcTarget,
                 srcLevel,
diff --git a/src/main/java/org/lwjgl/opengl/ARBCullDistance.java b/src/main/java/org/lwjglx/opengl/ARBCullDistance.java
similarity index 87%
rename from src/main/java/org/lwjgl/opengl/ARBCullDistance.java
rename to src/main/java/org/lwjglx/opengl/ARBCullDistance.java
index a8cf574e7..e52e2ff07 100644
--- a/src/main/java/org/lwjgl/opengl/ARBCullDistance.java
+++ b/src/main/java/org/lwjglx/opengl/ARBCullDistance.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBCullDistance {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBDebugOutput.java b/src/main/java/org/lwjglx/opengl/ARBDebugOutput.java
similarity index 86%
rename from src/main/java/org/lwjgl/opengl/ARBDebugOutput.java
rename to src/main/java/org/lwjglx/opengl/ARBDebugOutput.java
index 5cb208ed8..df1ffb737 100644
--- a/src/main/java/org/lwjgl/opengl/ARBDebugOutput.java
+++ b/src/main/java/org/lwjglx/opengl/ARBDebugOutput.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBDebugOutput {
 
@@ -27,21 +27,21 @@ public class ARBDebugOutput {
 
     public static void glDebugMessageControlARB(int source, int type, int severity, java.nio.IntBuffer ids,
             boolean enabled) {
-        org.lwjgl3.opengl.ARBDebugOutput.glDebugMessageControlARB(source, type, severity, ids, enabled);
+        org.lwjgl.opengl.ARBDebugOutput.glDebugMessageControlARB(source, type, severity, ids, enabled);
     }
 
     public static void glDebugMessageInsertARB(int source, int type, int id, int severity, java.lang.CharSequence buf) {
-        org.lwjgl3.opengl.ARBDebugOutput.glDebugMessageInsertARB(source, type, id, severity, buf);
+        org.lwjgl.opengl.ARBDebugOutput.glDebugMessageInsertARB(source, type, id, severity, buf);
     }
 
     public static void glDebugMessageInsertARB(int source, int type, int id, int severity, java.nio.ByteBuffer buf) {
-        org.lwjgl3.opengl.ARBDebugOutput.glDebugMessageInsertARB(source, type, id, severity, buf);
+        org.lwjgl.opengl.ARBDebugOutput.glDebugMessageInsertARB(source, type, id, severity, buf);
     }
 
     public static int glGetDebugMessageLogARB(int count, java.nio.IntBuffer sources, java.nio.IntBuffer types,
             java.nio.IntBuffer ids, java.nio.IntBuffer severities, java.nio.IntBuffer lengths,
             java.nio.ByteBuffer messageLog) {
-        return org.lwjgl3.opengl.ARBDebugOutput
+        return org.lwjgl.opengl.ARBDebugOutput
                 .glGetDebugMessageLogARB(count, sources, types, ids, severities, lengths, messageLog);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBDepthBufferFloat.java b/src/main/java/org/lwjglx/opengl/ARBDepthBufferFloat.java
similarity index 90%
rename from src/main/java/org/lwjgl/opengl/ARBDepthBufferFloat.java
rename to src/main/java/org/lwjglx/opengl/ARBDepthBufferFloat.java
index e056b1338..84e778c01 100644
--- a/src/main/java/org/lwjgl/opengl/ARBDepthBufferFloat.java
+++ b/src/main/java/org/lwjglx/opengl/ARBDepthBufferFloat.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBDepthBufferFloat {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBDepthClamp.java b/src/main/java/org/lwjglx/opengl/ARBDepthClamp.java
similarity index 77%
rename from src/main/java/org/lwjgl/opengl/ARBDepthClamp.java
rename to src/main/java/org/lwjglx/opengl/ARBDepthClamp.java
index 08725d4b0..1e9c95ce4 100644
--- a/src/main/java/org/lwjgl/opengl/ARBDepthClamp.java
+++ b/src/main/java/org/lwjglx/opengl/ARBDepthClamp.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBDepthClamp {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBDepthTexture.java b/src/main/java/org/lwjglx/opengl/ARBDepthTexture.java
similarity index 93%
rename from src/main/java/org/lwjgl/opengl/ARBDepthTexture.java
rename to src/main/java/org/lwjglx/opengl/ARBDepthTexture.java
index 2426fb66d..2d83f4eac 100644
--- a/src/main/java/org/lwjgl/opengl/ARBDepthTexture.java
+++ b/src/main/java/org/lwjglx/opengl/ARBDepthTexture.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBDepthTexture {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBDirectStateAccess.java b/src/main/java/org/lwjglx/opengl/ARBDirectStateAccess.java
similarity index 65%
rename from src/main/java/org/lwjgl/opengl/ARBDirectStateAccess.java
rename to src/main/java/org/lwjglx/opengl/ARBDirectStateAccess.java
index ff3aec207..96f0353f9 100644
--- a/src/main/java/org/lwjgl/opengl/ARBDirectStateAccess.java
+++ b/src/main/java/org/lwjglx/opengl/ARBDirectStateAccess.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBDirectStateAccess {
 
@@ -7,12 +7,12 @@ public class ARBDirectStateAccess {
     public static final int GL_TEXTURE_TARGET = (int) 4102;
 
     public static void glBindTextureUnit(int unit, int texture) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glBindTextureUnit(unit, texture);
+        org.lwjgl.opengl.ARBDirectStateAccess.glBindTextureUnit(unit, texture);
     }
 
     public static void glBlitNamedFramebuffer(int readFramebuffer, int drawFramebuffer, int srcX0, int srcY0, int srcX1,
             int srcY1, int dstX0, int dstY0, int dstX1, int dstY1, int mask, int filter) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glBlitNamedFramebuffer(
+        org.lwjgl.opengl.ARBDirectStateAccess.glBlitNamedFramebuffer(
                 readFramebuffer,
                 drawFramebuffer,
                 srcX0,
@@ -28,23 +28,23 @@ public static void glBlitNamedFramebuffer(int readFramebuffer, int drawFramebuff
     }
 
     public static int glCheckNamedFramebufferStatus(int framebuffer, int target) {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glCheckNamedFramebufferStatus(framebuffer, target);
+        return org.lwjgl.opengl.ARBDirectStateAccess.glCheckNamedFramebufferStatus(framebuffer, target);
     }
 
     public static void glClearNamedBufferData(int buffer, int internalformat, int format, int type,
             java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glClearNamedBufferData(buffer, internalformat, format, type, data);
+        org.lwjgl.opengl.ARBDirectStateAccess.glClearNamedBufferData(buffer, internalformat, format, type, data);
     }
 
     public static void glClearNamedBufferSubData(int buffer, int internalformat, long offset, long size, int format,
             int type, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.ARBDirectStateAccess
+        org.lwjgl.opengl.ARBDirectStateAccess
                 .glClearNamedBufferSubData(buffer, internalformat, offset, size, format, type, data);
     }
 
     public static void glCompressedTextureSubImage1D(int texture, int level, int xoffset, int width, int format,
             int data_imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glCompressedTextureSubImage1D(
+        org.lwjgl.opengl.ARBDirectStateAccess.glCompressedTextureSubImage1D(
                 texture,
                 level,
                 xoffset,
@@ -56,13 +56,13 @@ public static void glCompressedTextureSubImage1D(int texture, int level, int xof
 
     public static void glCompressedTextureSubImage1D(int texture, int level, int xoffset, int width, int format,
             java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.ARBDirectStateAccess
+        org.lwjgl.opengl.ARBDirectStateAccess
                 .glCompressedTextureSubImage1D(texture, level, xoffset, width, format, data);
     }
 
     public static void glCompressedTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width,
             int height, int format, int data_imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glCompressedTextureSubImage2D(
+        org.lwjgl.opengl.ARBDirectStateAccess.glCompressedTextureSubImage2D(
                 texture,
                 level,
                 xoffset,
@@ -76,13 +76,13 @@ public static void glCompressedTextureSubImage2D(int texture, int level, int xof
 
     public static void glCompressedTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width,
             int height, int format, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.ARBDirectStateAccess
+        org.lwjgl.opengl.ARBDirectStateAccess
                 .glCompressedTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, data);
     }
 
     public static void glCompressedTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, int format, int imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glCompressedTextureSubImage3D(
+        org.lwjgl.opengl.ARBDirectStateAccess.glCompressedTextureSubImage3D(
                 texture,
                 level,
                 xoffset,
@@ -98,390 +98,390 @@ public static void glCompressedTextureSubImage3D(int texture, int level, int xof
 
     public static void glCopyNamedBufferSubData(int readBuffer, int writeBuffer, long readOffset, long writeOffset,
             long size) {
-        org.lwjgl3.opengl.ARBDirectStateAccess
+        org.lwjgl.opengl.ARBDirectStateAccess
                 .glCopyNamedBufferSubData(readBuffer, writeBuffer, readOffset, writeOffset, size);
     }
 
     public static void glCopyTextureSubImage1D(int texture, int level, int xoffset, int x, int y, int width) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glCopyTextureSubImage1D(texture, level, xoffset, x, y, width);
+        org.lwjgl.opengl.ARBDirectStateAccess.glCopyTextureSubImage1D(texture, level, xoffset, x, y, width);
     }
 
     public static void glCopyTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int x, int y,
             int width, int height) {
-        org.lwjgl3.opengl.ARBDirectStateAccess
+        org.lwjgl.opengl.ARBDirectStateAccess
                 .glCopyTextureSubImage2D(texture, level, xoffset, yoffset, x, y, width, height);
     }
 
     public static void glCopyTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int x,
             int y, int width, int height) {
-        org.lwjgl3.opengl.ARBDirectStateAccess
+        org.lwjgl.opengl.ARBDirectStateAccess
                 .glCopyTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, x, y, width, height);
     }
 
     public static int glCreateBuffers() {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glCreateBuffers();
+        return org.lwjgl.opengl.ARBDirectStateAccess.glCreateBuffers();
     }
 
     public static void glCreateBuffers(java.nio.IntBuffer buffers) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glCreateBuffers(buffers);
+        org.lwjgl.opengl.ARBDirectStateAccess.glCreateBuffers(buffers);
     }
 
     public static int glCreateFramebuffers() {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glCreateFramebuffers();
+        return org.lwjgl.opengl.ARBDirectStateAccess.glCreateFramebuffers();
     }
 
     public static void glCreateFramebuffers(java.nio.IntBuffer framebuffers) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glCreateFramebuffers(framebuffers);
+        org.lwjgl.opengl.ARBDirectStateAccess.glCreateFramebuffers(framebuffers);
     }
 
     public static int glCreateProgramPipelines() {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glCreateProgramPipelines();
+        return org.lwjgl.opengl.ARBDirectStateAccess.glCreateProgramPipelines();
     }
 
     public static void glCreateProgramPipelines(java.nio.IntBuffer pipelines) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glCreateProgramPipelines(pipelines);
+        org.lwjgl.opengl.ARBDirectStateAccess.glCreateProgramPipelines(pipelines);
     }
 
     public static int glCreateQueries(int target) {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glCreateQueries(target);
+        return org.lwjgl.opengl.ARBDirectStateAccess.glCreateQueries(target);
     }
 
     public static void glCreateQueries(int target, java.nio.IntBuffer ids) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glCreateQueries(target, ids);
+        org.lwjgl.opengl.ARBDirectStateAccess.glCreateQueries(target, ids);
     }
 
     public static int glCreateRenderbuffers() {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glCreateRenderbuffers();
+        return org.lwjgl.opengl.ARBDirectStateAccess.glCreateRenderbuffers();
     }
 
     public static void glCreateRenderbuffers(java.nio.IntBuffer renderbuffers) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glCreateRenderbuffers(renderbuffers);
+        org.lwjgl.opengl.ARBDirectStateAccess.glCreateRenderbuffers(renderbuffers);
     }
 
     public static int glCreateSamplers() {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glCreateSamplers();
+        return org.lwjgl.opengl.ARBDirectStateAccess.glCreateSamplers();
     }
 
     public static void glCreateSamplers(java.nio.IntBuffer samplers) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glCreateSamplers(samplers);
+        org.lwjgl.opengl.ARBDirectStateAccess.glCreateSamplers(samplers);
     }
 
     public static int glCreateTextures(int target) {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glCreateTextures(target);
+        return org.lwjgl.opengl.ARBDirectStateAccess.glCreateTextures(target);
     }
 
     public static void glCreateTextures(int target, java.nio.IntBuffer textures) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glCreateTextures(target, textures);
+        org.lwjgl.opengl.ARBDirectStateAccess.glCreateTextures(target, textures);
     }
 
     public static int glCreateTransformFeedbacks() {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glCreateTransformFeedbacks();
+        return org.lwjgl.opengl.ARBDirectStateAccess.glCreateTransformFeedbacks();
     }
 
     public static void glCreateTransformFeedbacks(java.nio.IntBuffer ids) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glCreateTransformFeedbacks(ids);
+        org.lwjgl.opengl.ARBDirectStateAccess.glCreateTransformFeedbacks(ids);
     }
 
     public static int glCreateVertexArrays() {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glCreateVertexArrays();
+        return org.lwjgl.opengl.ARBDirectStateAccess.glCreateVertexArrays();
     }
 
     public static void glCreateVertexArrays(java.nio.IntBuffer arrays) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glCreateVertexArrays(arrays);
+        org.lwjgl.opengl.ARBDirectStateAccess.glCreateVertexArrays(arrays);
     }
 
     public static void glDisableVertexArrayAttrib(int vaobj, int index) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glDisableVertexArrayAttrib(vaobj, index);
+        org.lwjgl.opengl.ARBDirectStateAccess.glDisableVertexArrayAttrib(vaobj, index);
     }
 
     public static void glEnableVertexArrayAttrib(int vaobj, int index) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glEnableVertexArrayAttrib(vaobj, index);
+        org.lwjgl.opengl.ARBDirectStateAccess.glEnableVertexArrayAttrib(vaobj, index);
     }
 
     public static void glFlushMappedNamedBufferRange(int buffer, long offset, long length) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glFlushMappedNamedBufferRange(buffer, offset, length);
+        org.lwjgl.opengl.ARBDirectStateAccess.glFlushMappedNamedBufferRange(buffer, offset, length);
     }
 
     public static void glGenerateTextureMipmap(int texture) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glGenerateTextureMipmap(texture);
+        org.lwjgl.opengl.ARBDirectStateAccess.glGenerateTextureMipmap(texture);
     }
 
     public static void glGetCompressedTextureImage(int texture, int level, int pixels_bufSize,
             long pixels_buffer_offset) {
-        org.lwjgl3.opengl.ARBDirectStateAccess
+        org.lwjgl.opengl.ARBDirectStateAccess
                 .glGetCompressedTextureImage(texture, level, pixels_bufSize, pixels_buffer_offset);
     }
 
     public static void glGetCompressedTextureImage(int texture, int level, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glGetCompressedTextureImage(texture, level, pixels);
+        org.lwjgl.opengl.ARBDirectStateAccess.glGetCompressedTextureImage(texture, level, pixels);
     }
 
     public static long glGetNamedBufferParameteri64(int buffer, int pname) {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glGetNamedBufferParameteri64(buffer, pname);
+        return org.lwjgl.opengl.ARBDirectStateAccess.glGetNamedBufferParameteri64(buffer, pname);
     }
 
     public static int glGetNamedBufferParameteri(int buffer, int pname) {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glGetNamedBufferParameteri(buffer, pname);
+        return org.lwjgl.opengl.ARBDirectStateAccess.glGetNamedBufferParameteri(buffer, pname);
     }
 
     public static void glGetNamedBufferSubData(int buffer, long offset, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glGetNamedBufferSubData(buffer, offset, data);
+        org.lwjgl.opengl.ARBDirectStateAccess.glGetNamedBufferSubData(buffer, offset, data);
     }
 
     public static void glGetNamedBufferSubData(int buffer, long offset, java.nio.DoubleBuffer data) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glGetNamedBufferSubData(buffer, offset, data);
+        org.lwjgl.opengl.ARBDirectStateAccess.glGetNamedBufferSubData(buffer, offset, data);
     }
 
     public static void glGetNamedBufferSubData(int buffer, long offset, java.nio.FloatBuffer data) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glGetNamedBufferSubData(buffer, offset, data);
+        org.lwjgl.opengl.ARBDirectStateAccess.glGetNamedBufferSubData(buffer, offset, data);
     }
 
     public static void glGetNamedBufferSubData(int buffer, long offset, java.nio.IntBuffer data) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glGetNamedBufferSubData(buffer, offset, data);
+        org.lwjgl.opengl.ARBDirectStateAccess.glGetNamedBufferSubData(buffer, offset, data);
     }
 
     public static void glGetNamedBufferSubData(int buffer, long offset, java.nio.ShortBuffer data) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glGetNamedBufferSubData(buffer, offset, data);
+        org.lwjgl.opengl.ARBDirectStateAccess.glGetNamedBufferSubData(buffer, offset, data);
     }
 
     public static void glGetTextureImage(int texture, int level, int format, int type, int pixels_bufSize,
             long pixels_buffer_offset) {
-        org.lwjgl3.opengl.ARBDirectStateAccess
+        org.lwjgl.opengl.ARBDirectStateAccess
                 .glGetTextureImage(texture, level, format, type, pixels_bufSize, pixels_buffer_offset);
     }
 
     public static void glGetTextureImage(int texture, int level, int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glGetTextureImage(texture, level, format, type, pixels);
+        org.lwjgl.opengl.ARBDirectStateAccess.glGetTextureImage(texture, level, format, type, pixels);
     }
 
     public static void glGetTextureImage(int texture, int level, int format, int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glGetTextureImage(texture, level, format, type, pixels);
+        org.lwjgl.opengl.ARBDirectStateAccess.glGetTextureImage(texture, level, format, type, pixels);
     }
 
     public static void glGetTextureImage(int texture, int level, int format, int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glGetTextureImage(texture, level, format, type, pixels);
+        org.lwjgl.opengl.ARBDirectStateAccess.glGetTextureImage(texture, level, format, type, pixels);
     }
 
     public static void glGetTextureImage(int texture, int level, int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glGetTextureImage(texture, level, format, type, pixels);
+        org.lwjgl.opengl.ARBDirectStateAccess.glGetTextureImage(texture, level, format, type, pixels);
     }
 
     public static void glGetTextureImage(int texture, int level, int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glGetTextureImage(texture, level, format, type, pixels);
+        org.lwjgl.opengl.ARBDirectStateAccess.glGetTextureImage(texture, level, format, type, pixels);
     }
 
     public static float glGetTextureLevelParameterf(int texture, int level, int pname) {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glGetTextureLevelParameterf(texture, level, pname);
+        return org.lwjgl.opengl.ARBDirectStateAccess.glGetTextureLevelParameterf(texture, level, pname);
     }
 
     public static int glGetTextureLevelParameteri(int texture, int level, int pname) {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glGetTextureLevelParameteri(texture, level, pname);
+        return org.lwjgl.opengl.ARBDirectStateAccess.glGetTextureLevelParameteri(texture, level, pname);
     }
 
     public static int glGetTextureParameterIi(int texture, int pname) {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glGetTextureParameterIi(texture, pname);
+        return org.lwjgl.opengl.ARBDirectStateAccess.glGetTextureParameterIi(texture, pname);
     }
 
     public static int glGetTextureParameterIui(int texture, int pname) {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glGetTextureParameterIui(texture, pname);
+        return org.lwjgl.opengl.ARBDirectStateAccess.glGetTextureParameterIui(texture, pname);
     }
 
     public static float glGetTextureParameterf(int texture, int pname) {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glGetTextureParameterf(texture, pname);
+        return org.lwjgl.opengl.ARBDirectStateAccess.glGetTextureParameterf(texture, pname);
     }
 
     public static int glGetTextureParameteri(int texture, int pname) {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glGetTextureParameteri(texture, pname);
+        return org.lwjgl.opengl.ARBDirectStateAccess.glGetTextureParameteri(texture, pname);
     }
 
     public static long glGetTransformFeedbacki64(int xfb, int pname, int index) {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glGetTransformFeedbacki64(xfb, pname, index);
+        return org.lwjgl.opengl.ARBDirectStateAccess.glGetTransformFeedbacki64(xfb, pname, index);
     }
 
     public static int glGetTransformFeedbacki(int xfb, int pname) {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glGetTransformFeedbacki(xfb, pname);
+        return org.lwjgl.opengl.ARBDirectStateAccess.glGetTransformFeedbacki(xfb, pname);
     }
 
     public static int glGetTransformFeedbacki(int xfb, int pname, int index) {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glGetTransformFeedbacki(xfb, pname, index);
+        return org.lwjgl.opengl.ARBDirectStateAccess.glGetTransformFeedbacki(xfb, pname, index);
     }
 
     public static long glGetVertexArrayIndexed64i(int vaobj, int index, int pname) {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glGetVertexArrayIndexed64i(vaobj, index, pname);
+        return org.lwjgl.opengl.ARBDirectStateAccess.glGetVertexArrayIndexed64i(vaobj, index, pname);
     }
 
     public static void glInvalidateNamedFramebufferData(int framebuffer, java.nio.IntBuffer attachments) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glInvalidateNamedFramebufferData(framebuffer, attachments);
+        org.lwjgl.opengl.ARBDirectStateAccess.glInvalidateNamedFramebufferData(framebuffer, attachments);
     }
 
     public static void glInvalidateNamedFramebufferSubData(int framebuffer, java.nio.IntBuffer attachments, int x,
             int y, int width, int height) {
-        org.lwjgl3.opengl.ARBDirectStateAccess
+        org.lwjgl.opengl.ARBDirectStateAccess
                 .glInvalidateNamedFramebufferSubData(framebuffer, attachments, x, y, width, height);
     }
 
     public static java.nio.ByteBuffer glMapNamedBuffer(int buffer, int access, long length,
             java.nio.ByteBuffer old_buffer) {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glMapNamedBuffer(buffer, access, length, old_buffer);
+        return org.lwjgl.opengl.ARBDirectStateAccess.glMapNamedBuffer(buffer, access, length, old_buffer);
     }
 
     public static java.nio.ByteBuffer glMapNamedBuffer(int buffer, int access, java.nio.ByteBuffer old_buffer) {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glMapNamedBuffer(buffer, access, old_buffer);
+        return org.lwjgl.opengl.ARBDirectStateAccess.glMapNamedBuffer(buffer, access, old_buffer);
     }
 
     public static java.nio.ByteBuffer glMapNamedBufferRange(int buffer, long offset, long length, int access,
             java.nio.ByteBuffer old_buffer) {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glMapNamedBufferRange(buffer, offset, length, access, old_buffer);
+        return org.lwjgl.opengl.ARBDirectStateAccess.glMapNamedBufferRange(buffer, offset, length, access, old_buffer);
     }
 
     public static void glNamedBufferData(int buffer, long data_size, int usage) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glNamedBufferData(buffer, data_size, usage);
+        org.lwjgl.opengl.ARBDirectStateAccess.glNamedBufferData(buffer, data_size, usage);
     }
 
     public static void glNamedBufferData(int buffer, java.nio.ByteBuffer data, int usage) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glNamedBufferData(buffer, data, usage);
+        org.lwjgl.opengl.ARBDirectStateAccess.glNamedBufferData(buffer, data, usage);
     }
 
     public static void glNamedBufferData(int buffer, java.nio.DoubleBuffer data, int usage) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glNamedBufferData(buffer, data, usage);
+        org.lwjgl.opengl.ARBDirectStateAccess.glNamedBufferData(buffer, data, usage);
     }
 
     public static void glNamedBufferData(int buffer, java.nio.FloatBuffer data, int usage) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glNamedBufferData(buffer, data, usage);
+        org.lwjgl.opengl.ARBDirectStateAccess.glNamedBufferData(buffer, data, usage);
     }
 
     public static void glNamedBufferData(int buffer, java.nio.IntBuffer data, int usage) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glNamedBufferData(buffer, data, usage);
+        org.lwjgl.opengl.ARBDirectStateAccess.glNamedBufferData(buffer, data, usage);
     }
 
     public static void glNamedBufferData(int buffer, java.nio.ShortBuffer data, int usage) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glNamedBufferData(buffer, data, usage);
+        org.lwjgl.opengl.ARBDirectStateAccess.glNamedBufferData(buffer, data, usage);
     }
 
     public static void glNamedBufferStorage(int buffer, long size, int flags) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glNamedBufferStorage(buffer, size, flags);
+        org.lwjgl.opengl.ARBDirectStateAccess.glNamedBufferStorage(buffer, size, flags);
     }
 
     public static void glNamedBufferStorage(int buffer, java.nio.ByteBuffer data, int flags) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glNamedBufferStorage(buffer, data, flags);
+        org.lwjgl.opengl.ARBDirectStateAccess.glNamedBufferStorage(buffer, data, flags);
     }
 
     public static void glNamedBufferStorage(int buffer, java.nio.DoubleBuffer data, int flags) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glNamedBufferStorage(buffer, data, flags);
+        org.lwjgl.opengl.ARBDirectStateAccess.glNamedBufferStorage(buffer, data, flags);
     }
 
     public static void glNamedBufferStorage(int buffer, java.nio.FloatBuffer data, int flags) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glNamedBufferStorage(buffer, data, flags);
+        org.lwjgl.opengl.ARBDirectStateAccess.glNamedBufferStorage(buffer, data, flags);
     }
 
     public static void glNamedBufferStorage(int buffer, java.nio.IntBuffer data, int flags) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glNamedBufferStorage(buffer, data, flags);
+        org.lwjgl.opengl.ARBDirectStateAccess.glNamedBufferStorage(buffer, data, flags);
     }
 
     public static void glNamedBufferStorage(int buffer, java.nio.ShortBuffer data, int flags) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glNamedBufferStorage(buffer, data, flags);
+        org.lwjgl.opengl.ARBDirectStateAccess.glNamedBufferStorage(buffer, data, flags);
     }
 
     public static void glNamedBufferSubData(int buffer, long offset, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glNamedBufferSubData(buffer, offset, data);
+        org.lwjgl.opengl.ARBDirectStateAccess.glNamedBufferSubData(buffer, offset, data);
     }
 
     public static void glNamedBufferSubData(int buffer, long offset, java.nio.DoubleBuffer data) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glNamedBufferSubData(buffer, offset, data);
+        org.lwjgl.opengl.ARBDirectStateAccess.glNamedBufferSubData(buffer, offset, data);
     }
 
     public static void glNamedBufferSubData(int buffer, long offset, java.nio.FloatBuffer data) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glNamedBufferSubData(buffer, offset, data);
+        org.lwjgl.opengl.ARBDirectStateAccess.glNamedBufferSubData(buffer, offset, data);
     }
 
     public static void glNamedBufferSubData(int buffer, long offset, java.nio.IntBuffer data) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glNamedBufferSubData(buffer, offset, data);
+        org.lwjgl.opengl.ARBDirectStateAccess.glNamedBufferSubData(buffer, offset, data);
     }
 
     public static void glNamedBufferSubData(int buffer, long offset, java.nio.ShortBuffer data) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glNamedBufferSubData(buffer, offset, data);
+        org.lwjgl.opengl.ARBDirectStateAccess.glNamedBufferSubData(buffer, offset, data);
     }
 
     public static void glNamedFramebufferDrawBuffer(int framebuffer, int mode) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glNamedFramebufferDrawBuffer(framebuffer, mode);
+        org.lwjgl.opengl.ARBDirectStateAccess.glNamedFramebufferDrawBuffer(framebuffer, mode);
     }
 
     public static void glNamedFramebufferDrawBuffers(int framebuffer, java.nio.IntBuffer bufs) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glNamedFramebufferDrawBuffers(framebuffer, bufs);
+        org.lwjgl.opengl.ARBDirectStateAccess.glNamedFramebufferDrawBuffers(framebuffer, bufs);
     }
 
     public static void glNamedFramebufferParameteri(int framebuffer, int pname, int param) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glNamedFramebufferParameteri(framebuffer, pname, param);
+        org.lwjgl.opengl.ARBDirectStateAccess.glNamedFramebufferParameteri(framebuffer, pname, param);
     }
 
     public static void glNamedFramebufferReadBuffer(int framebuffer, int mode) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glNamedFramebufferReadBuffer(framebuffer, mode);
+        org.lwjgl.opengl.ARBDirectStateAccess.glNamedFramebufferReadBuffer(framebuffer, mode);
     }
 
     public static void glNamedFramebufferRenderbuffer(int framebuffer, int attachment, int renderbuffertarget,
             int renderbuffer) {
-        org.lwjgl3.opengl.ARBDirectStateAccess
+        org.lwjgl.opengl.ARBDirectStateAccess
                 .glNamedFramebufferRenderbuffer(framebuffer, attachment, renderbuffertarget, renderbuffer);
     }
 
     public static void glNamedFramebufferTexture(int framebuffer, int attachment, int texture, int level) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glNamedFramebufferTexture(framebuffer, attachment, texture, level);
+        org.lwjgl.opengl.ARBDirectStateAccess.glNamedFramebufferTexture(framebuffer, attachment, texture, level);
     }
 
     public static void glNamedFramebufferTextureLayer(int framebuffer, int attachment, int texture, int level,
             int layer) {
-        org.lwjgl3.opengl.ARBDirectStateAccess
+        org.lwjgl.opengl.ARBDirectStateAccess
                 .glNamedFramebufferTextureLayer(framebuffer, attachment, texture, level, layer);
     }
 
     public static void glNamedRenderbufferStorage(int renderbuffer, int internalformat, int width, int height) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glNamedRenderbufferStorage(renderbuffer, internalformat, width, height);
+        org.lwjgl.opengl.ARBDirectStateAccess.glNamedRenderbufferStorage(renderbuffer, internalformat, width, height);
     }
 
     public static void glNamedRenderbufferStorageMultisample(int renderbuffer, int samples, int internalformat,
             int width, int height) {
-        org.lwjgl3.opengl.ARBDirectStateAccess
+        org.lwjgl.opengl.ARBDirectStateAccess
                 .glNamedRenderbufferStorageMultisample(renderbuffer, samples, internalformat, width, height);
     }
 
     public static void glTextureBuffer(int texture, int internalformat, int buffer) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glTextureBuffer(texture, internalformat, buffer);
+        org.lwjgl.opengl.ARBDirectStateAccess.glTextureBuffer(texture, internalformat, buffer);
     }
 
     public static void glTextureBufferRange(int texture, int internalformat, int buffer, long offset, long size) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glTextureBufferRange(texture, internalformat, buffer, offset, size);
+        org.lwjgl.opengl.ARBDirectStateAccess.glTextureBufferRange(texture, internalformat, buffer, offset, size);
     }
 
     public static void glTextureParameterf(int texture, int pname, float param) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glTextureParameterf(texture, pname, param);
+        org.lwjgl.opengl.ARBDirectStateAccess.glTextureParameterf(texture, pname, param);
     }
 
     public static void glTextureParameteri(int texture, int pname, int param) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glTextureParameteri(texture, pname, param);
+        org.lwjgl.opengl.ARBDirectStateAccess.glTextureParameteri(texture, pname, param);
     }
 
     public static void glTextureStorage1D(int texture, int levels, int internalformat, int width) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glTextureStorage1D(texture, levels, internalformat, width);
+        org.lwjgl.opengl.ARBDirectStateAccess.glTextureStorage1D(texture, levels, internalformat, width);
     }
 
     public static void glTextureStorage2D(int texture, int levels, int internalformat, int width, int height) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glTextureStorage2D(texture, levels, internalformat, width, height);
+        org.lwjgl.opengl.ARBDirectStateAccess.glTextureStorage2D(texture, levels, internalformat, width, height);
     }
 
     public static void glTextureStorage2DMultisample(int texture, int samples, int internalformat, int width,
             int height, boolean fixedsamplelocations) {
-        org.lwjgl3.opengl.ARBDirectStateAccess
+        org.lwjgl.opengl.ARBDirectStateAccess
                 .glTextureStorage2DMultisample(texture, samples, internalformat, width, height, fixedsamplelocations);
     }
 
     public static void glTextureStorage3D(int texture, int levels, int internalformat, int width, int height,
             int depth) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glTextureStorage3D(texture, levels, internalformat, width, height, depth);
+        org.lwjgl.opengl.ARBDirectStateAccess.glTextureStorage3D(texture, levels, internalformat, width, height, depth);
     }
 
     public static void glTextureStorage3DMultisample(int texture, int samples, int internalformat, int width,
             int height, int depth, boolean fixedsamplelocations) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glTextureStorage3DMultisample(
+        org.lwjgl.opengl.ARBDirectStateAccess.glTextureStorage3DMultisample(
                 texture,
                 samples,
                 internalformat,
@@ -493,38 +493,38 @@ public static void glTextureStorage3DMultisample(int texture, int samples, int i
 
     public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type,
             long pixels_buffer_offset) {
-        org.lwjgl3.opengl.ARBDirectStateAccess
+        org.lwjgl.opengl.ARBDirectStateAccess
                 .glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels_buffer_offset);
     }
 
     public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type,
             java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
+        org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
     }
 
     public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type,
             java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
+        org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
     }
 
     public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type,
             java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
+        org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
     }
 
     public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type,
             java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
+        org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
     }
 
     public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type,
             java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
+        org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
     }
 
     public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height,
             int format, int type, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glTextureSubImage2D(
+        org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage2D(
                 texture,
                 level,
                 xoffset,
@@ -538,37 +538,37 @@ public static void glTextureSubImage2D(int texture, int level, int xoffset, int
 
     public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height,
             int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.ARBDirectStateAccess
+        org.lwjgl.opengl.ARBDirectStateAccess
                 .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height,
             int format, int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.ARBDirectStateAccess
+        org.lwjgl.opengl.ARBDirectStateAccess
                 .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height,
             int format, int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.ARBDirectStateAccess
+        org.lwjgl.opengl.ARBDirectStateAccess
                 .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height,
             int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.ARBDirectStateAccess
+        org.lwjgl.opengl.ARBDirectStateAccess
                 .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height,
             int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.ARBDirectStateAccess
+        org.lwjgl.opengl.ARBDirectStateAccess
                 .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glTextureSubImage3D(
+        org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage3D(
                 texture,
                 level,
                 xoffset,
@@ -584,7 +584,7 @@ public static void glTextureSubImage3D(int texture, int level, int xoffset, int
 
     public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glTextureSubImage3D(
+        org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage3D(
                 texture,
                 level,
                 xoffset,
@@ -600,7 +600,7 @@ public static void glTextureSubImage3D(int texture, int level, int xoffset, int
 
     public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glTextureSubImage3D(
+        org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage3D(
                 texture,
                 level,
                 xoffset,
@@ -616,7 +616,7 @@ public static void glTextureSubImage3D(int texture, int level, int xoffset, int
 
     public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glTextureSubImage3D(
+        org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage3D(
                 texture,
                 level,
                 xoffset,
@@ -632,7 +632,7 @@ public static void glTextureSubImage3D(int texture, int level, int xoffset, int
 
     public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glTextureSubImage3D(
+        org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage3D(
                 texture,
                 level,
                 xoffset,
@@ -648,7 +648,7 @@ public static void glTextureSubImage3D(int texture, int level, int xoffset, int
 
     public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glTextureSubImage3D(
+        org.lwjgl.opengl.ARBDirectStateAccess.glTextureSubImage3D(
                 texture,
                 level,
                 xoffset,
@@ -663,46 +663,46 @@ public static void glTextureSubImage3D(int texture, int level, int xoffset, int
     }
 
     public static void glTransformFeedbackBufferBase(int xfb, int index, int buffer) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glTransformFeedbackBufferBase(xfb, index, buffer);
+        org.lwjgl.opengl.ARBDirectStateAccess.glTransformFeedbackBufferBase(xfb, index, buffer);
     }
 
     public static void glTransformFeedbackBufferRange(int xfb, int index, int buffer, long offset, long size) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glTransformFeedbackBufferRange(xfb, index, buffer, offset, size);
+        org.lwjgl.opengl.ARBDirectStateAccess.glTransformFeedbackBufferRange(xfb, index, buffer, offset, size);
     }
 
     public static boolean glUnmapNamedBuffer(int buffer) {
-        return org.lwjgl3.opengl.ARBDirectStateAccess.glUnmapNamedBuffer(buffer);
+        return org.lwjgl.opengl.ARBDirectStateAccess.glUnmapNamedBuffer(buffer);
     }
 
     public static void glVertexArrayAttribBinding(int vaobj, int attribindex, int bindingindex) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glVertexArrayAttribBinding(vaobj, attribindex, bindingindex);
+        org.lwjgl.opengl.ARBDirectStateAccess.glVertexArrayAttribBinding(vaobj, attribindex, bindingindex);
     }
 
     public static void glVertexArrayAttribFormat(int vaobj, int attribindex, int size, int type, boolean normalized,
             int relativeoffset) {
-        org.lwjgl3.opengl.ARBDirectStateAccess
+        org.lwjgl.opengl.ARBDirectStateAccess
                 .glVertexArrayAttribFormat(vaobj, attribindex, size, type, normalized, relativeoffset);
     }
 
     public static void glVertexArrayAttribIFormat(int vaobj, int attribindex, int size, int type, int relativeoffset) {
-        org.lwjgl3.opengl.ARBDirectStateAccess
+        org.lwjgl.opengl.ARBDirectStateAccess
                 .glVertexArrayAttribIFormat(vaobj, attribindex, size, type, relativeoffset);
     }
 
     public static void glVertexArrayAttribLFormat(int vaobj, int attribindex, int size, int type, int relativeoffset) {
-        org.lwjgl3.opengl.ARBDirectStateAccess
+        org.lwjgl.opengl.ARBDirectStateAccess
                 .glVertexArrayAttribLFormat(vaobj, attribindex, size, type, relativeoffset);
     }
 
     public static void glVertexArrayBindingDivisor(int vaobj, int bindingindex, int divisor) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glVertexArrayBindingDivisor(vaobj, bindingindex, divisor);
+        org.lwjgl.opengl.ARBDirectStateAccess.glVertexArrayBindingDivisor(vaobj, bindingindex, divisor);
     }
 
     public static void glVertexArrayElementBuffer(int vaobj, int buffer) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glVertexArrayElementBuffer(vaobj, buffer);
+        org.lwjgl.opengl.ARBDirectStateAccess.glVertexArrayElementBuffer(vaobj, buffer);
     }
 
     public static void glVertexArrayVertexBuffer(int vaobj, int bindingindex, int buffer, long offset, int stride) {
-        org.lwjgl3.opengl.ARBDirectStateAccess.glVertexArrayVertexBuffer(vaobj, bindingindex, buffer, offset, stride);
+        org.lwjgl.opengl.ARBDirectStateAccess.glVertexArrayVertexBuffer(vaobj, bindingindex, buffer, offset, stride);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBDrawBuffers.java b/src/main/java/org/lwjglx/opengl/ARBDrawBuffers.java
similarity index 87%
rename from src/main/java/org/lwjgl/opengl/ARBDrawBuffers.java
rename to src/main/java/org/lwjglx/opengl/ARBDrawBuffers.java
index 336c67392..55e44ab59 100644
--- a/src/main/java/org/lwjgl/opengl/ARBDrawBuffers.java
+++ b/src/main/java/org/lwjglx/opengl/ARBDrawBuffers.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBDrawBuffers {
 
@@ -22,10 +22,10 @@ public class ARBDrawBuffers {
 
     public static void glDrawBuffersARB(int buffer) {
 
-        org.lwjgl3.opengl.ARBDrawBuffers.glDrawBuffersARB(new int[] { buffer });
+        org.lwjgl.opengl.ARBDrawBuffers.glDrawBuffersARB(new int[] { buffer });
     }
 
     public static void glDrawBuffersARB(java.nio.IntBuffer buffers) {
-        org.lwjgl3.opengl.ARBDrawBuffers.glDrawBuffersARB(buffers);
+        org.lwjgl.opengl.ARBDrawBuffers.glDrawBuffersARB(buffers);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBDrawBuffersBlend.java b/src/main/java/org/lwjglx/opengl/ARBDrawBuffersBlend.java
similarity index 50%
rename from src/main/java/org/lwjgl/opengl/ARBDrawBuffersBlend.java
rename to src/main/java/org/lwjglx/opengl/ARBDrawBuffersBlend.java
index f74e11963..fac6f0c0f 100644
--- a/src/main/java/org/lwjgl/opengl/ARBDrawBuffersBlend.java
+++ b/src/main/java/org/lwjglx/opengl/ARBDrawBuffersBlend.java
@@ -1,20 +1,20 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBDrawBuffersBlend {
 
     public static void glBlendEquationSeparateiARB(int buf, int modeRGB, int modeAlpha) {
-        org.lwjgl3.opengl.ARBDrawBuffersBlend.glBlendEquationSeparateiARB(buf, modeRGB, modeAlpha);
+        org.lwjgl.opengl.ARBDrawBuffersBlend.glBlendEquationSeparateiARB(buf, modeRGB, modeAlpha);
     }
 
     public static void glBlendEquationiARB(int buf, int mode) {
-        org.lwjgl3.opengl.ARBDrawBuffersBlend.glBlendEquationiARB(buf, mode);
+        org.lwjgl.opengl.ARBDrawBuffersBlend.glBlendEquationiARB(buf, mode);
     }
 
     public static void glBlendFuncSeparateiARB(int buf, int srcRGB, int dstRGB, int srcAlpha, int dstAlpha) {
-        org.lwjgl3.opengl.ARBDrawBuffersBlend.glBlendFuncSeparateiARB(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+        org.lwjgl.opengl.ARBDrawBuffersBlend.glBlendFuncSeparateiARB(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
     }
 
     public static void glBlendFunciARB(int buf, int src, int dst) {
-        org.lwjgl3.opengl.ARBDrawBuffersBlend.glBlendFunciARB(buf, src, dst);
+        org.lwjgl.opengl.ARBDrawBuffersBlend.glBlendFunciARB(buf, src, dst);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBDrawElementsBaseVertex.java b/src/main/java/org/lwjglx/opengl/ARBDrawElementsBaseVertex.java
similarity index 69%
rename from src/main/java/org/lwjgl/opengl/ARBDrawElementsBaseVertex.java
rename to src/main/java/org/lwjglx/opengl/ARBDrawElementsBaseVertex.java
index b558fdb5b..c5b95274c 100644
--- a/src/main/java/org/lwjgl/opengl/ARBDrawElementsBaseVertex.java
+++ b/src/main/java/org/lwjglx/opengl/ARBDrawElementsBaseVertex.java
@@ -1,28 +1,28 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBDrawElementsBaseVertex {
 
     public static void glDrawElementsBaseVertex(int mode, int indices_count, int type, long indices_buffer_offset,
             int basevertex) {
-        org.lwjgl3.opengl.ARBDrawElementsBaseVertex
+        org.lwjgl.opengl.ARBDrawElementsBaseVertex
                 .glDrawElementsBaseVertex(mode, indices_count, type, indices_buffer_offset, basevertex);
     }
 
     public static void glDrawElementsBaseVertex(int mode, java.nio.ByteBuffer indices, int basevertex) {
-        org.lwjgl3.opengl.ARBDrawElementsBaseVertex.glDrawElementsBaseVertex(mode, indices, basevertex);
+        org.lwjgl.opengl.ARBDrawElementsBaseVertex.glDrawElementsBaseVertex(mode, indices, basevertex);
     }
 
     public static void glDrawElementsBaseVertex(int mode, java.nio.IntBuffer indices, int basevertex) {
-        org.lwjgl3.opengl.ARBDrawElementsBaseVertex.glDrawElementsBaseVertex(mode, indices, basevertex);
+        org.lwjgl.opengl.ARBDrawElementsBaseVertex.glDrawElementsBaseVertex(mode, indices, basevertex);
     }
 
     public static void glDrawElementsBaseVertex(int mode, java.nio.ShortBuffer indices, int basevertex) {
-        org.lwjgl3.opengl.ARBDrawElementsBaseVertex.glDrawElementsBaseVertex(mode, indices, basevertex);
+        org.lwjgl.opengl.ARBDrawElementsBaseVertex.glDrawElementsBaseVertex(mode, indices, basevertex);
     }
 
     public static void glDrawElementsInstancedBaseVertex(int mode, int indices_count, int type,
             long indices_buffer_offset, int primcount, int basevertex) {
-        org.lwjgl3.opengl.ARBDrawElementsBaseVertex.glDrawElementsInstancedBaseVertex(
+        org.lwjgl.opengl.ARBDrawElementsBaseVertex.glDrawElementsInstancedBaseVertex(
                 mode,
                 indices_count,
                 type,
@@ -33,25 +33,25 @@ public static void glDrawElementsInstancedBaseVertex(int mode, int indices_count
 
     public static void glDrawElementsInstancedBaseVertex(int mode, java.nio.ByteBuffer indices, int primcount,
             int basevertex) {
-        org.lwjgl3.opengl.ARBDrawElementsBaseVertex
+        org.lwjgl.opengl.ARBDrawElementsBaseVertex
                 .glDrawElementsInstancedBaseVertex(mode, indices, primcount, basevertex);
     }
 
     public static void glDrawElementsInstancedBaseVertex(int mode, java.nio.IntBuffer indices, int primcount,
             int basevertex) {
-        org.lwjgl3.opengl.ARBDrawElementsBaseVertex
+        org.lwjgl.opengl.ARBDrawElementsBaseVertex
                 .glDrawElementsInstancedBaseVertex(mode, indices, primcount, basevertex);
     }
 
     public static void glDrawElementsInstancedBaseVertex(int mode, java.nio.ShortBuffer indices, int primcount,
             int basevertex) {
-        org.lwjgl3.opengl.ARBDrawElementsBaseVertex
+        org.lwjgl.opengl.ARBDrawElementsBaseVertex
                 .glDrawElementsInstancedBaseVertex(mode, indices, primcount, basevertex);
     }
 
     public static void glDrawRangeElementsBaseVertex(int mode, int start, int end, int indices_count, int type,
             long indices_buffer_offset, int basevertex) {
-        org.lwjgl3.opengl.ARBDrawElementsBaseVertex.glDrawRangeElementsBaseVertex(
+        org.lwjgl.opengl.ARBDrawElementsBaseVertex.glDrawRangeElementsBaseVertex(
                 mode,
                 start,
                 end,
@@ -63,16 +63,16 @@ public static void glDrawRangeElementsBaseVertex(int mode, int start, int end, i
 
     public static void glDrawRangeElementsBaseVertex(int mode, int start, int end, java.nio.ByteBuffer indices,
             int basevertex) {
-        org.lwjgl3.opengl.ARBDrawElementsBaseVertex.glDrawRangeElementsBaseVertex(mode, start, end, indices, basevertex);
+        org.lwjgl.opengl.ARBDrawElementsBaseVertex.glDrawRangeElementsBaseVertex(mode, start, end, indices, basevertex);
     }
 
     public static void glDrawRangeElementsBaseVertex(int mode, int start, int end, java.nio.IntBuffer indices,
             int basevertex) {
-        org.lwjgl3.opengl.ARBDrawElementsBaseVertex.glDrawRangeElementsBaseVertex(mode, start, end, indices, basevertex);
+        org.lwjgl.opengl.ARBDrawElementsBaseVertex.glDrawRangeElementsBaseVertex(mode, start, end, indices, basevertex);
     }
 
     public static void glDrawRangeElementsBaseVertex(int mode, int start, int end, java.nio.ShortBuffer indices,
             int basevertex) {
-        org.lwjgl3.opengl.ARBDrawElementsBaseVertex.glDrawRangeElementsBaseVertex(mode, start, end, indices, basevertex);
+        org.lwjgl.opengl.ARBDrawElementsBaseVertex.glDrawRangeElementsBaseVertex(mode, start, end, indices, basevertex);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBDrawIndirect.java b/src/main/java/org/lwjglx/opengl/ARBDrawIndirect.java
similarity index 57%
rename from src/main/java/org/lwjgl/opengl/ARBDrawIndirect.java
rename to src/main/java/org/lwjglx/opengl/ARBDrawIndirect.java
index 7adfc3744..2b27f70ed 100644
--- a/src/main/java/org/lwjgl/opengl/ARBDrawIndirect.java
+++ b/src/main/java/org/lwjglx/opengl/ARBDrawIndirect.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBDrawIndirect {
 
@@ -6,26 +6,26 @@ public class ARBDrawIndirect {
     public static final int GL_DRAW_INDIRECT_BUFFER_BINDING = (int) 36675;
 
     public static void glDrawArraysIndirect(int mode, long indirect_buffer_offset) {
-        org.lwjgl3.opengl.ARBDrawIndirect.glDrawArraysIndirect(mode, indirect_buffer_offset);
+        org.lwjgl.opengl.ARBDrawIndirect.glDrawArraysIndirect(mode, indirect_buffer_offset);
     }
 
     public static void glDrawArraysIndirect(int mode, java.nio.ByteBuffer indirect) {
-        org.lwjgl3.opengl.ARBDrawIndirect.glDrawArraysIndirect(mode, indirect);
+        org.lwjgl.opengl.ARBDrawIndirect.glDrawArraysIndirect(mode, indirect);
     }
 
     public static void glDrawArraysIndirect(int mode, java.nio.IntBuffer indirect) {
-        org.lwjgl3.opengl.ARBDrawIndirect.glDrawArraysIndirect(mode, indirect);
+        org.lwjgl.opengl.ARBDrawIndirect.glDrawArraysIndirect(mode, indirect);
     }
 
     public static void glDrawElementsIndirect(int mode, int type, long indirect_buffer_offset) {
-        org.lwjgl3.opengl.ARBDrawIndirect.glDrawElementsIndirect(mode, type, indirect_buffer_offset);
+        org.lwjgl.opengl.ARBDrawIndirect.glDrawElementsIndirect(mode, type, indirect_buffer_offset);
     }
 
     public static void glDrawElementsIndirect(int mode, int type, java.nio.ByteBuffer indirect) {
-        org.lwjgl3.opengl.ARBDrawIndirect.glDrawElementsIndirect(mode, type, indirect);
+        org.lwjgl.opengl.ARBDrawIndirect.glDrawElementsIndirect(mode, type, indirect);
     }
 
     public static void glDrawElementsIndirect(int mode, int type, java.nio.IntBuffer indirect) {
-        org.lwjgl3.opengl.ARBDrawIndirect.glDrawElementsIndirect(mode, type, indirect);
+        org.lwjgl.opengl.ARBDrawIndirect.glDrawElementsIndirect(mode, type, indirect);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBDrawInstanced.java b/src/main/java/org/lwjglx/opengl/ARBDrawInstanced.java
similarity index 61%
rename from src/main/java/org/lwjgl/opengl/ARBDrawInstanced.java
rename to src/main/java/org/lwjglx/opengl/ARBDrawInstanced.java
index 179398fbe..23dd2903d 100644
--- a/src/main/java/org/lwjgl/opengl/ARBDrawInstanced.java
+++ b/src/main/java/org/lwjglx/opengl/ARBDrawInstanced.java
@@ -1,26 +1,26 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBDrawInstanced {
 
     public static void glDrawArraysInstancedARB(int mode, int first, int count, int primcount) {
-        org.lwjgl3.opengl.ARBDrawInstanced.glDrawArraysInstancedARB(mode, first, count, primcount);
+        org.lwjgl.opengl.ARBDrawInstanced.glDrawArraysInstancedARB(mode, first, count, primcount);
     }
 
     public static void glDrawElementsInstancedARB(int mode, int indices_count, int type, long indices_buffer_offset,
             int primcount) {
-        org.lwjgl3.opengl.ARBDrawInstanced
+        org.lwjgl.opengl.ARBDrawInstanced
                 .glDrawElementsInstancedARB(mode, indices_count, type, indices_buffer_offset, primcount);
     }
 
     public static void glDrawElementsInstancedARB(int mode, java.nio.ByteBuffer indices, int primcount) {
-        org.lwjgl3.opengl.ARBDrawInstanced.glDrawElementsInstancedARB(mode, indices, primcount);
+        org.lwjgl.opengl.ARBDrawInstanced.glDrawElementsInstancedARB(mode, indices, primcount);
     }
 
     public static void glDrawElementsInstancedARB(int mode, java.nio.IntBuffer indices, int primcount) {
-        org.lwjgl3.opengl.ARBDrawInstanced.glDrawElementsInstancedARB(mode, indices, primcount);
+        org.lwjgl.opengl.ARBDrawInstanced.glDrawElementsInstancedARB(mode, indices, primcount);
     }
 
     public static void glDrawElementsInstancedARB(int mode, java.nio.ShortBuffer indices, int primcount) {
-        org.lwjgl3.opengl.ARBDrawInstanced.glDrawElementsInstancedARB(mode, indices, primcount);
+        org.lwjgl.opengl.ARBDrawInstanced.glDrawElementsInstancedARB(mode, indices, primcount);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBES2Compatibility.java b/src/main/java/org/lwjglx/opengl/ARBES2Compatibility.java
similarity index 76%
rename from src/main/java/org/lwjgl/opengl/ARBES2Compatibility.java
rename to src/main/java/org/lwjglx/opengl/ARBES2Compatibility.java
index 354d6b58b..c346b7fc1 100644
--- a/src/main/java/org/lwjgl/opengl/ARBES2Compatibility.java
+++ b/src/main/java/org/lwjglx/opengl/ARBES2Compatibility.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBES2Compatibility {
 
@@ -19,23 +19,23 @@ public class ARBES2Compatibility {
     public static final int GL_SHADER_COMPILER = (int) 36346;
 
     public static void glClearDepthf(float d) {
-        org.lwjgl3.opengl.ARBES2Compatibility.glClearDepthf(d);
+        org.lwjgl.opengl.ARBES2Compatibility.glClearDepthf(d);
     }
 
     public static void glDepthRangef(float n, float f) {
-        org.lwjgl3.opengl.ARBES2Compatibility.glDepthRangef(n, f);
+        org.lwjgl.opengl.ARBES2Compatibility.glDepthRangef(n, f);
     }
 
     public static void glGetShaderPrecisionFormat(int shadertype, int precisiontype, java.nio.IntBuffer range,
             java.nio.IntBuffer precision) {
-        org.lwjgl3.opengl.ARBES2Compatibility.glGetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
+        org.lwjgl.opengl.ARBES2Compatibility.glGetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
     }
 
     public static void glReleaseShaderCompiler() {
-        org.lwjgl3.opengl.ARBES2Compatibility.glReleaseShaderCompiler();
+        org.lwjgl.opengl.ARBES2Compatibility.glReleaseShaderCompiler();
     }
 
     public static void glShaderBinary(java.nio.IntBuffer shaders, int binaryformat, java.nio.ByteBuffer binary) {
-        org.lwjgl3.opengl.ARBES2Compatibility.glShaderBinary(shaders, binaryformat, binary);
+        org.lwjgl.opengl.ARBES2Compatibility.glShaderBinary(shaders, binaryformat, binary);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBES31Compatibility.java b/src/main/java/org/lwjglx/opengl/ARBES31Compatibility.java
similarity index 50%
rename from src/main/java/org/lwjgl/opengl/ARBES31Compatibility.java
rename to src/main/java/org/lwjglx/opengl/ARBES31Compatibility.java
index b1cbb224d..4b9d26f34 100644
--- a/src/main/java/org/lwjgl/opengl/ARBES31Compatibility.java
+++ b/src/main/java/org/lwjglx/opengl/ARBES31Compatibility.java
@@ -1,8 +1,8 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBES31Compatibility {
 
     public static void glMemoryBarrierByRegion(int barriers) {
-        org.lwjgl3.opengl.ARBES31Compatibility.glMemoryBarrierByRegion(barriers);
+        org.lwjgl.opengl.ARBES31Compatibility.glMemoryBarrierByRegion(barriers);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBES3Compatibility.java b/src/main/java/org/lwjglx/opengl/ARBES3Compatibility.java
similarity index 97%
rename from src/main/java/org/lwjgl/opengl/ARBES3Compatibility.java
rename to src/main/java/org/lwjglx/opengl/ARBES3Compatibility.java
index 96645ff02..6330d6a69 100644
--- a/src/main/java/org/lwjgl/opengl/ARBES3Compatibility.java
+++ b/src/main/java/org/lwjglx/opengl/ARBES3Compatibility.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBES3Compatibility {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBEnhancedLayouts.java b/src/main/java/org/lwjglx/opengl/ARBEnhancedLayouts.java
similarity index 90%
rename from src/main/java/org/lwjgl/opengl/ARBEnhancedLayouts.java
rename to src/main/java/org/lwjglx/opengl/ARBEnhancedLayouts.java
index 8c369b516..1d941d7f3 100644
--- a/src/main/java/org/lwjgl/opengl/ARBEnhancedLayouts.java
+++ b/src/main/java/org/lwjglx/opengl/ARBEnhancedLayouts.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBEnhancedLayouts {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBExplicitUniformLocation.java b/src/main/java/org/lwjglx/opengl/ARBExplicitUniformLocation.java
similarity index 80%
rename from src/main/java/org/lwjgl/opengl/ARBExplicitUniformLocation.java
rename to src/main/java/org/lwjglx/opengl/ARBExplicitUniformLocation.java
index ee9489a2a..92113b0c1 100644
--- a/src/main/java/org/lwjgl/opengl/ARBExplicitUniformLocation.java
+++ b/src/main/java/org/lwjglx/opengl/ARBExplicitUniformLocation.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBExplicitUniformLocation {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBFragmentProgram.java b/src/main/java/org/lwjglx/opengl/ARBFragmentProgram.java
similarity index 92%
rename from src/main/java/org/lwjgl/opengl/ARBFragmentProgram.java
rename to src/main/java/org/lwjglx/opengl/ARBFragmentProgram.java
index 1dbf09f09..d87d09a40 100644
--- a/src/main/java/org/lwjgl/opengl/ARBFragmentProgram.java
+++ b/src/main/java/org/lwjglx/opengl/ARBFragmentProgram.java
@@ -1,6 +1,6 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
-public class ARBFragmentProgram extends org.lwjgl.opengl.ARBProgram {
+public class ARBFragmentProgram extends ARBProgram {
 
     public static final int GL_FRAGMENT_PROGRAM_ARB = (int) 34820;
     public static final int GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB = (int) 34827;
diff --git a/src/main/java/org/lwjgl/opengl/ARBFragmentShader.java b/src/main/java/org/lwjglx/opengl/ARBFragmentShader.java
similarity index 93%
rename from src/main/java/org/lwjgl/opengl/ARBFragmentShader.java
rename to src/main/java/org/lwjglx/opengl/ARBFragmentShader.java
index 78a7b09f9..39a679adc 100644
--- a/src/main/java/org/lwjgl/opengl/ARBFragmentShader.java
+++ b/src/main/java/org/lwjglx/opengl/ARBFragmentShader.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBFragmentShader {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBFramebufferNoAttachments.java b/src/main/java/org/lwjglx/opengl/ARBFramebufferNoAttachments.java
similarity index 70%
rename from src/main/java/org/lwjgl/opengl/ARBFramebufferNoAttachments.java
rename to src/main/java/org/lwjglx/opengl/ARBFramebufferNoAttachments.java
index 392e50667..a57107d01 100644
--- a/src/main/java/org/lwjgl/opengl/ARBFramebufferNoAttachments.java
+++ b/src/main/java/org/lwjglx/opengl/ARBFramebufferNoAttachments.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBFramebufferNoAttachments {
 
@@ -13,18 +13,18 @@ public class ARBFramebufferNoAttachments {
     public static final int GL_MAX_FRAMEBUFFER_WIDTH = (int) 37653;
 
     public static void glFramebufferParameteri(int target, int pname, int param) {
-        org.lwjgl3.opengl.ARBFramebufferNoAttachments.glFramebufferParameteri(target, pname, param);
+        org.lwjgl.opengl.ARBFramebufferNoAttachments.glFramebufferParameteri(target, pname, param);
     }
 
     public static int glGetFramebufferParameteri(int target, int pname) {
-        return org.lwjgl3.opengl.ARBFramebufferNoAttachments.glGetFramebufferParameteri(target, pname);
+        return org.lwjgl.opengl.ARBFramebufferNoAttachments.glGetFramebufferParameteri(target, pname);
     }
 
     public static void glGetNamedFramebufferParameterEXT(int framebuffer, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.ARBFramebufferNoAttachments.glGetNamedFramebufferParameterivEXT(framebuffer, pname, params);
+        org.lwjgl.opengl.ARBFramebufferNoAttachments.glGetNamedFramebufferParameterivEXT(framebuffer, pname, params);
     }
 
     public static void glNamedFramebufferParameteriEXT(int framebuffer, int pname, int param) {
-        org.lwjgl3.opengl.ARBFramebufferNoAttachments.glNamedFramebufferParameteriEXT(framebuffer, pname, param);
+        org.lwjgl.opengl.ARBFramebufferNoAttachments.glNamedFramebufferParameteriEXT(framebuffer, pname, param);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBFramebufferObject.java b/src/main/java/org/lwjglx/opengl/ARBFramebufferObject.java
similarity index 79%
rename from src/main/java/org/lwjgl/opengl/ARBFramebufferObject.java
rename to src/main/java/org/lwjglx/opengl/ARBFramebufferObject.java
index c2de35595..11d8095a8 100644
--- a/src/main/java/org/lwjgl/opengl/ARBFramebufferObject.java
+++ b/src/main/java/org/lwjglx/opengl/ARBFramebufferObject.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBFramebufferObject {
 
@@ -78,105 +78,105 @@ public class ARBFramebufferObject {
     public static final int GL_UNSIGNED_NORMALIZED = (int) 35863;
 
     public static void glBindFramebuffer(int target, int framebuffer) {
-        org.lwjgl3.opengl.ARBFramebufferObject.glBindFramebuffer(target, framebuffer);
+        org.lwjgl.opengl.ARBFramebufferObject.glBindFramebuffer(target, framebuffer);
     }
 
     public static void glBindRenderbuffer(int target, int renderbuffer) {
-        org.lwjgl3.opengl.ARBFramebufferObject.glBindRenderbuffer(target, renderbuffer);
+        org.lwjgl.opengl.ARBFramebufferObject.glBindRenderbuffer(target, renderbuffer);
     }
 
     public static void glBlitFramebuffer(int srcX0, int srcY0, int srcX1, int srcY1, int dstX0, int dstY0, int dstX1,
             int dstY1, int mask, int filter) {
-        org.lwjgl3.opengl.ARBFramebufferObject
+        org.lwjgl.opengl.ARBFramebufferObject
                 .glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
     }
 
     public static int glCheckFramebufferStatus(int target) {
-        return org.lwjgl3.opengl.ARBFramebufferObject.glCheckFramebufferStatus(target);
+        return org.lwjgl.opengl.ARBFramebufferObject.glCheckFramebufferStatus(target);
     }
 
     public static void glDeleteFramebuffers(int framebuffer) {
-        org.lwjgl3.opengl.ARBFramebufferObject.glDeleteFramebuffers(framebuffer);
+        org.lwjgl.opengl.ARBFramebufferObject.glDeleteFramebuffers(framebuffer);
     }
 
     public static void glDeleteFramebuffers(java.nio.IntBuffer framebuffers) {
-        org.lwjgl3.opengl.ARBFramebufferObject.glDeleteFramebuffers(framebuffers);
+        org.lwjgl.opengl.ARBFramebufferObject.glDeleteFramebuffers(framebuffers);
     }
 
     public static void glDeleteRenderbuffers(int renderbuffer) {
-        org.lwjgl3.opengl.ARBFramebufferObject.glDeleteRenderbuffers(renderbuffer);
+        org.lwjgl.opengl.ARBFramebufferObject.glDeleteRenderbuffers(renderbuffer);
     }
 
     public static void glDeleteRenderbuffers(java.nio.IntBuffer renderbuffers) {
-        org.lwjgl3.opengl.ARBFramebufferObject.glDeleteRenderbuffers(renderbuffers);
+        org.lwjgl.opengl.ARBFramebufferObject.glDeleteRenderbuffers(renderbuffers);
     }
 
     public static void glFramebufferRenderbuffer(int target, int attachment, int renderbuffertarget, int renderbuffer) {
-        org.lwjgl3.opengl.ARBFramebufferObject
+        org.lwjgl.opengl.ARBFramebufferObject
                 .glFramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
     }
 
     public static void glFramebufferTexture1D(int target, int attachment, int textarget, int texture, int level) {
-        org.lwjgl3.opengl.ARBFramebufferObject.glFramebufferTexture1D(target, attachment, textarget, texture, level);
+        org.lwjgl.opengl.ARBFramebufferObject.glFramebufferTexture1D(target, attachment, textarget, texture, level);
     }
 
     public static void glFramebufferTexture2D(int target, int attachment, int textarget, int texture, int level) {
-        org.lwjgl3.opengl.ARBFramebufferObject.glFramebufferTexture2D(target, attachment, textarget, texture, level);
+        org.lwjgl.opengl.ARBFramebufferObject.glFramebufferTexture2D(target, attachment, textarget, texture, level);
     }
 
     public static void glFramebufferTexture3D(int target, int attachment, int textarget, int texture, int level,
             int layer) {
-        org.lwjgl3.opengl.ARBFramebufferObject
+        org.lwjgl.opengl.ARBFramebufferObject
                 .glFramebufferTexture3D(target, attachment, textarget, texture, level, layer);
     }
 
     public static void glFramebufferTextureLayer(int target, int attachment, int texture, int level, int layer) {
-        org.lwjgl3.opengl.ARBFramebufferObject.glFramebufferTextureLayer(target, attachment, texture, level, layer);
+        org.lwjgl.opengl.ARBFramebufferObject.glFramebufferTextureLayer(target, attachment, texture, level, layer);
     }
 
     public static int glGenFramebuffers() {
-        return org.lwjgl3.opengl.ARBFramebufferObject.glGenFramebuffers();
+        return org.lwjgl.opengl.ARBFramebufferObject.glGenFramebuffers();
     }
 
     public static void glGenFramebuffers(java.nio.IntBuffer framebuffers) {
-        org.lwjgl3.opengl.ARBFramebufferObject.glGenFramebuffers(framebuffers);
+        org.lwjgl.opengl.ARBFramebufferObject.glGenFramebuffers(framebuffers);
     }
 
     public static int glGenRenderbuffers() {
-        return org.lwjgl3.opengl.ARBFramebufferObject.glGenRenderbuffers();
+        return org.lwjgl.opengl.ARBFramebufferObject.glGenRenderbuffers();
     }
 
     public static void glGenRenderbuffers(java.nio.IntBuffer renderbuffers) {
-        org.lwjgl3.opengl.ARBFramebufferObject.glGenRenderbuffers(renderbuffers);
+        org.lwjgl.opengl.ARBFramebufferObject.glGenRenderbuffers(renderbuffers);
     }
 
     public static void glGenerateMipmap(int target) {
-        org.lwjgl3.opengl.ARBFramebufferObject.glGenerateMipmap(target);
+        org.lwjgl.opengl.ARBFramebufferObject.glGenerateMipmap(target);
     }
 
     public static int glGetFramebufferAttachmentParameteri(int target, int attachment, int pname) {
-        return org.lwjgl3.opengl.ARBFramebufferObject.glGetFramebufferAttachmentParameteri(target, attachment, pname);
+        return org.lwjgl.opengl.ARBFramebufferObject.glGetFramebufferAttachmentParameteri(target, attachment, pname);
     }
 
     public static int glGetRenderbufferParameteri(int target, int pname) {
-        return org.lwjgl3.opengl.ARBFramebufferObject.glGetRenderbufferParameteri(target, pname);
+        return org.lwjgl.opengl.ARBFramebufferObject.glGetRenderbufferParameteri(target, pname);
     }
 
     public static boolean glIsFramebuffer(int framebuffer) {
-        return org.lwjgl3.opengl.ARBFramebufferObject.glIsFramebuffer(framebuffer);
+        return org.lwjgl.opengl.ARBFramebufferObject.glIsFramebuffer(framebuffer);
     }
 
     public static boolean glIsRenderbuffer(int renderbuffer) {
-        return org.lwjgl3.opengl.ARBFramebufferObject.glIsRenderbuffer(renderbuffer);
+        return org.lwjgl.opengl.ARBFramebufferObject.glIsRenderbuffer(renderbuffer);
     }
 
     public static void glRenderbufferStorage(int target, int internalformat, int width, int height) {
-        org.lwjgl3.opengl.ARBFramebufferObject.glRenderbufferStorage(target, internalformat, width, height);
+        org.lwjgl.opengl.ARBFramebufferObject.glRenderbufferStorage(target, internalformat, width, height);
     }
 
     public static void glRenderbufferStorageMultisample(int target, int samples, int internalformat, int width,
             int height) {
-        org.lwjgl3.opengl.ARBFramebufferObject
+        org.lwjgl.opengl.ARBFramebufferObject
                 .glRenderbufferStorageMultisample(target, samples, internalformat, width, height);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBFramebufferSRGB.java b/src/main/java/org/lwjglx/opengl/ARBFramebufferSRGB.java
similarity index 92%
rename from src/main/java/org/lwjgl/opengl/ARBFramebufferSRGB.java
rename to src/main/java/org/lwjglx/opengl/ARBFramebufferSRGB.java
index 5d9b3edeb..2d132ccf4 100644
--- a/src/main/java/org/lwjgl/opengl/ARBFramebufferSRGB.java
+++ b/src/main/java/org/lwjglx/opengl/ARBFramebufferSRGB.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBFramebufferSRGB {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBGeometryShader4.java b/src/main/java/org/lwjglx/opengl/ARBGeometryShader4.java
similarity index 81%
rename from src/main/java/org/lwjgl/opengl/ARBGeometryShader4.java
rename to src/main/java/org/lwjglx/opengl/ARBGeometryShader4.java
index e98e26dfc..eb3dba933 100644
--- a/src/main/java/org/lwjgl/opengl/ARBGeometryShader4.java
+++ b/src/main/java/org/lwjglx/opengl/ARBGeometryShader4.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBGeometryShader4 {
 
@@ -24,18 +24,18 @@ public class ARBGeometryShader4 {
     public static final int GL_TRIANGLE_STRIP_ADJACENCY_ARB = (int) 13;
 
     public static void glFramebufferTextureARB(int target, int attachment, int texture, int level) {
-        org.lwjgl3.opengl.ARBGeometryShader4.glFramebufferTextureARB(target, attachment, texture, level);
+        org.lwjgl.opengl.ARBGeometryShader4.glFramebufferTextureARB(target, attachment, texture, level);
     }
 
     public static void glFramebufferTextureFaceARB(int target, int attachment, int texture, int level, int face) {
-        org.lwjgl3.opengl.ARBGeometryShader4.glFramebufferTextureFaceARB(target, attachment, texture, level, face);
+        org.lwjgl.opengl.ARBGeometryShader4.glFramebufferTextureFaceARB(target, attachment, texture, level, face);
     }
 
     public static void glFramebufferTextureLayerARB(int target, int attachment, int texture, int level, int layer) {
-        org.lwjgl3.opengl.ARBGeometryShader4.glFramebufferTextureLayerARB(target, attachment, texture, level, layer);
+        org.lwjgl.opengl.ARBGeometryShader4.glFramebufferTextureLayerARB(target, attachment, texture, level, layer);
     }
 
     public static void glProgramParameteriARB(int program, int pname, int value) {
-        org.lwjgl3.opengl.ARBGeometryShader4.glProgramParameteriARB(program, pname, value);
+        org.lwjgl.opengl.ARBGeometryShader4.glProgramParameteriARB(program, pname, value);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBGetProgramBinary.java b/src/main/java/org/lwjglx/opengl/ARBGetProgramBinary.java
similarity index 68%
rename from src/main/java/org/lwjgl/opengl/ARBGetProgramBinary.java
rename to src/main/java/org/lwjglx/opengl/ARBGetProgramBinary.java
index 0b48498fa..6ddd26a9a 100644
--- a/src/main/java/org/lwjgl/opengl/ARBGetProgramBinary.java
+++ b/src/main/java/org/lwjglx/opengl/ARBGetProgramBinary.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBGetProgramBinary {
 
@@ -9,14 +9,14 @@ public class ARBGetProgramBinary {
 
     public static void glGetProgramBinary(int program, java.nio.IntBuffer length, java.nio.IntBuffer binaryFormat,
             java.nio.ByteBuffer binary) {
-        org.lwjgl3.opengl.ARBGetProgramBinary.glGetProgramBinary(program, length, binaryFormat, binary);
+        org.lwjgl.opengl.ARBGetProgramBinary.glGetProgramBinary(program, length, binaryFormat, binary);
     }
 
     public static void glProgramBinary(int program, int binaryFormat, java.nio.ByteBuffer binary) {
-        org.lwjgl3.opengl.ARBGetProgramBinary.glProgramBinary(program, binaryFormat, binary);
+        org.lwjgl.opengl.ARBGetProgramBinary.glProgramBinary(program, binaryFormat, binary);
     }
 
     public static void glProgramParameteri(int program, int pname, int value) {
-        org.lwjgl3.opengl.ARBGetProgramBinary.glProgramParameteri(program, pname, value);
+        org.lwjgl.opengl.ARBGetProgramBinary.glProgramParameteri(program, pname, value);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBGetTextureSubImage.java b/src/main/java/org/lwjglx/opengl/ARBGetTextureSubImage.java
similarity index 85%
rename from src/main/java/org/lwjgl/opengl/ARBGetTextureSubImage.java
rename to src/main/java/org/lwjglx/opengl/ARBGetTextureSubImage.java
index 98d0d6f26..c52b16a2b 100644
--- a/src/main/java/org/lwjgl/opengl/ARBGetTextureSubImage.java
+++ b/src/main/java/org/lwjglx/opengl/ARBGetTextureSubImage.java
@@ -1,10 +1,10 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBGetTextureSubImage {
 
     public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, int pixels_bufSize, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.ARBGetTextureSubImage.glGetCompressedTextureSubImage(
+        org.lwjgl.opengl.ARBGetTextureSubImage.glGetCompressedTextureSubImage(
                 texture,
                 level,
                 xoffset,
@@ -19,7 +19,7 @@ public static void glGetCompressedTextureSubImage(int texture, int level, int xo
 
     public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.ARBGetTextureSubImage.glGetCompressedTextureSubImage(
+        org.lwjgl.opengl.ARBGetTextureSubImage.glGetCompressedTextureSubImage(
                 texture,
                 level,
                 xoffset,
@@ -33,7 +33,7 @@ public static void glGetCompressedTextureSubImage(int texture, int level, int xo
 
     public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.ARBGetTextureSubImage.glGetCompressedTextureSubImage(
+        org.lwjgl.opengl.ARBGetTextureSubImage.glGetCompressedTextureSubImage(
                 texture,
                 level,
                 xoffset,
@@ -47,7 +47,7 @@ public static void glGetCompressedTextureSubImage(int texture, int level, int xo
 
     public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.ARBGetTextureSubImage.glGetCompressedTextureSubImage(
+        org.lwjgl.opengl.ARBGetTextureSubImage.glGetCompressedTextureSubImage(
                 texture,
                 level,
                 xoffset,
@@ -61,7 +61,7 @@ public static void glGetCompressedTextureSubImage(int texture, int level, int xo
 
     public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.ARBGetTextureSubImage.glGetCompressedTextureSubImage(
+        org.lwjgl.opengl.ARBGetTextureSubImage.glGetCompressedTextureSubImage(
                 texture,
                 level,
                 xoffset,
@@ -75,7 +75,7 @@ public static void glGetCompressedTextureSubImage(int texture, int level, int xo
 
     public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.ARBGetTextureSubImage.glGetCompressedTextureSubImage(
+        org.lwjgl.opengl.ARBGetTextureSubImage.glGetCompressedTextureSubImage(
                 texture,
                 level,
                 xoffset,
@@ -89,7 +89,7 @@ public static void glGetCompressedTextureSubImage(int texture, int level, int xo
 
     public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, int pixels_bufSize, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.ARBGetTextureSubImage.glGetTextureSubImage(
+        org.lwjgl.opengl.ARBGetTextureSubImage.glGetTextureSubImage(
                 texture,
                 level,
                 xoffset,
@@ -106,7 +106,7 @@ public static void glGetTextureSubImage(int texture, int level, int xoffset, int
 
     public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.ARBGetTextureSubImage.glGetTextureSubImage(
+        org.lwjgl.opengl.ARBGetTextureSubImage.glGetTextureSubImage(
                 texture,
                 level,
                 xoffset,
@@ -122,7 +122,7 @@ public static void glGetTextureSubImage(int texture, int level, int xoffset, int
 
     public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.ARBGetTextureSubImage.glGetTextureSubImage(
+        org.lwjgl.opengl.ARBGetTextureSubImage.glGetTextureSubImage(
                 texture,
                 level,
                 xoffset,
@@ -138,7 +138,7 @@ public static void glGetTextureSubImage(int texture, int level, int xoffset, int
 
     public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.ARBGetTextureSubImage.glGetTextureSubImage(
+        org.lwjgl.opengl.ARBGetTextureSubImage.glGetTextureSubImage(
                 texture,
                 level,
                 xoffset,
@@ -154,7 +154,7 @@ public static void glGetTextureSubImage(int texture, int level, int xoffset, int
 
     public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.ARBGetTextureSubImage.glGetTextureSubImage(
+        org.lwjgl.opengl.ARBGetTextureSubImage.glGetTextureSubImage(
                 texture,
                 level,
                 xoffset,
@@ -170,7 +170,7 @@ public static void glGetTextureSubImage(int texture, int level, int xoffset, int
 
     public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.ARBGetTextureSubImage.glGetTextureSubImage(
+        org.lwjgl.opengl.ARBGetTextureSubImage.glGetTextureSubImage(
                 texture,
                 level,
                 xoffset,
diff --git a/src/main/java/org/lwjgl/opengl/ARBHalfFloatPixel.java b/src/main/java/org/lwjglx/opengl/ARBHalfFloatPixel.java
similarity index 78%
rename from src/main/java/org/lwjgl/opengl/ARBHalfFloatPixel.java
rename to src/main/java/org/lwjglx/opengl/ARBHalfFloatPixel.java
index f0d45fb89..bd59c12e1 100644
--- a/src/main/java/org/lwjgl/opengl/ARBHalfFloatPixel.java
+++ b/src/main/java/org/lwjglx/opengl/ARBHalfFloatPixel.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBHalfFloatPixel {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBHalfFloatVertex.java b/src/main/java/org/lwjglx/opengl/ARBHalfFloatVertex.java
similarity index 77%
rename from src/main/java/org/lwjgl/opengl/ARBHalfFloatVertex.java
rename to src/main/java/org/lwjglx/opengl/ARBHalfFloatVertex.java
index fa0abe97b..16b1e7fe1 100644
--- a/src/main/java/org/lwjgl/opengl/ARBHalfFloatVertex.java
+++ b/src/main/java/org/lwjglx/opengl/ARBHalfFloatVertex.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBHalfFloatVertex {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBImaging.java b/src/main/java/org/lwjglx/opengl/ARBImaging.java
similarity index 69%
rename from src/main/java/org/lwjgl/opengl/ARBImaging.java
rename to src/main/java/org/lwjglx/opengl/ARBImaging.java
index 704bf9518..abd56d1ef 100644
--- a/src/main/java/org/lwjgl/opengl/ARBImaging.java
+++ b/src/main/java/org/lwjglx/opengl/ARBImaging.java
@@ -1,6 +1,7 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
-import org.lwjgl.lwjgl3ify.BufferCasts;
+import org.lwjglx.MemoryUtil;
+import org.lwjglx.lwjgl3ify.BufferCasts;
 
 public class ARBImaging {
 
@@ -78,347 +79,347 @@ public class ARBImaging {
     public static final int GL_TABLE_TOO_LARGE = (int) 32817;
 
     public static void glBlendColor(float red, float green, float blue, float alpha) {
-        org.lwjgl3.opengl.ARBImaging.glBlendColor(red, green, blue, alpha);
+        org.lwjgl.opengl.ARBImaging.glBlendColor(red, green, blue, alpha);
     }
 
     public static void glBlendEquation(int mode) {
-        org.lwjgl3.opengl.ARBImaging.glBlendEquation(mode);
+        org.lwjgl.opengl.ARBImaging.glBlendEquation(mode);
     }
 
     public static void glColorSubTable(int target, int start, int count, int format, int type,
             long data_buffer_offset) {
-        org.lwjgl3.opengl.ARBImaging.glColorSubTable(target, start, count, format, type, data_buffer_offset);
+        org.lwjgl.opengl.ARBImaging.glColorSubTable(target, start, count, format, type, data_buffer_offset);
     }
 
     public static void glColorSubTable(int target, int start, int count, int format, int type,
             java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.ARBImaging.glColorSubTable(target, start, count, format, type, data);
+        org.lwjgl.opengl.ARBImaging.glColorSubTable(target, start, count, format, type, data);
     }
 
     public static void glColorSubTable(int target, int start, int count, int format, int type,
             java.nio.DoubleBuffer data) {
 
-        org.lwjgl3.opengl.ARBImaging
-                .glColorSubTable(target, start, count, format, type, org.lwjgl.MemoryUtil.getAddress(data));
+        org.lwjgl.opengl.ARBImaging
+                .glColorSubTable(target, start, count, format, type, MemoryUtil.getAddress(data));
     }
 
     public static void glColorSubTable(int target, int start, int count, int format, int type,
             java.nio.FloatBuffer data) {
 
-        org.lwjgl3.opengl.ARBImaging
-                .glColorSubTable(target, start, count, format, type, org.lwjgl.MemoryUtil.getAddress(data));
+        org.lwjgl.opengl.ARBImaging
+                .glColorSubTable(target, start, count, format, type, MemoryUtil.getAddress(data));
     }
 
     public static void glColorTable(int target, int internalFormat, int width, int format, int type,
             long data_buffer_offset) {
-        org.lwjgl3.opengl.ARBImaging.glColorTable(target, internalFormat, width, format, type, data_buffer_offset);
+        org.lwjgl.opengl.ARBImaging.glColorTable(target, internalFormat, width, format, type, data_buffer_offset);
     }
 
     public static void glColorTable(int target, int internalFormat, int width, int format, int type,
             java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.ARBImaging.glColorTable(target, internalFormat, width, format, type, data);
+        org.lwjgl.opengl.ARBImaging.glColorTable(target, internalFormat, width, format, type, data);
     }
 
     public static void glColorTable(int target, int internalFormat, int width, int format, int type,
             java.nio.DoubleBuffer data) {
 
-        org.lwjgl3.opengl.ARBImaging
-                .glColorTable(target, internalFormat, width, format, type, org.lwjgl.MemoryUtil.getAddress(data));
+        org.lwjgl.opengl.ARBImaging
+                .glColorTable(target, internalFormat, width, format, type, MemoryUtil.getAddress(data));
     }
 
     public static void glColorTable(int target, int internalFormat, int width, int format, int type,
             java.nio.FloatBuffer data) {
-        org.lwjgl3.opengl.ARBImaging.glColorTable(target, internalFormat, width, format, type, data);
+        org.lwjgl.opengl.ARBImaging.glColorTable(target, internalFormat, width, format, type, data);
     }
 
     public static void glColorTableParameter(int target, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.ARBImaging.glColorTableParameterfv(target, pname, params);
+        org.lwjgl.opengl.ARBImaging.glColorTableParameterfv(target, pname, params);
     }
 
     public static void glColorTableParameter(int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.ARBImaging.glColorTableParameteriv(target, pname, params);
+        org.lwjgl.opengl.ARBImaging.glColorTableParameteriv(target, pname, params);
     }
 
     public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type,
             long image_buffer_offset) {
-        org.lwjgl3.opengl.ARBImaging
+        org.lwjgl.opengl.ARBImaging
                 .glConvolutionFilter1D(target, internalformat, width, format, type, image_buffer_offset);
     }
 
     public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type,
             java.nio.ByteBuffer image) {
-        org.lwjgl3.opengl.ARBImaging.glConvolutionFilter1D(target, internalformat, width, format, type, image);
+        org.lwjgl.opengl.ARBImaging.glConvolutionFilter1D(target, internalformat, width, format, type, image);
     }
 
     public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type,
             java.nio.DoubleBuffer image) {
 
-        org.lwjgl3.opengl.ARBImaging.glConvolutionFilter1D(
+        org.lwjgl.opengl.ARBImaging.glConvolutionFilter1D(
                 target,
                 internalformat,
                 width,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(image));
+                MemoryUtil.getAddress(image));
     }
 
     public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type,
             java.nio.FloatBuffer image) {
 
-        org.lwjgl3.opengl.ARBImaging.glConvolutionFilter1D(
+        org.lwjgl.opengl.ARBImaging.glConvolutionFilter1D(
                 target,
                 internalformat,
                 width,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(image));
+                MemoryUtil.getAddress(image));
     }
 
     public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type,
             java.nio.IntBuffer image) {
 
-        org.lwjgl3.opengl.ARBImaging.glConvolutionFilter1D(
+        org.lwjgl.opengl.ARBImaging.glConvolutionFilter1D(
                 target,
                 internalformat,
                 width,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(image));
+                MemoryUtil.getAddress(image));
     }
 
     public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type,
             java.nio.ShortBuffer image) {
 
-        org.lwjgl3.opengl.ARBImaging.glConvolutionFilter1D(
+        org.lwjgl.opengl.ARBImaging.glConvolutionFilter1D(
                 target,
                 internalformat,
                 width,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(image));
+                MemoryUtil.getAddress(image));
     }
 
     public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format,
             int type, long image_buffer_offset) {
-        org.lwjgl3.opengl.ARBImaging
+        org.lwjgl.opengl.ARBImaging
                 .glConvolutionFilter2D(target, internalformat, width, height, format, type, image_buffer_offset);
     }
 
     public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format,
             int type, java.nio.ByteBuffer image) {
-        org.lwjgl3.opengl.ARBImaging.glConvolutionFilter2D(target, internalformat, width, height, format, type, image);
+        org.lwjgl.opengl.ARBImaging.glConvolutionFilter2D(target, internalformat, width, height, format, type, image);
     }
 
     public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format,
             int type, java.nio.IntBuffer image) {
 
-        org.lwjgl3.opengl.ARBImaging.glConvolutionFilter2D(
+        org.lwjgl.opengl.ARBImaging.glConvolutionFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(image));
+                MemoryUtil.getAddress(image));
     }
 
     public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format,
             int type, java.nio.ShortBuffer image) {
 
-        org.lwjgl3.opengl.ARBImaging.glConvolutionFilter2D(
+        org.lwjgl.opengl.ARBImaging.glConvolutionFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(image));
+                MemoryUtil.getAddress(image));
     }
 
     public static void glConvolutionParameter(int target, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.ARBImaging.glConvolutionParameterfv(target, pname, params);
+        org.lwjgl.opengl.ARBImaging.glConvolutionParameterfv(target, pname, params);
     }
 
     public static void glConvolutionParameter(int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.ARBImaging.glConvolutionParameteriv(target, pname, params);
+        org.lwjgl.opengl.ARBImaging.glConvolutionParameteriv(target, pname, params);
     }
 
     public static void glConvolutionParameterf(int target, int pname, float params) {
-        org.lwjgl3.opengl.ARBImaging.glConvolutionParameterf(target, pname, params);
+        org.lwjgl.opengl.ARBImaging.glConvolutionParameterf(target, pname, params);
     }
 
     public static void glConvolutionParameteri(int target, int pname, int params) {
-        org.lwjgl3.opengl.ARBImaging.glConvolutionParameteri(target, pname, params);
+        org.lwjgl.opengl.ARBImaging.glConvolutionParameteri(target, pname, params);
     }
 
     public static void glCopyColorSubTable(int target, int start, int x, int y, int width) {
-        org.lwjgl3.opengl.ARBImaging.glCopyColorSubTable(target, start, x, y, width);
+        org.lwjgl.opengl.ARBImaging.glCopyColorSubTable(target, start, x, y, width);
     }
 
     public static void glCopyColorTable(int target, int internalformat, int x, int y, int width) {
-        org.lwjgl3.opengl.ARBImaging.glCopyColorTable(target, internalformat, x, y, width);
+        org.lwjgl.opengl.ARBImaging.glCopyColorTable(target, internalformat, x, y, width);
     }
 
     public static void glCopyConvolutionFilter1D(int target, int internalformat, int x, int y, int width) {
-        org.lwjgl3.opengl.ARBImaging.glCopyConvolutionFilter1D(target, internalformat, x, y, width);
+        org.lwjgl.opengl.ARBImaging.glCopyConvolutionFilter1D(target, internalformat, x, y, width);
     }
 
     public static void glCopyConvolutionFilter2D(int target, int internalformat, int x, int y, int width, int height) {
-        org.lwjgl3.opengl.ARBImaging.glCopyConvolutionFilter2D(target, internalformat, x, y, width, height);
+        org.lwjgl.opengl.ARBImaging.glCopyConvolutionFilter2D(target, internalformat, x, y, width, height);
     }
 
     public static void glGetColorTable(int target, int format, int type, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.ARBImaging.glGetColorTable(target, format, type, data);
+        org.lwjgl.opengl.ARBImaging.glGetColorTable(target, format, type, data);
     }
 
     public static void glGetColorTable(int target, int format, int type, java.nio.DoubleBuffer data) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetColorTable(target, format, type, org.lwjgl.MemoryUtil.getAddress(data));
+        org.lwjgl.opengl.ARBImaging.glGetColorTable(target, format, type, MemoryUtil.getAddress(data));
     }
 
     public static void glGetColorTable(int target, int format, int type, java.nio.FloatBuffer data) {
-        org.lwjgl3.opengl.ARBImaging.glGetColorTable(target, format, type, data);
+        org.lwjgl.opengl.ARBImaging.glGetColorTable(target, format, type, data);
     }
 
     public static void glGetColorTableParameter(int target, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.ARBImaging.glGetColorTableParameterfv(target, pname, params);
+        org.lwjgl.opengl.ARBImaging.glGetColorTableParameterfv(target, pname, params);
     }
 
     public static void glGetColorTableParameter(int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.ARBImaging.glGetColorTableParameteriv(target, pname, params);
+        org.lwjgl.opengl.ARBImaging.glGetColorTableParameteriv(target, pname, params);
     }
 
     public static void glGetConvolutionFilter(int target, int format, int type, long image_buffer_offset) {
-        org.lwjgl3.opengl.ARBImaging.glGetConvolutionFilter(target, format, type, image_buffer_offset);
+        org.lwjgl.opengl.ARBImaging.glGetConvolutionFilter(target, format, type, image_buffer_offset);
     }
 
     public static void glGetConvolutionFilter(int target, int format, int type, java.nio.ByteBuffer image) {
-        org.lwjgl3.opengl.ARBImaging.glGetConvolutionFilter(target, format, type, image);
+        org.lwjgl.opengl.ARBImaging.glGetConvolutionFilter(target, format, type, image);
     }
 
     public static void glGetConvolutionFilter(int target, int format, int type, java.nio.DoubleBuffer image) {
 
-        org.lwjgl3.opengl.ARBImaging
-                .glGetConvolutionFilter(target, format, type, org.lwjgl.MemoryUtil.getAddress(image));
+        org.lwjgl.opengl.ARBImaging
+                .glGetConvolutionFilter(target, format, type, MemoryUtil.getAddress(image));
     }
 
     public static void glGetConvolutionFilter(int target, int format, int type, java.nio.FloatBuffer image) {
 
-        org.lwjgl3.opengl.ARBImaging
-                .glGetConvolutionFilter(target, format, type, org.lwjgl.MemoryUtil.getAddress(image));
+        org.lwjgl.opengl.ARBImaging
+                .glGetConvolutionFilter(target, format, type, MemoryUtil.getAddress(image));
     }
 
     public static void glGetConvolutionFilter(int target, int format, int type, java.nio.IntBuffer image) {
 
-        org.lwjgl3.opengl.ARBImaging
-                .glGetConvolutionFilter(target, format, type, org.lwjgl.MemoryUtil.getAddress(image));
+        org.lwjgl.opengl.ARBImaging
+                .glGetConvolutionFilter(target, format, type, MemoryUtil.getAddress(image));
     }
 
     public static void glGetConvolutionFilter(int target, int format, int type, java.nio.ShortBuffer image) {
 
-        org.lwjgl3.opengl.ARBImaging
-                .glGetConvolutionFilter(target, format, type, org.lwjgl.MemoryUtil.getAddress(image));
+        org.lwjgl.opengl.ARBImaging
+                .glGetConvolutionFilter(target, format, type, MemoryUtil.getAddress(image));
     }
 
     public static void glGetConvolutionParameter(int target, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.ARBImaging.glGetConvolutionParameterfv(target, pname, params);
+        org.lwjgl.opengl.ARBImaging.glGetConvolutionParameterfv(target, pname, params);
     }
 
     public static void glGetConvolutionParameter(int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.ARBImaging.glGetConvolutionParameteriv(target, pname, params);
+        org.lwjgl.opengl.ARBImaging.glGetConvolutionParameteriv(target, pname, params);
     }
 
     public static void glGetHistogram(int target, boolean reset, int format, int type, long values_buffer_offset) {
-        org.lwjgl3.opengl.ARBImaging.glGetHistogram(target, reset, format, type, values_buffer_offset);
+        org.lwjgl.opengl.ARBImaging.glGetHistogram(target, reset, format, type, values_buffer_offset);
     }
 
     public static void glGetHistogram(int target, boolean reset, int format, int type, java.nio.ByteBuffer values) {
-        org.lwjgl3.opengl.ARBImaging.glGetHistogram(target, reset, format, type, values);
+        org.lwjgl.opengl.ARBImaging.glGetHistogram(target, reset, format, type, values);
     }
 
     public static void glGetHistogram(int target, boolean reset, int format, int type, java.nio.DoubleBuffer values) {
 
-        org.lwjgl3.opengl.ARBImaging
-                .glGetHistogram(target, reset, format, type, org.lwjgl.MemoryUtil.getAddress(values));
+        org.lwjgl.opengl.ARBImaging
+                .glGetHistogram(target, reset, format, type, MemoryUtil.getAddress(values));
     }
 
     public static void glGetHistogram(int target, boolean reset, int format, int type, java.nio.FloatBuffer values) {
 
-        org.lwjgl3.opengl.ARBImaging
-                .glGetHistogram(target, reset, format, type, org.lwjgl.MemoryUtil.getAddress(values));
+        org.lwjgl.opengl.ARBImaging
+                .glGetHistogram(target, reset, format, type, MemoryUtil.getAddress(values));
     }
 
     public static void glGetHistogram(int target, boolean reset, int format, int type, java.nio.IntBuffer values) {
 
-        org.lwjgl3.opengl.ARBImaging
-                .glGetHistogram(target, reset, format, type, org.lwjgl.MemoryUtil.getAddress(values));
+        org.lwjgl.opengl.ARBImaging
+                .glGetHistogram(target, reset, format, type, MemoryUtil.getAddress(values));
     }
 
     public static void glGetHistogram(int target, boolean reset, int format, int type, java.nio.ShortBuffer values) {
 
-        org.lwjgl3.opengl.ARBImaging
-                .glGetHistogram(target, reset, format, type, org.lwjgl.MemoryUtil.getAddress(values));
+        org.lwjgl.opengl.ARBImaging
+                .glGetHistogram(target, reset, format, type, MemoryUtil.getAddress(values));
     }
 
     public static void glGetHistogramParameter(int target, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.ARBImaging.glGetHistogramParameterfv(target, pname, params);
+        org.lwjgl.opengl.ARBImaging.glGetHistogramParameterfv(target, pname, params);
     }
 
     public static void glGetHistogramParameter(int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.ARBImaging.glGetHistogramParameteriv(target, pname, params);
+        org.lwjgl.opengl.ARBImaging.glGetHistogramParameteriv(target, pname, params);
     }
 
     public static void glGetMinmax(int target, boolean reset, int format, int types, long values_buffer_offset) {
-        org.lwjgl3.opengl.ARBImaging.glGetMinmax(target, reset, format, types, values_buffer_offset);
+        org.lwjgl.opengl.ARBImaging.glGetMinmax(target, reset, format, types, values_buffer_offset);
     }
 
     public static void glGetMinmax(int target, boolean reset, int format, int types, java.nio.ByteBuffer values) {
-        org.lwjgl3.opengl.ARBImaging.glGetMinmax(target, reset, format, types, values);
+        org.lwjgl.opengl.ARBImaging.glGetMinmax(target, reset, format, types, values);
     }
 
     public static void glGetMinmax(int target, boolean reset, int format, int types, java.nio.DoubleBuffer values) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetMinmax(target, reset, format, types, org.lwjgl.MemoryUtil.getAddress(values));
+        org.lwjgl.opengl.ARBImaging.glGetMinmax(target, reset, format, types, MemoryUtil.getAddress(values));
     }
 
     public static void glGetMinmax(int target, boolean reset, int format, int types, java.nio.FloatBuffer values) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetMinmax(target, reset, format, types, org.lwjgl.MemoryUtil.getAddress(values));
+        org.lwjgl.opengl.ARBImaging.glGetMinmax(target, reset, format, types, MemoryUtil.getAddress(values));
     }
 
     public static void glGetMinmax(int target, boolean reset, int format, int types, java.nio.IntBuffer values) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetMinmax(target, reset, format, types, org.lwjgl.MemoryUtil.getAddress(values));
+        org.lwjgl.opengl.ARBImaging.glGetMinmax(target, reset, format, types, MemoryUtil.getAddress(values));
     }
 
     public static void glGetMinmax(int target, boolean reset, int format, int types, java.nio.ShortBuffer values) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetMinmax(target, reset, format, types, org.lwjgl.MemoryUtil.getAddress(values));
+        org.lwjgl.opengl.ARBImaging.glGetMinmax(target, reset, format, types, MemoryUtil.getAddress(values));
     }
 
     public static void glGetMinmaxParameter(int target, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.ARBImaging.glGetMinmaxParameterfv(target, pname, params);
+        org.lwjgl.opengl.ARBImaging.glGetMinmaxParameterfv(target, pname, params);
     }
 
     public static void glGetMinmaxParameter(int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.ARBImaging.glGetMinmaxParameteriv(target, pname, params);
+        org.lwjgl.opengl.ARBImaging.glGetMinmaxParameteriv(target, pname, params);
     }
 
     public static void glGetSeparableFilter(int target, int format, int type, java.nio.ByteBuffer row,
             java.nio.ByteBuffer column, java.nio.ByteBuffer span) {
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(target, format, type, row, column, span);
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(target, format, type, row, column, span);
     }
 
     public static void glGetSeparableFilter(int target, int format, int type, java.nio.ByteBuffer row,
             java.nio.ByteBuffer column, java.nio.DoubleBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -427,12 +428,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ByteBuffer column, java.nio.IntBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -441,12 +442,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ByteBuffer column, java.nio.ShortBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -454,12 +455,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
     public static void glGetSeparableFilter(int target, int format, int type, java.nio.ByteBuffer row,
             java.nio.DoubleBuffer column, java.nio.ByteBuffer span) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 span);
     }
 
@@ -467,12 +468,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.DoubleBuffer column, java.nio.DoubleBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -481,12 +482,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.DoubleBuffer column, java.nio.IntBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -495,12 +496,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.DoubleBuffer column, java.nio.ShortBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -508,12 +509,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
     public static void glGetSeparableFilter(int target, int format, int type, java.nio.ByteBuffer row,
             java.nio.IntBuffer column, java.nio.ByteBuffer span) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 span);
     }
 
@@ -521,12 +522,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.IntBuffer column, java.nio.DoubleBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -535,12 +536,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.IntBuffer column, java.nio.IntBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -549,12 +550,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.IntBuffer column, java.nio.ShortBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -562,12 +563,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
     public static void glGetSeparableFilter(int target, int format, int type, java.nio.ByteBuffer row,
             java.nio.ShortBuffer column, java.nio.ByteBuffer span) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 span);
     }
 
@@ -575,12 +576,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ShortBuffer column, java.nio.DoubleBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -589,12 +590,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ShortBuffer column, java.nio.IntBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -603,12 +604,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ShortBuffer column, java.nio.ShortBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -616,12 +617,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
     public static void glGetSeparableFilter(int target, int format, int type, java.nio.DoubleBuffer row,
             java.nio.ByteBuffer column, java.nio.ByteBuffer span) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 span);
     }
 
@@ -629,12 +630,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ByteBuffer column, java.nio.DoubleBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -643,12 +644,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ByteBuffer column, java.nio.IntBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -657,12 +658,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ByteBuffer column, java.nio.ShortBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -670,12 +671,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
     public static void glGetSeparableFilter(int target, int format, int type, java.nio.DoubleBuffer row,
             java.nio.DoubleBuffer column, java.nio.ByteBuffer span) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 span);
     }
 
@@ -683,12 +684,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.DoubleBuffer column, java.nio.DoubleBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -697,12 +698,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.DoubleBuffer column, java.nio.IntBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -711,12 +712,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.DoubleBuffer column, java.nio.ShortBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -724,12 +725,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
     public static void glGetSeparableFilter(int target, int format, int type, java.nio.DoubleBuffer row,
             java.nio.IntBuffer column, java.nio.ByteBuffer span) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 span);
     }
 
@@ -737,12 +738,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.IntBuffer column, java.nio.DoubleBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -751,12 +752,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.IntBuffer column, java.nio.IntBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -765,12 +766,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.IntBuffer column, java.nio.ShortBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -778,12 +779,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
     public static void glGetSeparableFilter(int target, int format, int type, java.nio.DoubleBuffer row,
             java.nio.ShortBuffer column, java.nio.ByteBuffer span) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 span);
     }
 
@@ -791,12 +792,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ShortBuffer column, java.nio.DoubleBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -805,12 +806,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ShortBuffer column, java.nio.IntBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -819,12 +820,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ShortBuffer column, java.nio.ShortBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -832,12 +833,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
     public static void glGetSeparableFilter(int target, int format, int type, java.nio.FloatBuffer row,
             java.nio.ByteBuffer column, java.nio.ByteBuffer span) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 span);
     }
 
@@ -845,12 +846,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ByteBuffer column, java.nio.DoubleBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -859,12 +860,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ByteBuffer column, java.nio.IntBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -873,12 +874,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ByteBuffer column, java.nio.ShortBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -886,12 +887,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
     public static void glGetSeparableFilter(int target, int format, int type, java.nio.FloatBuffer row,
             java.nio.DoubleBuffer column, java.nio.ByteBuffer span) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 span);
     }
 
@@ -899,12 +900,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.DoubleBuffer column, java.nio.DoubleBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -913,12 +914,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.DoubleBuffer column, java.nio.IntBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -927,12 +928,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.DoubleBuffer column, java.nio.ShortBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -940,12 +941,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
     public static void glGetSeparableFilter(int target, int format, int type, java.nio.FloatBuffer row,
             java.nio.IntBuffer column, java.nio.ByteBuffer span) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 span);
     }
 
@@ -953,12 +954,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.IntBuffer column, java.nio.DoubleBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -967,12 +968,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.IntBuffer column, java.nio.IntBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -981,12 +982,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.IntBuffer column, java.nio.ShortBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -994,12 +995,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
     public static void glGetSeparableFilter(int target, int format, int type, java.nio.FloatBuffer row,
             java.nio.ShortBuffer column, java.nio.ByteBuffer span) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 span);
     }
 
@@ -1007,12 +1008,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ShortBuffer column, java.nio.DoubleBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1021,12 +1022,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ShortBuffer column, java.nio.IntBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1035,12 +1036,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ShortBuffer column, java.nio.ShortBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1048,12 +1049,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
     public static void glGetSeparableFilter(int target, int format, int type, java.nio.IntBuffer row,
             java.nio.ByteBuffer column, java.nio.ByteBuffer span) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 span);
     }
 
@@ -1061,12 +1062,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ByteBuffer column, java.nio.DoubleBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1075,12 +1076,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ByteBuffer column, java.nio.IntBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1089,12 +1090,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ByteBuffer column, java.nio.ShortBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1102,12 +1103,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
     public static void glGetSeparableFilter(int target, int format, int type, java.nio.IntBuffer row,
             java.nio.DoubleBuffer column, java.nio.ByteBuffer span) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 span);
     }
 
@@ -1115,12 +1116,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.DoubleBuffer column, java.nio.DoubleBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1129,12 +1130,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.DoubleBuffer column, java.nio.IntBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1143,12 +1144,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.DoubleBuffer column, java.nio.ShortBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1156,12 +1157,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
     public static void glGetSeparableFilter(int target, int format, int type, java.nio.IntBuffer row,
             java.nio.IntBuffer column, java.nio.ByteBuffer span) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 span);
     }
 
@@ -1169,12 +1170,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.IntBuffer column, java.nio.DoubleBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1183,12 +1184,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.IntBuffer column, java.nio.IntBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1197,12 +1198,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.IntBuffer column, java.nio.ShortBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1210,12 +1211,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
     public static void glGetSeparableFilter(int target, int format, int type, java.nio.IntBuffer row,
             java.nio.ShortBuffer column, java.nio.ByteBuffer span) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 span);
     }
 
@@ -1223,12 +1224,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ShortBuffer column, java.nio.DoubleBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1237,12 +1238,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ShortBuffer column, java.nio.IntBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1251,12 +1252,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ShortBuffer column, java.nio.ShortBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1264,12 +1265,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
     public static void glGetSeparableFilter(int target, int format, int type, java.nio.ShortBuffer row,
             java.nio.ByteBuffer column, java.nio.ByteBuffer span) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 span);
     }
 
@@ -1277,12 +1278,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ByteBuffer column, java.nio.DoubleBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1291,12 +1292,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ByteBuffer column, java.nio.IntBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1305,12 +1306,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ByteBuffer column, java.nio.ShortBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1318,12 +1319,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
     public static void glGetSeparableFilter(int target, int format, int type, java.nio.ShortBuffer row,
             java.nio.DoubleBuffer column, java.nio.ByteBuffer span) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 span);
     }
 
@@ -1331,12 +1332,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.DoubleBuffer column, java.nio.DoubleBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1345,12 +1346,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.DoubleBuffer column, java.nio.IntBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1359,12 +1360,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.DoubleBuffer column, java.nio.ShortBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1372,12 +1373,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
     public static void glGetSeparableFilter(int target, int format, int type, java.nio.ShortBuffer row,
             java.nio.IntBuffer column, java.nio.ByteBuffer span) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 span);
     }
 
@@ -1385,12 +1386,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.IntBuffer column, java.nio.DoubleBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1399,12 +1400,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.IntBuffer column, java.nio.IntBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1413,12 +1414,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.IntBuffer column, java.nio.ShortBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1426,12 +1427,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
     public static void glGetSeparableFilter(int target, int format, int type, java.nio.ShortBuffer row,
             java.nio.ShortBuffer column, java.nio.ByteBuffer span) {
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 span);
     }
 
@@ -1439,12 +1440,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ShortBuffer column, java.nio.DoubleBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1453,12 +1454,12 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ShortBuffer column, java.nio.IntBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
@@ -1467,35 +1468,35 @@ public static void glGetSeparableFilter(int target, int format, int type, java.n
             java.nio.ShortBuffer column, java.nio.ShortBuffer span) {
         final java.nio.ByteBuffer wrappedArg5 = BufferCasts.toByteBuffer(span);
 
-        org.lwjgl3.opengl.ARBImaging.glGetSeparableFilter(
+        org.lwjgl.opengl.ARBImaging.glGetSeparableFilter(
                 target,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column),
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column),
                 wrappedArg5);
         BufferCasts.updateBuffer(span, wrappedArg5);
     }
 
     public static void glHistogram(int target, int width, int internalformat, boolean sink) {
-        org.lwjgl3.opengl.ARBImaging.glHistogram(target, width, internalformat, sink);
+        org.lwjgl.opengl.ARBImaging.glHistogram(target, width, internalformat, sink);
     }
 
     public static void glMinmax(int target, int internalformat, boolean sink) {
-        org.lwjgl3.opengl.ARBImaging.glMinmax(target, internalformat, sink);
+        org.lwjgl.opengl.ARBImaging.glMinmax(target, internalformat, sink);
     }
 
     public static void glResetHistogram(int target) {
-        org.lwjgl3.opengl.ARBImaging.glResetHistogram(target);
+        org.lwjgl.opengl.ARBImaging.glResetHistogram(target);
     }
 
     public static void glResetMinmax(int target) {
-        org.lwjgl3.opengl.ARBImaging.glResetMinmax(target);
+        org.lwjgl.opengl.ARBImaging.glResetMinmax(target);
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             long row_buffer_offset, long column_buffer_offset) {
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
@@ -1508,343 +1509,343 @@ public static void glSeparableFilter2D(int target, int internalformat, int width
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.ByteBuffer row, java.nio.ByteBuffer column) {
-        org.lwjgl3.opengl.ARBImaging
+        org.lwjgl.opengl.ARBImaging
                 .glSeparableFilter2D(target, internalformat, width, height, format, type, row, column);
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.ByteBuffer row, java.nio.DoubleBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.ByteBuffer row, java.nio.FloatBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.ByteBuffer row, java.nio.IntBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.ByteBuffer row, java.nio.ShortBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.DoubleBuffer row, java.nio.ByteBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.DoubleBuffer row, java.nio.DoubleBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.DoubleBuffer row, java.nio.FloatBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.DoubleBuffer row, java.nio.IntBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.DoubleBuffer row, java.nio.ShortBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.FloatBuffer row, java.nio.ByteBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.FloatBuffer row, java.nio.DoubleBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.FloatBuffer row, java.nio.FloatBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.FloatBuffer row, java.nio.IntBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.FloatBuffer row, java.nio.ShortBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.IntBuffer row, java.nio.ByteBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.IntBuffer row, java.nio.DoubleBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.IntBuffer row, java.nio.FloatBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.IntBuffer row, java.nio.IntBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.IntBuffer row, java.nio.ShortBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.ShortBuffer row, java.nio.ByteBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.ShortBuffer row, java.nio.DoubleBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.ShortBuffer row, java.nio.FloatBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.ShortBuffer row, java.nio.IntBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 
     public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type,
             java.nio.ShortBuffer row, java.nio.ShortBuffer column) {
 
-        org.lwjgl3.opengl.ARBImaging.glSeparableFilter2D(
+        org.lwjgl.opengl.ARBImaging.glSeparableFilter2D(
                 target,
                 internalformat,
                 width,
                 height,
                 format,
                 type,
-                org.lwjgl.MemoryUtil.getAddress(row),
-                org.lwjgl.MemoryUtil.getAddress(column));
+                MemoryUtil.getAddress(row),
+                MemoryUtil.getAddress(column));
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBIndirectParameters.java b/src/main/java/org/lwjglx/opengl/ARBIndirectParameters.java
similarity index 84%
rename from src/main/java/org/lwjgl/opengl/ARBIndirectParameters.java
rename to src/main/java/org/lwjglx/opengl/ARBIndirectParameters.java
index cec1cd9c0..013d76032 100644
--- a/src/main/java/org/lwjgl/opengl/ARBIndirectParameters.java
+++ b/src/main/java/org/lwjglx/opengl/ARBIndirectParameters.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBIndirectParameters {
 
@@ -7,25 +7,25 @@ public class ARBIndirectParameters {
 
     public static void glMultiDrawArraysIndirectCountARB(int mode, long indirect_buffer_offset, long drawcount,
             int maxdrawcount, int stride) {
-        org.lwjgl3.opengl.ARBIndirectParameters
+        org.lwjgl.opengl.ARBIndirectParameters
                 .glMultiDrawArraysIndirectCountARB(mode, indirect_buffer_offset, drawcount, maxdrawcount, stride);
     }
 
     public static void glMultiDrawArraysIndirectCountARB(int mode, java.nio.ByteBuffer indirect, long drawcount,
             int maxdrawcount, int stride) {
-        org.lwjgl3.opengl.ARBIndirectParameters
+        org.lwjgl.opengl.ARBIndirectParameters
                 .glMultiDrawArraysIndirectCountARB(mode, indirect, drawcount, maxdrawcount, stride);
     }
 
     public static void glMultiDrawArraysIndirectCountARB(int mode, java.nio.IntBuffer indirect, long drawcount,
             int maxdrawcount, int stride) {
-        org.lwjgl3.opengl.ARBIndirectParameters
+        org.lwjgl.opengl.ARBIndirectParameters
                 .glMultiDrawArraysIndirectCountARB(mode, indirect, drawcount, maxdrawcount, stride);
     }
 
     public static void glMultiDrawElementsIndirectCountARB(int mode, int type, long indirect_buffer_offset,
             long drawcount, int maxdrawcount, int stride) {
-        org.lwjgl3.opengl.ARBIndirectParameters.glMultiDrawElementsIndirectCountARB(
+        org.lwjgl.opengl.ARBIndirectParameters.glMultiDrawElementsIndirectCountARB(
                 mode,
                 type,
                 indirect_buffer_offset,
@@ -36,13 +36,13 @@ public static void glMultiDrawElementsIndirectCountARB(int mode, int type, long
 
     public static void glMultiDrawElementsIndirectCountARB(int mode, int type, java.nio.ByteBuffer indirect,
             long drawcount, int maxdrawcount, int stride) {
-        org.lwjgl3.opengl.ARBIndirectParameters
+        org.lwjgl.opengl.ARBIndirectParameters
                 .glMultiDrawElementsIndirectCountARB(mode, type, indirect, drawcount, maxdrawcount, stride);
     }
 
     public static void glMultiDrawElementsIndirectCountARB(int mode, int type, java.nio.IntBuffer indirect,
             long drawcount, int maxdrawcount, int stride) {
-        org.lwjgl3.opengl.ARBIndirectParameters
+        org.lwjgl.opengl.ARBIndirectParameters
                 .glMultiDrawElementsIndirectCountARB(mode, type, indirect, drawcount, maxdrawcount, stride);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBInstancedArrays.java b/src/main/java/org/lwjglx/opengl/ARBInstancedArrays.java
similarity index 63%
rename from src/main/java/org/lwjgl/opengl/ARBInstancedArrays.java
rename to src/main/java/org/lwjglx/opengl/ARBInstancedArrays.java
index 1921268f2..1857ce7d7 100644
--- a/src/main/java/org/lwjgl/opengl/ARBInstancedArrays.java
+++ b/src/main/java/org/lwjglx/opengl/ARBInstancedArrays.java
@@ -1,10 +1,10 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBInstancedArrays {
 
     public static final int GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB = (int) 35070;
 
     public static void glVertexAttribDivisorARB(int index, int divisor) {
-        org.lwjgl3.opengl.ARBInstancedArrays.glVertexAttribDivisorARB(index, divisor);
+        org.lwjgl.opengl.ARBInstancedArrays.glVertexAttribDivisorARB(index, divisor);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBInternalformatQuery.java b/src/main/java/org/lwjglx/opengl/ARBInternalformatQuery.java
similarity index 79%
rename from src/main/java/org/lwjgl/opengl/ARBInternalformatQuery.java
rename to src/main/java/org/lwjglx/opengl/ARBInternalformatQuery.java
index 54980fc2c..a51471d2d 100644
--- a/src/main/java/org/lwjgl/opengl/ARBInternalformatQuery.java
+++ b/src/main/java/org/lwjglx/opengl/ARBInternalformatQuery.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBInternalformatQuery {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBInternalformatQuery2.java b/src/main/java/org/lwjglx/opengl/ARBInternalformatQuery2.java
similarity index 98%
rename from src/main/java/org/lwjgl/opengl/ARBInternalformatQuery2.java
rename to src/main/java/org/lwjglx/opengl/ARBInternalformatQuery2.java
index 8d7955bf1..80f419544 100644
--- a/src/main/java/org/lwjgl/opengl/ARBInternalformatQuery2.java
+++ b/src/main/java/org/lwjglx/opengl/ARBInternalformatQuery2.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBInternalformatQuery2 {
 
@@ -113,6 +113,6 @@ public class ARBInternalformatQuery2 {
     public static final int GL_VIEW_COMPATIBILITY_CLASS = (int) 33462;
 
     public static long glGetInternalformati64(int target, int internalformat, int pname) {
-        return org.lwjgl3.opengl.ARBInternalformatQuery2.glGetInternalformati64(target, internalformat, pname);
+        return org.lwjgl.opengl.ARBInternalformatQuery2.glGetInternalformati64(target, internalformat, pname);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBInvalidateSubdata.java b/src/main/java/org/lwjglx/opengl/ARBInvalidateSubdata.java
similarity index 59%
rename from src/main/java/org/lwjgl/opengl/ARBInvalidateSubdata.java
rename to src/main/java/org/lwjglx/opengl/ARBInvalidateSubdata.java
index 1ca616887..a1a788e6b 100644
--- a/src/main/java/org/lwjgl/opengl/ARBInvalidateSubdata.java
+++ b/src/main/java/org/lwjglx/opengl/ARBInvalidateSubdata.java
@@ -1,31 +1,31 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBInvalidateSubdata {
 
     public static void glInvalidateBufferData(int buffer) {
-        org.lwjgl3.opengl.ARBInvalidateSubdata.glInvalidateBufferData(buffer);
+        org.lwjgl.opengl.ARBInvalidateSubdata.glInvalidateBufferData(buffer);
     }
 
     public static void glInvalidateBufferSubData(int buffer, long offset, long length) {
-        org.lwjgl3.opengl.ARBInvalidateSubdata.glInvalidateBufferSubData(buffer, offset, length);
+        org.lwjgl.opengl.ARBInvalidateSubdata.glInvalidateBufferSubData(buffer, offset, length);
     }
 
     public static void glInvalidateFramebuffer(int target, java.nio.IntBuffer attachments) {
-        org.lwjgl3.opengl.ARBInvalidateSubdata.glInvalidateFramebuffer(target, attachments);
+        org.lwjgl.opengl.ARBInvalidateSubdata.glInvalidateFramebuffer(target, attachments);
     }
 
     public static void glInvalidateSubFramebuffer(int target, java.nio.IntBuffer attachments, int x, int y, int width,
             int height) {
-        org.lwjgl3.opengl.ARBInvalidateSubdata.glInvalidateSubFramebuffer(target, attachments, x, y, width, height);
+        org.lwjgl.opengl.ARBInvalidateSubdata.glInvalidateSubFramebuffer(target, attachments, x, y, width, height);
     }
 
     public static void glInvalidateTexImage(int texture, int level) {
-        org.lwjgl3.opengl.ARBInvalidateSubdata.glInvalidateTexImage(texture, level);
+        org.lwjgl.opengl.ARBInvalidateSubdata.glInvalidateTexImage(texture, level);
     }
 
     public static void glInvalidateTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth) {
-        org.lwjgl3.opengl.ARBInvalidateSubdata
+        org.lwjgl.opengl.ARBInvalidateSubdata
                 .glInvalidateTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBMapBufferAlignment.java b/src/main/java/org/lwjglx/opengl/ARBMapBufferAlignment.java
similarity index 80%
rename from src/main/java/org/lwjgl/opengl/ARBMapBufferAlignment.java
rename to src/main/java/org/lwjglx/opengl/ARBMapBufferAlignment.java
index b321d316f..7b9597fea 100644
--- a/src/main/java/org/lwjgl/opengl/ARBMapBufferAlignment.java
+++ b/src/main/java/org/lwjglx/opengl/ARBMapBufferAlignment.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBMapBufferAlignment {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBMapBufferRange.java b/src/main/java/org/lwjglx/opengl/ARBMapBufferRange.java
similarity index 74%
rename from src/main/java/org/lwjgl/opengl/ARBMapBufferRange.java
rename to src/main/java/org/lwjglx/opengl/ARBMapBufferRange.java
index 84f3f81d6..460aa5d41 100644
--- a/src/main/java/org/lwjgl/opengl/ARBMapBufferRange.java
+++ b/src/main/java/org/lwjglx/opengl/ARBMapBufferRange.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBMapBufferRange {
 
@@ -10,11 +10,11 @@ public class ARBMapBufferRange {
     public static final int GL_MAP_WRITE_BIT = (int) 2;
 
     public static void glFlushMappedBufferRange(int target, long offset, long length) {
-        org.lwjgl3.opengl.ARBMapBufferRange.glFlushMappedBufferRange(target, offset, length);
+        org.lwjgl.opengl.ARBMapBufferRange.glFlushMappedBufferRange(target, offset, length);
     }
 
     public static java.nio.ByteBuffer glMapBufferRange(int target, long offset, long length, int access,
             java.nio.ByteBuffer old_buffer) {
-        return org.lwjgl3.opengl.ARBMapBufferRange.glMapBufferRange(target, offset, length, access, old_buffer);
+        return org.lwjgl.opengl.ARBMapBufferRange.glMapBufferRange(target, offset, length, access, old_buffer);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBMatrixPalette.java b/src/main/java/org/lwjglx/opengl/ARBMatrixPalette.java
similarity index 68%
rename from src/main/java/org/lwjgl/opengl/ARBMatrixPalette.java
rename to src/main/java/org/lwjglx/opengl/ARBMatrixPalette.java
index 685c56f76..85f0809a6 100644
--- a/src/main/java/org/lwjgl/opengl/ARBMatrixPalette.java
+++ b/src/main/java/org/lwjglx/opengl/ARBMatrixPalette.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBMatrixPalette {
 
@@ -14,34 +14,34 @@ public class ARBMatrixPalette {
     public static final int GL_MAX_PALETTE_MATRICES_ARB = (int) 34882;
 
     public static void glCurrentPaletteMatrixARB(int index) {
-        org.lwjgl3.opengl.ARBMatrixPalette.glCurrentPaletteMatrixARB(index);
+        org.lwjgl.opengl.ARBMatrixPalette.glCurrentPaletteMatrixARB(index);
     }
 
     public static void glMatrixIndexPointerARB(int size, int type, int stride, long pPointer_buffer_offset) {
-        org.lwjgl3.opengl.ARBMatrixPalette.glMatrixIndexPointerARB(size, type, stride, pPointer_buffer_offset);
+        org.lwjgl.opengl.ARBMatrixPalette.glMatrixIndexPointerARB(size, type, stride, pPointer_buffer_offset);
     }
 
     public static void glMatrixIndexPointerARB(int size, int stride, java.nio.ByteBuffer pPointer) {
-        org.lwjgl3.opengl.ARBMatrixPalette.glMatrixIndexPointerARB(size, stride, pPointer);
+        org.lwjgl.opengl.ARBMatrixPalette.glMatrixIndexPointerARB(size, stride, pPointer);
     }
 
     public static void glMatrixIndexPointerARB(int size, int stride, java.nio.IntBuffer pPointer) {
-        org.lwjgl3.opengl.ARBMatrixPalette.glMatrixIndexPointerARB(size, stride, pPointer);
+        org.lwjgl.opengl.ARBMatrixPalette.glMatrixIndexPointerARB(size, stride, pPointer);
     }
 
     public static void glMatrixIndexPointerARB(int size, int stride, java.nio.ShortBuffer pPointer) {
-        org.lwjgl3.opengl.ARBMatrixPalette.glMatrixIndexPointerARB(size, stride, pPointer);
+        org.lwjgl.opengl.ARBMatrixPalette.glMatrixIndexPointerARB(size, stride, pPointer);
     }
 
     public static void glMatrixIndexuARB(java.nio.ByteBuffer pIndices) {
-        org.lwjgl3.opengl.ARBMatrixPalette.glMatrixIndexubvARB(pIndices);
+        org.lwjgl.opengl.ARBMatrixPalette.glMatrixIndexubvARB(pIndices);
     }
 
     public static void glMatrixIndexuARB(java.nio.IntBuffer pIndices) {
-        org.lwjgl3.opengl.ARBMatrixPalette.glMatrixIndexuivARB(pIndices);
+        org.lwjgl.opengl.ARBMatrixPalette.glMatrixIndexuivARB(pIndices);
     }
 
     public static void glMatrixIndexuARB(java.nio.ShortBuffer pIndices) {
-        org.lwjgl3.opengl.ARBMatrixPalette.glMatrixIndexusvARB(pIndices);
+        org.lwjgl.opengl.ARBMatrixPalette.glMatrixIndexusvARB(pIndices);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBMultiBind.java b/src/main/java/org/lwjglx/opengl/ARBMultiBind.java
similarity index 53%
rename from src/main/java/org/lwjgl/opengl/ARBMultiBind.java
rename to src/main/java/org/lwjglx/opengl/ARBMultiBind.java
index fa920a369..7cd26afee 100644
--- a/src/main/java/org/lwjgl/opengl/ARBMultiBind.java
+++ b/src/main/java/org/lwjglx/opengl/ARBMultiBind.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBMultiBind {
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBMultiDrawIndirect.java b/src/main/java/org/lwjglx/opengl/ARBMultiDrawIndirect.java
similarity index 64%
rename from src/main/java/org/lwjgl/opengl/ARBMultiDrawIndirect.java
rename to src/main/java/org/lwjglx/opengl/ARBMultiDrawIndirect.java
index 2eed9b482..9cf411b93 100644
--- a/src/main/java/org/lwjgl/opengl/ARBMultiDrawIndirect.java
+++ b/src/main/java/org/lwjglx/opengl/ARBMultiDrawIndirect.java
@@ -1,33 +1,33 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBMultiDrawIndirect {
 
     public static void glMultiDrawArraysIndirect(int mode, long indirect_buffer_offset, int primcount, int stride) {
-        org.lwjgl3.opengl.ARBMultiDrawIndirect
+        org.lwjgl.opengl.ARBMultiDrawIndirect
                 .glMultiDrawArraysIndirect(mode, indirect_buffer_offset, primcount, stride);
     }
 
     public static void glMultiDrawArraysIndirect(int mode, java.nio.ByteBuffer indirect, int primcount, int stride) {
-        org.lwjgl3.opengl.ARBMultiDrawIndirect.glMultiDrawArraysIndirect(mode, indirect, primcount, stride);
+        org.lwjgl.opengl.ARBMultiDrawIndirect.glMultiDrawArraysIndirect(mode, indirect, primcount, stride);
     }
 
     public static void glMultiDrawArraysIndirect(int mode, java.nio.IntBuffer indirect, int primcount, int stride) {
-        org.lwjgl3.opengl.ARBMultiDrawIndirect.glMultiDrawArraysIndirect(mode, indirect, primcount, stride);
+        org.lwjgl.opengl.ARBMultiDrawIndirect.glMultiDrawArraysIndirect(mode, indirect, primcount, stride);
     }
 
     public static void glMultiDrawElementsIndirect(int mode, int type, long indirect_buffer_offset, int primcount,
             int stride) {
-        org.lwjgl3.opengl.ARBMultiDrawIndirect
+        org.lwjgl.opengl.ARBMultiDrawIndirect
                 .glMultiDrawElementsIndirect(mode, type, indirect_buffer_offset, primcount, stride);
     }
 
     public static void glMultiDrawElementsIndirect(int mode, int type, java.nio.ByteBuffer indirect, int primcount,
             int stride) {
-        org.lwjgl3.opengl.ARBMultiDrawIndirect.glMultiDrawElementsIndirect(mode, type, indirect, primcount, stride);
+        org.lwjgl.opengl.ARBMultiDrawIndirect.glMultiDrawElementsIndirect(mode, type, indirect, primcount, stride);
     }
 
     public static void glMultiDrawElementsIndirect(int mode, int type, java.nio.IntBuffer indirect, int primcount,
             int stride) {
-        org.lwjgl3.opengl.ARBMultiDrawIndirect.glMultiDrawElementsIndirect(mode, type, indirect, primcount, stride);
+        org.lwjgl.opengl.ARBMultiDrawIndirect.glMultiDrawElementsIndirect(mode, type, indirect, primcount, stride);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBMultisample.java b/src/main/java/org/lwjglx/opengl/ARBMultisample.java
similarity index 87%
rename from src/main/java/org/lwjgl/opengl/ARBMultisample.java
rename to src/main/java/org/lwjglx/opengl/ARBMultisample.java
index 8061f7f28..4d99c5a4c 100644
--- a/src/main/java/org/lwjgl/opengl/ARBMultisample.java
+++ b/src/main/java/org/lwjglx/opengl/ARBMultisample.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBMultisample {
 
@@ -13,6 +13,6 @@ public class ARBMultisample {
     public static final int GL_SAMPLE_COVERAGE_VALUE_ARB = (int) 32938;
 
     public static void glSampleCoverageARB(float value, boolean invert) {
-        org.lwjgl3.opengl.ARBMultisample.glSampleCoverageARB(value, invert);
+        org.lwjgl.opengl.ARBMultisample.glSampleCoverageARB(value, invert);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBMultitexture.java b/src/main/java/org/lwjglx/opengl/ARBMultitexture.java
similarity index 71%
rename from src/main/java/org/lwjgl/opengl/ARBMultitexture.java
rename to src/main/java/org/lwjglx/opengl/ARBMultitexture.java
index bdd99d696..feac6b4bb 100644
--- a/src/main/java/org/lwjgl/opengl/ARBMultitexture.java
+++ b/src/main/java/org/lwjglx/opengl/ARBMultitexture.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBMultitexture {
 
@@ -39,74 +39,74 @@ public class ARBMultitexture {
     public static final int GL_TEXTURE9_ARB = (int) 33993;
 
     public static void glActiveTextureARB(int texture) {
-        org.lwjgl3.opengl.ARBMultitexture.glActiveTextureARB(texture);
+        org.lwjgl.opengl.ARBMultitexture.glActiveTextureARB(texture);
     }
 
     public static void glClientActiveTextureARB(int texture) {
-        org.lwjgl3.opengl.ARBMultitexture.glClientActiveTextureARB(texture);
+        org.lwjgl.opengl.ARBMultitexture.glClientActiveTextureARB(texture);
     }
 
     public static void glMultiTexCoord1dARB(int target, double s) {
-        org.lwjgl3.opengl.ARBMultitexture.glMultiTexCoord1dARB(target, s);
+        org.lwjgl.opengl.ARBMultitexture.glMultiTexCoord1dARB(target, s);
     }
 
     public static void glMultiTexCoord1fARB(int target, float s) {
-        org.lwjgl3.opengl.ARBMultitexture.glMultiTexCoord1fARB(target, s);
+        org.lwjgl.opengl.ARBMultitexture.glMultiTexCoord1fARB(target, s);
     }
 
     public static void glMultiTexCoord1iARB(int target, int s) {
-        org.lwjgl3.opengl.ARBMultitexture.glMultiTexCoord1iARB(target, s);
+        org.lwjgl.opengl.ARBMultitexture.glMultiTexCoord1iARB(target, s);
     }
 
     public static void glMultiTexCoord1sARB(int target, short s) {
-        org.lwjgl3.opengl.ARBMultitexture.glMultiTexCoord1sARB(target, s);
+        org.lwjgl.opengl.ARBMultitexture.glMultiTexCoord1sARB(target, s);
     }
 
     public static void glMultiTexCoord2dARB(int target, double s, double t) {
-        org.lwjgl3.opengl.ARBMultitexture.glMultiTexCoord2dARB(target, s, t);
+        org.lwjgl.opengl.ARBMultitexture.glMultiTexCoord2dARB(target, s, t);
     }
 
     public static void glMultiTexCoord2fARB(int target, float s, float t) {
-        org.lwjgl3.opengl.ARBMultitexture.glMultiTexCoord2fARB(target, s, t);
+        org.lwjgl.opengl.ARBMultitexture.glMultiTexCoord2fARB(target, s, t);
     }
 
     public static void glMultiTexCoord2iARB(int target, int s, int t) {
-        org.lwjgl3.opengl.ARBMultitexture.glMultiTexCoord2iARB(target, s, t);
+        org.lwjgl.opengl.ARBMultitexture.glMultiTexCoord2iARB(target, s, t);
     }
 
     public static void glMultiTexCoord2sARB(int target, short s, short t) {
-        org.lwjgl3.opengl.ARBMultitexture.glMultiTexCoord2sARB(target, s, t);
+        org.lwjgl.opengl.ARBMultitexture.glMultiTexCoord2sARB(target, s, t);
     }
 
     public static void glMultiTexCoord3dARB(int target, double s, double t, double r) {
-        org.lwjgl3.opengl.ARBMultitexture.glMultiTexCoord3dARB(target, s, t, r);
+        org.lwjgl.opengl.ARBMultitexture.glMultiTexCoord3dARB(target, s, t, r);
     }
 
     public static void glMultiTexCoord3fARB(int target, float s, float t, float r) {
-        org.lwjgl3.opengl.ARBMultitexture.glMultiTexCoord3fARB(target, s, t, r);
+        org.lwjgl.opengl.ARBMultitexture.glMultiTexCoord3fARB(target, s, t, r);
     }
 
     public static void glMultiTexCoord3iARB(int target, int s, int t, int r) {
-        org.lwjgl3.opengl.ARBMultitexture.glMultiTexCoord3iARB(target, s, t, r);
+        org.lwjgl.opengl.ARBMultitexture.glMultiTexCoord3iARB(target, s, t, r);
     }
 
     public static void glMultiTexCoord3sARB(int target, short s, short t, short r) {
-        org.lwjgl3.opengl.ARBMultitexture.glMultiTexCoord3sARB(target, s, t, r);
+        org.lwjgl.opengl.ARBMultitexture.glMultiTexCoord3sARB(target, s, t, r);
     }
 
     public static void glMultiTexCoord4dARB(int target, double s, double t, double r, double q) {
-        org.lwjgl3.opengl.ARBMultitexture.glMultiTexCoord4dARB(target, s, t, r, q);
+        org.lwjgl.opengl.ARBMultitexture.glMultiTexCoord4dARB(target, s, t, r, q);
     }
 
     public static void glMultiTexCoord4fARB(int target, float s, float t, float r, float q) {
-        org.lwjgl3.opengl.ARBMultitexture.glMultiTexCoord4fARB(target, s, t, r, q);
+        org.lwjgl.opengl.ARBMultitexture.glMultiTexCoord4fARB(target, s, t, r, q);
     }
 
     public static void glMultiTexCoord4iARB(int target, int s, int t, int r, int q) {
-        org.lwjgl3.opengl.ARBMultitexture.glMultiTexCoord4iARB(target, s, t, r, q);
+        org.lwjgl.opengl.ARBMultitexture.glMultiTexCoord4iARB(target, s, t, r, q);
     }
 
     public static void glMultiTexCoord4sARB(int target, short s, short t, short r, short q) {
-        org.lwjgl3.opengl.ARBMultitexture.glMultiTexCoord4sARB(target, s, t, r, q);
+        org.lwjgl.opengl.ARBMultitexture.glMultiTexCoord4sARB(target, s, t, r, q);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBOcclusionQuery.java b/src/main/java/org/lwjglx/opengl/ARBOcclusionQuery.java
similarity index 57%
rename from src/main/java/org/lwjgl/opengl/ARBOcclusionQuery.java
rename to src/main/java/org/lwjglx/opengl/ARBOcclusionQuery.java
index fd09bf060..ec082381d 100644
--- a/src/main/java/org/lwjgl/opengl/ARBOcclusionQuery.java
+++ b/src/main/java/org/lwjglx/opengl/ARBOcclusionQuery.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBOcclusionQuery {
 
@@ -9,54 +9,54 @@ public class ARBOcclusionQuery {
     public static final int GL_SAMPLES_PASSED_ARB = (int) 35092;
 
     public static void glBeginQueryARB(int target, int id) {
-        org.lwjgl3.opengl.ARBOcclusionQuery.glBeginQueryARB(target, id);
+        org.lwjgl.opengl.ARBOcclusionQuery.glBeginQueryARB(target, id);
     }
 
     public static void glDeleteQueriesARB(int id) {
-        org.lwjgl3.opengl.ARBOcclusionQuery.glDeleteQueriesARB(id);
+        org.lwjgl.opengl.ARBOcclusionQuery.glDeleteQueriesARB(id);
     }
 
     public static void glDeleteQueriesARB(java.nio.IntBuffer ids) {
-        org.lwjgl3.opengl.ARBOcclusionQuery.glDeleteQueriesARB(ids);
+        org.lwjgl.opengl.ARBOcclusionQuery.glDeleteQueriesARB(ids);
     }
 
     public static void glEndQueryARB(int target) {
-        org.lwjgl3.opengl.ARBOcclusionQuery.glEndQueryARB(target);
+        org.lwjgl.opengl.ARBOcclusionQuery.glEndQueryARB(target);
     }
 
     public static int glGenQueriesARB() {
-        return org.lwjgl3.opengl.ARBOcclusionQuery.glGenQueriesARB();
+        return org.lwjgl.opengl.ARBOcclusionQuery.glGenQueriesARB();
     }
 
     public static void glGenQueriesARB(java.nio.IntBuffer ids) {
-        org.lwjgl3.opengl.ARBOcclusionQuery.glGenQueriesARB(ids);
+        org.lwjgl.opengl.ARBOcclusionQuery.glGenQueriesARB(ids);
     }
 
     public static void glGetQueryARB(int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.ARBOcclusionQuery.glGetQueryivARB(target, pname, params);
+        org.lwjgl.opengl.ARBOcclusionQuery.glGetQueryivARB(target, pname, params);
     }
 
     public static void glGetQueryObjectARB(int id, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.ARBOcclusionQuery.glGetQueryObjectivARB(id, pname, params);
+        org.lwjgl.opengl.ARBOcclusionQuery.glGetQueryObjectivARB(id, pname, params);
     }
 
     public static int glGetQueryObjectiARB(int id, int pname) {
-        return org.lwjgl3.opengl.ARBOcclusionQuery.glGetQueryObjectiARB(id, pname);
+        return org.lwjgl.opengl.ARBOcclusionQuery.glGetQueryObjectiARB(id, pname);
     }
 
     public static void glGetQueryObjectuARB(int id, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.ARBOcclusionQuery.glGetQueryObjectuivARB(id, pname, params);
+        org.lwjgl.opengl.ARBOcclusionQuery.glGetQueryObjectuivARB(id, pname, params);
     }
 
     public static int glGetQueryObjectuiARB(int id, int pname) {
-        return org.lwjgl3.opengl.ARBOcclusionQuery.glGetQueryObjectuiARB(id, pname);
+        return org.lwjgl.opengl.ARBOcclusionQuery.glGetQueryObjectuiARB(id, pname);
     }
 
     public static int glGetQueryiARB(int target, int pname) {
-        return org.lwjgl3.opengl.ARBOcclusionQuery.glGetQueryiARB(target, pname);
+        return org.lwjgl.opengl.ARBOcclusionQuery.glGetQueryiARB(target, pname);
     }
 
     public static boolean glIsQueryARB(int id) {
-        return org.lwjgl3.opengl.ARBOcclusionQuery.glIsQueryARB(id);
+        return org.lwjgl.opengl.ARBOcclusionQuery.glIsQueryARB(id);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBOcclusionQuery2.java b/src/main/java/org/lwjglx/opengl/ARBOcclusionQuery2.java
similarity index 79%
rename from src/main/java/org/lwjgl/opengl/ARBOcclusionQuery2.java
rename to src/main/java/org/lwjglx/opengl/ARBOcclusionQuery2.java
index cb2f1fd8f..fe996c1de 100644
--- a/src/main/java/org/lwjgl/opengl/ARBOcclusionQuery2.java
+++ b/src/main/java/org/lwjglx/opengl/ARBOcclusionQuery2.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBOcclusionQuery2 {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBPipelineStatisticsQuery.java b/src/main/java/org/lwjglx/opengl/ARBPipelineStatisticsQuery.java
similarity index 97%
rename from src/main/java/org/lwjgl/opengl/ARBPipelineStatisticsQuery.java
rename to src/main/java/org/lwjglx/opengl/ARBPipelineStatisticsQuery.java
index 9108097bd..efe79eed8 100644
--- a/src/main/java/org/lwjgl/opengl/ARBPipelineStatisticsQuery.java
+++ b/src/main/java/org/lwjglx/opengl/ARBPipelineStatisticsQuery.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBPipelineStatisticsQuery {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBPixelBufferObject.java b/src/main/java/org/lwjglx/opengl/ARBPixelBufferObject.java
similarity index 74%
rename from src/main/java/org/lwjgl/opengl/ARBPixelBufferObject.java
rename to src/main/java/org/lwjglx/opengl/ARBPixelBufferObject.java
index 1cc6daa93..178642bb6 100644
--- a/src/main/java/org/lwjgl/opengl/ARBPixelBufferObject.java
+++ b/src/main/java/org/lwjglx/opengl/ARBPixelBufferObject.java
@@ -1,6 +1,6 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
-public class ARBPixelBufferObject extends org.lwjgl.opengl.ARBBufferObject {
+public class ARBPixelBufferObject extends ARBBufferObject {
 
     public static final int GL_PIXEL_PACK_BUFFER_ARB = (int) 35051;
     public static final int GL_PIXEL_PACK_BUFFER_BINDING_ARB = (int) 35053;
diff --git a/src/main/java/org/lwjgl/opengl/ARBPointParameters.java b/src/main/java/org/lwjglx/opengl/ARBPointParameters.java
similarity index 71%
rename from src/main/java/org/lwjgl/opengl/ARBPointParameters.java
rename to src/main/java/org/lwjglx/opengl/ARBPointParameters.java
index 8c45666ec..420745413 100644
--- a/src/main/java/org/lwjgl/opengl/ARBPointParameters.java
+++ b/src/main/java/org/lwjglx/opengl/ARBPointParameters.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBPointParameters {
 
@@ -8,10 +8,10 @@ public class ARBPointParameters {
     public static final int GL_POINT_SIZE_MIN_ARB = (int) 33062;
 
     public static void glPointParameterARB(int pname, java.nio.FloatBuffer pfParams) {
-        org.lwjgl3.opengl.ARBPointParameters.glPointParameterfvARB(pname, pfParams);
+        org.lwjgl.opengl.ARBPointParameters.glPointParameterfvARB(pname, pfParams);
     }
 
     public static void glPointParameterfARB(int pname, float param) {
-        org.lwjgl3.opengl.ARBPointParameters.glPointParameterfARB(pname, param);
+        org.lwjgl.opengl.ARBPointParameters.glPointParameterfARB(pname, param);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBPointSprite.java b/src/main/java/org/lwjglx/opengl/ARBPointSprite.java
similarity index 85%
rename from src/main/java/org/lwjgl/opengl/ARBPointSprite.java
rename to src/main/java/org/lwjglx/opengl/ARBPointSprite.java
index 22b2d645b..185bc0f17 100644
--- a/src/main/java/org/lwjgl/opengl/ARBPointSprite.java
+++ b/src/main/java/org/lwjglx/opengl/ARBPointSprite.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBPointSprite {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBProgram.java b/src/main/java/org/lwjglx/opengl/ARBProgram.java
similarity index 51%
rename from src/main/java/org/lwjgl/opengl/ARBProgram.java
rename to src/main/java/org/lwjglx/opengl/ARBProgram.java
index a925c5033..d2bddb026 100644
--- a/src/main/java/org/lwjgl/opengl/ARBProgram.java
+++ b/src/main/java/org/lwjglx/opengl/ARBProgram.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBProgram {
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBProgramInterfaceQuery.java b/src/main/java/org/lwjglx/opengl/ARBProgramInterfaceQuery.java
similarity index 84%
rename from src/main/java/org/lwjgl/opengl/ARBProgramInterfaceQuery.java
rename to src/main/java/org/lwjglx/opengl/ARBProgramInterfaceQuery.java
index b6d1b6473..7d93880c8 100644
--- a/src/main/java/org/lwjgl/opengl/ARBProgramInterfaceQuery.java
+++ b/src/main/java/org/lwjglx/opengl/ARBProgramInterfaceQuery.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBProgramInterfaceQuery {
 
@@ -51,44 +51,44 @@ public class ARBProgramInterfaceQuery {
     public static final int GL_VERTEX_SUBROUTINE_UNIFORM = (int) 37614;
 
     public static int glGetProgramInterfacei(int program, int programInterface, int pname) {
-        return org.lwjgl3.opengl.ARBProgramInterfaceQuery.glGetProgramInterfacei(program, programInterface, pname);
+        return org.lwjgl.opengl.ARBProgramInterfaceQuery.glGetProgramInterfacei(program, programInterface, pname);
     }
 
     public static int glGetProgramResourceIndex(int program, int programInterface, java.lang.CharSequence name) {
-        return org.lwjgl3.opengl.ARBProgramInterfaceQuery.glGetProgramResourceIndex(program, programInterface, name);
+        return org.lwjgl.opengl.ARBProgramInterfaceQuery.glGetProgramResourceIndex(program, programInterface, name);
     }
 
     public static int glGetProgramResourceIndex(int program, int programInterface, java.nio.ByteBuffer name) {
-        return org.lwjgl3.opengl.ARBProgramInterfaceQuery.glGetProgramResourceIndex(program, programInterface, name);
+        return org.lwjgl.opengl.ARBProgramInterfaceQuery.glGetProgramResourceIndex(program, programInterface, name);
     }
 
     public static int glGetProgramResourceLocation(int program, int programInterface, java.lang.CharSequence name) {
-        return org.lwjgl3.opengl.ARBProgramInterfaceQuery.glGetProgramResourceLocation(program, programInterface, name);
+        return org.lwjgl.opengl.ARBProgramInterfaceQuery.glGetProgramResourceLocation(program, programInterface, name);
     }
 
     public static int glGetProgramResourceLocation(int program, int programInterface, java.nio.ByteBuffer name) {
-        return org.lwjgl3.opengl.ARBProgramInterfaceQuery.glGetProgramResourceLocation(program, programInterface, name);
+        return org.lwjgl.opengl.ARBProgramInterfaceQuery.glGetProgramResourceLocation(program, programInterface, name);
     }
 
     public static int glGetProgramResourceLocationIndex(int program, int programInterface,
             java.lang.CharSequence name) {
-        return org.lwjgl3.opengl.ARBProgramInterfaceQuery
+        return org.lwjgl.opengl.ARBProgramInterfaceQuery
                 .glGetProgramResourceLocationIndex(program, programInterface, name);
     }
 
     public static int glGetProgramResourceLocationIndex(int program, int programInterface, java.nio.ByteBuffer name) {
-        return org.lwjgl3.opengl.ARBProgramInterfaceQuery
+        return org.lwjgl.opengl.ARBProgramInterfaceQuery
                 .glGetProgramResourceLocationIndex(program, programInterface, name);
     }
 
     public static java.lang.String glGetProgramResourceName(int program, int programInterface, int index, int bufSize) {
-        return org.lwjgl3.opengl.ARBProgramInterfaceQuery
+        return org.lwjgl.opengl.ARBProgramInterfaceQuery
                 .glGetProgramResourceName(program, programInterface, index, bufSize);
     }
 
     public static void glGetProgramResourceName(int program, int programInterface, int index, java.nio.IntBuffer length,
             java.nio.ByteBuffer name) {
-        org.lwjgl3.opengl.ARBProgramInterfaceQuery
+        org.lwjgl.opengl.ARBProgramInterfaceQuery
                 .glGetProgramResourceName(program, programInterface, index, length, name);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBProvokingVertex.java b/src/main/java/org/lwjglx/opengl/ARBProvokingVertex.java
similarity index 80%
rename from src/main/java/org/lwjgl/opengl/ARBProvokingVertex.java
rename to src/main/java/org/lwjglx/opengl/ARBProvokingVertex.java
index 905daae27..c89cd22d4 100644
--- a/src/main/java/org/lwjgl/opengl/ARBProvokingVertex.java
+++ b/src/main/java/org/lwjglx/opengl/ARBProvokingVertex.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBProvokingVertex {
 
@@ -8,6 +8,6 @@ public class ARBProvokingVertex {
     public static final int GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION = (int) 36428;
 
     public static void glProvokingVertex(int mode) {
-        org.lwjgl3.opengl.ARBProvokingVertex.glProvokingVertex(mode);
+        org.lwjgl.opengl.ARBProvokingVertex.glProvokingVertex(mode);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBQueryBufferObject.java b/src/main/java/org/lwjglx/opengl/ARBQueryBufferObject.java
similarity index 91%
rename from src/main/java/org/lwjgl/opengl/ARBQueryBufferObject.java
rename to src/main/java/org/lwjglx/opengl/ARBQueryBufferObject.java
index 17241e1e7..b6bc6056e 100644
--- a/src/main/java/org/lwjgl/opengl/ARBQueryBufferObject.java
+++ b/src/main/java/org/lwjglx/opengl/ARBQueryBufferObject.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBQueryBufferObject {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBRobustness.java b/src/main/java/org/lwjglx/opengl/ARBRobustness.java
similarity index 64%
rename from src/main/java/org/lwjgl/opengl/ARBRobustness.java
rename to src/main/java/org/lwjglx/opengl/ARBRobustness.java
index af6bdd865..51b99917c 100644
--- a/src/main/java/org/lwjgl/opengl/ARBRobustness.java
+++ b/src/main/java/org/lwjglx/opengl/ARBRobustness.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBRobustness {
 
@@ -11,152 +11,152 @@ public class ARBRobustness {
     public static final int GL_UNKNOWN_CONTEXT_RESET_ARB = (int) 33365;
 
     public static int glGetGraphicsResetStatusARB() {
-        return org.lwjgl3.opengl.ARBRobustness.glGetGraphicsResetStatusARB();
+        return org.lwjgl.opengl.ARBRobustness.glGetGraphicsResetStatusARB();
     }
 
     public static void glGetnColorTableARB(int target, int format, int type, java.nio.ByteBuffer table) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnColorTableARB(target, format, type, table);
+        org.lwjgl.opengl.ARBRobustness.glGetnColorTableARB(target, format, type, table);
     }
 
     public static void glGetnColorTableARB(int target, int format, int type, java.nio.FloatBuffer table) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnColorTableARB(target, format, type, table);
+        org.lwjgl.opengl.ARBRobustness.glGetnColorTableARB(target, format, type, table);
     }
 
     public static void glGetnCompressedTexImageARB(int target, int lod, int img_bufSize, long img_buffer_offset) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnCompressedTexImageARB(target, lod, img_bufSize, img_buffer_offset);
+        org.lwjgl.opengl.ARBRobustness.glGetnCompressedTexImageARB(target, lod, img_bufSize, img_buffer_offset);
     }
 
     public static void glGetnCompressedTexImageARB(int target, int lod, java.nio.ByteBuffer img) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnCompressedTexImageARB(target, lod, img);
+        org.lwjgl.opengl.ARBRobustness.glGetnCompressedTexImageARB(target, lod, img);
     }
 
     public static void glGetnConvolutionFilterARB(int target, int format, int type, int image_bufSize,
             long image_buffer_offset) {
-        org.lwjgl3.opengl.ARBRobustness
+        org.lwjgl.opengl.ARBRobustness
                 .glGetnConvolutionFilterARB(target, format, type, image_bufSize, image_buffer_offset);
     }
 
     public static void glGetnConvolutionFilterARB(int target, int format, int type, java.nio.ByteBuffer image) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnConvolutionFilterARB(target, format, type, image);
+        org.lwjgl.opengl.ARBRobustness.glGetnConvolutionFilterARB(target, format, type, image);
     }
 
     public static void glGetnHistogramARB(int target, boolean reset, int format, int type, int values_bufSize,
             long values_buffer_offset) {
-        org.lwjgl3.opengl.ARBRobustness
+        org.lwjgl.opengl.ARBRobustness
                 .glGetnHistogramARB(target, reset, format, type, values_bufSize, values_buffer_offset);
     }
 
     public static void glGetnHistogramARB(int target, boolean reset, int format, int type, java.nio.ByteBuffer values) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnHistogramARB(target, reset, format, type, values);
+        org.lwjgl.opengl.ARBRobustness.glGetnHistogramARB(target, reset, format, type, values);
     }
 
     public static void glGetnMapdvARB(int target, int query, java.nio.DoubleBuffer v) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnMapdvARB(target, query, v);
+        org.lwjgl.opengl.ARBRobustness.glGetnMapdvARB(target, query, v);
     }
 
     public static void glGetnMapfvARB(int target, int query, java.nio.FloatBuffer v) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnMapfvARB(target, query, v);
+        org.lwjgl.opengl.ARBRobustness.glGetnMapfvARB(target, query, v);
     }
 
     public static void glGetnMapivARB(int target, int query, java.nio.IntBuffer v) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnMapivARB(target, query, v);
+        org.lwjgl.opengl.ARBRobustness.glGetnMapivARB(target, query, v);
     }
 
     public static void glGetnMinmaxARB(int target, boolean reset, int format, int type, int values_bufSize,
             long values_buffer_offset) {
-        org.lwjgl3.opengl.ARBRobustness
+        org.lwjgl.opengl.ARBRobustness
                 .glGetnMinmaxARB(target, reset, format, type, values_bufSize, values_buffer_offset);
     }
 
     public static void glGetnMinmaxARB(int target, boolean reset, int format, int type, java.nio.ByteBuffer values) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnMinmaxARB(target, reset, format, type, values);
+        org.lwjgl.opengl.ARBRobustness.glGetnMinmaxARB(target, reset, format, type, values);
     }
 
     public static void glGetnPixelMapfvARB(int map, java.nio.FloatBuffer values) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnPixelMapfvARB(map, values);
+        org.lwjgl.opengl.ARBRobustness.glGetnPixelMapfvARB(map, values);
     }
 
     public static void glGetnPixelMapuivARB(int map, java.nio.IntBuffer values) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnPixelMapuivARB(map, values);
+        org.lwjgl.opengl.ARBRobustness.glGetnPixelMapuivARB(map, values);
     }
 
     public static void glGetnPixelMapusvARB(int map, java.nio.ShortBuffer values) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnPixelMapusvARB(map, values);
+        org.lwjgl.opengl.ARBRobustness.glGetnPixelMapusvARB(map, values);
     }
 
     public static void glGetnPolygonStippleARB(java.nio.ByteBuffer pattern) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnPolygonStippleARB(pattern);
+        org.lwjgl.opengl.ARBRobustness.glGetnPolygonStippleARB(pattern);
     }
 
     public static void glGetnSeparableFilterARB(int target, int format, int type, java.nio.ByteBuffer row,
             java.nio.ByteBuffer column, java.nio.ByteBuffer span) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnSeparableFilterARB(target, format, type, row, column, span);
+        org.lwjgl.opengl.ARBRobustness.glGetnSeparableFilterARB(target, format, type, row, column, span);
     }
 
     public static void glGetnTexImageARB(int target, int level, int format, int type, int img_bufSize,
             long img_buffer_offset) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnTexImageARB(target, level, format, type, img_bufSize, img_buffer_offset);
+        org.lwjgl.opengl.ARBRobustness.glGetnTexImageARB(target, level, format, type, img_bufSize, img_buffer_offset);
     }
 
     public static void glGetnTexImageARB(int target, int level, int format, int type, java.nio.ByteBuffer img) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnTexImageARB(target, level, format, type, img);
+        org.lwjgl.opengl.ARBRobustness.glGetnTexImageARB(target, level, format, type, img);
     }
 
     public static void glGetnTexImageARB(int target, int level, int format, int type, java.nio.DoubleBuffer img) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnTexImageARB(target, level, format, type, img);
+        org.lwjgl.opengl.ARBRobustness.glGetnTexImageARB(target, level, format, type, img);
     }
 
     public static void glGetnTexImageARB(int target, int level, int format, int type, java.nio.FloatBuffer img) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnTexImageARB(target, level, format, type, img);
+        org.lwjgl.opengl.ARBRobustness.glGetnTexImageARB(target, level, format, type, img);
     }
 
     public static void glGetnTexImageARB(int target, int level, int format, int type, java.nio.IntBuffer img) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnTexImageARB(target, level, format, type, img);
+        org.lwjgl.opengl.ARBRobustness.glGetnTexImageARB(target, level, format, type, img);
     }
 
     public static void glGetnTexImageARB(int target, int level, int format, int type, java.nio.ShortBuffer img) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnTexImageARB(target, level, format, type, img);
+        org.lwjgl.opengl.ARBRobustness.glGetnTexImageARB(target, level, format, type, img);
     }
 
     public static void glGetnUniformdvARB(int program, int location, java.nio.DoubleBuffer params) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnUniformdvARB(program, location, params);
+        org.lwjgl.opengl.ARBRobustness.glGetnUniformdvARB(program, location, params);
     }
 
     public static void glGetnUniformfvARB(int program, int location, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnUniformfvARB(program, location, params);
+        org.lwjgl.opengl.ARBRobustness.glGetnUniformfvARB(program, location, params);
     }
 
     public static void glGetnUniformivARB(int program, int location, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnUniformivARB(program, location, params);
+        org.lwjgl.opengl.ARBRobustness.glGetnUniformivARB(program, location, params);
     }
 
     public static void glGetnUniformuivARB(int program, int location, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.ARBRobustness.glGetnUniformuivARB(program, location, params);
+        org.lwjgl.opengl.ARBRobustness.glGetnUniformuivARB(program, location, params);
     }
 
     public static void glReadnPixelsARB(int x, int y, int width, int height, int format, int type, int data_bufSize,
             long data_buffer_offset) {
-        org.lwjgl3.opengl.ARBRobustness
+        org.lwjgl.opengl.ARBRobustness
                 .glReadnPixelsARB(x, y, width, height, format, type, data_bufSize, data_buffer_offset);
     }
 
     public static void glReadnPixelsARB(int x, int y, int width, int height, int format, int type,
             java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.ARBRobustness.glReadnPixelsARB(x, y, width, height, format, type, data);
+        org.lwjgl.opengl.ARBRobustness.glReadnPixelsARB(x, y, width, height, format, type, data);
     }
 
     public static void glReadnPixelsARB(int x, int y, int width, int height, int format, int type,
             java.nio.FloatBuffer data) {
-        org.lwjgl3.opengl.ARBRobustness.glReadnPixelsARB(x, y, width, height, format, type, data);
+        org.lwjgl.opengl.ARBRobustness.glReadnPixelsARB(x, y, width, height, format, type, data);
     }
 
     public static void glReadnPixelsARB(int x, int y, int width, int height, int format, int type,
             java.nio.IntBuffer data) {
-        org.lwjgl3.opengl.ARBRobustness.glReadnPixelsARB(x, y, width, height, format, type, data);
+        org.lwjgl.opengl.ARBRobustness.glReadnPixelsARB(x, y, width, height, format, type, data);
     }
 
     public static void glReadnPixelsARB(int x, int y, int width, int height, int format, int type,
             java.nio.ShortBuffer data) {
-        org.lwjgl3.opengl.ARBRobustness.glReadnPixelsARB(x, y, width, height, format, type, data);
+        org.lwjgl.opengl.ARBRobustness.glReadnPixelsARB(x, y, width, height, format, type, data);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBSampleShading.java b/src/main/java/org/lwjglx/opengl/ARBSampleShading.java
similarity index 71%
rename from src/main/java/org/lwjgl/opengl/ARBSampleShading.java
rename to src/main/java/org/lwjglx/opengl/ARBSampleShading.java
index 19a4a3e90..418e57998 100644
--- a/src/main/java/org/lwjgl/opengl/ARBSampleShading.java
+++ b/src/main/java/org/lwjglx/opengl/ARBSampleShading.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBSampleShading {
 
@@ -6,6 +6,6 @@ public class ARBSampleShading {
     public static final int GL_SAMPLE_SHADING_ARB = (int) 35894;
 
     public static void glMinSampleShadingARB(float value) {
-        org.lwjgl3.opengl.ARBSampleShading.glMinSampleShadingARB(value);
+        org.lwjgl.opengl.ARBSampleShading.glMinSampleShadingARB(value);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBSamplerObjects.java b/src/main/java/org/lwjglx/opengl/ARBSamplerObjects.java
similarity index 50%
rename from src/main/java/org/lwjgl/opengl/ARBSamplerObjects.java
rename to src/main/java/org/lwjglx/opengl/ARBSamplerObjects.java
index 0354b5697..4542258e7 100644
--- a/src/main/java/org/lwjgl/opengl/ARBSamplerObjects.java
+++ b/src/main/java/org/lwjglx/opengl/ARBSamplerObjects.java
@@ -1,54 +1,54 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBSamplerObjects {
 
     public static final int GL_SAMPLER_BINDING = (int) 35097;
 
     public static void glBindSampler(int unit, int sampler) {
-        org.lwjgl3.opengl.ARBSamplerObjects.glBindSampler(unit, sampler);
+        org.lwjgl.opengl.ARBSamplerObjects.glBindSampler(unit, sampler);
     }
 
     public static void glDeleteSamplers(int sampler) {
-        org.lwjgl3.opengl.ARBSamplerObjects.glDeleteSamplers(sampler);
+        org.lwjgl.opengl.ARBSamplerObjects.glDeleteSamplers(sampler);
     }
 
     public static void glDeleteSamplers(java.nio.IntBuffer samplers) {
-        org.lwjgl3.opengl.ARBSamplerObjects.glDeleteSamplers(samplers);
+        org.lwjgl.opengl.ARBSamplerObjects.glDeleteSamplers(samplers);
     }
 
     public static int glGenSamplers() {
-        return org.lwjgl3.opengl.ARBSamplerObjects.glGenSamplers();
+        return org.lwjgl.opengl.ARBSamplerObjects.glGenSamplers();
     }
 
     public static void glGenSamplers(java.nio.IntBuffer samplers) {
-        org.lwjgl3.opengl.ARBSamplerObjects.glGenSamplers(samplers);
+        org.lwjgl.opengl.ARBSamplerObjects.glGenSamplers(samplers);
     }
 
     public static int glGetSamplerParameterIi(int sampler, int pname) {
-        return org.lwjgl3.opengl.ARBSamplerObjects.glGetSamplerParameterIi(sampler, pname);
+        return org.lwjgl.opengl.ARBSamplerObjects.glGetSamplerParameterIi(sampler, pname);
     }
 
     public static int glGetSamplerParameterIui(int sampler, int pname) {
-        return org.lwjgl3.opengl.ARBSamplerObjects.glGetSamplerParameterIui(sampler, pname);
+        return org.lwjgl.opengl.ARBSamplerObjects.glGetSamplerParameterIui(sampler, pname);
     }
 
     public static float glGetSamplerParameterf(int sampler, int pname) {
-        return org.lwjgl3.opengl.ARBSamplerObjects.glGetSamplerParameterf(sampler, pname);
+        return org.lwjgl.opengl.ARBSamplerObjects.glGetSamplerParameterf(sampler, pname);
     }
 
     public static int glGetSamplerParameteri(int sampler, int pname) {
-        return org.lwjgl3.opengl.ARBSamplerObjects.glGetSamplerParameteri(sampler, pname);
+        return org.lwjgl.opengl.ARBSamplerObjects.glGetSamplerParameteri(sampler, pname);
     }
 
     public static boolean glIsSampler(int sampler) {
-        return org.lwjgl3.opengl.ARBSamplerObjects.glIsSampler(sampler);
+        return org.lwjgl.opengl.ARBSamplerObjects.glIsSampler(sampler);
     }
 
     public static void glSamplerParameterf(int sampler, int pname, float param) {
-        org.lwjgl3.opengl.ARBSamplerObjects.glSamplerParameterf(sampler, pname, param);
+        org.lwjgl.opengl.ARBSamplerObjects.glSamplerParameterf(sampler, pname, param);
     }
 
     public static void glSamplerParameteri(int sampler, int pname, int param) {
-        org.lwjgl3.opengl.ARBSamplerObjects.glSamplerParameteri(sampler, pname, param);
+        org.lwjgl.opengl.ARBSamplerObjects.glSamplerParameteri(sampler, pname, param);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBSeamlessCubeMap.java b/src/main/java/org/lwjglx/opengl/ARBSeamlessCubeMap.java
similarity index 80%
rename from src/main/java/org/lwjgl/opengl/ARBSeamlessCubeMap.java
rename to src/main/java/org/lwjglx/opengl/ARBSeamlessCubeMap.java
index 6aa16cdce..6d0366d37 100644
--- a/src/main/java/org/lwjgl/opengl/ARBSeamlessCubeMap.java
+++ b/src/main/java/org/lwjglx/opengl/ARBSeamlessCubeMap.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBSeamlessCubeMap {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBSeamlessCubemapPerTexture.java b/src/main/java/org/lwjglx/opengl/ARBSeamlessCubemapPerTexture.java
similarity index 81%
rename from src/main/java/org/lwjgl/opengl/ARBSeamlessCubemapPerTexture.java
rename to src/main/java/org/lwjglx/opengl/ARBSeamlessCubemapPerTexture.java
index 7066f9661..6694ef6de 100644
--- a/src/main/java/org/lwjgl/opengl/ARBSeamlessCubemapPerTexture.java
+++ b/src/main/java/org/lwjglx/opengl/ARBSeamlessCubemapPerTexture.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBSeamlessCubemapPerTexture {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBSeparateShaderObjects.java b/src/main/java/org/lwjglx/opengl/ARBSeparateShaderObjects.java
similarity index 54%
rename from src/main/java/org/lwjgl/opengl/ARBSeparateShaderObjects.java
rename to src/main/java/org/lwjglx/opengl/ARBSeparateShaderObjects.java
index 473dcf71e..0f1ab6193 100644
--- a/src/main/java/org/lwjgl/opengl/ARBSeparateShaderObjects.java
+++ b/src/main/java/org/lwjglx/opengl/ARBSeparateShaderObjects.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBSeparateShaderObjects {
 
@@ -13,119 +13,119 @@ public class ARBSeparateShaderObjects {
     public static final int GL_VERTEX_SHADER_BIT = (int) 1;
 
     public static void glActiveShaderProgram(int pipeline, int program) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glActiveShaderProgram(pipeline, program);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glActiveShaderProgram(pipeline, program);
     }
 
     public static void glBindProgramPipeline(int pipeline) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glBindProgramPipeline(pipeline);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glBindProgramPipeline(pipeline);
     }
 
     public static void glDeleteProgramPipelines(int pipeline) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glDeleteProgramPipelines(pipeline);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glDeleteProgramPipelines(pipeline);
     }
 
     public static void glDeleteProgramPipelines(java.nio.IntBuffer pipelines) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glDeleteProgramPipelines(pipelines);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glDeleteProgramPipelines(pipelines);
     }
 
     public static int glGenProgramPipelines() {
-        return org.lwjgl3.opengl.ARBSeparateShaderObjects.glGenProgramPipelines();
+        return org.lwjgl.opengl.ARBSeparateShaderObjects.glGenProgramPipelines();
     }
 
     public static void glGenProgramPipelines(java.nio.IntBuffer pipelines) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glGenProgramPipelines(pipelines);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glGenProgramPipelines(pipelines);
     }
 
     public static java.lang.String glGetProgramPipelineInfoLog(int pipeline, int bufSize) {
-        return org.lwjgl3.opengl.ARBSeparateShaderObjects.glGetProgramPipelineInfoLog(pipeline, bufSize);
+        return org.lwjgl.opengl.ARBSeparateShaderObjects.glGetProgramPipelineInfoLog(pipeline, bufSize);
     }
 
     public static void glGetProgramPipelineInfoLog(int pipeline, java.nio.IntBuffer length,
             java.nio.ByteBuffer infoLog) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glGetProgramPipelineInfoLog(pipeline, length, infoLog);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glGetProgramPipelineInfoLog(pipeline, length, infoLog);
     }
 
     public static int glGetProgramPipelinei(int pipeline, int pname) {
-        return org.lwjgl3.opengl.ARBSeparateShaderObjects.glGetProgramPipelinei(pipeline, pname);
+        return org.lwjgl.opengl.ARBSeparateShaderObjects.glGetProgramPipelinei(pipeline, pname);
     }
 
     public static boolean glIsProgramPipeline(int pipeline) {
-        return org.lwjgl3.opengl.ARBSeparateShaderObjects.glIsProgramPipeline(pipeline);
+        return org.lwjgl.opengl.ARBSeparateShaderObjects.glIsProgramPipeline(pipeline);
     }
 
     public static void glProgramParameteri(int program, int pname, int value) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glProgramParameteri(program, pname, value);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glProgramParameteri(program, pname, value);
     }
 
     public static void glProgramUniform1d(int program, int location, double v0) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glProgramUniform1d(program, location, v0);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glProgramUniform1d(program, location, v0);
     }
 
     public static void glProgramUniform1f(int program, int location, float v0) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glProgramUniform1f(program, location, v0);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glProgramUniform1f(program, location, v0);
     }
 
     public static void glProgramUniform1i(int program, int location, int v0) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glProgramUniform1i(program, location, v0);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glProgramUniform1i(program, location, v0);
     }
 
     public static void glProgramUniform1ui(int program, int location, int v0) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glProgramUniform1ui(program, location, v0);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glProgramUniform1ui(program, location, v0);
     }
 
     public static void glProgramUniform2d(int program, int location, double v0, double v1) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glProgramUniform2d(program, location, v0, v1);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glProgramUniform2d(program, location, v0, v1);
     }
 
     public static void glProgramUniform2f(int program, int location, float v0, float v1) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glProgramUniform2f(program, location, v0, v1);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glProgramUniform2f(program, location, v0, v1);
     }
 
     public static void glProgramUniform2i(int program, int location, int v0, int v1) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glProgramUniform2i(program, location, v0, v1);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glProgramUniform2i(program, location, v0, v1);
     }
 
     public static void glProgramUniform2ui(int program, int location, int v0, int v1) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glProgramUniform2ui(program, location, v0, v1);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glProgramUniform2ui(program, location, v0, v1);
     }
 
     public static void glProgramUniform3d(int program, int location, double v0, double v1, double v2) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glProgramUniform3d(program, location, v0, v1, v2);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glProgramUniform3d(program, location, v0, v1, v2);
     }
 
     public static void glProgramUniform3f(int program, int location, float v0, float v1, float v2) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glProgramUniform3f(program, location, v0, v1, v2);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glProgramUniform3f(program, location, v0, v1, v2);
     }
 
     public static void glProgramUniform3i(int program, int location, int v0, int v1, int v2) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glProgramUniform3i(program, location, v0, v1, v2);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glProgramUniform3i(program, location, v0, v1, v2);
     }
 
     public static void glProgramUniform3ui(int program, int location, int v0, int v1, int v2) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glProgramUniform3ui(program, location, v0, v1, v2);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glProgramUniform3ui(program, location, v0, v1, v2);
     }
 
     public static void glProgramUniform4d(int program, int location, double v0, double v1, double v2, double v3) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glProgramUniform4d(program, location, v0, v1, v2, v3);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glProgramUniform4d(program, location, v0, v1, v2, v3);
     }
 
     public static void glProgramUniform4f(int program, int location, float v0, float v1, float v2, float v3) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glProgramUniform4f(program, location, v0, v1, v2, v3);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glProgramUniform4f(program, location, v0, v1, v2, v3);
     }
 
     public static void glProgramUniform4i(int program, int location, int v0, int v1, int v2, int v3) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glProgramUniform4i(program, location, v0, v1, v2, v3);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glProgramUniform4i(program, location, v0, v1, v2, v3);
     }
 
     public static void glProgramUniform4ui(int program, int location, int v0, int v1, int v2, int v3) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glProgramUniform4ui(program, location, v0, v1, v2, v3);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glProgramUniform4ui(program, location, v0, v1, v2, v3);
     }
 
     public static void glUseProgramStages(int pipeline, int stages, int program) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glUseProgramStages(pipeline, stages, program);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glUseProgramStages(pipeline, stages, program);
     }
 
     public static void glValidateProgramPipeline(int pipeline) {
-        org.lwjgl3.opengl.ARBSeparateShaderObjects.glValidateProgramPipeline(pipeline);
+        org.lwjgl.opengl.ARBSeparateShaderObjects.glValidateProgramPipeline(pipeline);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBShaderAtomicCounters.java b/src/main/java/org/lwjglx/opengl/ARBShaderAtomicCounters.java
similarity index 98%
rename from src/main/java/org/lwjgl/opengl/ARBShaderAtomicCounters.java
rename to src/main/java/org/lwjglx/opengl/ARBShaderAtomicCounters.java
index 5868e14a4..bacc01519 100644
--- a/src/main/java/org/lwjgl/opengl/ARBShaderAtomicCounters.java
+++ b/src/main/java/org/lwjglx/opengl/ARBShaderAtomicCounters.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBShaderAtomicCounters {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBShaderImageLoadStore.java b/src/main/java/org/lwjglx/opengl/ARBShaderImageLoadStore.java
similarity index 96%
rename from src/main/java/org/lwjgl/opengl/ARBShaderImageLoadStore.java
rename to src/main/java/org/lwjglx/opengl/ARBShaderImageLoadStore.java
index 16b0679a2..84c91b8ef 100644
--- a/src/main/java/org/lwjgl/opengl/ARBShaderImageLoadStore.java
+++ b/src/main/java/org/lwjglx/opengl/ARBShaderImageLoadStore.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBShaderImageLoadStore {
 
@@ -69,11 +69,11 @@ public class ARBShaderImageLoadStore {
 
     public static void glBindImageTexture(int unit, int texture, int level, boolean layered, int layer, int access,
             int format) {
-        org.lwjgl3.opengl.ARBShaderImageLoadStore
+        org.lwjgl.opengl.ARBShaderImageLoadStore
                 .glBindImageTexture(unit, texture, level, layered, layer, access, format);
     }
 
     public static void glMemoryBarrier(int barriers) {
-        org.lwjgl3.opengl.ARBShaderImageLoadStore.glMemoryBarrier(barriers);
+        org.lwjgl.opengl.ARBShaderImageLoadStore.glMemoryBarrier(barriers);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBShaderObjects.java b/src/main/java/org/lwjglx/opengl/ARBShaderObjects.java
similarity index 63%
rename from src/main/java/org/lwjgl/opengl/ARBShaderObjects.java
rename to src/main/java/org/lwjglx/opengl/ARBShaderObjects.java
index 633d8e537..806b68175 100644
--- a/src/main/java/org/lwjgl/opengl/ARBShaderObjects.java
+++ b/src/main/java/org/lwjglx/opengl/ARBShaderObjects.java
@@ -1,6 +1,6 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
-import org.lwjgl.lwjgl3ify.BufferCasts;
+import org.lwjglx.lwjgl3ify.BufferCasts;
 
 public class ARBShaderObjects {
 
@@ -40,185 +40,185 @@ public class ARBShaderObjects {
     public static final int GL_SHADER_OBJECT_ARB = (int) 35656;
 
     public static void glAttachObjectARB(int containerObj, int obj) {
-        org.lwjgl3.opengl.ARBShaderObjects.glAttachObjectARB(containerObj, obj);
+        org.lwjgl.opengl.ARBShaderObjects.glAttachObjectARB(containerObj, obj);
     }
 
     public static void glCompileShaderARB(int shaderObj) {
-        org.lwjgl3.opengl.ARBShaderObjects.glCompileShaderARB(shaderObj);
+        org.lwjgl.opengl.ARBShaderObjects.glCompileShaderARB(shaderObj);
     }
 
     public static int glCreateProgramObjectARB() {
-        return org.lwjgl3.opengl.ARBShaderObjects.glCreateProgramObjectARB();
+        return org.lwjgl.opengl.ARBShaderObjects.glCreateProgramObjectARB();
     }
 
     public static int glCreateShaderObjectARB(int shaderType) {
-        return org.lwjgl3.opengl.ARBShaderObjects.glCreateShaderObjectARB(shaderType);
+        return org.lwjgl.opengl.ARBShaderObjects.glCreateShaderObjectARB(shaderType);
     }
 
     public static void glDeleteObjectARB(int obj) {
-        org.lwjgl3.opengl.ARBShaderObjects.glDeleteObjectARB(obj);
+        org.lwjgl.opengl.ARBShaderObjects.glDeleteObjectARB(obj);
     }
 
     public static void glDetachObjectARB(int containerObj, int attachedObj) {
-        org.lwjgl3.opengl.ARBShaderObjects.glDetachObjectARB(containerObj, attachedObj);
+        org.lwjgl.opengl.ARBShaderObjects.glDetachObjectARB(containerObj, attachedObj);
     }
 
     public static void glGetActiveUniformARB(int programObj, int index, java.nio.IntBuffer length,
             java.nio.IntBuffer size, java.nio.IntBuffer type, java.nio.ByteBuffer name) {
-        org.lwjgl3.opengl.ARBShaderObjects.glGetActiveUniformARB(programObj, index, length, size, type, name);
+        org.lwjgl.opengl.ARBShaderObjects.glGetActiveUniformARB(programObj, index, length, size, type, name);
     }
 
     public static void glGetAttachedObjectsARB(int containerObj, java.nio.IntBuffer count, java.nio.IntBuffer obj) {
-        org.lwjgl3.opengl.ARBShaderObjects.glGetAttachedObjectsARB(containerObj, count, obj);
+        org.lwjgl.opengl.ARBShaderObjects.glGetAttachedObjectsARB(containerObj, count, obj);
     }
 
     public static int glGetHandleARB(int pname) {
-        return org.lwjgl3.opengl.ARBShaderObjects.glGetHandleARB(pname);
+        return org.lwjgl.opengl.ARBShaderObjects.glGetHandleARB(pname);
     }
 
     public static java.lang.String glGetInfoLogARB(int obj, int maxLength) {
-        return org.lwjgl3.opengl.ARBShaderObjects.glGetInfoLogARB(obj, maxLength);
+        return org.lwjgl.opengl.ARBShaderObjects.glGetInfoLogARB(obj, maxLength);
     }
 
     public static void glGetInfoLogARB(int obj, java.nio.IntBuffer length, java.nio.ByteBuffer infoLog) {
-        org.lwjgl3.opengl.ARBShaderObjects.glGetInfoLogARB(obj, length, infoLog);
+        org.lwjgl.opengl.ARBShaderObjects.glGetInfoLogARB(obj, length, infoLog);
     }
 
     public static void glGetObjectParameterARB(int obj, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.ARBShaderObjects.glGetObjectParameterfvARB(obj, pname, params);
+        org.lwjgl.opengl.ARBShaderObjects.glGetObjectParameterfvARB(obj, pname, params);
     }
 
     public static void glGetObjectParameterARB(int obj, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.ARBShaderObjects.glGetObjectParameterivARB(obj, pname, params);
+        org.lwjgl.opengl.ARBShaderObjects.glGetObjectParameterivARB(obj, pname, params);
     }
 
     public static int glGetObjectParameteriARB(int obj, int pname) {
-        return org.lwjgl3.opengl.ARBShaderObjects.glGetObjectParameteriARB(obj, pname);
+        return org.lwjgl.opengl.ARBShaderObjects.glGetObjectParameteriARB(obj, pname);
     }
 
     public static java.lang.String glGetShaderSourceARB(int obj, int maxLength) {
-        return org.lwjgl3.opengl.ARBShaderObjects.glGetShaderSourceARB(obj, maxLength);
+        return org.lwjgl.opengl.ARBShaderObjects.glGetShaderSourceARB(obj, maxLength);
     }
 
     public static void glGetShaderSourceARB(int obj, java.nio.IntBuffer length, java.nio.ByteBuffer source) {
-        org.lwjgl3.opengl.ARBShaderObjects.glGetShaderSourceARB(obj, length, source);
+        org.lwjgl.opengl.ARBShaderObjects.glGetShaderSourceARB(obj, length, source);
     }
 
     public static void glGetUniformARB(int programObj, int location, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.ARBShaderObjects.glGetUniformfvARB(programObj, location, params);
+        org.lwjgl.opengl.ARBShaderObjects.glGetUniformfvARB(programObj, location, params);
     }
 
     public static void glGetUniformARB(int programObj, int location, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.ARBShaderObjects.glGetUniformivARB(programObj, location, params);
+        org.lwjgl.opengl.ARBShaderObjects.glGetUniformivARB(programObj, location, params);
     }
 
     public static int glGetUniformLocationARB(int programObj, java.lang.CharSequence name) {
-        return org.lwjgl3.opengl.ARBShaderObjects.glGetUniformLocationARB(programObj, name);
+        return org.lwjgl.opengl.ARBShaderObjects.glGetUniformLocationARB(programObj, name);
     }
 
     public static int glGetUniformLocationARB(int programObj, java.nio.ByteBuffer name) {
-        return org.lwjgl3.opengl.ARBShaderObjects.glGetUniformLocationARB(programObj, name);
+        return org.lwjgl.opengl.ARBShaderObjects.glGetUniformLocationARB(programObj, name);
     }
 
     public static void glLinkProgramARB(int programObj) {
-        org.lwjgl3.opengl.ARBShaderObjects.glLinkProgramARB(programObj);
+        org.lwjgl.opengl.ARBShaderObjects.glLinkProgramARB(programObj);
     }
 
     public static void glShaderSourceARB(int shader, java.lang.CharSequence string) {
-        org.lwjgl3.opengl.ARBShaderObjects.glShaderSourceARB(shader, string);
+        org.lwjgl.opengl.ARBShaderObjects.glShaderSourceARB(shader, string);
     }
 
     public static void glShaderSourceARB(int shader, java.nio.ByteBuffer string) {
 
-        org.lwjgl3.opengl.ARBShaderObjects
+        org.lwjgl.opengl.ARBShaderObjects
                 .glShaderSourceARB(shader, BufferCasts.bufferToCharSeq(string));
     }
 
     public static void glShaderSourceARB(int shader, java.lang.CharSequence[] strings) {
-        org.lwjgl3.opengl.ARBShaderObjects.glShaderSourceARB(shader, strings);
+        org.lwjgl.opengl.ARBShaderObjects.glShaderSourceARB(shader, strings);
     }
 
     public static void glUniform1ARB(int location, java.nio.FloatBuffer values) {
-        org.lwjgl3.opengl.ARBShaderObjects.glUniform1fvARB(location, values);
+        org.lwjgl.opengl.ARBShaderObjects.glUniform1fvARB(location, values);
     }
 
     public static void glUniform1ARB(int location, java.nio.IntBuffer values) {
-        org.lwjgl3.opengl.ARBShaderObjects.glUniform1ivARB(location, values);
+        org.lwjgl.opengl.ARBShaderObjects.glUniform1ivARB(location, values);
     }
 
     public static void glUniform1fARB(int location, float v0) {
-        org.lwjgl3.opengl.ARBShaderObjects.glUniform1fARB(location, v0);
+        org.lwjgl.opengl.ARBShaderObjects.glUniform1fARB(location, v0);
     }
 
     public static void glUniform1iARB(int location, int v0) {
-        org.lwjgl3.opengl.ARBShaderObjects.glUniform1iARB(location, v0);
+        org.lwjgl.opengl.ARBShaderObjects.glUniform1iARB(location, v0);
     }
 
     public static void glUniform2ARB(int location, java.nio.FloatBuffer values) {
-        org.lwjgl3.opengl.ARBShaderObjects.glUniform2fvARB(location, values);
+        org.lwjgl.opengl.ARBShaderObjects.glUniform2fvARB(location, values);
     }
 
     public static void glUniform2ARB(int location, java.nio.IntBuffer values) {
-        org.lwjgl3.opengl.ARBShaderObjects.glUniform2ivARB(location, values);
+        org.lwjgl.opengl.ARBShaderObjects.glUniform2ivARB(location, values);
     }
 
     public static void glUniform2fARB(int location, float v0, float v1) {
-        org.lwjgl3.opengl.ARBShaderObjects.glUniform2fARB(location, v0, v1);
+        org.lwjgl.opengl.ARBShaderObjects.glUniform2fARB(location, v0, v1);
     }
 
     public static void glUniform2iARB(int location, int v0, int v1) {
-        org.lwjgl3.opengl.ARBShaderObjects.glUniform2iARB(location, v0, v1);
+        org.lwjgl.opengl.ARBShaderObjects.glUniform2iARB(location, v0, v1);
     }
 
     public static void glUniform3ARB(int location, java.nio.FloatBuffer values) {
-        org.lwjgl3.opengl.ARBShaderObjects.glUniform3fvARB(location, values);
+        org.lwjgl.opengl.ARBShaderObjects.glUniform3fvARB(location, values);
     }
 
     public static void glUniform3ARB(int location, java.nio.IntBuffer values) {
-        org.lwjgl3.opengl.ARBShaderObjects.glUniform3ivARB(location, values);
+        org.lwjgl.opengl.ARBShaderObjects.glUniform3ivARB(location, values);
     }
 
     public static void glUniform3fARB(int location, float v0, float v1, float v2) {
-        org.lwjgl3.opengl.ARBShaderObjects.glUniform3fARB(location, v0, v1, v2);
+        org.lwjgl.opengl.ARBShaderObjects.glUniform3fARB(location, v0, v1, v2);
     }
 
     public static void glUniform3iARB(int location, int v0, int v1, int v2) {
-        org.lwjgl3.opengl.ARBShaderObjects.glUniform3iARB(location, v0, v1, v2);
+        org.lwjgl.opengl.ARBShaderObjects.glUniform3iARB(location, v0, v1, v2);
     }
 
     public static void glUniform4ARB(int location, java.nio.FloatBuffer values) {
-        org.lwjgl3.opengl.ARBShaderObjects.glUniform4fvARB(location, values);
+        org.lwjgl.opengl.ARBShaderObjects.glUniform4fvARB(location, values);
     }
 
     public static void glUniform4ARB(int location, java.nio.IntBuffer values) {
-        org.lwjgl3.opengl.ARBShaderObjects.glUniform4ivARB(location, values);
+        org.lwjgl.opengl.ARBShaderObjects.glUniform4ivARB(location, values);
     }
 
     public static void glUniform4fARB(int location, float v0, float v1, float v2, float v3) {
-        org.lwjgl3.opengl.ARBShaderObjects.glUniform4fARB(location, v0, v1, v2, v3);
+        org.lwjgl.opengl.ARBShaderObjects.glUniform4fARB(location, v0, v1, v2, v3);
     }
 
     public static void glUniform4iARB(int location, int v0, int v1, int v2, int v3) {
-        org.lwjgl3.opengl.ARBShaderObjects.glUniform4iARB(location, v0, v1, v2, v3);
+        org.lwjgl.opengl.ARBShaderObjects.glUniform4iARB(location, v0, v1, v2, v3);
     }
 
     public static void glUniformMatrix2ARB(int location, boolean transpose, java.nio.FloatBuffer matrices) {
-        org.lwjgl3.opengl.ARBShaderObjects.glUniformMatrix2fvARB(location, transpose, matrices);
+        org.lwjgl.opengl.ARBShaderObjects.glUniformMatrix2fvARB(location, transpose, matrices);
     }
 
     public static void glUniformMatrix3ARB(int location, boolean transpose, java.nio.FloatBuffer matrices) {
-        org.lwjgl3.opengl.ARBShaderObjects.glUniformMatrix3fvARB(location, transpose, matrices);
+        org.lwjgl.opengl.ARBShaderObjects.glUniformMatrix3fvARB(location, transpose, matrices);
     }
 
     public static void glUniformMatrix4ARB(int location, boolean transpose, java.nio.FloatBuffer matrices) {
-        org.lwjgl3.opengl.ARBShaderObjects.glUniformMatrix4fvARB(location, transpose, matrices);
+        org.lwjgl.opengl.ARBShaderObjects.glUniformMatrix4fvARB(location, transpose, matrices);
     }
 
     public static void glUseProgramObjectARB(int programObj) {
-        org.lwjgl3.opengl.ARBShaderObjects.glUseProgramObjectARB(programObj);
+        org.lwjgl.opengl.ARBShaderObjects.glUseProgramObjectARB(programObj);
     }
 
     public static void glValidateProgramARB(int programObj) {
-        org.lwjgl3.opengl.ARBShaderObjects.glValidateProgramARB(programObj);
+        org.lwjgl.opengl.ARBShaderObjects.glValidateProgramARB(programObj);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBShaderStorageBufferObject.java b/src/main/java/org/lwjglx/opengl/ARBShaderStorageBufferObject.java
similarity index 94%
rename from src/main/java/org/lwjgl/opengl/ARBShaderStorageBufferObject.java
rename to src/main/java/org/lwjglx/opengl/ARBShaderStorageBufferObject.java
index ad13aa691..bbcab502c 100644
--- a/src/main/java/org/lwjgl/opengl/ARBShaderStorageBufferObject.java
+++ b/src/main/java/org/lwjglx/opengl/ARBShaderStorageBufferObject.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBShaderStorageBufferObject {
 
@@ -20,7 +20,7 @@ public class ARBShaderStorageBufferObject {
     public static final int GL_SHADER_STORAGE_BUFFER_START = (int) 37076;
 
     public static void glShaderStorageBlockBinding(int program, int storageBlockIndex, int storageBlockBinding) {
-        org.lwjgl3.opengl.ARBShaderStorageBufferObject
+        org.lwjgl.opengl.ARBShaderStorageBufferObject
                 .glShaderStorageBlockBinding(program, storageBlockIndex, storageBlockBinding);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBShaderSubroutine.java b/src/main/java/org/lwjglx/opengl/ARBShaderSubroutine.java
similarity index 64%
rename from src/main/java/org/lwjgl/opengl/ARBShaderSubroutine.java
rename to src/main/java/org/lwjglx/opengl/ARBShaderSubroutine.java
index a4a35c048..98d39f9b7 100644
--- a/src/main/java/org/lwjgl/opengl/ARBShaderSubroutine.java
+++ b/src/main/java/org/lwjglx/opengl/ARBShaderSubroutine.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBShaderSubroutine {
 
@@ -13,50 +13,50 @@ public class ARBShaderSubroutine {
     public static final int GL_NUM_COMPATIBLE_SUBROUTINES = (int) 36426;
 
     public static java.lang.String glGetActiveSubroutineName(int program, int shadertype, int index, int bufsize) {
-        return org.lwjgl3.opengl.ARBShaderSubroutine.glGetActiveSubroutineName(program, shadertype, index, bufsize);
+        return org.lwjgl.opengl.ARBShaderSubroutine.glGetActiveSubroutineName(program, shadertype, index, bufsize);
     }
 
     public static void glGetActiveSubroutineName(int program, int shadertype, int index, java.nio.IntBuffer length,
             java.nio.ByteBuffer name) {
-        org.lwjgl3.opengl.ARBShaderSubroutine.glGetActiveSubroutineName(program, shadertype, index, length, name);
+        org.lwjgl.opengl.ARBShaderSubroutine.glGetActiveSubroutineName(program, shadertype, index, length, name);
     }
 
     public static java.lang.String glGetActiveSubroutineUniformName(int program, int shadertype, int index,
             int bufsize) {
-        return org.lwjgl3.opengl.ARBShaderSubroutine
+        return org.lwjgl.opengl.ARBShaderSubroutine
                 .glGetActiveSubroutineUniformName(program, shadertype, index, bufsize);
     }
 
     public static void glGetActiveSubroutineUniformName(int program, int shadertype, int index,
             java.nio.IntBuffer length, java.nio.ByteBuffer name) {
-        org.lwjgl3.opengl.ARBShaderSubroutine.glGetActiveSubroutineUniformName(program, shadertype, index, length, name);
+        org.lwjgl.opengl.ARBShaderSubroutine.glGetActiveSubroutineUniformName(program, shadertype, index, length, name);
     }
 
     public static int glGetActiveSubroutineUniformi(int program, int shadertype, int index, int pname) {
-        return org.lwjgl3.opengl.ARBShaderSubroutine.glGetActiveSubroutineUniformi(program, shadertype, index, pname);
+        return org.lwjgl.opengl.ARBShaderSubroutine.glGetActiveSubroutineUniformi(program, shadertype, index, pname);
     }
 
     public static int glGetProgramStagei(int program, int shadertype, int pname) {
-        return org.lwjgl3.opengl.ARBShaderSubroutine.glGetProgramStagei(program, shadertype, pname);
+        return org.lwjgl.opengl.ARBShaderSubroutine.glGetProgramStagei(program, shadertype, pname);
     }
 
     public static int glGetSubroutineIndex(int program, int shadertype, java.lang.CharSequence name) {
-        return org.lwjgl3.opengl.ARBShaderSubroutine.glGetSubroutineIndex(program, shadertype, name);
+        return org.lwjgl.opengl.ARBShaderSubroutine.glGetSubroutineIndex(program, shadertype, name);
     }
 
     public static int glGetSubroutineIndex(int program, int shadertype, java.nio.ByteBuffer name) {
-        return org.lwjgl3.opengl.ARBShaderSubroutine.glGetSubroutineIndex(program, shadertype, name);
+        return org.lwjgl.opengl.ARBShaderSubroutine.glGetSubroutineIndex(program, shadertype, name);
     }
 
     public static int glGetSubroutineUniformLocation(int program, int shadertype, java.lang.CharSequence name) {
-        return org.lwjgl3.opengl.ARBShaderSubroutine.glGetSubroutineUniformLocation(program, shadertype, name);
+        return org.lwjgl.opengl.ARBShaderSubroutine.glGetSubroutineUniformLocation(program, shadertype, name);
     }
 
     public static int glGetSubroutineUniformLocation(int program, int shadertype, java.nio.ByteBuffer name) {
-        return org.lwjgl3.opengl.ARBShaderSubroutine.glGetSubroutineUniformLocation(program, shadertype, name);
+        return org.lwjgl.opengl.ARBShaderSubroutine.glGetSubroutineUniformLocation(program, shadertype, name);
     }
 
     public static int glGetUniformSubroutineui(int shadertype, int location) {
-        return org.lwjgl3.opengl.ARBShaderSubroutine.glGetUniformSubroutineui(shadertype, location);
+        return org.lwjgl.opengl.ARBShaderSubroutine.glGetUniformSubroutineui(shadertype, location);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBShadingLanguage100.java b/src/main/java/org/lwjglx/opengl/ARBShadingLanguage100.java
similarity index 81%
rename from src/main/java/org/lwjgl/opengl/ARBShadingLanguage100.java
rename to src/main/java/org/lwjglx/opengl/ARBShadingLanguage100.java
index 501dabebd..07747f958 100644
--- a/src/main/java/org/lwjgl/opengl/ARBShadingLanguage100.java
+++ b/src/main/java/org/lwjglx/opengl/ARBShadingLanguage100.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBShadingLanguage100 {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBShadingLanguageInclude.java b/src/main/java/org/lwjglx/opengl/ARBShadingLanguageInclude.java
similarity index 57%
rename from src/main/java/org/lwjgl/opengl/ARBShadingLanguageInclude.java
rename to src/main/java/org/lwjglx/opengl/ARBShadingLanguageInclude.java
index 73021b8ce..f31de7b5f 100644
--- a/src/main/java/org/lwjgl/opengl/ARBShadingLanguageInclude.java
+++ b/src/main/java/org/lwjglx/opengl/ARBShadingLanguageInclude.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBShadingLanguageInclude {
 
@@ -7,52 +7,52 @@ public class ARBShadingLanguageInclude {
     public static final int GL_SHADER_INCLUDE_ARB = (int) 36270;
 
     public static void glDeleteNamedStringARB(java.lang.CharSequence name) {
-        org.lwjgl3.opengl.ARBShadingLanguageInclude.glDeleteNamedStringARB(name);
+        org.lwjgl.opengl.ARBShadingLanguageInclude.glDeleteNamedStringARB(name);
     }
 
     public static void glDeleteNamedStringARB(java.nio.ByteBuffer name) {
-        org.lwjgl3.opengl.ARBShadingLanguageInclude.glDeleteNamedStringARB(name);
+        org.lwjgl.opengl.ARBShadingLanguageInclude.glDeleteNamedStringARB(name);
     }
 
     public static java.lang.String glGetNamedStringARB(java.lang.CharSequence name, int bufSize) {
-        return org.lwjgl3.opengl.ARBShadingLanguageInclude.glGetNamedStringARB(name, bufSize);
+        return org.lwjgl.opengl.ARBShadingLanguageInclude.glGetNamedStringARB(name, bufSize);
     }
 
     public static void glGetNamedStringARB(java.lang.CharSequence name, java.nio.IntBuffer stringlen,
             java.nio.ByteBuffer string) {
-        org.lwjgl3.opengl.ARBShadingLanguageInclude.glGetNamedStringARB(name, stringlen, string);
+        org.lwjgl.opengl.ARBShadingLanguageInclude.glGetNamedStringARB(name, stringlen, string);
     }
 
     public static void glGetNamedStringARB(java.nio.ByteBuffer name, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.ARBShadingLanguageInclude.glGetNamedStringivARB(name, pname, params);
+        org.lwjgl.opengl.ARBShadingLanguageInclude.glGetNamedStringivARB(name, pname, params);
     }
 
     public static void glGetNamedStringARB(java.nio.ByteBuffer name, java.nio.IntBuffer stringlen,
             java.nio.ByteBuffer string) {
-        org.lwjgl3.opengl.ARBShadingLanguageInclude.glGetNamedStringARB(name, stringlen, string);
+        org.lwjgl.opengl.ARBShadingLanguageInclude.glGetNamedStringARB(name, stringlen, string);
     }
 
     public static int glGetNamedStringiARB(java.lang.CharSequence name, int pname) {
-        return org.lwjgl3.opengl.ARBShadingLanguageInclude.glGetNamedStringiARB(name, pname);
+        return org.lwjgl.opengl.ARBShadingLanguageInclude.glGetNamedStringiARB(name, pname);
     }
 
     public static void glGetNamedStringiARB(java.lang.CharSequence name, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.ARBShadingLanguageInclude.glGetNamedStringivARB(name, pname, params);
+        org.lwjgl.opengl.ARBShadingLanguageInclude.glGetNamedStringivARB(name, pname, params);
     }
 
     public static boolean glIsNamedStringARB(java.lang.CharSequence name) {
-        return org.lwjgl3.opengl.ARBShadingLanguageInclude.glIsNamedStringARB(name);
+        return org.lwjgl.opengl.ARBShadingLanguageInclude.glIsNamedStringARB(name);
     }
 
     public static boolean glIsNamedStringARB(java.nio.ByteBuffer name) {
-        return org.lwjgl3.opengl.ARBShadingLanguageInclude.glIsNamedStringARB(name);
+        return org.lwjgl.opengl.ARBShadingLanguageInclude.glIsNamedStringARB(name);
     }
 
     public static void glNamedStringARB(int type, java.lang.CharSequence name, java.lang.CharSequence string) {
-        org.lwjgl3.opengl.ARBShadingLanguageInclude.glNamedStringARB(type, name, string);
+        org.lwjgl.opengl.ARBShadingLanguageInclude.glNamedStringARB(type, name, string);
     }
 
     public static void glNamedStringARB(int type, java.nio.ByteBuffer name, java.nio.ByteBuffer string) {
-        org.lwjgl3.opengl.ARBShadingLanguageInclude.glNamedStringARB(type, name, string);
+        org.lwjgl.opengl.ARBShadingLanguageInclude.glNamedStringARB(type, name, string);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBShadow.java b/src/main/java/org/lwjglx/opengl/ARBShadow.java
similarity index 89%
rename from src/main/java/org/lwjgl/opengl/ARBShadow.java
rename to src/main/java/org/lwjglx/opengl/ARBShadow.java
index 61b5208ac..46bd5a3d4 100644
--- a/src/main/java/org/lwjgl/opengl/ARBShadow.java
+++ b/src/main/java/org/lwjglx/opengl/ARBShadow.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBShadow {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBShadowAmbient.java b/src/main/java/org/lwjglx/opengl/ARBShadowAmbient.java
similarity index 80%
rename from src/main/java/org/lwjgl/opengl/ARBShadowAmbient.java
rename to src/main/java/org/lwjglx/opengl/ARBShadowAmbient.java
index 798e6d894..0cf9cce62 100644
--- a/src/main/java/org/lwjgl/opengl/ARBShadowAmbient.java
+++ b/src/main/java/org/lwjglx/opengl/ARBShadowAmbient.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBShadowAmbient {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBSparseBuffer.java b/src/main/java/org/lwjglx/opengl/ARBSparseBuffer.java
similarity index 69%
rename from src/main/java/org/lwjgl/opengl/ARBSparseBuffer.java
rename to src/main/java/org/lwjglx/opengl/ARBSparseBuffer.java
index 1115a8b93..c899777f5 100644
--- a/src/main/java/org/lwjgl/opengl/ARBSparseBuffer.java
+++ b/src/main/java/org/lwjglx/opengl/ARBSparseBuffer.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBSparseBuffer {
 
@@ -6,6 +6,6 @@ public class ARBSparseBuffer {
     public static final int GL_SPARSE_STORAGE_BIT_ARB = (int) 1024;
 
     public static void glBufferPageCommitmentARB(int target, long offset, long size, boolean commit) {
-        org.lwjgl3.opengl.ARBSparseBuffer.glBufferPageCommitmentARB(target, offset, size, commit);
+        org.lwjgl.opengl.ARBSparseBuffer.glBufferPageCommitmentARB(target, offset, size, commit);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBSparseTexture.java b/src/main/java/org/lwjglx/opengl/ARBSparseTexture.java
similarity index 94%
rename from src/main/java/org/lwjgl/opengl/ARBSparseTexture.java
rename to src/main/java/org/lwjglx/opengl/ARBSparseTexture.java
index e4ca94b77..56e64aef7 100644
--- a/src/main/java/org/lwjgl/opengl/ARBSparseTexture.java
+++ b/src/main/java/org/lwjglx/opengl/ARBSparseTexture.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBSparseTexture {
 
@@ -16,7 +16,7 @@ public class ARBSparseTexture {
 
     public static void glTexPageCommitmentARB(int target, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, boolean commit) {
-        org.lwjgl3.opengl.ARBSparseTexture
+        org.lwjgl.opengl.ARBSparseTexture
                 .glTexPageCommitmentARB(target, level, xoffset, yoffset, zoffset, width, height, depth, commit);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBStencilTexturing.java b/src/main/java/org/lwjglx/opengl/ARBStencilTexturing.java
similarity index 80%
rename from src/main/java/org/lwjgl/opengl/ARBStencilTexturing.java
rename to src/main/java/org/lwjglx/opengl/ARBStencilTexturing.java
index 7017d70a4..7ec5bbc88 100644
--- a/src/main/java/org/lwjgl/opengl/ARBStencilTexturing.java
+++ b/src/main/java/org/lwjglx/opengl/ARBStencilTexturing.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBStencilTexturing {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBSync.java b/src/main/java/org/lwjglx/opengl/ARBSync.java
similarity index 91%
rename from src/main/java/org/lwjgl/opengl/ARBSync.java
rename to src/main/java/org/lwjglx/opengl/ARBSync.java
index 4c01e2300..a3a9bbf41 100644
--- a/src/main/java/org/lwjgl/opengl/ARBSync.java
+++ b/src/main/java/org/lwjglx/opengl/ARBSync.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBSync {
 
@@ -19,6 +19,6 @@ public class ARBSync {
     public static final int GL_WAIT_FAILED = (int) 37149;
 
     public static long glGetInteger64(int pname) {
-        return org.lwjgl3.opengl.ARBSync.glGetInteger64(pname);
+        return org.lwjgl.opengl.ARBSync.glGetInteger64(pname);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBTessellationShader.java b/src/main/java/org/lwjglx/opengl/ARBTessellationShader.java
similarity index 95%
rename from src/main/java/org/lwjgl/opengl/ARBTessellationShader.java
rename to src/main/java/org/lwjglx/opengl/ARBTessellationShader.java
index e92dfd529..27ce994fe 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTessellationShader.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTessellationShader.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTessellationShader {
 
@@ -36,6 +36,6 @@ public class ARBTessellationShader {
     public static final int GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER = (int) 34033;
 
     public static void glPatchParameteri(int pname, int value) {
-        org.lwjgl3.opengl.ARBTessellationShader.glPatchParameteri(pname, value);
+        org.lwjgl.opengl.ARBTessellationShader.glPatchParameteri(pname, value);
     }
 }
diff --git a/src/main/java/org/lwjglx/opengl/ARBTextureBarrier.java b/src/main/java/org/lwjglx/opengl/ARBTextureBarrier.java
new file mode 100644
index 000000000..116b20e09
--- /dev/null
+++ b/src/main/java/org/lwjglx/opengl/ARBTextureBarrier.java
@@ -0,0 +1,8 @@
+package org.lwjglx.opengl;
+
+public class ARBTextureBarrier {
+
+    public static void glTextureBarrier() {
+        org.lwjgl.opengl.ARBTextureBarrier.glTextureBarrier();
+    }
+}
diff --git a/src/main/java/org/lwjgl/opengl/ARBTextureBorderClamp.java b/src/main/java/org/lwjglx/opengl/ARBTextureBorderClamp.java
similarity index 79%
rename from src/main/java/org/lwjgl/opengl/ARBTextureBorderClamp.java
rename to src/main/java/org/lwjglx/opengl/ARBTextureBorderClamp.java
index 71ac85f9b..0c28fc030 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTextureBorderClamp.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTextureBorderClamp.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTextureBorderClamp {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBTextureBufferObject.java b/src/main/java/org/lwjglx/opengl/ARBTextureBufferObject.java
similarity index 80%
rename from src/main/java/org/lwjgl/opengl/ARBTextureBufferObject.java
rename to src/main/java/org/lwjglx/opengl/ARBTextureBufferObject.java
index f8702c9cc..cf6ea8680 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTextureBufferObject.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTextureBufferObject.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTextureBufferObject {
 
@@ -9,6 +9,6 @@ public class ARBTextureBufferObject {
     public static final int GL_TEXTURE_BUFFER_FORMAT_ARB = (int) 35886;
 
     public static void glTexBufferARB(int target, int internalformat, int buffer) {
-        org.lwjgl3.opengl.ARBTextureBufferObject.glTexBufferARB(target, internalformat, buffer);
+        org.lwjgl.opengl.ARBTextureBufferObject.glTexBufferARB(target, internalformat, buffer);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBTextureBufferRange.java b/src/main/java/org/lwjglx/opengl/ARBTextureBufferRange.java
similarity index 76%
rename from src/main/java/org/lwjgl/opengl/ARBTextureBufferRange.java
rename to src/main/java/org/lwjglx/opengl/ARBTextureBufferRange.java
index a36297f9c..dc840d4d9 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTextureBufferRange.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTextureBufferRange.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTextureBufferRange {
 
@@ -7,12 +7,12 @@ public class ARBTextureBufferRange {
     public static final int GL_TEXTURE_BUFFER_SIZE = (int) 37278;
 
     public static void glTexBufferRange(int target, int internalformat, int buffer, long offset, long size) {
-        org.lwjgl3.opengl.ARBTextureBufferRange.glTexBufferRange(target, internalformat, buffer, offset, size);
+        org.lwjgl.opengl.ARBTextureBufferRange.glTexBufferRange(target, internalformat, buffer, offset, size);
     }
 
     public static void glTextureBufferRangeEXT(int texture, int target, int internalformat, int buffer, long offset,
             long size) {
-        org.lwjgl3.opengl.ARBTextureBufferRange
+        org.lwjgl.opengl.ARBTextureBufferRange
                 .glTextureBufferRangeEXT(texture, target, internalformat, buffer, offset, size);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBTextureCompression.java b/src/main/java/org/lwjglx/opengl/ARBTextureCompression.java
similarity index 84%
rename from src/main/java/org/lwjgl/opengl/ARBTextureCompression.java
rename to src/main/java/org/lwjglx/opengl/ARBTextureCompression.java
index e3d11871d..b5aa10f8a 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTextureCompression.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTextureCompression.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTextureCompression {
 
@@ -16,7 +16,7 @@ public class ARBTextureCompression {
 
     public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border,
             int pData_imageSize, long pData_buffer_offset) {
-        org.lwjgl3.opengl.ARBTextureCompression.glCompressedTexImage1DARB(
+        org.lwjgl.opengl.ARBTextureCompression.glCompressedTexImage1DARB(
                 target,
                 level,
                 internalformat,
@@ -28,7 +28,7 @@ public static void glCompressedTexImage1DARB(int target, int level, int internal
 
     public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height,
             int border, int pData_imageSize, long pData_buffer_offset) {
-        org.lwjgl3.opengl.ARBTextureCompression.glCompressedTexImage2DARB(
+        org.lwjgl.opengl.ARBTextureCompression.glCompressedTexImage2DARB(
                 target,
                 level,
                 internalformat,
@@ -41,7 +41,7 @@ public static void glCompressedTexImage2DARB(int target, int level, int internal
 
     public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height,
             int depth, int border, int pData_imageSize, long pData_buffer_offset) {
-        org.lwjgl3.opengl.ARBTextureCompression.glCompressedTexImage3DARB(
+        org.lwjgl.opengl.ARBTextureCompression.glCompressedTexImage3DARB(
                 target,
                 level,
                 internalformat,
@@ -55,7 +55,7 @@ public static void glCompressedTexImage3DARB(int target, int level, int internal
 
     public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format,
             int pData_imageSize, long pData_buffer_offset) {
-        org.lwjgl3.opengl.ARBTextureCompression.glCompressedTexSubImage1DARB(
+        org.lwjgl.opengl.ARBTextureCompression.glCompressedTexSubImage1DARB(
                 target,
                 level,
                 xoffset,
@@ -67,13 +67,13 @@ public static void glCompressedTexSubImage1DARB(int target, int level, int xoffs
 
     public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format,
             java.nio.ByteBuffer pData) {
-        org.lwjgl3.opengl.ARBTextureCompression
+        org.lwjgl.opengl.ARBTextureCompression
                 .glCompressedTexSubImage1DARB(target, level, xoffset, width, format, pData);
     }
 
     public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width,
             int height, int format, int pData_imageSize, long pData_buffer_offset) {
-        org.lwjgl3.opengl.ARBTextureCompression.glCompressedTexSubImage2DARB(
+        org.lwjgl.opengl.ARBTextureCompression.glCompressedTexSubImage2DARB(
                 target,
                 level,
                 xoffset,
@@ -87,13 +87,13 @@ public static void glCompressedTexSubImage2DARB(int target, int level, int xoffs
 
     public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width,
             int height, int format, java.nio.ByteBuffer pData) {
-        org.lwjgl3.opengl.ARBTextureCompression
+        org.lwjgl.opengl.ARBTextureCompression
                 .glCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, pData);
     }
 
     public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, int format, int pData_imageSize, long pData_buffer_offset) {
-        org.lwjgl3.opengl.ARBTextureCompression.glCompressedTexSubImage3DARB(
+        org.lwjgl.opengl.ARBTextureCompression.glCompressedTexSubImage3DARB(
                 target,
                 level,
                 xoffset,
@@ -109,7 +109,7 @@ public static void glCompressedTexSubImage3DARB(int target, int level, int xoffs
 
     public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, int format, java.nio.ByteBuffer pData) {
-        org.lwjgl3.opengl.ARBTextureCompression.glCompressedTexSubImage3DARB(
+        org.lwjgl.opengl.ARBTextureCompression.glCompressedTexSubImage3DARB(
                 target,
                 level,
                 xoffset,
@@ -123,10 +123,10 @@ public static void glCompressedTexSubImage3DARB(int target, int level, int xoffs
     }
 
     public static void glGetCompressedTexImageARB(int target, int lod, long pImg_buffer_offset) {
-        org.lwjgl3.opengl.ARBTextureCompression.glGetCompressedTexImageARB(target, lod, pImg_buffer_offset);
+        org.lwjgl.opengl.ARBTextureCompression.glGetCompressedTexImageARB(target, lod, pImg_buffer_offset);
     }
 
     public static void glGetCompressedTexImageARB(int target, int lod, java.nio.ByteBuffer pImg) {
-        org.lwjgl3.opengl.ARBTextureCompression.glGetCompressedTexImageARB(target, lod, pImg);
+        org.lwjgl.opengl.ARBTextureCompression.glGetCompressedTexImageARB(target, lod, pImg);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBTextureCompressionBPTC.java b/src/main/java/org/lwjglx/opengl/ARBTextureCompressionBPTC.java
similarity index 93%
rename from src/main/java/org/lwjgl/opengl/ARBTextureCompressionBPTC.java
rename to src/main/java/org/lwjglx/opengl/ARBTextureCompressionBPTC.java
index f5911ce85..ffd94d18f 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTextureCompressionBPTC.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTextureCompressionBPTC.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTextureCompressionBPTC {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBTextureCompressionRGTC.java b/src/main/java/org/lwjglx/opengl/ARBTextureCompressionRGTC.java
similarity index 92%
rename from src/main/java/org/lwjgl/opengl/ARBTextureCompressionRGTC.java
rename to src/main/java/org/lwjglx/opengl/ARBTextureCompressionRGTC.java
index a184d2de5..21baa301e 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTextureCompressionRGTC.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTextureCompressionRGTC.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTextureCompressionRGTC {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBTextureCubeMap.java b/src/main/java/org/lwjglx/opengl/ARBTextureCubeMap.java
similarity index 97%
rename from src/main/java/org/lwjgl/opengl/ARBTextureCubeMap.java
rename to src/main/java/org/lwjglx/opengl/ARBTextureCubeMap.java
index 5cced2557..5b2ff58d9 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTextureCubeMap.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTextureCubeMap.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTextureCubeMap {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBTextureCubeMapArray.java b/src/main/java/org/lwjglx/opengl/ARBTextureCubeMapArray.java
similarity index 95%
rename from src/main/java/org/lwjgl/opengl/ARBTextureCubeMapArray.java
rename to src/main/java/org/lwjglx/opengl/ARBTextureCubeMapArray.java
index e9a3f4a69..4f1e4f439 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTextureCubeMapArray.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTextureCubeMapArray.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTextureCubeMapArray {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBTextureEnvCombine.java b/src/main/java/org/lwjglx/opengl/ARBTextureEnvCombine.java
similarity index 98%
rename from src/main/java/org/lwjgl/opengl/ARBTextureEnvCombine.java
rename to src/main/java/org/lwjglx/opengl/ARBTextureEnvCombine.java
index a17aac928..202ac9161 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTextureEnvCombine.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTextureEnvCombine.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTextureEnvCombine {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBTextureEnvDot3.java b/src/main/java/org/lwjglx/opengl/ARBTextureEnvDot3.java
similarity index 85%
rename from src/main/java/org/lwjgl/opengl/ARBTextureEnvDot3.java
rename to src/main/java/org/lwjglx/opengl/ARBTextureEnvDot3.java
index 336224502..27e0aadcc 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTextureEnvDot3.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTextureEnvDot3.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTextureEnvDot3 {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBTextureFloat.java b/src/main/java/org/lwjglx/opengl/ARBTextureFloat.java
similarity index 98%
rename from src/main/java/org/lwjgl/opengl/ARBTextureFloat.java
rename to src/main/java/org/lwjglx/opengl/ARBTextureFloat.java
index 8cad02ae6..5d1d91bd8 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTextureFloat.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTextureFloat.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTextureFloat {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBTextureGather.java b/src/main/java/org/lwjglx/opengl/ARBTextureGather.java
similarity index 91%
rename from src/main/java/org/lwjgl/opengl/ARBTextureGather.java
rename to src/main/java/org/lwjglx/opengl/ARBTextureGather.java
index 0e1a71a77..626e463b4 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTextureGather.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTextureGather.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTextureGather {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBTextureMirrorClampToEdge.java b/src/main/java/org/lwjglx/opengl/ARBTextureMirrorClampToEdge.java
similarity index 80%
rename from src/main/java/org/lwjgl/opengl/ARBTextureMirrorClampToEdge.java
rename to src/main/java/org/lwjglx/opengl/ARBTextureMirrorClampToEdge.java
index a4253246f..ec7e5617f 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTextureMirrorClampToEdge.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTextureMirrorClampToEdge.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTextureMirrorClampToEdge {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBTextureMirroredRepeat.java b/src/main/java/org/lwjglx/opengl/ARBTextureMirroredRepeat.java
similarity index 80%
rename from src/main/java/org/lwjgl/opengl/ARBTextureMirroredRepeat.java
rename to src/main/java/org/lwjglx/opengl/ARBTextureMirroredRepeat.java
index 8b18fca94..987a4e261 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTextureMirroredRepeat.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTextureMirroredRepeat.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTextureMirroredRepeat {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBTextureMultisample.java b/src/main/java/org/lwjglx/opengl/ARBTextureMultisample.java
similarity index 91%
rename from src/main/java/org/lwjgl/opengl/ARBTextureMultisample.java
rename to src/main/java/org/lwjglx/opengl/ARBTextureMultisample.java
index 80d10bc8c..b69ca0b2b 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTextureMultisample.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTextureMultisample.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTextureMultisample {
 
@@ -25,18 +25,18 @@ public class ARBTextureMultisample {
     public static final int GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY = (int) 37133;
 
     public static void glSampleMaski(int index, int mask) {
-        org.lwjgl3.opengl.ARBTextureMultisample.glSampleMaski(index, mask);
+        org.lwjgl.opengl.ARBTextureMultisample.glSampleMaski(index, mask);
     }
 
     public static void glTexImage2DMultisample(int target, int samples, int internalformat, int width, int height,
             boolean fixedsamplelocations) {
-        org.lwjgl3.opengl.ARBTextureMultisample
+        org.lwjgl.opengl.ARBTextureMultisample
                 .glTexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
     }
 
     public static void glTexImage3DMultisample(int target, int samples, int internalformat, int width, int height,
             int depth, boolean fixedsamplelocations) {
-        org.lwjgl3.opengl.ARBTextureMultisample
+        org.lwjgl.opengl.ARBTextureMultisample
                 .glTexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBTextureRGB10_A2UI.java b/src/main/java/org/lwjglx/opengl/ARBTextureRGB10_A2UI.java
similarity index 78%
rename from src/main/java/org/lwjgl/opengl/ARBTextureRGB10_A2UI.java
rename to src/main/java/org/lwjglx/opengl/ARBTextureRGB10_A2UI.java
index 47926c00e..c5d090695 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTextureRGB10_A2UI.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTextureRGB10_A2UI.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTextureRGB10_A2UI {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBTextureRectangle.java b/src/main/java/org/lwjglx/opengl/ARBTextureRectangle.java
similarity index 94%
rename from src/main/java/org/lwjgl/opengl/ARBTextureRectangle.java
rename to src/main/java/org/lwjglx/opengl/ARBTextureRectangle.java
index 18555c49e..18ee048f0 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTextureRectangle.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTextureRectangle.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTextureRectangle {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBTextureStorage.java b/src/main/java/org/lwjglx/opengl/ARBTextureStorage.java
similarity index 66%
rename from src/main/java/org/lwjgl/opengl/ARBTextureStorage.java
rename to src/main/java/org/lwjglx/opengl/ARBTextureStorage.java
index 970d04490..0cf084fa9 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTextureStorage.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTextureStorage.java
@@ -1,34 +1,34 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTextureStorage {
 
     public static final int GL_TEXTURE_IMMUTABLE_FORMAT = (int) 37167;
 
     public static void glTexStorage1D(int target, int levels, int internalformat, int width) {
-        org.lwjgl3.opengl.ARBTextureStorage.glTexStorage1D(target, levels, internalformat, width);
+        org.lwjgl.opengl.ARBTextureStorage.glTexStorage1D(target, levels, internalformat, width);
     }
 
     public static void glTexStorage2D(int target, int levels, int internalformat, int width, int height) {
-        org.lwjgl3.opengl.ARBTextureStorage.glTexStorage2D(target, levels, internalformat, width, height);
+        org.lwjgl.opengl.ARBTextureStorage.glTexStorage2D(target, levels, internalformat, width, height);
     }
 
     public static void glTexStorage3D(int target, int levels, int internalformat, int width, int height, int depth) {
-        org.lwjgl3.opengl.ARBTextureStorage.glTexStorage3D(target, levels, internalformat, width, height, depth);
+        org.lwjgl.opengl.ARBTextureStorage.glTexStorage3D(target, levels, internalformat, width, height, depth);
     }
 
     public static void glTextureStorage1DEXT(int texture, int target, int levels, int internalformat, int width) {
-        org.lwjgl3.opengl.ARBTextureStorage.glTextureStorage1DEXT(texture, target, levels, internalformat, width);
+        org.lwjgl.opengl.ARBTextureStorage.glTextureStorage1DEXT(texture, target, levels, internalformat, width);
     }
 
     public static void glTextureStorage2DEXT(int texture, int target, int levels, int internalformat, int width,
             int height) {
-        org.lwjgl3.opengl.ARBTextureStorage
+        org.lwjgl.opengl.ARBTextureStorage
                 .glTextureStorage2DEXT(texture, target, levels, internalformat, width, height);
     }
 
     public static void glTextureStorage3DEXT(int texture, int target, int levels, int internalformat, int width,
             int height, int depth) {
-        org.lwjgl3.opengl.ARBTextureStorage
+        org.lwjgl.opengl.ARBTextureStorage
                 .glTextureStorage3DEXT(texture, target, levels, internalformat, width, height, depth);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBTextureStorageMultisample.java b/src/main/java/org/lwjglx/opengl/ARBTextureStorageMultisample.java
similarity index 81%
rename from src/main/java/org/lwjgl/opengl/ARBTextureStorageMultisample.java
rename to src/main/java/org/lwjglx/opengl/ARBTextureStorageMultisample.java
index 832fbc0e1..b5c503eda 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTextureStorageMultisample.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTextureStorageMultisample.java
@@ -1,22 +1,22 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTextureStorageMultisample {
 
     public static void glTexStorage2DMultisample(int target, int samples, int internalformat, int width, int height,
             boolean fixedsamplelocations) {
-        org.lwjgl3.opengl.ARBTextureStorageMultisample
+        org.lwjgl.opengl.ARBTextureStorageMultisample
                 .glTexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
     }
 
     public static void glTexStorage3DMultisample(int target, int samples, int internalformat, int width, int height,
             int depth, boolean fixedsamplelocations) {
-        org.lwjgl3.opengl.ARBTextureStorageMultisample
+        org.lwjgl.opengl.ARBTextureStorageMultisample
                 .glTexStorage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
     }
 
     public static void glTextureStorage2DMultisampleEXT(int texture, int target, int samples, int internalformat,
             int width, int height, boolean fixedsamplelocations) {
-        org.lwjgl3.opengl.ARBTextureStorageMultisample.glTextureStorage2DMultisampleEXT(
+        org.lwjgl.opengl.ARBTextureStorageMultisample.glTextureStorage2DMultisampleEXT(
                 texture,
                 target,
                 samples,
@@ -28,7 +28,7 @@ public static void glTextureStorage2DMultisampleEXT(int texture, int target, int
 
     public static void glTextureStorage3DMultisampleEXT(int texture, int target, int samples, int internalformat,
             int width, int height, int depth, boolean fixedsamplelocations) {
-        org.lwjgl3.opengl.ARBTextureStorageMultisample.glTextureStorage3DMultisampleEXT(
+        org.lwjgl.opengl.ARBTextureStorageMultisample.glTextureStorage3DMultisampleEXT(
                 texture,
                 target,
                 samples,
diff --git a/src/main/java/org/lwjgl/opengl/ARBTextureSwizzle.java b/src/main/java/org/lwjglx/opengl/ARBTextureSwizzle.java
similarity index 93%
rename from src/main/java/org/lwjgl/opengl/ARBTextureSwizzle.java
rename to src/main/java/org/lwjglx/opengl/ARBTextureSwizzle.java
index fd49a4aa3..7b58d9db7 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTextureSwizzle.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTextureSwizzle.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTextureSwizzle {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBTextureView.java b/src/main/java/org/lwjglx/opengl/ARBTextureView.java
similarity index 91%
rename from src/main/java/org/lwjgl/opengl/ARBTextureView.java
rename to src/main/java/org/lwjglx/opengl/ARBTextureView.java
index aeaa5a5a4..c72babc05 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTextureView.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTextureView.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTextureView {
 
@@ -10,7 +10,7 @@ public class ARBTextureView {
 
     public static void glTextureView(int texture, int target, int origtexture, int internalformat, int minlevel,
             int numlevels, int minlayer, int numlayers) {
-        org.lwjgl3.opengl.ARBTextureView
+        org.lwjgl.opengl.ARBTextureView
                 .glTextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBTimerQuery.java b/src/main/java/org/lwjglx/opengl/ARBTimerQuery.java
similarity index 61%
rename from src/main/java/org/lwjgl/opengl/ARBTimerQuery.java
rename to src/main/java/org/lwjglx/opengl/ARBTimerQuery.java
index 44839df5d..521ecf2c9 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTimerQuery.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTimerQuery.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTimerQuery {
 
@@ -6,14 +6,14 @@ public class ARBTimerQuery {
     public static final int GL_TIME_ELAPSED = (int) 35007;
 
     public static long glGetQueryObjecti64(int id, int pname) {
-        return org.lwjgl3.opengl.ARBTimerQuery.glGetQueryObjecti64(id, pname);
+        return org.lwjgl.opengl.ARBTimerQuery.glGetQueryObjecti64(id, pname);
     }
 
     public static long glGetQueryObjectui64(int id, int pname) {
-        return org.lwjgl3.opengl.ARBTimerQuery.glGetQueryObjectui64(id, pname);
+        return org.lwjgl.opengl.ARBTimerQuery.glGetQueryObjectui64(id, pname);
     }
 
     public static void glQueryCounter(int id, int target) {
-        org.lwjgl3.opengl.ARBTimerQuery.glQueryCounter(id, target);
+        org.lwjgl.opengl.ARBTimerQuery.glQueryCounter(id, target);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBTransformFeedback2.java b/src/main/java/org/lwjglx/opengl/ARBTransformFeedback2.java
similarity index 56%
rename from src/main/java/org/lwjgl/opengl/ARBTransformFeedback2.java
rename to src/main/java/org/lwjglx/opengl/ARBTransformFeedback2.java
index c55fee5f8..c74f509e1 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTransformFeedback2.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTransformFeedback2.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTransformFeedback2 {
 
@@ -8,38 +8,38 @@ public class ARBTransformFeedback2 {
     public static final int GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED = (int) 36387;
 
     public static void glBindTransformFeedback(int target, int id) {
-        org.lwjgl3.opengl.ARBTransformFeedback2.glBindTransformFeedback(target, id);
+        org.lwjgl.opengl.ARBTransformFeedback2.glBindTransformFeedback(target, id);
     }
 
     public static void glDeleteTransformFeedbacks(int id) {
-        org.lwjgl3.opengl.ARBTransformFeedback2.glDeleteTransformFeedbacks(id);
+        org.lwjgl.opengl.ARBTransformFeedback2.glDeleteTransformFeedbacks(id);
     }
 
     public static void glDeleteTransformFeedbacks(java.nio.IntBuffer ids) {
-        org.lwjgl3.opengl.ARBTransformFeedback2.glDeleteTransformFeedbacks(ids);
+        org.lwjgl.opengl.ARBTransformFeedback2.glDeleteTransformFeedbacks(ids);
     }
 
     public static void glDrawTransformFeedback(int mode, int id) {
-        org.lwjgl3.opengl.ARBTransformFeedback2.glDrawTransformFeedback(mode, id);
+        org.lwjgl.opengl.ARBTransformFeedback2.glDrawTransformFeedback(mode, id);
     }
 
     public static int glGenTransformFeedbacks() {
-        return org.lwjgl3.opengl.ARBTransformFeedback2.glGenTransformFeedbacks();
+        return org.lwjgl.opengl.ARBTransformFeedback2.glGenTransformFeedbacks();
     }
 
     public static void glGenTransformFeedbacks(java.nio.IntBuffer ids) {
-        org.lwjgl3.opengl.ARBTransformFeedback2.glGenTransformFeedbacks(ids);
+        org.lwjgl.opengl.ARBTransformFeedback2.glGenTransformFeedbacks(ids);
     }
 
     public static boolean glIsTransformFeedback(int id) {
-        return org.lwjgl3.opengl.ARBTransformFeedback2.glIsTransformFeedback(id);
+        return org.lwjgl.opengl.ARBTransformFeedback2.glIsTransformFeedback(id);
     }
 
     public static void glPauseTransformFeedback() {
-        org.lwjgl3.opengl.ARBTransformFeedback2.glPauseTransformFeedback();
+        org.lwjgl.opengl.ARBTransformFeedback2.glPauseTransformFeedback();
     }
 
     public static void glResumeTransformFeedback() {
-        org.lwjgl3.opengl.ARBTransformFeedback2.glResumeTransformFeedback();
+        org.lwjgl.opengl.ARBTransformFeedback2.glResumeTransformFeedback();
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBTransformFeedback3.java b/src/main/java/org/lwjglx/opengl/ARBTransformFeedback3.java
similarity index 56%
rename from src/main/java/org/lwjgl/opengl/ARBTransformFeedback3.java
rename to src/main/java/org/lwjglx/opengl/ARBTransformFeedback3.java
index f0b5b693d..bcf2da66b 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTransformFeedback3.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTransformFeedback3.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTransformFeedback3 {
 
@@ -6,18 +6,18 @@ public class ARBTransformFeedback3 {
     public static final int GL_MAX_VERTEX_STREAMS = (int) 36465;
 
     public static void glBeginQueryIndexed(int target, int index, int id) {
-        org.lwjgl3.opengl.ARBTransformFeedback3.glBeginQueryIndexed(target, index, id);
+        org.lwjgl.opengl.ARBTransformFeedback3.glBeginQueryIndexed(target, index, id);
     }
 
     public static void glDrawTransformFeedbackStream(int mode, int id, int stream) {
-        org.lwjgl3.opengl.ARBTransformFeedback3.glDrawTransformFeedbackStream(mode, id, stream);
+        org.lwjgl.opengl.ARBTransformFeedback3.glDrawTransformFeedbackStream(mode, id, stream);
     }
 
     public static void glEndQueryIndexed(int target, int index) {
-        org.lwjgl3.opengl.ARBTransformFeedback3.glEndQueryIndexed(target, index);
+        org.lwjgl.opengl.ARBTransformFeedback3.glEndQueryIndexed(target, index);
     }
 
     public static int glGetQueryIndexedi(int target, int index, int pname) {
-        return org.lwjgl3.opengl.ARBTransformFeedback3.glGetQueryIndexedi(target, index, pname);
+        return org.lwjgl.opengl.ARBTransformFeedback3.glGetQueryIndexedi(target, index, pname);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBTransformFeedbackInstanced.java b/src/main/java/org/lwjglx/opengl/ARBTransformFeedbackInstanced.java
similarity index 64%
rename from src/main/java/org/lwjgl/opengl/ARBTransformFeedbackInstanced.java
rename to src/main/java/org/lwjglx/opengl/ARBTransformFeedbackInstanced.java
index 445220a4a..89969dbbd 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTransformFeedbackInstanced.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTransformFeedbackInstanced.java
@@ -1,13 +1,13 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTransformFeedbackInstanced {
 
     public static void glDrawTransformFeedbackInstanced(int mode, int id, int primcount) {
-        org.lwjgl3.opengl.ARBTransformFeedbackInstanced.glDrawTransformFeedbackInstanced(mode, id, primcount);
+        org.lwjgl.opengl.ARBTransformFeedbackInstanced.glDrawTransformFeedbackInstanced(mode, id, primcount);
     }
 
     public static void glDrawTransformFeedbackStreamInstanced(int mode, int id, int stream, int primcount) {
-        org.lwjgl3.opengl.ARBTransformFeedbackInstanced
+        org.lwjgl.opengl.ARBTransformFeedbackInstanced
                 .glDrawTransformFeedbackStreamInstanced(mode, id, stream, primcount);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBTransformFeedbackOverflowQuery.java b/src/main/java/org/lwjglx/opengl/ARBTransformFeedbackOverflowQuery.java
similarity index 88%
rename from src/main/java/org/lwjgl/opengl/ARBTransformFeedbackOverflowQuery.java
rename to src/main/java/org/lwjglx/opengl/ARBTransformFeedbackOverflowQuery.java
index dcf230475..f17703c9d 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTransformFeedbackOverflowQuery.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTransformFeedbackOverflowQuery.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTransformFeedbackOverflowQuery {
 
diff --git a/src/main/java/org/lwjgl/opengl/ARBTransposeMatrix.java b/src/main/java/org/lwjglx/opengl/ARBTransposeMatrix.java
similarity index 73%
rename from src/main/java/org/lwjgl/opengl/ARBTransposeMatrix.java
rename to src/main/java/org/lwjglx/opengl/ARBTransposeMatrix.java
index c295be405..ed3b25664 100644
--- a/src/main/java/org/lwjgl/opengl/ARBTransposeMatrix.java
+++ b/src/main/java/org/lwjglx/opengl/ARBTransposeMatrix.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBTransposeMatrix {
 
@@ -8,10 +8,10 @@ public class ARBTransposeMatrix {
     public static final int GL_TRANSPOSE_TEXTURE_MATRIX_ARB = (int) 34021;
 
     public static void glLoadTransposeMatrixARB(java.nio.FloatBuffer pfMtx) {
-        org.lwjgl3.opengl.ARBTransposeMatrix.glLoadTransposeMatrixfARB(pfMtx);
+        org.lwjgl.opengl.ARBTransposeMatrix.glLoadTransposeMatrixfARB(pfMtx);
     }
 
     public static void glMultTransposeMatrixARB(java.nio.FloatBuffer pfMtx) {
-        org.lwjgl3.opengl.ARBTransposeMatrix.glMultTransposeMatrixfARB(pfMtx);
+        org.lwjgl.opengl.ARBTransposeMatrix.glMultTransposeMatrixfARB(pfMtx);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBUniformBufferObject.java b/src/main/java/org/lwjglx/opengl/ARBUniformBufferObject.java
similarity index 75%
rename from src/main/java/org/lwjgl/opengl/ARBUniformBufferObject.java
rename to src/main/java/org/lwjglx/opengl/ARBUniformBufferObject.java
index 0b75e1f3b..64ded7fec 100644
--- a/src/main/java/org/lwjgl/opengl/ARBUniformBufferObject.java
+++ b/src/main/java/org/lwjglx/opengl/ARBUniformBufferObject.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBUniformBufferObject {
 
@@ -37,54 +37,54 @@ public class ARBUniformBufferObject {
     public static final int GL_UNIFORM_TYPE = (int) 35383;
 
     public static void glBindBufferBase(int target, int index, int buffer) {
-        org.lwjgl3.opengl.ARBUniformBufferObject.glBindBufferBase(target, index, buffer);
+        org.lwjgl.opengl.ARBUniformBufferObject.glBindBufferBase(target, index, buffer);
     }
 
     public static void glBindBufferRange(int target, int index, int buffer, long offset, long size) {
-        org.lwjgl3.opengl.ARBUniformBufferObject.glBindBufferRange(target, index, buffer, offset, size);
+        org.lwjgl.opengl.ARBUniformBufferObject.glBindBufferRange(target, index, buffer, offset, size);
     }
 
     public static java.lang.String glGetActiveUniformBlockName(int program, int uniformBlockIndex, int bufSize) {
-        return org.lwjgl3.opengl.ARBUniformBufferObject.glGetActiveUniformBlockName(program, uniformBlockIndex, bufSize);
+        return org.lwjgl.opengl.ARBUniformBufferObject.glGetActiveUniformBlockName(program, uniformBlockIndex, bufSize);
     }
 
     public static void glGetActiveUniformBlockName(int program, int uniformBlockIndex, java.nio.IntBuffer length,
             java.nio.ByteBuffer uniformBlockName) {
-        org.lwjgl3.opengl.ARBUniformBufferObject
+        org.lwjgl.opengl.ARBUniformBufferObject
                 .glGetActiveUniformBlockName(program, uniformBlockIndex, length, uniformBlockName);
     }
 
     public static int glGetActiveUniformBlocki(int program, int uniformBlockIndex, int pname) {
-        return org.lwjgl3.opengl.ARBUniformBufferObject.glGetActiveUniformBlocki(program, uniformBlockIndex, pname);
+        return org.lwjgl.opengl.ARBUniformBufferObject.glGetActiveUniformBlocki(program, uniformBlockIndex, pname);
     }
 
     public static java.lang.String glGetActiveUniformName(int program, int uniformIndex, int bufSize) {
-        return org.lwjgl3.opengl.ARBUniformBufferObject.glGetActiveUniformName(program, uniformIndex, bufSize);
+        return org.lwjgl.opengl.ARBUniformBufferObject.glGetActiveUniformName(program, uniformIndex, bufSize);
     }
 
     public static void glGetActiveUniformName(int program, int uniformIndex, java.nio.IntBuffer length,
             java.nio.ByteBuffer uniformName) {
-        org.lwjgl3.opengl.ARBUniformBufferObject.glGetActiveUniformName(program, uniformIndex, length, uniformName);
+        org.lwjgl.opengl.ARBUniformBufferObject.glGetActiveUniformName(program, uniformIndex, length, uniformName);
     }
 
     public static int glGetActiveUniformsi(int program, int uniformIndex, int pname) {
-        return org.lwjgl3.opengl.ARBUniformBufferObject.glGetActiveUniformsi(program, uniformIndex, pname);
+        return org.lwjgl.opengl.ARBUniformBufferObject.glGetActiveUniformsi(program, uniformIndex, pname);
     }
 
     public static int glGetUniformBlockIndex(int program, java.lang.CharSequence uniformBlockName) {
-        return org.lwjgl3.opengl.ARBUniformBufferObject.glGetUniformBlockIndex(program, uniformBlockName);
+        return org.lwjgl.opengl.ARBUniformBufferObject.glGetUniformBlockIndex(program, uniformBlockName);
     }
 
     public static int glGetUniformBlockIndex(int program, java.nio.ByteBuffer uniformBlockName) {
-        return org.lwjgl3.opengl.ARBUniformBufferObject.glGetUniformBlockIndex(program, uniformBlockName);
+        return org.lwjgl.opengl.ARBUniformBufferObject.glGetUniformBlockIndex(program, uniformBlockName);
     }
 
     public static void glGetUniformIndices(int program, java.lang.CharSequence[] uniformNames,
             java.nio.IntBuffer uniformIndices) {
-        org.lwjgl3.opengl.ARBUniformBufferObject.glGetUniformIndices(program, uniformNames, uniformIndices);
+        org.lwjgl.opengl.ARBUniformBufferObject.glGetUniformIndices(program, uniformNames, uniformIndices);
     }
 
     public static void glUniformBlockBinding(int program, int uniformBlockIndex, int uniformBlockBinding) {
-        org.lwjgl3.opengl.ARBUniformBufferObject.glUniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
+        org.lwjgl.opengl.ARBUniformBufferObject.glUniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBVertexArrayObject.java b/src/main/java/org/lwjglx/opengl/ARBVertexArrayObject.java
similarity index 51%
rename from src/main/java/org/lwjgl/opengl/ARBVertexArrayObject.java
rename to src/main/java/org/lwjglx/opengl/ARBVertexArrayObject.java
index 8a0f8d550..e303e946d 100644
--- a/src/main/java/org/lwjgl/opengl/ARBVertexArrayObject.java
+++ b/src/main/java/org/lwjglx/opengl/ARBVertexArrayObject.java
@@ -1,30 +1,30 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBVertexArrayObject {
 
     public static final int GL_VERTEX_ARRAY_BINDING = (int) 34229;
 
     public static void glBindVertexArray(int array) {
-        org.lwjgl3.opengl.ARBVertexArrayObject.glBindVertexArray(array);
+        org.lwjgl.opengl.ARBVertexArrayObject.glBindVertexArray(array);
     }
 
     public static void glDeleteVertexArrays(int array) {
-        org.lwjgl3.opengl.ARBVertexArrayObject.glDeleteVertexArrays(array);
+        org.lwjgl.opengl.ARBVertexArrayObject.glDeleteVertexArrays(array);
     }
 
     public static void glDeleteVertexArrays(java.nio.IntBuffer arrays) {
-        org.lwjgl3.opengl.ARBVertexArrayObject.glDeleteVertexArrays(arrays);
+        org.lwjgl.opengl.ARBVertexArrayObject.glDeleteVertexArrays(arrays);
     }
 
     public static int glGenVertexArrays() {
-        return org.lwjgl3.opengl.ARBVertexArrayObject.glGenVertexArrays();
+        return org.lwjgl.opengl.ARBVertexArrayObject.glGenVertexArrays();
     }
 
     public static void glGenVertexArrays(java.nio.IntBuffer arrays) {
-        org.lwjgl3.opengl.ARBVertexArrayObject.glGenVertexArrays(arrays);
+        org.lwjgl.opengl.ARBVertexArrayObject.glGenVertexArrays(arrays);
     }
 
     public static boolean glIsVertexArray(int array) {
-        return org.lwjgl3.opengl.ARBVertexArrayObject.glIsVertexArray(array);
+        return org.lwjgl.opengl.ARBVertexArrayObject.glIsVertexArray(array);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBVertexAttribBinding.java b/src/main/java/org/lwjglx/opengl/ARBVertexAttribBinding.java
similarity index 67%
rename from src/main/java/org/lwjgl/opengl/ARBVertexAttribBinding.java
rename to src/main/java/org/lwjglx/opengl/ARBVertexAttribBinding.java
index ccd19d1fc..2b10f1757 100644
--- a/src/main/java/org/lwjgl/opengl/ARBVertexAttribBinding.java
+++ b/src/main/java/org/lwjglx/opengl/ARBVertexAttribBinding.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBVertexAttribBinding {
 
@@ -11,28 +11,28 @@ public class ARBVertexAttribBinding {
     public static final int GL_VERTEX_BINDING_STRIDE = (int) 33496;
 
     public static void glBindVertexBuffer(int bindingindex, int buffer, long offset, int stride) {
-        org.lwjgl3.opengl.ARBVertexAttribBinding.glBindVertexBuffer(bindingindex, buffer, offset, stride);
+        org.lwjgl.opengl.ARBVertexAttribBinding.glBindVertexBuffer(bindingindex, buffer, offset, stride);
     }
 
     public static void glVertexAttribBinding(int attribindex, int bindingindex) {
-        org.lwjgl3.opengl.ARBVertexAttribBinding.glVertexAttribBinding(attribindex, bindingindex);
+        org.lwjgl.opengl.ARBVertexAttribBinding.glVertexAttribBinding(attribindex, bindingindex);
     }
 
     public static void glVertexAttribFormat(int attribindex, int size, int type, boolean normalized,
             int relativeoffset) {
-        org.lwjgl3.opengl.ARBVertexAttribBinding
+        org.lwjgl.opengl.ARBVertexAttribBinding
                 .glVertexAttribFormat(attribindex, size, type, normalized, relativeoffset);
     }
 
     public static void glVertexAttribIFormat(int attribindex, int size, int type, int relativeoffset) {
-        org.lwjgl3.opengl.ARBVertexAttribBinding.glVertexAttribIFormat(attribindex, size, type, relativeoffset);
+        org.lwjgl.opengl.ARBVertexAttribBinding.glVertexAttribIFormat(attribindex, size, type, relativeoffset);
     }
 
     public static void glVertexAttribLFormat(int attribindex, int size, int type, int relativeoffset) {
-        org.lwjgl3.opengl.ARBVertexAttribBinding.glVertexAttribLFormat(attribindex, size, type, relativeoffset);
+        org.lwjgl.opengl.ARBVertexAttribBinding.glVertexAttribLFormat(attribindex, size, type, relativeoffset);
     }
 
     public static void glVertexBindingDivisor(int bindingindex, int divisor) {
-        org.lwjgl3.opengl.ARBVertexAttribBinding.glVertexBindingDivisor(bindingindex, divisor);
+        org.lwjgl.opengl.ARBVertexAttribBinding.glVertexBindingDivisor(bindingindex, divisor);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBVertexBlend.java b/src/main/java/org/lwjglx/opengl/ARBVertexBlend.java
similarity index 71%
rename from src/main/java/org/lwjgl/opengl/ARBVertexBlend.java
rename to src/main/java/org/lwjglx/opengl/ARBVertexBlend.java
index 7d50f2c49..265055a46 100644
--- a/src/main/java/org/lwjgl/opengl/ARBVertexBlend.java
+++ b/src/main/java/org/lwjglx/opengl/ARBVertexBlend.java
@@ -1,6 +1,7 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
-import org.lwjgl.lwjgl3ify.BufferCasts;
+import org.lwjglx.MemoryUtil;
+import org.lwjglx.lwjgl3ify.BufferCasts;
 
 public class ARBVertexBlend {
 
@@ -48,83 +49,83 @@ public class ARBVertexBlend {
     public static final int GL_WEIGHT_SUM_UNITY_ARB = (int) 34470;
 
     public static void glVertexBlendARB(int count) {
-        org.lwjgl3.opengl.ARBVertexBlend.glVertexBlendARB(count);
+        org.lwjgl.opengl.ARBVertexBlend.glVertexBlendARB(count);
     }
 
     public static void glWeightARB(java.nio.ByteBuffer pWeights) {
-        org.lwjgl3.opengl.ARBVertexBlend.glWeightbvARB(pWeights);
+        org.lwjgl.opengl.ARBVertexBlend.glWeightbvARB(pWeights);
     }
 
     public static void glWeightARB(java.nio.DoubleBuffer pWeights) {
-        org.lwjgl3.opengl.ARBVertexBlend.glWeightdvARB(pWeights);
+        org.lwjgl.opengl.ARBVertexBlend.glWeightdvARB(pWeights);
     }
 
     public static void glWeightARB(java.nio.FloatBuffer pWeights) {
-        org.lwjgl3.opengl.ARBVertexBlend.glWeightfvARB(pWeights);
+        org.lwjgl.opengl.ARBVertexBlend.glWeightfvARB(pWeights);
     }
 
     public static void glWeightARB(java.nio.IntBuffer pWeights) {
-        org.lwjgl3.opengl.ARBVertexBlend.glWeightivARB(pWeights);
+        org.lwjgl.opengl.ARBVertexBlend.glWeightivARB(pWeights);
     }
 
     public static void glWeightARB(java.nio.ShortBuffer pWeights) {
-        org.lwjgl3.opengl.ARBVertexBlend.glWeightsvARB(pWeights);
+        org.lwjgl.opengl.ARBVertexBlend.glWeightsvARB(pWeights);
     }
 
     public static void glWeightPointerARB(int size, int type, int stride, long pPointer_buffer_offset) {
-        org.lwjgl3.opengl.ARBVertexBlend.glWeightPointerARB(size, type, stride, pPointer_buffer_offset);
+        org.lwjgl.opengl.ARBVertexBlend.glWeightPointerARB(size, type, stride, pPointer_buffer_offset);
     }
 
     public static void glWeightPointerARB(int size, int stride, java.nio.DoubleBuffer pPointer) {
 
-        org.lwjgl3.opengl.ARBVertexBlend.glWeightPointerARB(
+        org.lwjgl.opengl.ARBVertexBlend.glWeightPointerARB(
                 size,
-                org.lwjgl3.opengl.GL11.GL_DOUBLE,
+                org.lwjgl.opengl.GL11.GL_DOUBLE,
                 stride,
                 BufferCasts.toByteBuffer(pPointer));
     }
 
     public static void glWeightPointerARB(int size, int stride, java.nio.FloatBuffer pPointer) {
 
-        org.lwjgl3.opengl.ARBVertexBlend.glWeightPointerARB(size, org.lwjgl3.opengl.GL11.GL_FLOAT, stride, pPointer);
+        org.lwjgl.opengl.ARBVertexBlend.glWeightPointerARB(size, org.lwjgl.opengl.GL11.GL_FLOAT, stride, pPointer);
     }
 
     public static void glWeightPointerARB(int size, boolean unsigned, int stride, java.nio.ByteBuffer pPointer) {
 
-        org.lwjgl3.opengl.ARBVertexBlend.glWeightPointerARB(
+        org.lwjgl.opengl.ARBVertexBlend.glWeightPointerARB(
                 size,
-                (unsigned ? org.lwjgl3.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl3.opengl.GL11.GL_BYTE),
+                (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl.opengl.GL11.GL_BYTE),
                 stride,
-                org.lwjgl.MemoryUtil.getAddress(pPointer));
+                MemoryUtil.getAddress(pPointer));
     }
 
     public static void glWeightPointerARB(int size, boolean unsigned, int stride, java.nio.IntBuffer pPointer) {
 
-        org.lwjgl3.opengl.ARBVertexBlend.glWeightPointerARB(
+        org.lwjgl.opengl.ARBVertexBlend.glWeightPointerARB(
                 size,
-                (unsigned ? org.lwjgl3.opengl.GL11.GL_UNSIGNED_INT : org.lwjgl3.opengl.GL11.GL_INT),
+                (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_INT : org.lwjgl.opengl.GL11.GL_INT),
                 stride,
-                org.lwjgl.MemoryUtil.getAddress(pPointer));
+                MemoryUtil.getAddress(pPointer));
     }
 
     public static void glWeightPointerARB(int size, boolean unsigned, int stride, java.nio.ShortBuffer pPointer) {
 
-        org.lwjgl3.opengl.ARBVertexBlend.glWeightPointerARB(
+        org.lwjgl.opengl.ARBVertexBlend.glWeightPointerARB(
                 size,
-                (unsigned ? org.lwjgl3.opengl.GL11.GL_UNSIGNED_SHORT : org.lwjgl3.opengl.GL11.GL_SHORT),
+                (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_SHORT : org.lwjgl.opengl.GL11.GL_SHORT),
                 stride,
-                org.lwjgl.MemoryUtil.getAddress(pPointer));
+                MemoryUtil.getAddress(pPointer));
     }
 
     public static void glWeightuARB(java.nio.ByteBuffer pWeights) {
-        org.lwjgl3.opengl.ARBVertexBlend.glWeightubvARB(pWeights);
+        org.lwjgl.opengl.ARBVertexBlend.glWeightubvARB(pWeights);
     }
 
     public static void glWeightuARB(java.nio.IntBuffer pWeights) {
-        org.lwjgl3.opengl.ARBVertexBlend.glWeightuivARB(pWeights);
+        org.lwjgl.opengl.ARBVertexBlend.glWeightuivARB(pWeights);
     }
 
     public static void glWeightuARB(java.nio.ShortBuffer pWeights) {
-        org.lwjgl3.opengl.ARBVertexBlend.glWeightusvARB(pWeights);
+        org.lwjgl.opengl.ARBVertexBlend.glWeightusvARB(pWeights);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBVertexBufferObject.java b/src/main/java/org/lwjglx/opengl/ARBVertexBufferObject.java
similarity index 91%
rename from src/main/java/org/lwjgl/opengl/ARBVertexBufferObject.java
rename to src/main/java/org/lwjglx/opengl/ARBVertexBufferObject.java
index a1dfeaf78..5202a800b 100644
--- a/src/main/java/org/lwjgl/opengl/ARBVertexBufferObject.java
+++ b/src/main/java/org/lwjglx/opengl/ARBVertexBufferObject.java
@@ -1,6 +1,6 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
-public class ARBVertexBufferObject extends org.lwjgl.opengl.ARBBufferObject {
+public class ARBVertexBufferObject extends ARBBufferObject {
 
     public static final int GL_ARRAY_BUFFER_ARB = (int) 34962;
     public static final int GL_ARRAY_BUFFER_BINDING_ARB = (int) 34964;
diff --git a/src/main/java/org/lwjgl/opengl/ARBVertexProgram.java b/src/main/java/org/lwjglx/opengl/ARBVertexProgram.java
similarity index 67%
rename from src/main/java/org/lwjgl/opengl/ARBVertexProgram.java
rename to src/main/java/org/lwjglx/opengl/ARBVertexProgram.java
index e9afd4e48..6c7fa101c 100644
--- a/src/main/java/org/lwjgl/opengl/ARBVertexProgram.java
+++ b/src/main/java/org/lwjglx/opengl/ARBVertexProgram.java
@@ -1,6 +1,6 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
-public class ARBVertexProgram extends org.lwjgl.opengl.ARBProgram {
+public class ARBVertexProgram extends ARBProgram {
 
     public static final int GL_COLOR_SUM_ARB = (int) 33880;
     public static final int GL_CURRENT_VERTEX_ATTRIB_ARB = (int) 34342;
@@ -20,68 +20,68 @@ public class ARBVertexProgram extends org.lwjgl.opengl.ARBProgram {
     public static final int GL_VERTEX_PROGRAM_TWO_SIDE_ARB = (int) 34371;
 
     public static void glDisableVertexAttribArrayARB(int index) {
-        org.lwjgl3.opengl.ARBVertexProgram.glDisableVertexAttribArrayARB(index);
+        org.lwjgl.opengl.ARBVertexProgram.glDisableVertexAttribArrayARB(index);
     }
 
     public static void glEnableVertexAttribArrayARB(int index) {
-        org.lwjgl3.opengl.ARBVertexProgram.glEnableVertexAttribArrayARB(index);
+        org.lwjgl.opengl.ARBVertexProgram.glEnableVertexAttribArrayARB(index);
     }
 
     public static void glVertexAttrib1dARB(int index, double x) {
-        org.lwjgl3.opengl.ARBVertexProgram.glVertexAttrib1dARB(index, x);
+        org.lwjgl.opengl.ARBVertexProgram.glVertexAttrib1dARB(index, x);
     }
 
     public static void glVertexAttrib1fARB(int index, float x) {
-        org.lwjgl3.opengl.ARBVertexProgram.glVertexAttrib1fARB(index, x);
+        org.lwjgl.opengl.ARBVertexProgram.glVertexAttrib1fARB(index, x);
     }
 
     public static void glVertexAttrib1sARB(int index, short x) {
-        org.lwjgl3.opengl.ARBVertexProgram.glVertexAttrib1sARB(index, x);
+        org.lwjgl.opengl.ARBVertexProgram.glVertexAttrib1sARB(index, x);
     }
 
     public static void glVertexAttrib2dARB(int index, double x, double y) {
-        org.lwjgl3.opengl.ARBVertexProgram.glVertexAttrib2dARB(index, x, y);
+        org.lwjgl.opengl.ARBVertexProgram.glVertexAttrib2dARB(index, x, y);
     }
 
     public static void glVertexAttrib2fARB(int index, float x, float y) {
-        org.lwjgl3.opengl.ARBVertexProgram.glVertexAttrib2fARB(index, x, y);
+        org.lwjgl.opengl.ARBVertexProgram.glVertexAttrib2fARB(index, x, y);
     }
 
     public static void glVertexAttrib2sARB(int index, short x, short y) {
-        org.lwjgl3.opengl.ARBVertexProgram.glVertexAttrib2sARB(index, x, y);
+        org.lwjgl.opengl.ARBVertexProgram.glVertexAttrib2sARB(index, x, y);
     }
 
     public static void glVertexAttrib3dARB(int index, double x, double y, double z) {
-        org.lwjgl3.opengl.ARBVertexProgram.glVertexAttrib3dARB(index, x, y, z);
+        org.lwjgl.opengl.ARBVertexProgram.glVertexAttrib3dARB(index, x, y, z);
     }
 
     public static void glVertexAttrib3fARB(int index, float x, float y, float z) {
-        org.lwjgl3.opengl.ARBVertexProgram.glVertexAttrib3fARB(index, x, y, z);
+        org.lwjgl.opengl.ARBVertexProgram.glVertexAttrib3fARB(index, x, y, z);
     }
 
     public static void glVertexAttrib3sARB(int index, short x, short y, short z) {
-        org.lwjgl3.opengl.ARBVertexProgram.glVertexAttrib3sARB(index, x, y, z);
+        org.lwjgl.opengl.ARBVertexProgram.glVertexAttrib3sARB(index, x, y, z);
     }
 
     public static void glVertexAttrib4NubARB(int index, byte x, byte y, byte z, byte w) {
-        org.lwjgl3.opengl.ARBVertexProgram.glVertexAttrib4NubARB(index, x, y, z, w);
+        org.lwjgl.opengl.ARBVertexProgram.glVertexAttrib4NubARB(index, x, y, z, w);
     }
 
     public static void glVertexAttrib4dARB(int index, double x, double y, double z, double w) {
-        org.lwjgl3.opengl.ARBVertexProgram.glVertexAttrib4dARB(index, x, y, z, w);
+        org.lwjgl.opengl.ARBVertexProgram.glVertexAttrib4dARB(index, x, y, z, w);
     }
 
     public static void glVertexAttrib4fARB(int index, float x, float y, float z, float w) {
-        org.lwjgl3.opengl.ARBVertexProgram.glVertexAttrib4fARB(index, x, y, z, w);
+        org.lwjgl.opengl.ARBVertexProgram.glVertexAttrib4fARB(index, x, y, z, w);
     }
 
     public static void glVertexAttrib4sARB(int index, short x, short y, short z, short w) {
-        org.lwjgl3.opengl.ARBVertexProgram.glVertexAttrib4sARB(index, x, y, z, w);
+        org.lwjgl.opengl.ARBVertexProgram.glVertexAttrib4sARB(index, x, y, z, w);
     }
 
     public static void glVertexAttribPointerARB(int index, int size, int type, boolean normalized, int stride,
             long buffer_buffer_offset) {
-        org.lwjgl3.opengl.ARBVertexProgram
+        org.lwjgl.opengl.ARBVertexProgram
                 .glVertexAttribPointerARB(index, size, type, normalized, stride, buffer_buffer_offset);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBVertexShader.java b/src/main/java/org/lwjglx/opengl/ARBVertexShader.java
similarity index 65%
rename from src/main/java/org/lwjgl/opengl/ARBVertexShader.java
rename to src/main/java/org/lwjglx/opengl/ARBVertexShader.java
index 3fe1def19..f977a651e 100644
--- a/src/main/java/org/lwjgl/opengl/ARBVertexShader.java
+++ b/src/main/java/org/lwjglx/opengl/ARBVertexShader.java
@@ -1,6 +1,7 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
-import org.lwjgl.lwjgl3ify.BufferCasts;
+import org.lwjglx.MemoryUtil;
+import org.lwjglx.lwjgl3ify.BufferCasts;
 
 public class ARBVertexShader {
 
@@ -31,116 +32,116 @@ public class ARBVertexShader {
     public static final int GL_VERTEX_SHADER_ARB = (int) 35633;
 
     public static void glBindAttribLocationARB(int programObj, int index, java.lang.CharSequence name) {
-        org.lwjgl3.opengl.ARBVertexShader.glBindAttribLocationARB(programObj, index, name);
+        org.lwjgl.opengl.ARBVertexShader.glBindAttribLocationARB(programObj, index, name);
     }
 
     public static void glBindAttribLocationARB(int programObj, int index, java.nio.ByteBuffer name) {
-        org.lwjgl3.opengl.ARBVertexShader.glBindAttribLocationARB(programObj, index, name);
+        org.lwjgl.opengl.ARBVertexShader.glBindAttribLocationARB(programObj, index, name);
     }
 
     public static void glDisableVertexAttribArrayARB(int index) {
-        org.lwjgl3.opengl.ARBVertexShader.glDisableVertexAttribArrayARB(index);
+        org.lwjgl.opengl.ARBVertexShader.glDisableVertexAttribArrayARB(index);
     }
 
     public static void glEnableVertexAttribArrayARB(int index) {
-        org.lwjgl3.opengl.ARBVertexShader.glEnableVertexAttribArrayARB(index);
+        org.lwjgl.opengl.ARBVertexShader.glEnableVertexAttribArrayARB(index);
     }
 
     public static void glGetActiveAttribARB(int programObj, int index, java.nio.IntBuffer length,
             java.nio.IntBuffer size, java.nio.IntBuffer type, java.nio.ByteBuffer name) {
-        org.lwjgl3.opengl.ARBVertexShader.glGetActiveAttribARB(programObj, index, length, size, type, name);
+        org.lwjgl.opengl.ARBVertexShader.glGetActiveAttribARB(programObj, index, length, size, type, name);
     }
 
     public static int glGetAttribLocationARB(int programObj, java.lang.CharSequence name) {
-        return org.lwjgl3.opengl.ARBVertexShader.glGetAttribLocationARB(programObj, name);
+        return org.lwjgl.opengl.ARBVertexShader.glGetAttribLocationARB(programObj, name);
     }
 
     public static int glGetAttribLocationARB(int programObj, java.nio.ByteBuffer name) {
-        return org.lwjgl3.opengl.ARBVertexShader.glGetAttribLocationARB(programObj, name);
+        return org.lwjgl.opengl.ARBVertexShader.glGetAttribLocationARB(programObj, name);
     }
 
     public static void glGetVertexAttribARB(int index, int pname, java.nio.DoubleBuffer params) {
-        org.lwjgl3.opengl.ARBVertexShader.glGetVertexAttribdvARB(index, pname, params);
+        org.lwjgl.opengl.ARBVertexShader.glGetVertexAttribdvARB(index, pname, params);
     }
 
     public static void glGetVertexAttribARB(int index, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.ARBVertexShader.glGetVertexAttribfvARB(index, pname, params);
+        org.lwjgl.opengl.ARBVertexShader.glGetVertexAttribfvARB(index, pname, params);
     }
 
     public static void glGetVertexAttribARB(int index, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.ARBVertexShader.glGetVertexAttribivARB(index, pname, params);
+        org.lwjgl.opengl.ARBVertexShader.glGetVertexAttribivARB(index, pname, params);
     }
 
     public static void glVertexAttrib1dARB(int index, double v0) {
-        org.lwjgl3.opengl.ARBVertexShader.glVertexAttrib1dARB(index, v0);
+        org.lwjgl.opengl.ARBVertexShader.glVertexAttrib1dARB(index, v0);
     }
 
     public static void glVertexAttrib1fARB(int index, float v0) {
-        org.lwjgl3.opengl.ARBVertexShader.glVertexAttrib1fARB(index, v0);
+        org.lwjgl.opengl.ARBVertexShader.glVertexAttrib1fARB(index, v0);
     }
 
     public static void glVertexAttrib1sARB(int index, short v0) {
-        org.lwjgl3.opengl.ARBVertexShader.glVertexAttrib1sARB(index, v0);
+        org.lwjgl.opengl.ARBVertexShader.glVertexAttrib1sARB(index, v0);
     }
 
     public static void glVertexAttrib2dARB(int index, double v0, double v1) {
-        org.lwjgl3.opengl.ARBVertexShader.glVertexAttrib2dARB(index, v0, v1);
+        org.lwjgl.opengl.ARBVertexShader.glVertexAttrib2dARB(index, v0, v1);
     }
 
     public static void glVertexAttrib2fARB(int index, float v0, float v1) {
-        org.lwjgl3.opengl.ARBVertexShader.glVertexAttrib2fARB(index, v0, v1);
+        org.lwjgl.opengl.ARBVertexShader.glVertexAttrib2fARB(index, v0, v1);
     }
 
     public static void glVertexAttrib2sARB(int index, short v0, short v1) {
-        org.lwjgl3.opengl.ARBVertexShader.glVertexAttrib2sARB(index, v0, v1);
+        org.lwjgl.opengl.ARBVertexShader.glVertexAttrib2sARB(index, v0, v1);
     }
 
     public static void glVertexAttrib3dARB(int index, double v0, double v1, double v2) {
-        org.lwjgl3.opengl.ARBVertexShader.glVertexAttrib3dARB(index, v0, v1, v2);
+        org.lwjgl.opengl.ARBVertexShader.glVertexAttrib3dARB(index, v0, v1, v2);
     }
 
     public static void glVertexAttrib3fARB(int index, float v0, float v1, float v2) {
-        org.lwjgl3.opengl.ARBVertexShader.glVertexAttrib3fARB(index, v0, v1, v2);
+        org.lwjgl.opengl.ARBVertexShader.glVertexAttrib3fARB(index, v0, v1, v2);
     }
 
     public static void glVertexAttrib3sARB(int index, short v0, short v1, short v2) {
-        org.lwjgl3.opengl.ARBVertexShader.glVertexAttrib3sARB(index, v0, v1, v2);
+        org.lwjgl.opengl.ARBVertexShader.glVertexAttrib3sARB(index, v0, v1, v2);
     }
 
     public static void glVertexAttrib4NubARB(int index, byte x, byte y, byte z, byte w) {
-        org.lwjgl3.opengl.ARBVertexShader.glVertexAttrib4NubARB(index, x, y, z, w);
+        org.lwjgl.opengl.ARBVertexShader.glVertexAttrib4NubARB(index, x, y, z, w);
     }
 
     public static void glVertexAttrib4dARB(int index, double v0, double v1, double v2, double v3) {
-        org.lwjgl3.opengl.ARBVertexShader.glVertexAttrib4dARB(index, v0, v1, v2, v3);
+        org.lwjgl.opengl.ARBVertexShader.glVertexAttrib4dARB(index, v0, v1, v2, v3);
     }
 
     public static void glVertexAttrib4fARB(int index, float v0, float v1, float v2, float v3) {
-        org.lwjgl3.opengl.ARBVertexShader.glVertexAttrib4fARB(index, v0, v1, v2, v3);
+        org.lwjgl.opengl.ARBVertexShader.glVertexAttrib4fARB(index, v0, v1, v2, v3);
     }
 
     public static void glVertexAttrib4sARB(int index, short v0, short v1, short v2, short v3) {
-        org.lwjgl3.opengl.ARBVertexShader.glVertexAttrib4sARB(index, v0, v1, v2, v3);
+        org.lwjgl.opengl.ARBVertexShader.glVertexAttrib4sARB(index, v0, v1, v2, v3);
     }
 
     public static void glVertexAttribPointerARB(int index, int size, int type, boolean normalized, int stride,
             long buffer_buffer_offset) {
-        org.lwjgl3.opengl.ARBVertexShader
+        org.lwjgl.opengl.ARBVertexShader
                 .glVertexAttribPointerARB(index, size, type, normalized, stride, buffer_buffer_offset);
     }
 
     public static void glVertexAttribPointerARB(int index, int size, int type, boolean normalized, int stride,
             java.nio.ByteBuffer buffer) {
-        org.lwjgl3.opengl.ARBVertexShader.glVertexAttribPointerARB(index, size, type, normalized, stride, buffer);
+        org.lwjgl.opengl.ARBVertexShader.glVertexAttribPointerARB(index, size, type, normalized, stride, buffer);
     }
 
     public static void glVertexAttribPointerARB(int index, int size, boolean normalized, int stride,
             java.nio.DoubleBuffer buffer) {
 
-        org.lwjgl3.opengl.ARBVertexShader.glVertexAttribPointerARB(
+        org.lwjgl.opengl.ARBVertexShader.glVertexAttribPointerARB(
                 index,
                 size,
-                org.lwjgl3.opengl.GL11.GL_DOUBLE,
+                org.lwjgl.opengl.GL11.GL_DOUBLE,
                 normalized,
                 stride,
                 BufferCasts.toByteBuffer(buffer));
@@ -149,43 +150,43 @@ public static void glVertexAttribPointerARB(int index, int size, boolean normali
     public static void glVertexAttribPointerARB(int index, int size, boolean normalized, int stride,
             java.nio.FloatBuffer buffer) {
 
-        org.lwjgl3.opengl.ARBVertexShader
-                .glVertexAttribPointerARB(index, size, org.lwjgl3.opengl.GL11.GL_FLOAT, normalized, stride, buffer);
+        org.lwjgl.opengl.ARBVertexShader
+                .glVertexAttribPointerARB(index, size, org.lwjgl.opengl.GL11.GL_FLOAT, normalized, stride, buffer);
     }
 
     public static void glVertexAttribPointerARB(int index, int size, boolean unsigned, boolean normalized, int stride,
             java.nio.ByteBuffer buffer) {
 
-        org.lwjgl3.opengl.ARBVertexShader.glVertexAttribPointerARB(
+        org.lwjgl.opengl.ARBVertexShader.glVertexAttribPointerARB(
                 index,
                 size,
-                (unsigned ? org.lwjgl3.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl3.opengl.GL11.GL_BYTE),
+                (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl.opengl.GL11.GL_BYTE),
                 normalized,
                 stride,
-                org.lwjgl.MemoryUtil.getAddress(buffer));
+                MemoryUtil.getAddress(buffer));
     }
 
     public static void glVertexAttribPointerARB(int index, int size, boolean unsigned, boolean normalized, int stride,
             java.nio.IntBuffer buffer) {
 
-        org.lwjgl3.opengl.ARBVertexShader.glVertexAttribPointerARB(
+        org.lwjgl.opengl.ARBVertexShader.glVertexAttribPointerARB(
                 index,
                 size,
-                (unsigned ? org.lwjgl3.opengl.GL11.GL_UNSIGNED_INT : org.lwjgl3.opengl.GL11.GL_INT),
+                (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_INT : org.lwjgl.opengl.GL11.GL_INT),
                 normalized,
                 stride,
-                org.lwjgl.MemoryUtil.getAddress(buffer));
+                MemoryUtil.getAddress(buffer));
     }
 
     public static void glVertexAttribPointerARB(int index, int size, boolean unsigned, boolean normalized, int stride,
             java.nio.ShortBuffer buffer) {
 
-        org.lwjgl3.opengl.ARBVertexShader.glVertexAttribPointerARB(
+        org.lwjgl.opengl.ARBVertexShader.glVertexAttribPointerARB(
                 index,
                 size,
-                (unsigned ? org.lwjgl3.opengl.GL11.GL_UNSIGNED_SHORT : org.lwjgl3.opengl.GL11.GL_SHORT),
+                (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_SHORT : org.lwjgl.opengl.GL11.GL_SHORT),
                 normalized,
                 stride,
-                org.lwjgl.MemoryUtil.getAddress(buffer));
+                MemoryUtil.getAddress(buffer));
     }
 }
diff --git a/src/main/java/org/lwjglx/opengl/ARBVertexType2_10_10_10_REV.java b/src/main/java/org/lwjglx/opengl/ARBVertexType2_10_10_10_REV.java
new file mode 100644
index 000000000..2d466d635
--- /dev/null
+++ b/src/main/java/org/lwjglx/opengl/ARBVertexType2_10_10_10_REV.java
@@ -0,0 +1,83 @@
+package org.lwjglx.opengl;
+
+public class ARBVertexType2_10_10_10_REV {
+
+    public static final int GL_INT_2_10_10_10_REV = (int) 36255;
+    public static final int GL_UNSIGNED_INT_2_10_10_10_REV = (int) 33640;
+
+    public static void glColorP3ui(int type, int color) {
+        org.lwjgl.opengl.ARBVertexType2_10_10_10_REV.glColorP3ui(type, color);
+    }
+
+    public static void glColorP4ui(int type, int color) {
+        org.lwjgl.opengl.ARBVertexType2_10_10_10_REV.glColorP4ui(type, color);
+    }
+
+    public static void glMultiTexCoordP1ui(int texture, int type, int coords) {
+        org.lwjgl.opengl.ARBVertexType2_10_10_10_REV.glMultiTexCoordP1ui(texture, type, coords);
+    }
+
+    public static void glMultiTexCoordP2ui(int texture, int type, int coords) {
+        org.lwjgl.opengl.ARBVertexType2_10_10_10_REV.glMultiTexCoordP2ui(texture, type, coords);
+    }
+
+    public static void glMultiTexCoordP3ui(int texture, int type, int coords) {
+        org.lwjgl.opengl.ARBVertexType2_10_10_10_REV.glMultiTexCoordP3ui(texture, type, coords);
+    }
+
+    public static void glMultiTexCoordP4ui(int texture, int type, int coords) {
+        org.lwjgl.opengl.ARBVertexType2_10_10_10_REV.glMultiTexCoordP4ui(texture, type, coords);
+    }
+
+    public static void glNormalP3ui(int type, int coords) {
+        org.lwjgl.opengl.ARBVertexType2_10_10_10_REV.glNormalP3ui(type, coords);
+    }
+
+    public static void glSecondaryColorP3ui(int type, int color) {
+        org.lwjgl.opengl.ARBVertexType2_10_10_10_REV.glSecondaryColorP3ui(type, color);
+    }
+
+    public static void glTexCoordP1ui(int type, int coords) {
+        org.lwjgl.opengl.ARBVertexType2_10_10_10_REV.glTexCoordP1ui(type, coords);
+    }
+
+    public static void glTexCoordP2ui(int type, int coords) {
+        org.lwjgl.opengl.ARBVertexType2_10_10_10_REV.glTexCoordP2ui(type, coords);
+    }
+
+    public static void glTexCoordP3ui(int type, int coords) {
+        org.lwjgl.opengl.ARBVertexType2_10_10_10_REV.glTexCoordP3ui(type, coords);
+    }
+
+    public static void glTexCoordP4ui(int type, int coords) {
+        org.lwjgl.opengl.ARBVertexType2_10_10_10_REV.glTexCoordP4ui(type, coords);
+    }
+
+    public static void glVertexAttribP1ui(int index, int type, boolean normalized, int value) {
+        org.lwjgl.opengl.ARBVertexType2_10_10_10_REV.glVertexAttribP1ui(index, type, normalized, value);
+    }
+
+    public static void glVertexAttribP2ui(int index, int type, boolean normalized, int value) {
+        org.lwjgl.opengl.ARBVertexType2_10_10_10_REV.glVertexAttribP2ui(index, type, normalized, value);
+    }
+
+    public static void glVertexAttribP3ui(int index, int type, boolean normalized, int value) {
+        org.lwjgl.opengl.ARBVertexType2_10_10_10_REV.glVertexAttribP3ui(index, type, normalized, value);
+    }
+
+    public static void glVertexAttribP4ui(int index, int type, boolean normalized, int value) {
+        org.lwjgl.opengl.ARBVertexType2_10_10_10_REV.glVertexAttribP4ui(index, type, normalized, value);
+    }
+
+    public static void glVertexP2ui(int type, int value) {
+        org.lwjgl.opengl.ARBVertexType2_10_10_10_REV.glVertexP2ui(type, value);
+    }
+
+    public static void glVertexP3ui(int type, int value) {
+        org.lwjgl.opengl.ARBVertexType2_10_10_10_REV.glVertexP3ui(type, value);
+    }
+
+    public static void glVertexP4ui(int type, int value) {
+        org.lwjgl.opengl.ARBVertexType2_10_10_10_REV.glVertexP4ui(type, value);
+    }
+}
diff --git a/src/main/java/org/lwjgl/opengl/ARBViewportArray.java b/src/main/java/org/lwjglx/opengl/ARBViewportArray.java
similarity index 76%
rename from src/main/java/org/lwjgl/opengl/ARBViewportArray.java
rename to src/main/java/org/lwjglx/opengl/ARBViewportArray.java
index 523bf0f48..049853f27 100644
--- a/src/main/java/org/lwjgl/opengl/ARBViewportArray.java
+++ b/src/main/java/org/lwjglx/opengl/ARBViewportArray.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBViewportArray {
 
@@ -13,14 +13,14 @@ public class ARBViewportArray {
     public static final int GL_VIEWPORT_SUBPIXEL_BITS = (int) 33372;
 
     public static void glDepthRangeIndexed(int index, double n, double f) {
-        org.lwjgl3.opengl.ARBViewportArray.glDepthRangeIndexed(index, n, f);
+        org.lwjgl.opengl.ARBViewportArray.glDepthRangeIndexed(index, n, f);
     }
 
     public static void glScissorIndexed(int index, int left, int bottom, int width, int height) {
-        org.lwjgl3.opengl.ARBViewportArray.glScissorIndexed(index, left, bottom, width, height);
+        org.lwjgl.opengl.ARBViewportArray.glScissorIndexed(index, left, bottom, width, height);
     }
 
     public static void glViewportIndexedf(int index, float x, float y, float w, float h) {
-        org.lwjgl3.opengl.ARBViewportArray.glViewportIndexedf(index, x, y, w, h);
+        org.lwjgl.opengl.ARBViewportArray.glViewportIndexedf(index, x, y, w, h);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ARBWindowPos.java b/src/main/java/org/lwjglx/opengl/ARBWindowPos.java
similarity index 52%
rename from src/main/java/org/lwjgl/opengl/ARBWindowPos.java
rename to src/main/java/org/lwjglx/opengl/ARBWindowPos.java
index 4bc189789..b1b0d9e90 100644
--- a/src/main/java/org/lwjgl/opengl/ARBWindowPos.java
+++ b/src/main/java/org/lwjglx/opengl/ARBWindowPos.java
@@ -1,36 +1,36 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ARBWindowPos {
 
     public static void glWindowPos2dARB(double x, double y) {
-        org.lwjgl3.opengl.ARBWindowPos.glWindowPos2dARB(x, y);
+        org.lwjgl.opengl.ARBWindowPos.glWindowPos2dARB(x, y);
     }
 
     public static void glWindowPos2fARB(float x, float y) {
-        org.lwjgl3.opengl.ARBWindowPos.glWindowPos2fARB(x, y);
+        org.lwjgl.opengl.ARBWindowPos.glWindowPos2fARB(x, y);
     }
 
     public static void glWindowPos2iARB(int x, int y) {
-        org.lwjgl3.opengl.ARBWindowPos.glWindowPos2iARB(x, y);
+        org.lwjgl.opengl.ARBWindowPos.glWindowPos2iARB(x, y);
     }
 
     public static void glWindowPos2sARB(short x, short y) {
-        org.lwjgl3.opengl.ARBWindowPos.glWindowPos2sARB(x, y);
+        org.lwjgl.opengl.ARBWindowPos.glWindowPos2sARB(x, y);
     }
 
     public static void glWindowPos3dARB(double x, double y, double z) {
-        org.lwjgl3.opengl.ARBWindowPos.glWindowPos3dARB(x, y, z);
+        org.lwjgl.opengl.ARBWindowPos.glWindowPos3dARB(x, y, z);
     }
 
     public static void glWindowPos3fARB(float x, float y, float z) {
-        org.lwjgl3.opengl.ARBWindowPos.glWindowPos3fARB(x, y, z);
+        org.lwjgl.opengl.ARBWindowPos.glWindowPos3fARB(x, y, z);
     }
 
     public static void glWindowPos3iARB(int x, int y, int z) {
-        org.lwjgl3.opengl.ARBWindowPos.glWindowPos3iARB(x, y, z);
+        org.lwjgl.opengl.ARBWindowPos.glWindowPos3iARB(x, y, z);
     }
 
     public static void glWindowPos3sARB(short x, short y, short z) {
-        org.lwjgl3.opengl.ARBWindowPos.glWindowPos3sARB(x, y, z);
+        org.lwjgl.opengl.ARBWindowPos.glWindowPos3sARB(x, y, z);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/ATIMeminfo.java b/src/main/java/org/lwjglx/opengl/ATIMeminfo.java
similarity index 89%
rename from src/main/java/org/lwjgl/opengl/ATIMeminfo.java
rename to src/main/java/org/lwjglx/opengl/ATIMeminfo.java
index cd532b2fe..14cdfac71 100644
--- a/src/main/java/org/lwjgl/opengl/ATIMeminfo.java
+++ b/src/main/java/org/lwjglx/opengl/ATIMeminfo.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ATIMeminfo {
 
diff --git a/src/main/java/org/lwjgl/opengl/ATITextureCompression3DC.java b/src/main/java/org/lwjglx/opengl/ATITextureCompression3DC.java
similarity index 82%
rename from src/main/java/org/lwjgl/opengl/ATITextureCompression3DC.java
rename to src/main/java/org/lwjglx/opengl/ATITextureCompression3DC.java
index c312e9f84..aae6152e5 100644
--- a/src/main/java/org/lwjgl/opengl/ATITextureCompression3DC.java
+++ b/src/main/java/org/lwjglx/opengl/ATITextureCompression3DC.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class ATITextureCompression3DC {
 
diff --git a/src/main/java/org/lwjgl/opengl/AWTGLCanvas.java b/src/main/java/org/lwjglx/opengl/AWTGLCanvas.java
similarity index 97%
rename from src/main/java/org/lwjgl/opengl/AWTGLCanvas.java
rename to src/main/java/org/lwjglx/opengl/AWTGLCanvas.java
index b5bb0f7a5..fbb78b575 100644
--- a/src/main/java/org/lwjgl/opengl/AWTGLCanvas.java
+++ b/src/main/java/org/lwjglx/opengl/AWTGLCanvas.java
@@ -13,7 +13,7 @@
  * 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.opengl;
+package org.lwjglx.opengl;
 
 import java.awt.*;
 import java.awt.event.ComponentEvent;
@@ -21,8 +21,8 @@
 import java.awt.event.HierarchyEvent;
 import java.awt.event.HierarchyListener;
 
-import org.lwjgl.LWJGLException;
-import org.lwjgl.PointerBuffer;
+import org.lwjglx.LWJGLException;
+import org.lwjglx.PointerBuffer;
 
 public class AWTGLCanvas extends Canvas implements Drawable, ComponentListener, HierarchyListener {
 
diff --git a/src/main/java/org/lwjgl/opengl/CallbackUtil.java b/src/main/java/org/lwjglx/opengl/CallbackUtil.java
similarity index 99%
rename from src/main/java/org/lwjgl/opengl/CallbackUtil.java
rename to src/main/java/org/lwjglx/opengl/CallbackUtil.java
index 17a44af6c..46bc8e750 100644
--- a/src/main/java/org/lwjgl/opengl/CallbackUtil.java
+++ b/src/main/java/org/lwjglx/opengl/CallbackUtil.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.opengl;
+package org.lwjglx.opengl;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/org/lwjgl/opengl/Context.java b/src/main/java/org/lwjglx/opengl/Context.java
similarity index 96%
rename from src/main/java/org/lwjgl/opengl/Context.java
rename to src/main/java/org/lwjglx/opengl/Context.java
index cff4a206c..8dcab8c66 100644
--- a/src/main/java/org/lwjgl/opengl/Context.java
+++ b/src/main/java/org/lwjglx/opengl/Context.java
@@ -13,9 +13,9 @@
  * 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.opengl;
+package org.lwjglx.opengl;
 
-import org.lwjgl.LWJGLException;
+import org.lwjglx.LWJGLException;
 
 /**
  * @author Spasi
diff --git a/src/main/java/org/lwjgl/opengl/ContextAttribs.java b/src/main/java/org/lwjglx/opengl/ContextAttribs.java
similarity index 99%
rename from src/main/java/org/lwjgl/opengl/ContextAttribs.java
rename to src/main/java/org/lwjglx/opengl/ContextAttribs.java
index 8772fce3e..5c0501346 100644
--- a/src/main/java/org/lwjgl/opengl/ContextAttribs.java
+++ b/src/main/java/org/lwjglx/opengl/ContextAttribs.java
@@ -13,7 +13,7 @@
  * 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.opengl;
+package org.lwjglx.opengl;
 
 public final class ContextAttribs {
 
diff --git a/src/main/java/org/lwjgl/opengl/ContextCapabilities.java b/src/main/java/org/lwjglx/opengl/ContextCapabilities.java
similarity index 98%
rename from src/main/java/org/lwjgl/opengl/ContextCapabilities.java
rename to src/main/java/org/lwjglx/opengl/ContextCapabilities.java
index e17189621..03ae154de 100644
--- a/src/main/java/org/lwjgl/opengl/ContextCapabilities.java
+++ b/src/main/java/org/lwjglx/opengl/ContextCapabilities.java
@@ -1,14 +1,14 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 import java.lang.reflect.Field;
 
 public class ContextCapabilities {
 
-    org.lwjgl3.opengl.GLCapabilities cap = org.lwjgl3.opengl.GL.getCapabilities();
+    org.lwjgl.opengl.GLCapabilities cap = org.lwjgl.opengl.GL.getCapabilities();
 
     public ContextCapabilities() {
 
-        Field[] fields = org.lwjgl3.opengl.GLCapabilities.class.getFields();
+        Field[] fields = org.lwjgl.opengl.GLCapabilities.class.getFields();
 
         try {
             for (Field field : fields) {
diff --git a/src/main/java/org/lwjgl/opengl/ContextGL.java b/src/main/java/org/lwjglx/opengl/ContextGL.java
similarity index 95%
rename from src/main/java/org/lwjgl/opengl/ContextGL.java
rename to src/main/java/org/lwjglx/opengl/ContextGL.java
index 3c0045128..f9c43225c 100644
--- a/src/main/java/org/lwjgl/opengl/ContextGL.java
+++ b/src/main/java/org/lwjglx/opengl/ContextGL.java
@@ -13,12 +13,12 @@
  * 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.opengl;
+package org.lwjglx.opengl;
 
-import org.lwjgl3.glfw.GLFW;
-import org.lwjgl3.opengl.GL;
-import org.lwjgl.LWJGLException;
-import org.lwjgl.PointerBuffer;
+import org.lwjgl.glfw.GLFW;
+import org.lwjgl.opengl.GL;
+import org.lwjglx.LWJGLException;
+import org.lwjglx.PointerBuffer;
 
 /**
  * <p/>
diff --git a/src/main/java/org/lwjgl/opengl/Display.java b/src/main/java/org/lwjglx/opengl/Display.java
similarity index 97%
rename from src/main/java/org/lwjgl/opengl/Display.java
rename to src/main/java/org/lwjglx/opengl/Display.java
index ad04dbd9d..40f4d6d8d 100644
--- a/src/main/java/org/lwjgl/opengl/Display.java
+++ b/src/main/java/org/lwjglx/opengl/Display.java
@@ -1,16 +1,17 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 import net.minecraft.client.Minecraft;
 import net.minecraftforge.common.ForgeEarlyConfig;
-import org.lwjgl.input.*;
-import org.lwjgl.util.Rectangle;
-import org.lwjgl3.PointerBuffer;
-import org.lwjgl3.glfw.GLFW;
-import org.lwjgl3.glfw.*;
-import org.lwjgl3.opengl.GL;
-import org.lwjgl3.opengl.GL11;
-import org.lwjgl.BufferUtils;
-import org.lwjgl.Sys;
+import org.lwjglx.LWJGLException;
+import org.lwjglx.input.*;
+import org.lwjglx.util.Rectangle;
+import org.lwjgl.PointerBuffer;
+import org.lwjgl.glfw.GLFW;
+import org.lwjgl.glfw.*;
+import org.lwjgl.opengl.GL;
+import org.lwjgl.opengl.GL11;
+import org.lwjglx.BufferUtils;
+import org.lwjglx.Sys;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -21,8 +22,8 @@
 import java.util.HashMap;
 import java.util.Optional;
 
-import static org.lwjgl3.glfw.GLFW.*;
-import static org.lwjgl3.system.MemoryUtil.NULL;
+import static org.lwjgl.glfw.GLFW.*;
+import static org.lwjgl.system.MemoryUtil.NULL;
 
 public class Display {
 
@@ -99,7 +100,7 @@ public class Display {
      *
      * @param pixel_format    Describes the minimum specifications the context must fulfill.
      * @param shared_drawable The Drawable to share context with. (optional, may be null)
-     * @throws org.lwjgl.LWJGLException
+     * @throws LWJGLException
      */
     public static void create(PixelFormat pixel_format, Drawable shared_drawable) {
         System.out.println("TODO: Implement Display.create(PixelFormat, Drawable)"); // TODO
@@ -160,7 +161,7 @@ public static void create() {
             throw new IllegalStateException("Failed to create Display window");
         }
 
-        if (org.lwjgl3.glfw.GLFW.glfwRawMouseMotionSupported() && ForgeEarlyConfig.RAW_INPUT) {
+        if (org.lwjgl.glfw.GLFW.glfwRawMouseMotionSupported() && ForgeEarlyConfig.RAW_INPUT) {
             GLFW.glfwSetInputMode(Window.handle, GLFW_RAW_MOUSE_MOTION, GLFW_TRUE);
         }
 
@@ -531,7 +532,7 @@ public static float getPixelScaleFactor() {
 
     public static void setTitle(String title) {
         if (getWindow() != 0) {
-            org.lwjgl3.glfw.GLFW.glfwSetWindowTitle(Window.handle, title);
+            org.lwjgl.glfw.GLFW.glfwSetWindowTitle(Window.handle, title);
         }
         windowTitle = title;
     }
@@ -556,7 +557,7 @@ public static int setIcon(java.nio.ByteBuffer[] icons) {
         GLFWImage.Buffer glfwImages = GLFWImage.calloc(icons.length);
         ByteBuffer[] nativeBuffers = new ByteBuffer[icons.length];
         for (int icon = 0; icon < icons.length; icon++) {
-            nativeBuffers[icon] = org.lwjgl3.BufferUtils.createByteBuffer(icons[icon].capacity());
+            nativeBuffers[icon] = org.lwjgl.BufferUtils.createByteBuffer(icons[icon].capacity());
             nativeBuffers[icon].put(icons[icon]);
             nativeBuffers[icon].flip();
             int dimension = (int) Math.sqrt(nativeBuffers[icon].limit() / 4D);
diff --git a/src/main/java/org/lwjgl/opengl/DisplayImplementation.java b/src/main/java/org/lwjglx/opengl/DisplayImplementation.java
similarity index 99%
rename from src/main/java/org/lwjgl/opengl/DisplayImplementation.java
rename to src/main/java/org/lwjglx/opengl/DisplayImplementation.java
index 253c94813..9e47652ea 100644
--- a/src/main/java/org/lwjgl/opengl/DisplayImplementation.java
+++ b/src/main/java/org/lwjglx/opengl/DisplayImplementation.java
@@ -13,7 +13,7 @@
  * 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.opengl;
+package org.lwjglx.opengl;
 
 /**
  * This is the Display implementation interface. Display delegates to implementors of this interface. There is one
@@ -26,7 +26,7 @@
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 
-import org.lwjgl.LWJGLException;
+import org.lwjglx.LWJGLException;
 
 interface DisplayImplementation extends InputImplementation {
 
diff --git a/src/main/java/org/lwjgl/opengl/DisplayMode.java b/src/main/java/org/lwjglx/opengl/DisplayMode.java
similarity index 99%
rename from src/main/java/org/lwjgl/opengl/DisplayMode.java
rename to src/main/java/org/lwjglx/opengl/DisplayMode.java
index 614d9f70e..1862a814b 100644
--- a/src/main/java/org/lwjgl/opengl/DisplayMode.java
+++ b/src/main/java/org/lwjglx/opengl/DisplayMode.java
@@ -13,7 +13,7 @@
  * 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.opengl;
+package org.lwjglx.opengl;
 
 /**
  *
diff --git a/src/main/java/org/lwjgl/opengl/Drawable.java b/src/main/java/org/lwjglx/opengl/Drawable.java
similarity index 96%
rename from src/main/java/org/lwjgl/opengl/Drawable.java
rename to src/main/java/org/lwjglx/opengl/Drawable.java
index ef26bf13e..ddd007e7c 100644
--- a/src/main/java/org/lwjgl/opengl/Drawable.java
+++ b/src/main/java/org/lwjglx/opengl/Drawable.java
@@ -13,10 +13,10 @@
  * 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.opengl;
+package org.lwjglx.opengl;
 
-import org.lwjgl.LWJGLException;
-import org.lwjgl.PointerBuffer;
+import org.lwjglx.LWJGLException;
+import org.lwjglx.PointerBuffer;
 
 /**
  * The Drawable interface describes an OpenGL drawable with an associated Context.
diff --git a/src/main/java/org/lwjgl/opengl/DrawableGL.java b/src/main/java/org/lwjglx/opengl/DrawableGL.java
similarity index 93%
rename from src/main/java/org/lwjgl/opengl/DrawableGL.java
rename to src/main/java/org/lwjglx/opengl/DrawableGL.java
index 214a9ce83..62915200a 100644
--- a/src/main/java/org/lwjgl/opengl/DrawableGL.java
+++ b/src/main/java/org/lwjglx/opengl/DrawableGL.java
@@ -13,17 +13,17 @@
  * 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.opengl;
+package org.lwjglx.opengl;
 
-import static org.lwjgl3.glfw.GLFW.GLFW_FALSE;
-import static org.lwjgl3.glfw.GLFW.GLFW_VISIBLE;
-import static org.lwjgl3.glfw.GLFW.glfwWindowHint;
-import static org.lwjgl3.opengl.GL11.*;
+import static org.lwjgl.glfw.GLFW.GLFW_FALSE;
+import static org.lwjgl.glfw.GLFW.GLFW_VISIBLE;
+import static org.lwjgl.glfw.GLFW.glfwWindowHint;
+import static org.lwjgl.opengl.GL11.*;
 
-import org.lwjgl3.glfw.GLFW;
-import org.lwjgl.LWJGLException;
-import org.lwjgl.LWJGLUtil;
-import org.lwjgl.PointerBuffer;
+import org.lwjgl.glfw.GLFW;
+import org.lwjglx.LWJGLException;
+import org.lwjglx.LWJGLUtil;
+import org.lwjglx.PointerBuffer;
 
 /** @author Spasi */
 public class DrawableGL implements DrawableLWJGL {
diff --git a/src/main/java/org/lwjgl/opengl/DrawableLWJGL.java b/src/main/java/org/lwjglx/opengl/DrawableLWJGL.java
similarity index 97%
rename from src/main/java/org/lwjgl/opengl/DrawableLWJGL.java
rename to src/main/java/org/lwjglx/opengl/DrawableLWJGL.java
index 4b9d426a7..133920768 100644
--- a/src/main/java/org/lwjgl/opengl/DrawableLWJGL.java
+++ b/src/main/java/org/lwjglx/opengl/DrawableLWJGL.java
@@ -13,9 +13,9 @@
  * 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.opengl;
+package org.lwjglx.opengl;
 
-import org.lwjgl.LWJGLException;
+import org.lwjglx.LWJGLException;
 
 /**
  * [INTERNAL USE ONLY]
diff --git a/src/main/java/org/lwjgl/opengl/EXTBindableUniform.java b/src/main/java/org/lwjglx/opengl/EXTBindableUniform.java
similarity index 70%
rename from src/main/java/org/lwjgl/opengl/EXTBindableUniform.java
rename to src/main/java/org/lwjglx/opengl/EXTBindableUniform.java
index 9dd2f8cb1..520bc8418 100644
--- a/src/main/java/org/lwjgl/opengl/EXTBindableUniform.java
+++ b/src/main/java/org/lwjglx/opengl/EXTBindableUniform.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTBindableUniform {
 
@@ -10,14 +10,14 @@ public class EXTBindableUniform {
     public static final int GL_UNIFORM_BUFFER_EXT = (int) 36334;
 
     public static int glGetUniformBufferSizeEXT(int program, int location) {
-        return org.lwjgl3.opengl.EXTBindableUniform.glGetUniformBufferSizeEXT(program, location);
+        return org.lwjgl.opengl.EXTBindableUniform.glGetUniformBufferSizeEXT(program, location);
     }
 
     public static long glGetUniformOffsetEXT(int program, int location) {
-        return org.lwjgl3.opengl.EXTBindableUniform.glGetUniformOffsetEXT(program, location);
+        return org.lwjgl.opengl.EXTBindableUniform.glGetUniformOffsetEXT(program, location);
     }
 
     public static void glUniformBufferEXT(int program, int location, int buffer) {
-        org.lwjgl3.opengl.EXTBindableUniform.glUniformBufferEXT(program, location, buffer);
+        org.lwjgl.opengl.EXTBindableUniform.glUniformBufferEXT(program, location, buffer);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTBlendColor.java b/src/main/java/org/lwjglx/opengl/EXTBlendColor.java
similarity index 81%
rename from src/main/java/org/lwjgl/opengl/EXTBlendColor.java
rename to src/main/java/org/lwjglx/opengl/EXTBlendColor.java
index e4dac8ee0..e52651045 100644
--- a/src/main/java/org/lwjgl/opengl/EXTBlendColor.java
+++ b/src/main/java/org/lwjglx/opengl/EXTBlendColor.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTBlendColor {
 
@@ -9,6 +9,6 @@ public class EXTBlendColor {
     public static final int GL_ONE_MINUS_CONSTANT_COLOR_EXT = (int) 32770;
 
     public static void glBlendColorEXT(float red, float green, float blue, float alpha) {
-        org.lwjgl3.opengl.EXTBlendColor.glBlendColorEXT(red, green, blue, alpha);
+        org.lwjgl.opengl.EXTBlendColor.glBlendColorEXT(red, green, blue, alpha);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTBlendEquationSeparate.java b/src/main/java/org/lwjglx/opengl/EXTBlendEquationSeparate.java
similarity index 68%
rename from src/main/java/org/lwjgl/opengl/EXTBlendEquationSeparate.java
rename to src/main/java/org/lwjglx/opengl/EXTBlendEquationSeparate.java
index c04919c2e..ff6f441c6 100644
--- a/src/main/java/org/lwjgl/opengl/EXTBlendEquationSeparate.java
+++ b/src/main/java/org/lwjglx/opengl/EXTBlendEquationSeparate.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTBlendEquationSeparate {
 
@@ -6,6 +6,6 @@ public class EXTBlendEquationSeparate {
     public static final int GL_BLEND_EQUATION_RGB_EXT = (int) 32777;
 
     public static void glBlendEquationSeparateEXT(int modeRGB, int modeAlpha) {
-        org.lwjgl3.opengl.EXTBlendEquationSeparate.glBlendEquationSeparateEXT(modeRGB, modeAlpha);
+        org.lwjgl.opengl.EXTBlendEquationSeparate.glBlendEquationSeparateEXT(modeRGB, modeAlpha);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTBlendFuncSeparate.java b/src/main/java/org/lwjglx/opengl/EXTBlendFuncSeparate.java
similarity index 87%
rename from src/main/java/org/lwjgl/opengl/EXTBlendFuncSeparate.java
rename to src/main/java/org/lwjglx/opengl/EXTBlendFuncSeparate.java
index cec99fd74..b538bed1e 100644
--- a/src/main/java/org/lwjgl/opengl/EXTBlendFuncSeparate.java
+++ b/src/main/java/org/lwjglx/opengl/EXTBlendFuncSeparate.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTBlendFuncSeparate {
 
@@ -8,7 +8,7 @@ public class EXTBlendFuncSeparate {
     public static final int GL_BLEND_SRC_RGB_EXT = (int) 32969;
 
     public static void glBlendFuncSeparateEXT(int sfactorRGB, int dfactorRGB, int sfactorAlpha, int dfactorAlpha) {
-        org.lwjgl3.opengl.EXTBlendFuncSeparate
+        org.lwjgl.opengl.EXTBlendFuncSeparate
                 .glBlendFuncSeparateEXT(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTBlendMinmax.java b/src/main/java/org/lwjglx/opengl/EXTBlendMinmax.java
similarity index 77%
rename from src/main/java/org/lwjgl/opengl/EXTBlendMinmax.java
rename to src/main/java/org/lwjglx/opengl/EXTBlendMinmax.java
index 856e70e84..86b87eaa0 100644
--- a/src/main/java/org/lwjgl/opengl/EXTBlendMinmax.java
+++ b/src/main/java/org/lwjglx/opengl/EXTBlendMinmax.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTBlendMinmax {
 
@@ -8,6 +8,6 @@ public class EXTBlendMinmax {
     public static final int GL_MIN_EXT = (int) 32775;
 
     public static void glBlendEquationEXT(int mode) {
-        org.lwjgl3.opengl.EXTBlendMinmax.glBlendEquationEXT(mode);
+        org.lwjgl.opengl.EXTBlendMinmax.glBlendEquationEXT(mode);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTBlendSubtract.java b/src/main/java/org/lwjglx/opengl/EXTBlendSubtract.java
similarity index 86%
rename from src/main/java/org/lwjgl/opengl/EXTBlendSubtract.java
rename to src/main/java/org/lwjglx/opengl/EXTBlendSubtract.java
index 760bda879..6ef796afe 100644
--- a/src/main/java/org/lwjgl/opengl/EXTBlendSubtract.java
+++ b/src/main/java/org/lwjglx/opengl/EXTBlendSubtract.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTBlendSubtract {
 
diff --git a/src/main/java/org/lwjgl/opengl/EXTCompiledVertexArray.java b/src/main/java/org/lwjglx/opengl/EXTCompiledVertexArray.java
similarity index 64%
rename from src/main/java/org/lwjgl/opengl/EXTCompiledVertexArray.java
rename to src/main/java/org/lwjglx/opengl/EXTCompiledVertexArray.java
index bd0b25327..b14ad8471 100644
--- a/src/main/java/org/lwjgl/opengl/EXTCompiledVertexArray.java
+++ b/src/main/java/org/lwjglx/opengl/EXTCompiledVertexArray.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTCompiledVertexArray {
 
@@ -6,10 +6,10 @@ public class EXTCompiledVertexArray {
     public static final int GL_ARRAY_ELEMENT_LOCK_FIRST_EXT = (int) 33192;
 
     public static void glLockArraysEXT(int first, int count) {
-        org.lwjgl3.opengl.EXTCompiledVertexArray.glLockArraysEXT(first, count);
+        org.lwjgl.opengl.EXTCompiledVertexArray.glLockArraysEXT(first, count);
     }
 
     public static void glUnlockArraysEXT() {
-        org.lwjgl3.opengl.EXTCompiledVertexArray.glUnlockArraysEXT();
+        org.lwjgl.opengl.EXTCompiledVertexArray.glUnlockArraysEXT();
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTDepthBoundsTest.java b/src/main/java/org/lwjglx/opengl/EXTDepthBoundsTest.java
similarity index 70%
rename from src/main/java/org/lwjgl/opengl/EXTDepthBoundsTest.java
rename to src/main/java/org/lwjglx/opengl/EXTDepthBoundsTest.java
index 51b74fd71..1a9b33a0c 100644
--- a/src/main/java/org/lwjgl/opengl/EXTDepthBoundsTest.java
+++ b/src/main/java/org/lwjglx/opengl/EXTDepthBoundsTest.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTDepthBoundsTest {
 
@@ -6,6 +6,6 @@ public class EXTDepthBoundsTest {
     public static final int GL_DEPTH_BOUNDS_TEST_EXT = (int) 34960;
 
     public static void glDepthBoundsEXT(double zmin, double zmax) {
-        org.lwjgl3.opengl.EXTDepthBoundsTest.glDepthBoundsEXT(zmin, zmax);
+        org.lwjgl.opengl.EXTDepthBoundsTest.glDepthBoundsEXT(zmin, zmax);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTDirectStateAccess.java b/src/main/java/org/lwjglx/opengl/EXTDirectStateAccess.java
similarity index 71%
rename from src/main/java/org/lwjgl/opengl/EXTDirectStateAccess.java
rename to src/main/java/org/lwjglx/opengl/EXTDirectStateAccess.java
index 6cda2b9f1..128bac002 100644
--- a/src/main/java/org/lwjgl/opengl/EXTDirectStateAccess.java
+++ b/src/main/java/org/lwjglx/opengl/EXTDirectStateAccess.java
@@ -1,6 +1,7 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
-import org.lwjgl.lwjgl3ify.BufferCasts;
+import org.lwjglx.MemoryUtil;
+import org.lwjglx.lwjgl3ify.BufferCasts;
 
 public class EXTDirectStateAccess {
 
@@ -9,20 +10,20 @@ public class EXTDirectStateAccess {
     public static final int GL_TRANSPOSE_PROGRAM_MATRIX_EXT = (int) 36398;
 
     public static void glBindMultiTextureEXT(int texunit, int target, int texture) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glBindMultiTextureEXT(texunit, target, texture);
+        org.lwjgl.opengl.EXTDirectStateAccess.glBindMultiTextureEXT(texunit, target, texture);
     }
 
     public static int glCheckNamedFramebufferStatusEXT(int framebuffer, int target) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess.glCheckNamedFramebufferStatusEXT(framebuffer, target);
+        return org.lwjgl.opengl.EXTDirectStateAccess.glCheckNamedFramebufferStatusEXT(framebuffer, target);
     }
 
     public static void glClientAttribDefaultEXT(int mask) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glClientAttribDefaultEXT(mask);
+        org.lwjgl.opengl.EXTDirectStateAccess.glClientAttribDefaultEXT(mask);
     }
 
     public static void glCompressedMultiTexImage1DEXT(int texunit, int target, int level, int internalformat, int width,
             int border, int data_imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glCompressedMultiTexImage1DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glCompressedMultiTexImage1DEXT(
                 texunit,
                 target,
                 level,
@@ -35,13 +36,13 @@ public static void glCompressedMultiTexImage1DEXT(int texunit, int target, int l
 
     public static void glCompressedMultiTexImage1DEXT(int texunit, int target, int level, int internalformat, int width,
             int border, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glCompressedMultiTexImage1DEXT(texunit, target, level, internalformat, width, border, data);
     }
 
     public static void glCompressedMultiTexImage2DEXT(int texunit, int target, int level, int internalformat, int width,
             int height, int border, int data_imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glCompressedMultiTexImage2DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glCompressedMultiTexImage2DEXT(
                 texunit,
                 target,
                 level,
@@ -55,13 +56,13 @@ public static void glCompressedMultiTexImage2DEXT(int texunit, int target, int l
 
     public static void glCompressedMultiTexImage2DEXT(int texunit, int target, int level, int internalformat, int width,
             int height, int border, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glCompressedMultiTexImage2DEXT(texunit, target, level, internalformat, width, height, border, data);
     }
 
     public static void glCompressedMultiTexImage3DEXT(int texunit, int target, int level, int internalformat, int width,
             int height, int depth, int border, int data_imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glCompressedMultiTexImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glCompressedMultiTexImage3DEXT(
                 texunit,
                 target,
                 level,
@@ -76,7 +77,7 @@ public static void glCompressedMultiTexImage3DEXT(int texunit, int target, int l
 
     public static void glCompressedMultiTexImage3DEXT(int texunit, int target, int level, int internalformat, int width,
             int height, int depth, int border, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glCompressedMultiTexImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glCompressedMultiTexImage3DEXT(
                 texunit,
                 target,
                 level,
@@ -90,7 +91,7 @@ public static void glCompressedMultiTexImage3DEXT(int texunit, int target, int l
 
     public static void glCompressedMultiTexSubImage1DEXT(int texunit, int target, int level, int xoffset, int width,
             int format, int data_imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glCompressedMultiTexSubImage1DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glCompressedMultiTexSubImage1DEXT(
                 texunit,
                 target,
                 level,
@@ -103,13 +104,13 @@ public static void glCompressedMultiTexSubImage1DEXT(int texunit, int target, in
 
     public static void glCompressedMultiTexSubImage1DEXT(int texunit, int target, int level, int xoffset, int width,
             int format, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glCompressedMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, data);
     }
 
     public static void glCompressedMultiTexSubImage2DEXT(int texunit, int target, int level, int xoffset, int yoffset,
             int width, int height, int format, int data_imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glCompressedMultiTexSubImage2DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glCompressedMultiTexSubImage2DEXT(
                 texunit,
                 target,
                 level,
@@ -124,7 +125,7 @@ public static void glCompressedMultiTexSubImage2DEXT(int texunit, int target, in
 
     public static void glCompressedMultiTexSubImage2DEXT(int texunit, int target, int level, int xoffset, int yoffset,
             int width, int height, int format, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glCompressedMultiTexSubImage2DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glCompressedMultiTexSubImage2DEXT(
                 texunit,
                 target,
                 level,
@@ -138,7 +139,7 @@ public static void glCompressedMultiTexSubImage2DEXT(int texunit, int target, in
 
     public static void glCompressedMultiTexSubImage3DEXT(int texunit, int target, int level, int xoffset, int yoffset,
             int zoffset, int width, int height, int depth, int format, int data_imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glCompressedMultiTexSubImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glCompressedMultiTexSubImage3DEXT(
                 texunit,
                 target,
                 level,
@@ -155,7 +156,7 @@ public static void glCompressedMultiTexSubImage3DEXT(int texunit, int target, in
 
     public static void glCompressedMultiTexSubImage3DEXT(int texunit, int target, int level, int xoffset, int yoffset,
             int zoffset, int width, int height, int depth, int format, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glCompressedMultiTexSubImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glCompressedMultiTexSubImage3DEXT(
                 texunit,
                 target,
                 level,
@@ -171,7 +172,7 @@ public static void glCompressedMultiTexSubImage3DEXT(int texunit, int target, in
 
     public static void glCompressedTextureImage1DEXT(int texture, int target, int level, int internalformat, int width,
             int border, int data_imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glCompressedTextureImage1DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glCompressedTextureImage1DEXT(
                 texture,
                 target,
                 level,
@@ -184,13 +185,13 @@ public static void glCompressedTextureImage1DEXT(int texture, int target, int le
 
     public static void glCompressedTextureImage1DEXT(int texture, int target, int level, int internalformat, int width,
             int border, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glCompressedTextureImage1DEXT(texture, target, level, internalformat, width, border, data);
     }
 
     public static void glCompressedTextureImage2DEXT(int texture, int target, int level, int internalformat, int width,
             int height, int border, int data_imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glCompressedTextureImage2DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glCompressedTextureImage2DEXT(
                 texture,
                 target,
                 level,
@@ -204,13 +205,13 @@ public static void glCompressedTextureImage2DEXT(int texture, int target, int le
 
     public static void glCompressedTextureImage2DEXT(int texture, int target, int level, int internalformat, int width,
             int height, int border, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glCompressedTextureImage2DEXT(texture, target, level, internalformat, width, height, border, data);
     }
 
     public static void glCompressedTextureImage3DEXT(int texture, int target, int level, int internalformat, int width,
             int height, int depth, int border, int data_imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glCompressedTextureImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glCompressedTextureImage3DEXT(
                 texture,
                 target,
                 level,
@@ -225,7 +226,7 @@ public static void glCompressedTextureImage3DEXT(int texture, int target, int le
 
     public static void glCompressedTextureImage3DEXT(int texture, int target, int level, int internalformat, int width,
             int height, int depth, int border, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glCompressedTextureImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glCompressedTextureImage3DEXT(
                 texture,
                 target,
                 level,
@@ -239,7 +240,7 @@ public static void glCompressedTextureImage3DEXT(int texture, int target, int le
 
     public static void glCompressedTextureSubImage1DEXT(int texture, int target, int level, int xoffset, int width,
             int format, int data_imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glCompressedTextureSubImage1DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glCompressedTextureSubImage1DEXT(
                 texture,
                 target,
                 level,
@@ -252,13 +253,13 @@ public static void glCompressedTextureSubImage1DEXT(int texture, int target, int
 
     public static void glCompressedTextureSubImage1DEXT(int texture, int target, int level, int xoffset, int width,
             int format, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glCompressedTextureSubImage1DEXT(texture, target, level, xoffset, width, format, data);
     }
 
     public static void glCompressedTextureSubImage2DEXT(int texture, int target, int level, int xoffset, int yoffset,
             int width, int height, int format, int data_imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glCompressedTextureSubImage2DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glCompressedTextureSubImage2DEXT(
                 texture,
                 target,
                 level,
@@ -273,7 +274,7 @@ public static void glCompressedTextureSubImage2DEXT(int texture, int target, int
 
     public static void glCompressedTextureSubImage2DEXT(int texture, int target, int level, int xoffset, int yoffset,
             int width, int height, int format, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glCompressedTextureSubImage2DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glCompressedTextureSubImage2DEXT(
                 texture,
                 target,
                 level,
@@ -287,7 +288,7 @@ public static void glCompressedTextureSubImage2DEXT(int texture, int target, int
 
     public static void glCompressedTextureSubImage3DEXT(int texture, int target, int level, int xoffset, int yoffset,
             int zoffset, int width, int height, int depth, int format, int data_imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glCompressedTextureSubImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glCompressedTextureSubImage3DEXT(
                 texture,
                 target,
                 level,
@@ -304,7 +305,7 @@ public static void glCompressedTextureSubImage3DEXT(int texture, int target, int
 
     public static void glCompressedTextureSubImage3DEXT(int texture, int target, int level, int xoffset, int yoffset,
             int zoffset, int width, int height, int depth, int format, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glCompressedTextureSubImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glCompressedTextureSubImage3DEXT(
                 texture,
                 target,
                 level,
@@ -320,627 +321,627 @@ public static void glCompressedTextureSubImage3DEXT(int texture, int target, int
 
     public static void glCopyMultiTexImage1DEXT(int texunit, int target, int level, int internalformat, int x, int y,
             int width, int border) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glCopyMultiTexImage1DEXT(texunit, target, level, internalformat, x, y, width, border);
     }
 
     public static void glCopyMultiTexImage2DEXT(int texunit, int target, int level, int internalformat, int x, int y,
             int width, int height, int border) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glCopyMultiTexImage2DEXT(texunit, target, level, internalformat, x, y, width, height, border);
     }
 
     public static void glCopyMultiTexSubImage1DEXT(int texunit, int target, int level, int xoffset, int x, int y,
             int width) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glCopyMultiTexSubImage1DEXT(texunit, target, level, xoffset, x, y, width);
+        org.lwjgl.opengl.EXTDirectStateAccess.glCopyMultiTexSubImage1DEXT(texunit, target, level, xoffset, x, y, width);
     }
 
     public static void glCopyMultiTexSubImage2DEXT(int texunit, int target, int level, int xoffset, int yoffset, int x,
             int y, int width, int height) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glCopyMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, x, y, width, height);
     }
 
     public static void glCopyMultiTexSubImage3DEXT(int texunit, int target, int level, int xoffset, int yoffset,
             int zoffset, int x, int y, int width, int height) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glCopyMultiTexSubImage3DEXT(texunit, target, level, xoffset, yoffset, zoffset, x, y, width, height);
     }
 
     public static void glCopyTextureImage1DEXT(int texture, int target, int level, int internalformat, int x, int y,
             int width, int border) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glCopyTextureImage1DEXT(texture, target, level, internalformat, x, y, width, border);
     }
 
     public static void glCopyTextureImage2DEXT(int texture, int target, int level, int internalformat, int x, int y,
             int width, int height, int border) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glCopyTextureImage2DEXT(texture, target, level, internalformat, x, y, width, height, border);
     }
 
     public static void glCopyTextureSubImage1DEXT(int texture, int target, int level, int xoffset, int x, int y,
             int width) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glCopyTextureSubImage1DEXT(texture, target, level, xoffset, x, y, width);
+        org.lwjgl.opengl.EXTDirectStateAccess.glCopyTextureSubImage1DEXT(texture, target, level, xoffset, x, y, width);
     }
 
     public static void glCopyTextureSubImage2DEXT(int texture, int target, int level, int xoffset, int yoffset, int x,
             int y, int width, int height) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glCopyTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, x, y, width, height);
     }
 
     public static void glCopyTextureSubImage3DEXT(int texture, int target, int level, int xoffset, int yoffset,
             int zoffset, int x, int y, int width, int height) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glCopyTextureSubImage3DEXT(texture, target, level, xoffset, yoffset, zoffset, x, y, width, height);
     }
 
     public static void glDisableClientStateIndexedEXT(int array, int index) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glDisableClientStateIndexedEXT(array, index);
+        org.lwjgl.opengl.EXTDirectStateAccess.glDisableClientStateIndexedEXT(array, index);
     }
 
     public static void glDisableClientStateiEXT(int array, int index) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glDisableClientStateiEXT(array, index);
+        org.lwjgl.opengl.EXTDirectStateAccess.glDisableClientStateiEXT(array, index);
     }
 
     public static void glDisableIndexedEXT(int cap, int index) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glDisableIndexedEXT(cap, index);
+        org.lwjgl.opengl.EXTDirectStateAccess.glDisableIndexedEXT(cap, index);
     }
 
     public static void glDisableVertexArrayAttribEXT(int vaobj, int index) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glDisableVertexArrayAttribEXT(vaobj, index);
+        org.lwjgl.opengl.EXTDirectStateAccess.glDisableVertexArrayAttribEXT(vaobj, index);
     }
 
     public static void glDisableVertexArrayEXT(int vaobj, int array) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glDisableVertexArrayEXT(vaobj, array);
+        org.lwjgl.opengl.EXTDirectStateAccess.glDisableVertexArrayEXT(vaobj, array);
     }
 
     public static void glEnableClientStateIndexedEXT(int array, int index) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glEnableClientStateIndexedEXT(array, index);
+        org.lwjgl.opengl.EXTDirectStateAccess.glEnableClientStateIndexedEXT(array, index);
     }
 
     public static void glEnableClientStateiEXT(int array, int index) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glEnableClientStateiEXT(array, index);
+        org.lwjgl.opengl.EXTDirectStateAccess.glEnableClientStateiEXT(array, index);
     }
 
     public static void glEnableIndexedEXT(int cap, int index) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glEnableIndexedEXT(cap, index);
+        org.lwjgl.opengl.EXTDirectStateAccess.glEnableIndexedEXT(cap, index);
     }
 
     public static void glEnableVertexArrayAttribEXT(int vaobj, int index) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glEnableVertexArrayAttribEXT(vaobj, index);
+        org.lwjgl.opengl.EXTDirectStateAccess.glEnableVertexArrayAttribEXT(vaobj, index);
     }
 
     public static void glEnableVertexArrayEXT(int vaobj, int array) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glEnableVertexArrayEXT(vaobj, array);
+        org.lwjgl.opengl.EXTDirectStateAccess.glEnableVertexArrayEXT(vaobj, array);
     }
 
     public static void glFlushMappedNamedBufferRangeEXT(int buffer, long offset, long length) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glFlushMappedNamedBufferRangeEXT(buffer, offset, length);
+        org.lwjgl.opengl.EXTDirectStateAccess.glFlushMappedNamedBufferRangeEXT(buffer, offset, length);
     }
 
     public static void glFramebufferDrawBufferEXT(int framebuffer, int mode) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glFramebufferDrawBufferEXT(framebuffer, mode);
+        org.lwjgl.opengl.EXTDirectStateAccess.glFramebufferDrawBufferEXT(framebuffer, mode);
     }
 
     public static void glFramebufferDrawBuffersEXT(int framebuffer, java.nio.IntBuffer bufs) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glFramebufferDrawBuffersEXT(framebuffer, bufs);
+        org.lwjgl.opengl.EXTDirectStateAccess.glFramebufferDrawBuffersEXT(framebuffer, bufs);
     }
 
     public static void glFramebufferReadBufferEXT(int framebuffer, int mode) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glFramebufferReadBufferEXT(framebuffer, mode);
+        org.lwjgl.opengl.EXTDirectStateAccess.glFramebufferReadBufferEXT(framebuffer, mode);
     }
 
     public static void glGenerateMultiTexMipmapEXT(int texunit, int target) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGenerateMultiTexMipmapEXT(texunit, target);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGenerateMultiTexMipmapEXT(texunit, target);
     }
 
     public static void glGenerateTextureMipmapEXT(int texture, int target) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGenerateTextureMipmapEXT(texture, target);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGenerateTextureMipmapEXT(texture, target);
     }
 
     public static boolean glGetBooleanIndexedEXT(int pname, int index) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess.glGetBooleanIndexedEXT(pname, index);
+        return org.lwjgl.opengl.EXTDirectStateAccess.glGetBooleanIndexedEXT(pname, index);
     }
 
     public static void glGetCompressedMultiTexImageEXT(int texunit, int target, int level, long img_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glGetCompressedMultiTexImageEXT(texunit, target, level, img_buffer_offset);
     }
 
     public static void glGetCompressedMultiTexImageEXT(int texunit, int target, int level, java.nio.ByteBuffer img) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetCompressedMultiTexImageEXT(texunit, target, level, img);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetCompressedMultiTexImageEXT(texunit, target, level, img);
     }
 
     public static void glGetCompressedMultiTexImageEXT(int texunit, int target, int level, java.nio.IntBuffer img) {
 
-        org.lwjgl3.opengl.EXTDirectStateAccess
-                .glGetCompressedMultiTexImageEXT(texunit, target, level, org.lwjgl.MemoryUtil.getAddress(img));
+        org.lwjgl.opengl.EXTDirectStateAccess
+                .glGetCompressedMultiTexImageEXT(texunit, target, level, MemoryUtil.getAddress(img));
     }
 
     public static void glGetCompressedMultiTexImageEXT(int texunit, int target, int level, java.nio.ShortBuffer img) {
 
-        org.lwjgl3.opengl.EXTDirectStateAccess
-                .glGetCompressedMultiTexImageEXT(texunit, target, level, org.lwjgl.MemoryUtil.getAddress(img));
+        org.lwjgl.opengl.EXTDirectStateAccess
+                .glGetCompressedMultiTexImageEXT(texunit, target, level, MemoryUtil.getAddress(img));
     }
 
     public static void glGetCompressedTextureImageEXT(int texture, int target, int level, long img_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetCompressedTextureImageEXT(texture, target, level, img_buffer_offset);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetCompressedTextureImageEXT(texture, target, level, img_buffer_offset);
     }
 
     public static void glGetCompressedTextureImageEXT(int texture, int target, int level, java.nio.ByteBuffer img) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetCompressedTextureImageEXT(texture, target, level, img);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetCompressedTextureImageEXT(texture, target, level, img);
     }
 
     public static void glGetCompressedTextureImageEXT(int texture, int target, int level, java.nio.IntBuffer img) {
 
-        org.lwjgl3.opengl.EXTDirectStateAccess
-                .glGetCompressedTextureImageEXT(texture, target, level, org.lwjgl.MemoryUtil.getAddress(img));
+        org.lwjgl.opengl.EXTDirectStateAccess
+                .glGetCompressedTextureImageEXT(texture, target, level, MemoryUtil.getAddress(img));
     }
 
     public static void glGetCompressedTextureImageEXT(int texture, int target, int level, java.nio.ShortBuffer img) {
 
-        org.lwjgl3.opengl.EXTDirectStateAccess
-                .glGetCompressedTextureImageEXT(texture, target, level, org.lwjgl.MemoryUtil.getAddress(img));
+        org.lwjgl.opengl.EXTDirectStateAccess
+                .glGetCompressedTextureImageEXT(texture, target, level, MemoryUtil.getAddress(img));
     }
 
     public static void glGetDoubleEXT(int pname, int index, java.nio.DoubleBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetDoublei_vEXT(pname, index, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetDoublei_vEXT(pname, index, params);
     }
 
     public static double glGetDoubleIndexedEXT(int pname, int index) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess.glGetDoubleIndexedEXT(pname, index);
+        return org.lwjgl.opengl.EXTDirectStateAccess.glGetDoubleIndexedEXT(pname, index);
     }
 
     public static void glGetDoubleIndexedEXT(int pname, int index, java.nio.DoubleBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetDoubleIndexedvEXT(pname, index, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetDoubleIndexedvEXT(pname, index, params);
     }
 
     public static void glGetFloatEXT(int pname, int index, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetFloati_vEXT(pname, index, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetFloati_vEXT(pname, index, params);
     }
 
     public static float glGetFloatIndexedEXT(int pname, int index) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess.glGetFloatIndexedEXT(pname, index);
+        return org.lwjgl.opengl.EXTDirectStateAccess.glGetFloatIndexedEXT(pname, index);
     }
 
     public static void glGetFloatIndexedEXT(int pname, int index, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetFloatIndexedvEXT(pname, index, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetFloatIndexedvEXT(pname, index, params);
     }
 
     public static void glGetFramebufferParameterEXT(int framebuffer, int pname, java.nio.IntBuffer param) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetFramebufferParameterivEXT(framebuffer, pname, param);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetFramebufferParameterivEXT(framebuffer, pname, param);
     }
 
     public static int glGetIntegerIndexedEXT(int pname, int index) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess.glGetIntegerIndexedEXT(pname, index);
+        return org.lwjgl.opengl.EXTDirectStateAccess.glGetIntegerIndexedEXT(pname, index);
     }
 
     public static void glGetMultiTexEnvEXT(int texunit, int target, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetMultiTexEnvfvEXT(texunit, target, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexEnvfvEXT(texunit, target, pname, params);
     }
 
     public static void glGetMultiTexEnvEXT(int texunit, int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetMultiTexEnvivEXT(texunit, target, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexEnvivEXT(texunit, target, pname, params);
     }
 
     public static void glGetMultiTexGenEXT(int texunit, int coord, int pname, java.nio.DoubleBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetMultiTexGendvEXT(texunit, coord, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexGendvEXT(texunit, coord, pname, params);
     }
 
     public static void glGetMultiTexGenEXT(int texunit, int coord, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetMultiTexGenfvEXT(texunit, coord, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexGenfvEXT(texunit, coord, pname, params);
     }
 
     public static void glGetMultiTexGenEXT(int texunit, int coord, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetMultiTexGenivEXT(texunit, coord, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexGenivEXT(texunit, coord, pname, params);
     }
 
     public static void glGetMultiTexImageEXT(int texunit, int target, int level, int format, int type,
             long pixels_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glGetMultiTexImageEXT(texunit, target, level, format, type, pixels_buffer_offset);
     }
 
     public static void glGetMultiTexImageEXT(int texunit, int target, int level, int format, int type,
             java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetMultiTexImageEXT(texunit, target, level, format, type, pixels);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexImageEXT(texunit, target, level, format, type, pixels);
     }
 
     public static void glGetMultiTexImageEXT(int texunit, int target, int level, int format, int type,
             java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetMultiTexImageEXT(texunit, target, level, format, type, pixels);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexImageEXT(texunit, target, level, format, type, pixels);
     }
 
     public static void glGetMultiTexImageEXT(int texunit, int target, int level, int format, int type,
             java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetMultiTexImageEXT(texunit, target, level, format, type, pixels);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexImageEXT(texunit, target, level, format, type, pixels);
     }
 
     public static void glGetMultiTexImageEXT(int texunit, int target, int level, int format, int type,
             java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetMultiTexImageEXT(texunit, target, level, format, type, pixels);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexImageEXT(texunit, target, level, format, type, pixels);
     }
 
     public static void glGetMultiTexImageEXT(int texunit, int target, int level, int format, int type,
             java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetMultiTexImageEXT(texunit, target, level, format, type, pixels);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexImageEXT(texunit, target, level, format, type, pixels);
     }
 
     public static void glGetMultiTexLevelParameterEXT(int texunit, int target, int level, int pname,
             java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetMultiTexLevelParameterfvEXT(texunit, target, level, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexLevelParameterfvEXT(texunit, target, level, pname, params);
     }
 
     public static void glGetMultiTexLevelParameterEXT(int texunit, int target, int level, int pname,
             java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetMultiTexLevelParameterivEXT(texunit, target, level, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexLevelParameterivEXT(texunit, target, level, pname, params);
     }
 
     public static float glGetMultiTexLevelParameterfEXT(int texunit, int target, int level, int pname) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess.glGetMultiTexLevelParameterfEXT(texunit, target, level, pname);
+        return org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexLevelParameterfEXT(texunit, target, level, pname);
     }
 
     public static int glGetMultiTexLevelParameteriEXT(int texunit, int target, int level, int pname) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess.glGetMultiTexLevelParameteriEXT(texunit, target, level, pname);
+        return org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexLevelParameteriEXT(texunit, target, level, pname);
     }
 
     public static void glGetMultiTexParameterEXT(int texunit, int target, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetMultiTexParameterfvEXT(texunit, target, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexParameterfvEXT(texunit, target, pname, params);
     }
 
     public static void glGetMultiTexParameterEXT(int texunit, int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetMultiTexParameterivEXT(texunit, target, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexParameterivEXT(texunit, target, pname, params);
     }
 
     public static void glGetMultiTexParameterIEXT(int texunit, int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetMultiTexParameterIivEXT(texunit, target, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexParameterIivEXT(texunit, target, pname, params);
     }
 
     public static int glGetMultiTexParameterIiEXT(int texunit, int target, int pname) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess.glGetMultiTexParameterIiEXT(texunit, target, pname);
+        return org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexParameterIiEXT(texunit, target, pname);
     }
 
     public static void glGetMultiTexParameterIuEXT(int texunit, int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetMultiTexParameterIuivEXT(texunit, target, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexParameterIuivEXT(texunit, target, pname, params);
     }
 
     public static int glGetMultiTexParameterIuiEXT(int texunit, int target, int pname) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess.glGetMultiTexParameterIuiEXT(texunit, target, pname);
+        return org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexParameterIuiEXT(texunit, target, pname);
     }
 
     public static float glGetMultiTexParameterfEXT(int texunit, int target, int pname) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess.glGetMultiTexParameterfEXT(texunit, target, pname);
+        return org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexParameterfEXT(texunit, target, pname);
     }
 
     public static int glGetMultiTexParameteriEXT(int texunit, int target, int pname) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess.glGetMultiTexParameteriEXT(texunit, target, pname);
+        return org.lwjgl.opengl.EXTDirectStateAccess.glGetMultiTexParameteriEXT(texunit, target, pname);
     }
 
     public static void glGetNamedBufferParameterEXT(int buffer, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetNamedBufferParameterivEXT(buffer, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetNamedBufferParameterivEXT(buffer, pname, params);
     }
 
     public static void glGetNamedBufferSubDataEXT(int buffer, long offset, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetNamedBufferSubDataEXT(buffer, offset, data);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetNamedBufferSubDataEXT(buffer, offset, data);
     }
 
     public static void glGetNamedBufferSubDataEXT(int buffer, long offset, java.nio.DoubleBuffer data) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetNamedBufferSubDataEXT(buffer, offset, data);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetNamedBufferSubDataEXT(buffer, offset, data);
     }
 
     public static void glGetNamedBufferSubDataEXT(int buffer, long offset, java.nio.FloatBuffer data) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetNamedBufferSubDataEXT(buffer, offset, data);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetNamedBufferSubDataEXT(buffer, offset, data);
     }
 
     public static void glGetNamedBufferSubDataEXT(int buffer, long offset, java.nio.IntBuffer data) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetNamedBufferSubDataEXT(buffer, offset, data);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetNamedBufferSubDataEXT(buffer, offset, data);
     }
 
     public static void glGetNamedBufferSubDataEXT(int buffer, long offset, java.nio.ShortBuffer data) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetNamedBufferSubDataEXT(buffer, offset, data);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetNamedBufferSubDataEXT(buffer, offset, data);
     }
 
     public static void glGetNamedFramebufferAttachmentParameterEXT(int framebuffer, int attachment, int pname,
             java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glGetNamedFramebufferAttachmentParameterivEXT(framebuffer, attachment, pname, params);
     }
 
     public static void glGetNamedProgramEXT(int program, int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetNamedProgramivEXT(program, target, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetNamedProgramivEXT(program, target, pname, params);
     }
 
     public static void glGetNamedProgramLocalParameterEXT(int program, int target, int index,
             java.nio.DoubleBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetNamedProgramLocalParameterdvEXT(program, target, index, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetNamedProgramLocalParameterdvEXT(program, target, index, params);
     }
 
     public static void glGetNamedProgramLocalParameterEXT(int program, int target, int index,
             java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetNamedProgramLocalParameterfvEXT(program, target, index, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetNamedProgramLocalParameterfvEXT(program, target, index, params);
     }
 
     public static void glGetNamedProgramLocalParameterIEXT(int program, int target, int index,
             java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetNamedProgramLocalParameterIivEXT(program, target, index, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetNamedProgramLocalParameterIivEXT(program, target, index, params);
     }
 
     public static void glGetNamedProgramLocalParameterIuEXT(int program, int target, int index,
             java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetNamedProgramLocalParameterIuivEXT(program, target, index, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetNamedProgramLocalParameterIuivEXT(program, target, index, params);
     }
 
     public static void glGetNamedProgramStringEXT(int program, int target, int pname, java.nio.ByteBuffer string) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetNamedProgramStringEXT(program, target, pname, string);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetNamedProgramStringEXT(program, target, pname, string);
     }
 
     public static void glGetNamedRenderbufferParameterEXT(int renderbuffer, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetNamedRenderbufferParameterivEXT(renderbuffer, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetNamedRenderbufferParameterivEXT(renderbuffer, pname, params);
     }
 
     public static void glGetTextureImageEXT(int texture, int target, int level, int format, int type,
             long pixels_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glGetTextureImageEXT(texture, target, level, format, type, pixels_buffer_offset);
     }
 
     public static void glGetTextureImageEXT(int texture, int target, int level, int format, int type,
             java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetTextureImageEXT(texture, target, level, format, type, pixels);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureImageEXT(texture, target, level, format, type, pixels);
     }
 
     public static void glGetTextureImageEXT(int texture, int target, int level, int format, int type,
             java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetTextureImageEXT(texture, target, level, format, type, pixels);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureImageEXT(texture, target, level, format, type, pixels);
     }
 
     public static void glGetTextureImageEXT(int texture, int target, int level, int format, int type,
             java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetTextureImageEXT(texture, target, level, format, type, pixels);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureImageEXT(texture, target, level, format, type, pixels);
     }
 
     public static void glGetTextureImageEXT(int texture, int target, int level, int format, int type,
             java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetTextureImageEXT(texture, target, level, format, type, pixels);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureImageEXT(texture, target, level, format, type, pixels);
     }
 
     public static void glGetTextureImageEXT(int texture, int target, int level, int format, int type,
             java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetTextureImageEXT(texture, target, level, format, type, pixels);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureImageEXT(texture, target, level, format, type, pixels);
     }
 
     public static void glGetTextureLevelParameterEXT(int texture, int target, int level, int pname,
             java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetTextureLevelParameterfvEXT(texture, target, level, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureLevelParameterfvEXT(texture, target, level, pname, params);
     }
 
     public static void glGetTextureLevelParameterEXT(int texture, int target, int level, int pname,
             java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetTextureLevelParameterivEXT(texture, target, level, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureLevelParameterivEXT(texture, target, level, pname, params);
     }
 
     public static float glGetTextureLevelParameterfEXT(int texture, int target, int level, int pname) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess.glGetTextureLevelParameterfEXT(texture, target, level, pname);
+        return org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureLevelParameterfEXT(texture, target, level, pname);
     }
 
     public static int glGetTextureLevelParameteriEXT(int texture, int target, int level, int pname) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess.glGetTextureLevelParameteriEXT(texture, target, level, pname);
+        return org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureLevelParameteriEXT(texture, target, level, pname);
     }
 
     public static void glGetTextureParameterEXT(int texture, int target, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetTextureParameterfvEXT(texture, target, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureParameterfvEXT(texture, target, pname, params);
     }
 
     public static void glGetTextureParameterEXT(int texture, int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetTextureParameterivEXT(texture, target, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureParameterivEXT(texture, target, pname, params);
     }
 
     public static void glGetTextureParameterIEXT(int texture, int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetTextureParameterIivEXT(texture, target, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureParameterIivEXT(texture, target, pname, params);
     }
 
     public static int glGetTextureParameterIiEXT(int texture, int target, int pname) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess.glGetTextureParameterIiEXT(texture, target, pname);
+        return org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureParameterIiEXT(texture, target, pname);
     }
 
     public static void glGetTextureParameterIuEXT(int texture, int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetTextureParameterIuivEXT(texture, target, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureParameterIuivEXT(texture, target, pname, params);
     }
 
     public static int glGetTextureParameterIuiEXT(int texture, int target, int pname) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess.glGetTextureParameterIuiEXT(texture, target, pname);
+        return org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureParameterIuiEXT(texture, target, pname);
     }
 
     public static float glGetTextureParameterfEXT(int texture, int target, int pname) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess.glGetTextureParameterfEXT(texture, target, pname);
+        return org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureParameterfEXT(texture, target, pname);
     }
 
     public static int glGetTextureParameteriEXT(int texture, int target, int pname) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess.glGetTextureParameteriEXT(texture, target, pname);
+        return org.lwjgl.opengl.EXTDirectStateAccess.glGetTextureParameteriEXT(texture, target, pname);
     }
 
     public static int glGetVertexArrayIntegerEXT(int vaobj, int pname) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess.glGetVertexArrayIntegerEXT(vaobj, pname);
+        return org.lwjgl.opengl.EXTDirectStateAccess.glGetVertexArrayIntegerEXT(vaobj, pname);
     }
 
     public static void glGetVertexArrayIntegerEXT(int vaobj, int index, int pname, java.nio.IntBuffer param) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetVertexArrayIntegeri_vEXT(vaobj, index, pname, param);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetVertexArrayIntegeri_vEXT(vaobj, index, pname, param);
     }
 
     public static void glGetVertexArrayIntegerEXT(int vaobj, int pname, java.nio.IntBuffer param) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glGetVertexArrayIntegervEXT(vaobj, pname, param);
+        org.lwjgl.opengl.EXTDirectStateAccess.glGetVertexArrayIntegervEXT(vaobj, pname, param);
     }
 
     public static int glGetVertexArrayIntegeriEXT(int vaobj, int index, int pname) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess.glGetVertexArrayIntegeriEXT(vaobj, index, pname);
+        return org.lwjgl.opengl.EXTDirectStateAccess.glGetVertexArrayIntegeriEXT(vaobj, index, pname);
     }
 
     public static boolean glIsEnabledIndexedEXT(int cap, int index) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess.glIsEnabledIndexedEXT(cap, index);
+        return org.lwjgl.opengl.EXTDirectStateAccess.glIsEnabledIndexedEXT(cap, index);
     }
 
     public static java.nio.ByteBuffer glMapNamedBufferEXT(int buffer, int access, long length,
             java.nio.ByteBuffer old_buffer) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess.glMapNamedBufferEXT(buffer, access, length, old_buffer);
+        return org.lwjgl.opengl.EXTDirectStateAccess.glMapNamedBufferEXT(buffer, access, length, old_buffer);
     }
 
     public static java.nio.ByteBuffer glMapNamedBufferEXT(int buffer, int access, java.nio.ByteBuffer old_buffer) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess.glMapNamedBufferEXT(buffer, access, old_buffer);
+        return org.lwjgl.opengl.EXTDirectStateAccess.glMapNamedBufferEXT(buffer, access, old_buffer);
     }
 
     public static java.nio.ByteBuffer glMapNamedBufferRangeEXT(int buffer, long offset, long length, int access,
             java.nio.ByteBuffer old_buffer) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess
+        return org.lwjgl.opengl.EXTDirectStateAccess
                 .glMapNamedBufferRangeEXT(buffer, offset, length, access, old_buffer);
     }
 
     public static void glMatrixFrustumEXT(int matrixMode, double l, double r, double b, double t, double n, double f) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMatrixFrustumEXT(matrixMode, l, r, b, t, n, f);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMatrixFrustumEXT(matrixMode, l, r, b, t, n, f);
     }
 
     public static void glMatrixLoadEXT(int matrixMode, java.nio.DoubleBuffer m) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMatrixLoaddEXT(matrixMode, m);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMatrixLoaddEXT(matrixMode, m);
     }
 
     public static void glMatrixLoadEXT(int matrixMode, java.nio.FloatBuffer m) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMatrixLoadfEXT(matrixMode, m);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMatrixLoadfEXT(matrixMode, m);
     }
 
     public static void glMatrixLoadIdentityEXT(int matrixMode) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMatrixLoadIdentityEXT(matrixMode);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMatrixLoadIdentityEXT(matrixMode);
     }
 
     public static void glMatrixLoadTransposeEXT(int matrixMode, java.nio.DoubleBuffer m) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMatrixLoadTransposedEXT(matrixMode, m);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMatrixLoadTransposedEXT(matrixMode, m);
     }
 
     public static void glMatrixLoadTransposeEXT(int matrixMode, java.nio.FloatBuffer m) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMatrixLoadTransposefEXT(matrixMode, m);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMatrixLoadTransposefEXT(matrixMode, m);
     }
 
     public static void glMatrixMultEXT(int matrixMode, java.nio.DoubleBuffer m) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMatrixMultdEXT(matrixMode, m);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMatrixMultdEXT(matrixMode, m);
     }
 
     public static void glMatrixMultEXT(int matrixMode, java.nio.FloatBuffer m) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMatrixMultfEXT(matrixMode, m);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMatrixMultfEXT(matrixMode, m);
     }
 
     public static void glMatrixMultTransposeEXT(int matrixMode, java.nio.DoubleBuffer m) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMatrixMultTransposedEXT(matrixMode, m);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMatrixMultTransposedEXT(matrixMode, m);
     }
 
     public static void glMatrixMultTransposeEXT(int matrixMode, java.nio.FloatBuffer m) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMatrixMultTransposefEXT(matrixMode, m);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMatrixMultTransposefEXT(matrixMode, m);
     }
 
     public static void glMatrixOrthoEXT(int matrixMode, double l, double r, double b, double t, double n, double f) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMatrixOrthoEXT(matrixMode, l, r, b, t, n, f);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMatrixOrthoEXT(matrixMode, l, r, b, t, n, f);
     }
 
     public static void glMatrixPopEXT(int matrixMode) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMatrixPopEXT(matrixMode);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMatrixPopEXT(matrixMode);
     }
 
     public static void glMatrixPushEXT(int matrixMode) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMatrixPushEXT(matrixMode);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMatrixPushEXT(matrixMode);
     }
 
     public static void glMatrixRotatedEXT(int matrixMode, double angle, double x, double y, double z) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMatrixRotatedEXT(matrixMode, angle, x, y, z);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMatrixRotatedEXT(matrixMode, angle, x, y, z);
     }
 
     public static void glMatrixRotatefEXT(int matrixMode, float angle, float x, float y, float z) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMatrixRotatefEXT(matrixMode, angle, x, y, z);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMatrixRotatefEXT(matrixMode, angle, x, y, z);
     }
 
     public static void glMatrixScaledEXT(int matrixMode, double x, double y, double z) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMatrixScaledEXT(matrixMode, x, y, z);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMatrixScaledEXT(matrixMode, x, y, z);
     }
 
     public static void glMatrixScalefEXT(int matrixMode, float x, float y, float z) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMatrixScalefEXT(matrixMode, x, y, z);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMatrixScalefEXT(matrixMode, x, y, z);
     }
 
     public static void glMatrixTranslatedEXT(int matrixMode, double x, double y, double z) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMatrixTranslatedEXT(matrixMode, x, y, z);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMatrixTranslatedEXT(matrixMode, x, y, z);
     }
 
     public static void glMatrixTranslatefEXT(int matrixMode, float x, float y, float z) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMatrixTranslatefEXT(matrixMode, x, y, z);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMatrixTranslatefEXT(matrixMode, x, y, z);
     }
 
     public static void glMultiTexBufferEXT(int texunit, int target, int internalformat, int buffer) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexBufferEXT(texunit, target, internalformat, buffer);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexBufferEXT(texunit, target, internalformat, buffer);
     }
 
     public static void glMultiTexCoordPointerEXT(int texunit, int size, int type, int stride,
             long pointer_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glMultiTexCoordPointerEXT(texunit, size, type, stride, pointer_buffer_offset);
     }
 
     public static void glMultiTexCoordPointerEXT(int texunit, int size, int stride, java.nio.DoubleBuffer pointer) {
 
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexCoordPointerEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexCoordPointerEXT(
                 texunit,
                 size,
-                org.lwjgl3.opengl.GL11.GL_DOUBLE,
+                org.lwjgl.opengl.GL11.GL_DOUBLE,
                 stride,
                 BufferCasts.toByteBuffer(pointer));
     }
 
     public static void glMultiTexCoordPointerEXT(int texunit, int size, int stride, java.nio.FloatBuffer pointer) {
 
-        org.lwjgl3.opengl.EXTDirectStateAccess
-                .glMultiTexCoordPointerEXT(texunit, size, org.lwjgl3.opengl.GL11.GL_FLOAT, stride, pointer);
+        org.lwjgl.opengl.EXTDirectStateAccess
+                .glMultiTexCoordPointerEXT(texunit, size, org.lwjgl.opengl.GL11.GL_FLOAT, stride, pointer);
     }
 
     public static void glMultiTexEnvEXT(int texunit, int target, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexEnvfvEXT(texunit, target, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexEnvfvEXT(texunit, target, pname, params);
     }
 
     public static void glMultiTexEnvEXT(int texunit, int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexEnvivEXT(texunit, target, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexEnvivEXT(texunit, target, pname, params);
     }
 
     public static void glMultiTexEnvfEXT(int texunit, int target, int pname, float param) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexEnvfEXT(texunit, target, pname, param);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexEnvfEXT(texunit, target, pname, param);
     }
 
     public static void glMultiTexEnviEXT(int texunit, int target, int pname, int param) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexEnviEXT(texunit, target, pname, param);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexEnviEXT(texunit, target, pname, param);
     }
 
     public static void glMultiTexGenEXT(int texunit, int coord, int pname, java.nio.DoubleBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexGendvEXT(texunit, coord, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexGendvEXT(texunit, coord, pname, params);
     }
 
     public static void glMultiTexGenEXT(int texunit, int coord, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexGenfvEXT(texunit, coord, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexGenfvEXT(texunit, coord, pname, params);
     }
 
     public static void glMultiTexGenEXT(int texunit, int coord, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexGenivEXT(texunit, coord, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexGenivEXT(texunit, coord, pname, params);
     }
 
     public static void glMultiTexGendEXT(int texunit, int coord, int pname, double param) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexGendEXT(texunit, coord, pname, param);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexGendEXT(texunit, coord, pname, param);
     }
 
     public static void glMultiTexGenfEXT(int texunit, int coord, int pname, float param) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexGenfEXT(texunit, coord, pname, param);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexGenfEXT(texunit, coord, pname, param);
     }
 
     public static void glMultiTexGeniEXT(int texunit, int coord, int pname, int param) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexGeniEXT(texunit, coord, pname, param);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexGeniEXT(texunit, coord, pname, param);
     }
 
     public static void glMultiTexImage1DEXT(int texunit, int target, int level, int internalformat, int width,
             int border, int format, int type, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexImage1DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage1DEXT(
                 texunit,
                 target,
                 level,
@@ -954,37 +955,37 @@ public static void glMultiTexImage1DEXT(int texunit, int target, int level, int
 
     public static void glMultiTexImage1DEXT(int texunit, int target, int level, int internalformat, int width,
             int border, int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glMultiTexImage1DEXT(texunit, target, level, internalformat, width, border, format, type, pixels);
     }
 
     public static void glMultiTexImage1DEXT(int texunit, int target, int level, int internalformat, int width,
             int border, int format, int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glMultiTexImage1DEXT(texunit, target, level, internalformat, width, border, format, type, pixels);
     }
 
     public static void glMultiTexImage1DEXT(int texunit, int target, int level, int internalformat, int width,
             int border, int format, int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glMultiTexImage1DEXT(texunit, target, level, internalformat, width, border, format, type, pixels);
     }
 
     public static void glMultiTexImage1DEXT(int texunit, int target, int level, int internalformat, int width,
             int border, int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glMultiTexImage1DEXT(texunit, target, level, internalformat, width, border, format, type, pixels);
     }
 
     public static void glMultiTexImage1DEXT(int texunit, int target, int level, int internalformat, int width,
             int border, int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glMultiTexImage1DEXT(texunit, target, level, internalformat, width, border, format, type, pixels);
     }
 
     public static void glMultiTexImage2DEXT(int texunit, int target, int level, int internalformat, int width,
             int height, int border, int format, int type, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexImage2DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage2DEXT(
                 texunit,
                 target,
                 level,
@@ -999,7 +1000,7 @@ public static void glMultiTexImage2DEXT(int texunit, int target, int level, int
 
     public static void glMultiTexImage2DEXT(int texunit, int target, int level, int internalformat, int width,
             int height, int border, int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexImage2DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage2DEXT(
                 texunit,
                 target,
                 level,
@@ -1014,7 +1015,7 @@ public static void glMultiTexImage2DEXT(int texunit, int target, int level, int
 
     public static void glMultiTexImage2DEXT(int texunit, int target, int level, int internalformat, int width,
             int height, int border, int format, int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexImage2DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage2DEXT(
                 texunit,
                 target,
                 level,
@@ -1029,7 +1030,7 @@ public static void glMultiTexImage2DEXT(int texunit, int target, int level, int
 
     public static void glMultiTexImage2DEXT(int texunit, int target, int level, int internalformat, int width,
             int height, int border, int format, int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexImage2DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage2DEXT(
                 texunit,
                 target,
                 level,
@@ -1044,7 +1045,7 @@ public static void glMultiTexImage2DEXT(int texunit, int target, int level, int
 
     public static void glMultiTexImage2DEXT(int texunit, int target, int level, int internalformat, int width,
             int height, int border, int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexImage2DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage2DEXT(
                 texunit,
                 target,
                 level,
@@ -1059,7 +1060,7 @@ public static void glMultiTexImage2DEXT(int texunit, int target, int level, int
 
     public static void glMultiTexImage2DEXT(int texunit, int target, int level, int internalformat, int width,
             int height, int border, int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexImage2DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage2DEXT(
                 texunit,
                 target,
                 level,
@@ -1074,7 +1075,7 @@ public static void glMultiTexImage2DEXT(int texunit, int target, int level, int
 
     public static void glMultiTexImage3DEXT(int texunit, int target, int level, int internalformat, int width,
             int height, int depth, int border, int format, int type, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage3DEXT(
                 texunit,
                 target,
                 level,
@@ -1090,7 +1091,7 @@ public static void glMultiTexImage3DEXT(int texunit, int target, int level, int
 
     public static void glMultiTexImage3DEXT(int texunit, int target, int level, int internalformat, int width,
             int height, int depth, int border, int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage3DEXT(
                 texunit,
                 target,
                 level,
@@ -1106,7 +1107,7 @@ public static void glMultiTexImage3DEXT(int texunit, int target, int level, int
 
     public static void glMultiTexImage3DEXT(int texunit, int target, int level, int internalformat, int width,
             int height, int depth, int border, int format, int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage3DEXT(
                 texunit,
                 target,
                 level,
@@ -1122,7 +1123,7 @@ public static void glMultiTexImage3DEXT(int texunit, int target, int level, int
 
     public static void glMultiTexImage3DEXT(int texunit, int target, int level, int internalformat, int width,
             int height, int depth, int border, int format, int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage3DEXT(
                 texunit,
                 target,
                 level,
@@ -1138,7 +1139,7 @@ public static void glMultiTexImage3DEXT(int texunit, int target, int level, int
 
     public static void glMultiTexImage3DEXT(int texunit, int target, int level, int internalformat, int width,
             int height, int depth, int border, int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage3DEXT(
                 texunit,
                 target,
                 level,
@@ -1154,7 +1155,7 @@ public static void glMultiTexImage3DEXT(int texunit, int target, int level, int
 
     public static void glMultiTexImage3DEXT(int texunit, int target, int level, int internalformat, int width,
             int height, int depth, int border, int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexImage3DEXT(
                 texunit,
                 target,
                 level,
@@ -1169,82 +1170,82 @@ public static void glMultiTexImage3DEXT(int texunit, int target, int level, int
     }
 
     public static void glMultiTexParameterEXT(int texunit, int target, int pname, java.nio.FloatBuffer param) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexParameterfvEXT(texunit, target, pname, param);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexParameterfvEXT(texunit, target, pname, param);
     }
 
     public static void glMultiTexParameterEXT(int texunit, int target, int pname, java.nio.IntBuffer param) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexParameterivEXT(texunit, target, pname, param);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexParameterivEXT(texunit, target, pname, param);
     }
 
     public static void glMultiTexParameterIEXT(int texunit, int target, int pname, int param) {
 
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexParameterIivEXT(texunit, target, pname, new int[] { param });
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexParameterIivEXT(texunit, target, pname, new int[] { param });
     }
 
     public static void glMultiTexParameterIEXT(int texunit, int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexParameterIivEXT(texunit, target, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexParameterIivEXT(texunit, target, pname, params);
     }
 
     public static void glMultiTexParameterIuEXT(int texunit, int target, int pname, int param) {
 
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexParameterIuivEXT(texunit, target, pname, new int[] { param });
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexParameterIuivEXT(texunit, target, pname, new int[] { param });
     }
 
     public static void glMultiTexParameterIuEXT(int texunit, int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexParameterIuivEXT(texunit, target, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexParameterIuivEXT(texunit, target, pname, params);
     }
 
     public static void glMultiTexParameterfEXT(int texunit, int target, int pname, float param) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexParameterfEXT(texunit, target, pname, param);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexParameterfEXT(texunit, target, pname, param);
     }
 
     public static void glMultiTexParameteriEXT(int texunit, int target, int pname, int param) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexParameteriEXT(texunit, target, pname, param);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexParameteriEXT(texunit, target, pname, param);
     }
 
     public static void glMultiTexRenderbufferEXT(int texunit, int target, int renderbuffer) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexRenderbufferEXT(texunit, target, renderbuffer);
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexRenderbufferEXT(texunit, target, renderbuffer);
     }
 
     public static void glMultiTexSubImage1DEXT(int texunit, int target, int level, int xoffset, int width, int format,
             int type, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, type, pixels_buffer_offset);
     }
 
     public static void glMultiTexSubImage1DEXT(int texunit, int target, int level, int xoffset, int width, int format,
             int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, type, pixels);
     }
 
     public static void glMultiTexSubImage1DEXT(int texunit, int target, int level, int xoffset, int width, int format,
             int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, type, pixels);
     }
 
     public static void glMultiTexSubImage1DEXT(int texunit, int target, int level, int xoffset, int width, int format,
             int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, type, pixels);
     }
 
     public static void glMultiTexSubImage1DEXT(int texunit, int target, int level, int xoffset, int width, int format,
             int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, type, pixels);
     }
 
     public static void glMultiTexSubImage1DEXT(int texunit, int target, int level, int xoffset, int width, int format,
             int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, type, pixels);
     }
 
     public static void glMultiTexSubImage2DEXT(int texunit, int target, int level, int xoffset, int yoffset, int width,
             int height, int format, int type, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexSubImage2DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexSubImage2DEXT(
                 texunit,
                 target,
                 level,
@@ -1259,37 +1260,37 @@ public static void glMultiTexSubImage2DEXT(int texunit, int target, int level, i
 
     public static void glMultiTexSubImage2DEXT(int texunit, int target, int level, int xoffset, int yoffset, int width,
             int height, int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glMultiTexSubImage2DEXT(int texunit, int target, int level, int xoffset, int yoffset, int width,
             int height, int format, int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glMultiTexSubImage2DEXT(int texunit, int target, int level, int xoffset, int yoffset, int width,
             int height, int format, int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glMultiTexSubImage2DEXT(int texunit, int target, int level, int xoffset, int yoffset, int width,
             int height, int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glMultiTexSubImage2DEXT(int texunit, int target, int level, int xoffset, int yoffset, int width,
             int height, int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glMultiTexSubImage3DEXT(int texunit, int target, int level, int xoffset, int yoffset,
             int zoffset, int width, int height, int depth, int format, int type, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexSubImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexSubImage3DEXT(
                 texunit,
                 target,
                 level,
@@ -1306,7 +1307,7 @@ public static void glMultiTexSubImage3DEXT(int texunit, int target, int level, i
 
     public static void glMultiTexSubImage3DEXT(int texunit, int target, int level, int xoffset, int yoffset,
             int zoffset, int width, int height, int depth, int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexSubImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexSubImage3DEXT(
                 texunit,
                 target,
                 level,
@@ -1323,7 +1324,7 @@ public static void glMultiTexSubImage3DEXT(int texunit, int target, int level, i
 
     public static void glMultiTexSubImage3DEXT(int texunit, int target, int level, int xoffset, int yoffset,
             int zoffset, int width, int height, int depth, int format, int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexSubImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexSubImage3DEXT(
                 texunit,
                 target,
                 level,
@@ -1340,7 +1341,7 @@ public static void glMultiTexSubImage3DEXT(int texunit, int target, int level, i
 
     public static void glMultiTexSubImage3DEXT(int texunit, int target, int level, int xoffset, int yoffset,
             int zoffset, int width, int height, int depth, int format, int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexSubImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexSubImage3DEXT(
                 texunit,
                 target,
                 level,
@@ -1357,7 +1358,7 @@ public static void glMultiTexSubImage3DEXT(int texunit, int target, int level, i
 
     public static void glMultiTexSubImage3DEXT(int texunit, int target, int level, int xoffset, int yoffset,
             int zoffset, int width, int height, int depth, int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexSubImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexSubImage3DEXT(
                 texunit,
                 target,
                 level,
@@ -1374,7 +1375,7 @@ public static void glMultiTexSubImage3DEXT(int texunit, int target, int level, i
 
     public static void glMultiTexSubImage3DEXT(int texunit, int target, int level, int xoffset, int yoffset,
             int zoffset, int width, int height, int depth, int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glMultiTexSubImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glMultiTexSubImage3DEXT(
                 texunit,
                 target,
                 level,
@@ -1390,162 +1391,162 @@ public static void glMultiTexSubImage3DEXT(int texunit, int target, int level, i
     }
 
     public static void glNamedBufferDataEXT(int buffer, long data_size, int usage) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedBufferDataEXT(buffer, data_size, usage);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedBufferDataEXT(buffer, data_size, usage);
     }
 
     public static void glNamedBufferDataEXT(int buffer, java.nio.ByteBuffer data, int usage) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedBufferDataEXT(buffer, data, usage);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedBufferDataEXT(buffer, data, usage);
     }
 
     public static void glNamedBufferDataEXT(int buffer, java.nio.DoubleBuffer data, int usage) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedBufferDataEXT(buffer, data, usage);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedBufferDataEXT(buffer, data, usage);
     }
 
     public static void glNamedBufferDataEXT(int buffer, java.nio.FloatBuffer data, int usage) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedBufferDataEXT(buffer, data, usage);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedBufferDataEXT(buffer, data, usage);
     }
 
     public static void glNamedBufferDataEXT(int buffer, java.nio.IntBuffer data, int usage) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedBufferDataEXT(buffer, data, usage);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedBufferDataEXT(buffer, data, usage);
     }
 
     public static void glNamedBufferDataEXT(int buffer, java.nio.ShortBuffer data, int usage) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedBufferDataEXT(buffer, data, usage);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedBufferDataEXT(buffer, data, usage);
     }
 
     public static void glNamedBufferSubDataEXT(int buffer, long offset, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedBufferSubDataEXT(buffer, offset, data);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedBufferSubDataEXT(buffer, offset, data);
     }
 
     public static void glNamedBufferSubDataEXT(int buffer, long offset, java.nio.DoubleBuffer data) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedBufferSubDataEXT(buffer, offset, data);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedBufferSubDataEXT(buffer, offset, data);
     }
 
     public static void glNamedBufferSubDataEXT(int buffer, long offset, java.nio.FloatBuffer data) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedBufferSubDataEXT(buffer, offset, data);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedBufferSubDataEXT(buffer, offset, data);
     }
 
     public static void glNamedBufferSubDataEXT(int buffer, long offset, java.nio.IntBuffer data) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedBufferSubDataEXT(buffer, offset, data);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedBufferSubDataEXT(buffer, offset, data);
     }
 
     public static void glNamedBufferSubDataEXT(int buffer, long offset, java.nio.ShortBuffer data) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedBufferSubDataEXT(buffer, offset, data);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedBufferSubDataEXT(buffer, offset, data);
     }
 
     public static void glNamedCopyBufferSubDataEXT(int readBuffer, int writeBuffer, long readoffset, long writeoffset,
             long size) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glNamedCopyBufferSubDataEXT(readBuffer, writeBuffer, readoffset, writeoffset, size);
     }
 
     public static void glNamedFramebufferRenderbufferEXT(int framebuffer, int attachment, int renderbuffertarget,
             int renderbuffer) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glNamedFramebufferRenderbufferEXT(framebuffer, attachment, renderbuffertarget, renderbuffer);
     }
 
     public static void glNamedFramebufferTexture1DEXT(int framebuffer, int attachment, int textarget, int texture,
             int level) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glNamedFramebufferTexture1DEXT(framebuffer, attachment, textarget, texture, level);
     }
 
     public static void glNamedFramebufferTexture2DEXT(int framebuffer, int attachment, int textarget, int texture,
             int level) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glNamedFramebufferTexture2DEXT(framebuffer, attachment, textarget, texture, level);
     }
 
     public static void glNamedFramebufferTexture3DEXT(int framebuffer, int attachment, int textarget, int texture,
             int level, int zoffset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glNamedFramebufferTexture3DEXT(framebuffer, attachment, textarget, texture, level, zoffset);
     }
 
     public static void glNamedFramebufferTextureEXT(int framebuffer, int attachment, int texture, int level) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedFramebufferTextureEXT(framebuffer, attachment, texture, level);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedFramebufferTextureEXT(framebuffer, attachment, texture, level);
     }
 
     public static void glNamedFramebufferTextureFaceEXT(int framebuffer, int attachment, int texture, int level,
             int face) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glNamedFramebufferTextureFaceEXT(framebuffer, attachment, texture, level, face);
     }
 
     public static void glNamedFramebufferTextureLayerEXT(int framebuffer, int attachment, int texture, int level,
             int layer) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glNamedFramebufferTextureLayerEXT(framebuffer, attachment, texture, level, layer);
     }
 
     public static void glNamedProgramLocalParameter4EXT(int program, int target, int index,
             java.nio.DoubleBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedProgramLocalParameter4dvEXT(program, target, index, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedProgramLocalParameter4dvEXT(program, target, index, params);
     }
 
     public static void glNamedProgramLocalParameter4EXT(int program, int target, int index,
             java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedProgramLocalParameter4fvEXT(program, target, index, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedProgramLocalParameter4fvEXT(program, target, index, params);
     }
 
     public static void glNamedProgramLocalParameter4dEXT(int program, int target, int index, double x, double y,
             double z, double w) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedProgramLocalParameter4dEXT(program, target, index, x, y, z, w);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedProgramLocalParameter4dEXT(program, target, index, x, y, z, w);
     }
 
     public static void glNamedProgramLocalParameter4fEXT(int program, int target, int index, float x, float y, float z,
             float w) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedProgramLocalParameter4fEXT(program, target, index, x, y, z, w);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedProgramLocalParameter4fEXT(program, target, index, x, y, z, w);
     }
 
     public static void glNamedProgramLocalParameterI4EXT(int program, int target, int index,
             java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedProgramLocalParameterI4ivEXT(program, target, index, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedProgramLocalParameterI4ivEXT(program, target, index, params);
     }
 
     public static void glNamedProgramLocalParameterI4iEXT(int program, int target, int index, int x, int y, int z,
             int w) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedProgramLocalParameterI4iEXT(program, target, index, x, y, z, w);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedProgramLocalParameterI4iEXT(program, target, index, x, y, z, w);
     }
 
     public static void glNamedProgramLocalParameterI4uEXT(int program, int target, int index,
             java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedProgramLocalParameterI4uivEXT(program, target, index, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedProgramLocalParameterI4uivEXT(program, target, index, params);
     }
 
     public static void glNamedProgramLocalParameterI4uiEXT(int program, int target, int index, int x, int y, int z,
             int w) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedProgramLocalParameterI4uiEXT(program, target, index, x, y, z, w);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedProgramLocalParameterI4uiEXT(program, target, index, x, y, z, w);
     }
 
     public static void glNamedProgramLocalParameters4EXT(int program, int target, int index,
             java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedProgramLocalParameters4fvEXT(program, target, index, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedProgramLocalParameters4fvEXT(program, target, index, params);
     }
 
     public static void glNamedProgramLocalParametersI4EXT(int program, int target, int index,
             java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedProgramLocalParametersI4ivEXT(program, target, index, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedProgramLocalParametersI4ivEXT(program, target, index, params);
     }
 
     public static void glNamedProgramLocalParametersI4uEXT(int program, int target, int index,
             java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedProgramLocalParametersI4uivEXT(program, target, index, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedProgramLocalParametersI4uivEXT(program, target, index, params);
     }
 
     public static void glNamedProgramStringEXT(int program, int target, int format, java.nio.ByteBuffer string) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedProgramStringEXT(program, target, format, string);
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedProgramStringEXT(program, target, format, string);
     }
 
     public static void glNamedRenderbufferStorageEXT(int renderbuffer, int internalformat, int width, int height) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glNamedRenderbufferStorageEXT(renderbuffer, internalformat, width, height);
     }
 
     public static void glNamedRenderbufferStorageMultisampleCoverageEXT(int renderbuffer, int coverageSamples,
             int colorSamples, int internalformat, int width, int height) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glNamedRenderbufferStorageMultisampleCoverageEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glNamedRenderbufferStorageMultisampleCoverageEXT(
                 renderbuffer,
                 coverageSamples,
                 colorSamples,
@@ -1556,162 +1557,162 @@ public static void glNamedRenderbufferStorageMultisampleCoverageEXT(int renderbu
 
     public static void glNamedRenderbufferStorageMultisampleEXT(int renderbuffer, int samples, int internalformat,
             int width, int height) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glNamedRenderbufferStorageMultisampleEXT(renderbuffer, samples, internalformat, width, height);
     }
 
     public static void glProgramUniform1EXT(int program, int location, java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform1fvEXT(program, location, value);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform1fvEXT(program, location, value);
     }
 
     public static void glProgramUniform1EXT(int program, int location, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform1ivEXT(program, location, value);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform1ivEXT(program, location, value);
     }
 
     public static void glProgramUniform1fEXT(int program, int location, float v0) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform1fEXT(program, location, v0);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform1fEXT(program, location, v0);
     }
 
     public static void glProgramUniform1iEXT(int program, int location, int v0) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform1iEXT(program, location, v0);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform1iEXT(program, location, v0);
     }
 
     public static void glProgramUniform1uEXT(int program, int location, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform1uivEXT(program, location, value);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform1uivEXT(program, location, value);
     }
 
     public static void glProgramUniform1uiEXT(int program, int location, int v0) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform1uiEXT(program, location, v0);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform1uiEXT(program, location, v0);
     }
 
     public static void glProgramUniform2EXT(int program, int location, java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform2fvEXT(program, location, value);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform2fvEXT(program, location, value);
     }
 
     public static void glProgramUniform2EXT(int program, int location, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform2ivEXT(program, location, value);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform2ivEXT(program, location, value);
     }
 
     public static void glProgramUniform2fEXT(int program, int location, float v0, float v1) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform2fEXT(program, location, v0, v1);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform2fEXT(program, location, v0, v1);
     }
 
     public static void glProgramUniform2iEXT(int program, int location, int v0, int v1) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform2iEXT(program, location, v0, v1);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform2iEXT(program, location, v0, v1);
     }
 
     public static void glProgramUniform2uEXT(int program, int location, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform2uivEXT(program, location, value);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform2uivEXT(program, location, value);
     }
 
     public static void glProgramUniform2uiEXT(int program, int location, int v0, int v1) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform2uiEXT(program, location, v0, v1);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform2uiEXT(program, location, v0, v1);
     }
 
     public static void glProgramUniform3EXT(int program, int location, java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform3fvEXT(program, location, value);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform3fvEXT(program, location, value);
     }
 
     public static void glProgramUniform3EXT(int program, int location, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform3ivEXT(program, location, value);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform3ivEXT(program, location, value);
     }
 
     public static void glProgramUniform3fEXT(int program, int location, float v0, float v1, float v2) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform3fEXT(program, location, v0, v1, v2);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform3fEXT(program, location, v0, v1, v2);
     }
 
     public static void glProgramUniform3iEXT(int program, int location, int v0, int v1, int v2) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform3iEXT(program, location, v0, v1, v2);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform3iEXT(program, location, v0, v1, v2);
     }
 
     public static void glProgramUniform3uEXT(int program, int location, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform3uivEXT(program, location, value);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform3uivEXT(program, location, value);
     }
 
     public static void glProgramUniform3uiEXT(int program, int location, int v0, int v1, int v2) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform3uiEXT(program, location, v0, v1, v2);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform3uiEXT(program, location, v0, v1, v2);
     }
 
     public static void glProgramUniform4EXT(int program, int location, java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform4fvEXT(program, location, value);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform4fvEXT(program, location, value);
     }
 
     public static void glProgramUniform4EXT(int program, int location, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform4ivEXT(program, location, value);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform4ivEXT(program, location, value);
     }
 
     public static void glProgramUniform4fEXT(int program, int location, float v0, float v1, float v2, float v3) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform4fEXT(program, location, v0, v1, v2, v3);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform4fEXT(program, location, v0, v1, v2, v3);
     }
 
     public static void glProgramUniform4iEXT(int program, int location, int v0, int v1, int v2, int v3) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform4iEXT(program, location, v0, v1, v2, v3);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform4iEXT(program, location, v0, v1, v2, v3);
     }
 
     public static void glProgramUniform4uEXT(int program, int location, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform4uivEXT(program, location, value);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform4uivEXT(program, location, value);
     }
 
     public static void glProgramUniform4uiEXT(int program, int location, int v0, int v1, int v2, int v3) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniform4uiEXT(program, location, v0, v1, v2, v3);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniform4uiEXT(program, location, v0, v1, v2, v3);
     }
 
     public static void glProgramUniformMatrix2EXT(int program, int location, boolean transpose,
             java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniformMatrix2fvEXT(program, location, transpose, value);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniformMatrix2fvEXT(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix2x3EXT(int program, int location, boolean transpose,
             java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniformMatrix2x3fvEXT(program, location, transpose, value);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniformMatrix2x3fvEXT(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix2x4EXT(int program, int location, boolean transpose,
             java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniformMatrix2x4fvEXT(program, location, transpose, value);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniformMatrix2x4fvEXT(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix3EXT(int program, int location, boolean transpose,
             java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniformMatrix3fvEXT(program, location, transpose, value);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniformMatrix3fvEXT(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix3x2EXT(int program, int location, boolean transpose,
             java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniformMatrix3x2fvEXT(program, location, transpose, value);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniformMatrix3x2fvEXT(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix3x4EXT(int program, int location, boolean transpose,
             java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniformMatrix3x4fvEXT(program, location, transpose, value);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniformMatrix3x4fvEXT(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix4EXT(int program, int location, boolean transpose,
             java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniformMatrix4fvEXT(program, location, transpose, value);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniformMatrix4fvEXT(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix4x2EXT(int program, int location, boolean transpose,
             java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniformMatrix4x2fvEXT(program, location, transpose, value);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniformMatrix4x2fvEXT(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix4x3EXT(int program, int location, boolean transpose,
             java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glProgramUniformMatrix4x3fvEXT(program, location, transpose, value);
+        org.lwjgl.opengl.EXTDirectStateAccess.glProgramUniformMatrix4x3fvEXT(program, location, transpose, value);
     }
 
     public static void glPushClientAttribDefaultEXT(int mask) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glPushClientAttribDefaultEXT(mask);
+        org.lwjgl.opengl.EXTDirectStateAccess.glPushClientAttribDefaultEXT(mask);
     }
 
     public static void glTextureBufferEXT(int texture, int target, int internalformat, int buffer) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureBufferEXT(texture, target, internalformat, buffer);
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureBufferEXT(texture, target, internalformat, buffer);
     }
 
     public static void glTextureImage1DEXT(int texture, int target, int level, int internalformat, int width,
             int border, int format, int type, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureImage1DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage1DEXT(
                 texture,
                 target,
                 level,
@@ -1725,37 +1726,37 @@ public static void glTextureImage1DEXT(int texture, int target, int level, int i
 
     public static void glTextureImage1DEXT(int texture, int target, int level, int internalformat, int width,
             int border, int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glTextureImage1DEXT(texture, target, level, internalformat, width, border, format, type, pixels);
     }
 
     public static void glTextureImage1DEXT(int texture, int target, int level, int internalformat, int width,
             int border, int format, int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glTextureImage1DEXT(texture, target, level, internalformat, width, border, format, type, pixels);
     }
 
     public static void glTextureImage1DEXT(int texture, int target, int level, int internalformat, int width,
             int border, int format, int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glTextureImage1DEXT(texture, target, level, internalformat, width, border, format, type, pixels);
     }
 
     public static void glTextureImage1DEXT(int texture, int target, int level, int internalformat, int width,
             int border, int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glTextureImage1DEXT(texture, target, level, internalformat, width, border, format, type, pixels);
     }
 
     public static void glTextureImage1DEXT(int texture, int target, int level, int internalformat, int width,
             int border, int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glTextureImage1DEXT(texture, target, level, internalformat, width, border, format, type, pixels);
     }
 
     public static void glTextureImage2DEXT(int texture, int target, int level, int internalformat, int width,
             int height, int border, int format, int type, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureImage2DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage2DEXT(
                 texture,
                 target,
                 level,
@@ -1770,7 +1771,7 @@ public static void glTextureImage2DEXT(int texture, int target, int level, int i
 
     public static void glTextureImage2DEXT(int texture, int target, int level, int internalformat, int width,
             int height, int border, int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureImage2DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage2DEXT(
                 texture,
                 target,
                 level,
@@ -1785,7 +1786,7 @@ public static void glTextureImage2DEXT(int texture, int target, int level, int i
 
     public static void glTextureImage2DEXT(int texture, int target, int level, int internalformat, int width,
             int height, int border, int format, int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureImage2DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage2DEXT(
                 texture,
                 target,
                 level,
@@ -1800,7 +1801,7 @@ public static void glTextureImage2DEXT(int texture, int target, int level, int i
 
     public static void glTextureImage2DEXT(int texture, int target, int level, int internalformat, int width,
             int height, int border, int format, int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureImage2DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage2DEXT(
                 texture,
                 target,
                 level,
@@ -1815,7 +1816,7 @@ public static void glTextureImage2DEXT(int texture, int target, int level, int i
 
     public static void glTextureImage2DEXT(int texture, int target, int level, int internalformat, int width,
             int height, int border, int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureImage2DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage2DEXT(
                 texture,
                 target,
                 level,
@@ -1830,7 +1831,7 @@ public static void glTextureImage2DEXT(int texture, int target, int level, int i
 
     public static void glTextureImage2DEXT(int texture, int target, int level, int internalformat, int width,
             int height, int border, int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureImage2DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage2DEXT(
                 texture,
                 target,
                 level,
@@ -1845,7 +1846,7 @@ public static void glTextureImage2DEXT(int texture, int target, int level, int i
 
     public static void glTextureImage3DEXT(int texture, int target, int level, int internalformat, int width,
             int height, int depth, int border, int format, int type, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage3DEXT(
                 texture,
                 target,
                 level,
@@ -1861,7 +1862,7 @@ public static void glTextureImage3DEXT(int texture, int target, int level, int i
 
     public static void glTextureImage3DEXT(int texture, int target, int level, int internalformat, int width,
             int height, int depth, int border, int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage3DEXT(
                 texture,
                 target,
                 level,
@@ -1877,7 +1878,7 @@ public static void glTextureImage3DEXT(int texture, int target, int level, int i
 
     public static void glTextureImage3DEXT(int texture, int target, int level, int internalformat, int width,
             int height, int depth, int border, int format, int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage3DEXT(
                 texture,
                 target,
                 level,
@@ -1893,7 +1894,7 @@ public static void glTextureImage3DEXT(int texture, int target, int level, int i
 
     public static void glTextureImage3DEXT(int texture, int target, int level, int internalformat, int width,
             int height, int depth, int border, int format, int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage3DEXT(
                 texture,
                 target,
                 level,
@@ -1909,7 +1910,7 @@ public static void glTextureImage3DEXT(int texture, int target, int level, int i
 
     public static void glTextureImage3DEXT(int texture, int target, int level, int internalformat, int width,
             int height, int depth, int border, int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage3DEXT(
                 texture,
                 target,
                 level,
@@ -1925,7 +1926,7 @@ public static void glTextureImage3DEXT(int texture, int target, int level, int i
 
     public static void glTextureImage3DEXT(int texture, int target, int level, int internalformat, int width,
             int height, int depth, int border, int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureImage3DEXT(
                 texture,
                 target,
                 level,
@@ -1940,82 +1941,82 @@ public static void glTextureImage3DEXT(int texture, int target, int level, int i
     }
 
     public static void glTextureParameterEXT(int texture, int target, int pname, java.nio.FloatBuffer param) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureParameterfvEXT(texture, target, pname, param);
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureParameterfvEXT(texture, target, pname, param);
     }
 
     public static void glTextureParameterEXT(int texture, int target, int pname, java.nio.IntBuffer param) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureParameterivEXT(texture, target, pname, param);
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureParameterivEXT(texture, target, pname, param);
     }
 
     public static void glTextureParameterIEXT(int texture, int target, int pname, int param) {
 
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureParameterIivEXT(texture, target, pname, new int[] { param });
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureParameterIivEXT(texture, target, pname, new int[] { param });
     }
 
     public static void glTextureParameterIEXT(int texture, int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureParameterIivEXT(texture, target, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureParameterIivEXT(texture, target, pname, params);
     }
 
     public static void glTextureParameterIuEXT(int texture, int target, int pname, int param) {
 
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureParameterIuivEXT(texture, target, pname, new int[] { param });
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureParameterIuivEXT(texture, target, pname, new int[] { param });
     }
 
     public static void glTextureParameterIuEXT(int texture, int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureParameterIuivEXT(texture, target, pname, params);
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureParameterIuivEXT(texture, target, pname, params);
     }
 
     public static void glTextureParameterfEXT(int texture, int target, int pname, float param) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureParameterfEXT(texture, target, pname, param);
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureParameterfEXT(texture, target, pname, param);
     }
 
     public static void glTextureParameteriEXT(int texture, int target, int pname, int param) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureParameteriEXT(texture, target, pname, param);
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureParameteriEXT(texture, target, pname, param);
     }
 
     public static void glTextureRenderbufferEXT(int texture, int target, int renderbuffer) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureRenderbufferEXT(texture, target, renderbuffer);
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureRenderbufferEXT(texture, target, renderbuffer);
     }
 
     public static void glTextureSubImage1DEXT(int texture, int target, int level, int xoffset, int width, int format,
             int type, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glTextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels_buffer_offset);
     }
 
     public static void glTextureSubImage1DEXT(int texture, int target, int level, int xoffset, int width, int format,
             int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glTextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels);
     }
 
     public static void glTextureSubImage1DEXT(int texture, int target, int level, int xoffset, int width, int format,
             int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glTextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels);
     }
 
     public static void glTextureSubImage1DEXT(int texture, int target, int level, int xoffset, int width, int format,
             int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glTextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels);
     }
 
     public static void glTextureSubImage1DEXT(int texture, int target, int level, int xoffset, int width, int format,
             int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glTextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels);
     }
 
     public static void glTextureSubImage1DEXT(int texture, int target, int level, int xoffset, int width, int format,
             int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glTextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels);
     }
 
     public static void glTextureSubImage2DEXT(int texture, int target, int level, int xoffset, int yoffset, int width,
             int height, int format, int type, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureSubImage2DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureSubImage2DEXT(
                 texture,
                 target,
                 level,
@@ -2030,37 +2031,37 @@ public static void glTextureSubImage2DEXT(int texture, int target, int level, in
 
     public static void glTextureSubImage2DEXT(int texture, int target, int level, int xoffset, int yoffset, int width,
             int height, int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glTextureSubImage2DEXT(int texture, int target, int level, int xoffset, int yoffset, int width,
             int height, int format, int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glTextureSubImage2DEXT(int texture, int target, int level, int xoffset, int yoffset, int width,
             int height, int format, int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glTextureSubImage2DEXT(int texture, int target, int level, int xoffset, int yoffset, int width,
             int height, int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glTextureSubImage2DEXT(int texture, int target, int level, int xoffset, int yoffset, int width,
             int height, int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glTextureSubImage3DEXT(int texture, int target, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, int format, int type, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureSubImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureSubImage3DEXT(
                 texture,
                 target,
                 level,
@@ -2077,7 +2078,7 @@ public static void glTextureSubImage3DEXT(int texture, int target, int level, in
 
     public static void glTextureSubImage3DEXT(int texture, int target, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureSubImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureSubImage3DEXT(
                 texture,
                 target,
                 level,
@@ -2094,7 +2095,7 @@ public static void glTextureSubImage3DEXT(int texture, int target, int level, in
 
     public static void glTextureSubImage3DEXT(int texture, int target, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, int format, int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureSubImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureSubImage3DEXT(
                 texture,
                 target,
                 level,
@@ -2111,7 +2112,7 @@ public static void glTextureSubImage3DEXT(int texture, int target, int level, in
 
     public static void glTextureSubImage3DEXT(int texture, int target, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, int format, int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureSubImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureSubImage3DEXT(
                 texture,
                 target,
                 level,
@@ -2128,7 +2129,7 @@ public static void glTextureSubImage3DEXT(int texture, int target, int level, in
 
     public static void glTextureSubImage3DEXT(int texture, int target, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureSubImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureSubImage3DEXT(
                 texture,
                 target,
                 level,
@@ -2145,7 +2146,7 @@ public static void glTextureSubImage3DEXT(int texture, int target, int level, in
 
     public static void glTextureSubImage3DEXT(int texture, int target, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glTextureSubImage3DEXT(
+        org.lwjgl.opengl.EXTDirectStateAccess.glTextureSubImage3DEXT(
                 texture,
                 target,
                 level,
@@ -2161,60 +2162,60 @@ public static void glTextureSubImage3DEXT(int texture, int target, int level, in
     }
 
     public static boolean glUnmapNamedBufferEXT(int buffer) {
-        return org.lwjgl3.opengl.EXTDirectStateAccess.glUnmapNamedBufferEXT(buffer);
+        return org.lwjgl.opengl.EXTDirectStateAccess.glUnmapNamedBufferEXT(buffer);
     }
 
     public static void glVertexArrayColorOffsetEXT(int vaobj, int buffer, int size, int type, int stride, long offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glVertexArrayColorOffsetEXT(vaobj, buffer, size, type, stride, offset);
+        org.lwjgl.opengl.EXTDirectStateAccess.glVertexArrayColorOffsetEXT(vaobj, buffer, size, type, stride, offset);
     }
 
     public static void glVertexArrayEdgeFlagOffsetEXT(int vaobj, int buffer, int stride, long offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glVertexArrayEdgeFlagOffsetEXT(vaobj, buffer, stride, offset);
+        org.lwjgl.opengl.EXTDirectStateAccess.glVertexArrayEdgeFlagOffsetEXT(vaobj, buffer, stride, offset);
     }
 
     public static void glVertexArrayFogCoordOffsetEXT(int vaobj, int buffer, int type, int stride, long offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glVertexArrayFogCoordOffsetEXT(vaobj, buffer, type, stride, offset);
+        org.lwjgl.opengl.EXTDirectStateAccess.glVertexArrayFogCoordOffsetEXT(vaobj, buffer, type, stride, offset);
     }
 
     public static void glVertexArrayIndexOffsetEXT(int vaobj, int buffer, int type, int stride, long offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glVertexArrayIndexOffsetEXT(vaobj, buffer, type, stride, offset);
+        org.lwjgl.opengl.EXTDirectStateAccess.glVertexArrayIndexOffsetEXT(vaobj, buffer, type, stride, offset);
     }
 
     public static void glVertexArrayMultiTexCoordOffsetEXT(int vaobj, int buffer, int texunit, int size, int type,
             int stride, long offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glVertexArrayMultiTexCoordOffsetEXT(vaobj, buffer, texunit, size, type, stride, offset);
     }
 
     public static void glVertexArrayNormalOffsetEXT(int vaobj, int buffer, int type, int stride, long offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glVertexArrayNormalOffsetEXT(vaobj, buffer, type, stride, offset);
+        org.lwjgl.opengl.EXTDirectStateAccess.glVertexArrayNormalOffsetEXT(vaobj, buffer, type, stride, offset);
     }
 
     public static void glVertexArraySecondaryColorOffsetEXT(int vaobj, int buffer, int size, int type, int stride,
             long offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glVertexArraySecondaryColorOffsetEXT(vaobj, buffer, size, type, stride, offset);
     }
 
     public static void glVertexArrayTexCoordOffsetEXT(int vaobj, int buffer, int size, int type, int stride,
             long offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glVertexArrayTexCoordOffsetEXT(vaobj, buffer, size, type, stride, offset);
+        org.lwjgl.opengl.EXTDirectStateAccess.glVertexArrayTexCoordOffsetEXT(vaobj, buffer, size, type, stride, offset);
     }
 
     public static void glVertexArrayVertexAttribIOffsetEXT(int vaobj, int buffer, int index, int size, int type,
             int stride, long offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glVertexArrayVertexAttribIOffsetEXT(vaobj, buffer, index, size, type, stride, offset);
     }
 
     public static void glVertexArrayVertexAttribOffsetEXT(int vaobj, int buffer, int index, int size, int type,
             boolean normalized, int stride, long offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess
+        org.lwjgl.opengl.EXTDirectStateAccess
                 .glVertexArrayVertexAttribOffsetEXT(vaobj, buffer, index, size, type, normalized, stride, offset);
     }
 
     public static void glVertexArrayVertexOffsetEXT(int vaobj, int buffer, int size, int type, int stride,
             long offset) {
-        org.lwjgl3.opengl.EXTDirectStateAccess.glVertexArrayVertexOffsetEXT(vaobj, buffer, size, type, stride, offset);
+        org.lwjgl.opengl.EXTDirectStateAccess.glVertexArrayVertexOffsetEXT(vaobj, buffer, size, type, stride, offset);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTDrawBuffers2.java b/src/main/java/org/lwjglx/opengl/EXTDrawBuffers2.java
similarity index 52%
rename from src/main/java/org/lwjgl/opengl/EXTDrawBuffers2.java
rename to src/main/java/org/lwjglx/opengl/EXTDrawBuffers2.java
index 032d5d71f..ee45c2378 100644
--- a/src/main/java/org/lwjgl/opengl/EXTDrawBuffers2.java
+++ b/src/main/java/org/lwjglx/opengl/EXTDrawBuffers2.java
@@ -1,36 +1,36 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTDrawBuffers2 {
 
     public static void glColorMaskIndexedEXT(int buf, boolean r, boolean g, boolean b, boolean a) {
-        org.lwjgl3.opengl.EXTDrawBuffers2.glColorMaskIndexedEXT(buf, r, g, b, a);
+        org.lwjgl.opengl.EXTDrawBuffers2.glColorMaskIndexedEXT(buf, r, g, b, a);
     }
 
     public static void glDisableIndexedEXT(int target, int index) {
-        org.lwjgl3.opengl.EXTDrawBuffers2.glDisableIndexedEXT(target, index);
+        org.lwjgl.opengl.EXTDrawBuffers2.glDisableIndexedEXT(target, index);
     }
 
     public static void glEnableIndexedEXT(int target, int index) {
-        org.lwjgl3.opengl.EXTDrawBuffers2.glEnableIndexedEXT(target, index);
+        org.lwjgl.opengl.EXTDrawBuffers2.glEnableIndexedEXT(target, index);
     }
 
     public static boolean glGetBooleanIndexedEXT(int value, int index) {
-        return org.lwjgl3.opengl.EXTDrawBuffers2.glGetBooleanIndexedEXT(value, index);
+        return org.lwjgl.opengl.EXTDrawBuffers2.glGetBooleanIndexedEXT(value, index);
     }
 
     public static void glGetBooleanIndexedEXT(int value, int index, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.EXTDrawBuffers2.glGetBooleanIndexedvEXT(value, index, data);
+        org.lwjgl.opengl.EXTDrawBuffers2.glGetBooleanIndexedvEXT(value, index, data);
     }
 
     public static int glGetIntegerIndexedEXT(int value, int index) {
-        return org.lwjgl3.opengl.EXTDrawBuffers2.glGetIntegerIndexedEXT(value, index);
+        return org.lwjgl.opengl.EXTDrawBuffers2.glGetIntegerIndexedEXT(value, index);
     }
 
     public static void glGetIntegerIndexedEXT(int value, int index, java.nio.IntBuffer data) {
-        org.lwjgl3.opengl.EXTDrawBuffers2.glGetIntegerIndexedvEXT(value, index, data);
+        org.lwjgl.opengl.EXTDrawBuffers2.glGetIntegerIndexedvEXT(value, index, data);
     }
 
     public static boolean glIsEnabledIndexedEXT(int target, int index) {
-        return org.lwjgl3.opengl.EXTDrawBuffers2.glIsEnabledIndexedEXT(target, index);
+        return org.lwjgl.opengl.EXTDrawBuffers2.glIsEnabledIndexedEXT(target, index);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTDrawInstanced.java b/src/main/java/org/lwjglx/opengl/EXTDrawInstanced.java
similarity index 61%
rename from src/main/java/org/lwjgl/opengl/EXTDrawInstanced.java
rename to src/main/java/org/lwjglx/opengl/EXTDrawInstanced.java
index 9445e5117..002e1b807 100644
--- a/src/main/java/org/lwjgl/opengl/EXTDrawInstanced.java
+++ b/src/main/java/org/lwjglx/opengl/EXTDrawInstanced.java
@@ -1,26 +1,26 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTDrawInstanced {
 
     public static void glDrawArraysInstancedEXT(int mode, int first, int count, int primcount) {
-        org.lwjgl3.opengl.EXTDrawInstanced.glDrawArraysInstancedEXT(mode, first, count, primcount);
+        org.lwjgl.opengl.EXTDrawInstanced.glDrawArraysInstancedEXT(mode, first, count, primcount);
     }
 
     public static void glDrawElementsInstancedEXT(int mode, int indices_count, int type, long indices_buffer_offset,
             int primcount) {
-        org.lwjgl3.opengl.EXTDrawInstanced
+        org.lwjgl.opengl.EXTDrawInstanced
                 .glDrawElementsInstancedEXT(mode, indices_count, type, indices_buffer_offset, primcount);
     }
 
     public static void glDrawElementsInstancedEXT(int mode, java.nio.ByteBuffer indices, int primcount) {
-        org.lwjgl3.opengl.EXTDrawInstanced.glDrawElementsInstancedEXT(mode, indices, primcount);
+        org.lwjgl.opengl.EXTDrawInstanced.glDrawElementsInstancedEXT(mode, indices, primcount);
     }
 
     public static void glDrawElementsInstancedEXT(int mode, java.nio.IntBuffer indices, int primcount) {
-        org.lwjgl3.opengl.EXTDrawInstanced.glDrawElementsInstancedEXT(mode, indices, primcount);
+        org.lwjgl.opengl.EXTDrawInstanced.glDrawElementsInstancedEXT(mode, indices, primcount);
     }
 
     public static void glDrawElementsInstancedEXT(int mode, java.nio.ShortBuffer indices, int primcount) {
-        org.lwjgl3.opengl.EXTDrawInstanced.glDrawElementsInstancedEXT(mode, indices, primcount);
+        org.lwjgl.opengl.EXTDrawInstanced.glDrawElementsInstancedEXT(mode, indices, primcount);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTFramebufferBlit.java b/src/main/java/org/lwjglx/opengl/EXTFramebufferBlit.java
similarity index 89%
rename from src/main/java/org/lwjgl/opengl/EXTFramebufferBlit.java
rename to src/main/java/org/lwjglx/opengl/EXTFramebufferBlit.java
index f231060eb..4d4f5c5dd 100644
--- a/src/main/java/org/lwjgl/opengl/EXTFramebufferBlit.java
+++ b/src/main/java/org/lwjglx/opengl/EXTFramebufferBlit.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTFramebufferBlit {
 
@@ -9,7 +9,7 @@ public class EXTFramebufferBlit {
 
     public static void glBlitFramebufferEXT(int srcX0, int srcY0, int srcX1, int srcY1, int dstX0, int dstY0, int dstX1,
             int dstY1, int mask, int filter) {
-        org.lwjgl3.opengl.EXTFramebufferBlit
+        org.lwjgl.opengl.EXTFramebufferBlit
                 .glBlitFramebufferEXT(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTFramebufferMultisample.java b/src/main/java/org/lwjglx/opengl/EXTFramebufferMultisample.java
similarity index 86%
rename from src/main/java/org/lwjgl/opengl/EXTFramebufferMultisample.java
rename to src/main/java/org/lwjglx/opengl/EXTFramebufferMultisample.java
index 7831ac818..9d065d5e5 100644
--- a/src/main/java/org/lwjgl/opengl/EXTFramebufferMultisample.java
+++ b/src/main/java/org/lwjglx/opengl/EXTFramebufferMultisample.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTFramebufferMultisample {
 
@@ -8,7 +8,7 @@ public class EXTFramebufferMultisample {
 
     public static void glRenderbufferStorageMultisampleEXT(int target, int samples, int internalformat, int width,
             int height) {
-        org.lwjgl3.opengl.EXTFramebufferMultisample
+        org.lwjgl.opengl.EXTFramebufferMultisample
                 .glRenderbufferStorageMultisampleEXT(target, samples, internalformat, width, height);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTFramebufferMultisampleBlitScaled.java b/src/main/java/org/lwjglx/opengl/EXTFramebufferMultisampleBlitScaled.java
similarity index 88%
rename from src/main/java/org/lwjgl/opengl/EXTFramebufferMultisampleBlitScaled.java
rename to src/main/java/org/lwjglx/opengl/EXTFramebufferMultisampleBlitScaled.java
index 8f3da65ce..74af9583c 100644
--- a/src/main/java/org/lwjgl/opengl/EXTFramebufferMultisampleBlitScaled.java
+++ b/src/main/java/org/lwjglx/opengl/EXTFramebufferMultisampleBlitScaled.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTFramebufferMultisampleBlitScaled {
 
diff --git a/src/main/java/org/lwjgl/opengl/EXTFramebufferObject.java b/src/main/java/org/lwjglx/opengl/EXTFramebufferObject.java
similarity index 75%
rename from src/main/java/org/lwjgl/opengl/EXTFramebufferObject.java
rename to src/main/java/org/lwjglx/opengl/EXTFramebufferObject.java
index e55d079b4..e78d50c65 100644
--- a/src/main/java/org/lwjgl/opengl/EXTFramebufferObject.java
+++ b/src/main/java/org/lwjglx/opengl/EXTFramebufferObject.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTFramebufferObject {
 
@@ -55,100 +55,100 @@ public class EXTFramebufferObject {
     public static final int GL_STENCIL_INDEX8_EXT = (int) 36168;
 
     public static void glBindFramebufferEXT(int target, int framebuffer) {
-        org.lwjgl3.opengl.EXTFramebufferObject.glBindFramebufferEXT(target, framebuffer);
+        org.lwjgl.opengl.EXTFramebufferObject.glBindFramebufferEXT(target, framebuffer);
     }
 
     public static void glBindRenderbufferEXT(int target, int renderbuffer) {
-        org.lwjgl3.opengl.EXTFramebufferObject.glBindRenderbufferEXT(target, renderbuffer);
+        org.lwjgl.opengl.EXTFramebufferObject.glBindRenderbufferEXT(target, renderbuffer);
     }
 
     public static int glCheckFramebufferStatusEXT(int target) {
-        return org.lwjgl3.opengl.EXTFramebufferObject.glCheckFramebufferStatusEXT(target);
+        return org.lwjgl.opengl.EXTFramebufferObject.glCheckFramebufferStatusEXT(target);
     }
 
     public static void glDeleteFramebuffersEXT(int framebuffer) {
-        org.lwjgl3.opengl.EXTFramebufferObject.glDeleteFramebuffersEXT(framebuffer);
+        org.lwjgl.opengl.EXTFramebufferObject.glDeleteFramebuffersEXT(framebuffer);
     }
 
     public static void glDeleteFramebuffersEXT(java.nio.IntBuffer framebuffers) {
-        org.lwjgl3.opengl.EXTFramebufferObject.glDeleteFramebuffersEXT(framebuffers);
+        org.lwjgl.opengl.EXTFramebufferObject.glDeleteFramebuffersEXT(framebuffers);
     }
 
     public static void glDeleteRenderbuffersEXT(int renderbuffer) {
-        org.lwjgl3.opengl.EXTFramebufferObject.glDeleteRenderbuffersEXT(renderbuffer);
+        org.lwjgl.opengl.EXTFramebufferObject.glDeleteRenderbuffersEXT(renderbuffer);
     }
 
     public static void glDeleteRenderbuffersEXT(java.nio.IntBuffer renderbuffers) {
-        org.lwjgl3.opengl.EXTFramebufferObject.glDeleteRenderbuffersEXT(renderbuffers);
+        org.lwjgl.opengl.EXTFramebufferObject.glDeleteRenderbuffersEXT(renderbuffers);
     }
 
     public static void glFramebufferRenderbufferEXT(int target, int attachment, int renderbuffertarget,
             int renderbuffer) {
-        org.lwjgl3.opengl.EXTFramebufferObject
+        org.lwjgl.opengl.EXTFramebufferObject
                 .glFramebufferRenderbufferEXT(target, attachment, renderbuffertarget, renderbuffer);
     }
 
     public static void glFramebufferTexture1DEXT(int target, int attachment, int textarget, int texture, int level) {
-        org.lwjgl3.opengl.EXTFramebufferObject.glFramebufferTexture1DEXT(target, attachment, textarget, texture, level);
+        org.lwjgl.opengl.EXTFramebufferObject.glFramebufferTexture1DEXT(target, attachment, textarget, texture, level);
     }
 
     public static void glFramebufferTexture2DEXT(int target, int attachment, int textarget, int texture, int level) {
-        org.lwjgl3.opengl.EXTFramebufferObject.glFramebufferTexture2DEXT(target, attachment, textarget, texture, level);
+        org.lwjgl.opengl.EXTFramebufferObject.glFramebufferTexture2DEXT(target, attachment, textarget, texture, level);
     }
 
     public static void glFramebufferTexture3DEXT(int target, int attachment, int textarget, int texture, int level,
             int zoffset) {
-        org.lwjgl3.opengl.EXTFramebufferObject
+        org.lwjgl.opengl.EXTFramebufferObject
                 .glFramebufferTexture3DEXT(target, attachment, textarget, texture, level, zoffset);
     }
 
     public static int glGenFramebuffersEXT() {
-        return org.lwjgl3.opengl.EXTFramebufferObject.glGenFramebuffersEXT();
+        return org.lwjgl.opengl.EXTFramebufferObject.glGenFramebuffersEXT();
     }
 
     public static void glGenFramebuffersEXT(java.nio.IntBuffer framebuffers) {
-        org.lwjgl3.opengl.EXTFramebufferObject.glGenFramebuffersEXT(framebuffers);
+        org.lwjgl.opengl.EXTFramebufferObject.glGenFramebuffersEXT(framebuffers);
     }
 
     public static int glGenRenderbuffersEXT() {
-        return org.lwjgl3.opengl.EXTFramebufferObject.glGenRenderbuffersEXT();
+        return org.lwjgl.opengl.EXTFramebufferObject.glGenRenderbuffersEXT();
     }
 
     public static void glGenRenderbuffersEXT(java.nio.IntBuffer renderbuffers) {
-        org.lwjgl3.opengl.EXTFramebufferObject.glGenRenderbuffersEXT(renderbuffers);
+        org.lwjgl.opengl.EXTFramebufferObject.glGenRenderbuffersEXT(renderbuffers);
     }
 
     public static void glGenerateMipmapEXT(int target) {
-        org.lwjgl3.opengl.EXTFramebufferObject.glGenerateMipmapEXT(target);
+        org.lwjgl.opengl.EXTFramebufferObject.glGenerateMipmapEXT(target);
     }
 
     public static void glGetFramebufferAttachmentParameterEXT(int target, int attachment, int pname,
             java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTFramebufferObject
+        org.lwjgl.opengl.EXTFramebufferObject
                 .glGetFramebufferAttachmentParameterivEXT(target, attachment, pname, params);
     }
 
     public static int glGetFramebufferAttachmentParameteriEXT(int target, int attachment, int pname) {
-        return org.lwjgl3.opengl.EXTFramebufferObject.glGetFramebufferAttachmentParameteriEXT(target, attachment, pname);
+        return org.lwjgl.opengl.EXTFramebufferObject.glGetFramebufferAttachmentParameteriEXT(target, attachment, pname);
     }
 
     public static void glGetRenderbufferParameterEXT(int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTFramebufferObject.glGetRenderbufferParameterivEXT(target, pname, params);
+        org.lwjgl.opengl.EXTFramebufferObject.glGetRenderbufferParameterivEXT(target, pname, params);
     }
 
     public static int glGetRenderbufferParameteriEXT(int target, int pname) {
-        return org.lwjgl3.opengl.EXTFramebufferObject.glGetRenderbufferParameteriEXT(target, pname);
+        return org.lwjgl.opengl.EXTFramebufferObject.glGetRenderbufferParameteriEXT(target, pname);
     }
 
     public static boolean glIsFramebufferEXT(int framebuffer) {
-        return org.lwjgl3.opengl.EXTFramebufferObject.glIsFramebufferEXT(framebuffer);
+        return org.lwjgl.opengl.EXTFramebufferObject.glIsFramebufferEXT(framebuffer);
     }
 
     public static boolean glIsRenderbufferEXT(int renderbuffer) {
-        return org.lwjgl3.opengl.EXTFramebufferObject.glIsRenderbufferEXT(renderbuffer);
+        return org.lwjgl.opengl.EXTFramebufferObject.glIsRenderbufferEXT(renderbuffer);
     }
 
     public static void glRenderbufferStorageEXT(int target, int internalformat, int width, int height) {
-        org.lwjgl3.opengl.EXTFramebufferObject.glRenderbufferStorageEXT(target, internalformat, width, height);
+        org.lwjgl.opengl.EXTFramebufferObject.glRenderbufferStorageEXT(target, internalformat, width, height);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTFramebufferSRGB.java b/src/main/java/org/lwjglx/opengl/EXTFramebufferSRGB.java
similarity index 92%
rename from src/main/java/org/lwjgl/opengl/EXTFramebufferSRGB.java
rename to src/main/java/org/lwjglx/opengl/EXTFramebufferSRGB.java
index e7e9f32f9..79688d404 100644
--- a/src/main/java/org/lwjgl/opengl/EXTFramebufferSRGB.java
+++ b/src/main/java/org/lwjglx/opengl/EXTFramebufferSRGB.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTFramebufferSRGB {
 
diff --git a/src/main/java/org/lwjgl/opengl/EXTGeometryShader4.java b/src/main/java/org/lwjglx/opengl/EXTGeometryShader4.java
similarity index 81%
rename from src/main/java/org/lwjgl/opengl/EXTGeometryShader4.java
rename to src/main/java/org/lwjglx/opengl/EXTGeometryShader4.java
index daead0162..233ea0a77 100644
--- a/src/main/java/org/lwjgl/opengl/EXTGeometryShader4.java
+++ b/src/main/java/org/lwjglx/opengl/EXTGeometryShader4.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTGeometryShader4 {
 
@@ -24,18 +24,18 @@ public class EXTGeometryShader4 {
     public static final int GL_TRIANGLE_STRIP_ADJACENCY_EXT = (int) 13;
 
     public static void glFramebufferTextureEXT(int target, int attachment, int texture, int level) {
-        org.lwjgl3.opengl.EXTGeometryShader4.glFramebufferTextureEXT(target, attachment, texture, level);
+        org.lwjgl.opengl.EXTGeometryShader4.glFramebufferTextureEXT(target, attachment, texture, level);
     }
 
     public static void glFramebufferTextureFaceEXT(int target, int attachment, int texture, int level, int face) {
-        org.lwjgl3.opengl.EXTGeometryShader4.glFramebufferTextureFaceEXT(target, attachment, texture, level, face);
+        org.lwjgl.opengl.EXTGeometryShader4.glFramebufferTextureFaceEXT(target, attachment, texture, level, face);
     }
 
     public static void glFramebufferTextureLayerEXT(int target, int attachment, int texture, int level, int layer) {
-        org.lwjgl3.opengl.EXTGeometryShader4.glFramebufferTextureLayerEXT(target, attachment, texture, level, layer);
+        org.lwjgl.opengl.EXTGeometryShader4.glFramebufferTextureLayerEXT(target, attachment, texture, level, layer);
     }
 
     public static void glProgramParameteriEXT(int program, int pname, int value) {
-        org.lwjgl3.opengl.EXTGeometryShader4.glProgramParameteriEXT(program, pname, value);
+        org.lwjgl.opengl.EXTGeometryShader4.glProgramParameteriEXT(program, pname, value);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTPackedDepthStencil.java b/src/main/java/org/lwjglx/opengl/EXTPackedDepthStencil.java
similarity index 92%
rename from src/main/java/org/lwjgl/opengl/EXTPackedDepthStencil.java
rename to src/main/java/org/lwjglx/opengl/EXTPackedDepthStencil.java
index c86c3214b..926aea23f 100644
--- a/src/main/java/org/lwjgl/opengl/EXTPackedDepthStencil.java
+++ b/src/main/java/org/lwjglx/opengl/EXTPackedDepthStencil.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTPackedDepthStencil {
 
diff --git a/src/main/java/org/lwjgl/opengl/EXTPackedFloat.java b/src/main/java/org/lwjglx/opengl/EXTPackedFloat.java
similarity index 94%
rename from src/main/java/org/lwjgl/opengl/EXTPackedFloat.java
rename to src/main/java/org/lwjglx/opengl/EXTPackedFloat.java
index 642bc5258..02e7f6f3f 100644
--- a/src/main/java/org/lwjgl/opengl/EXTPackedFloat.java
+++ b/src/main/java/org/lwjglx/opengl/EXTPackedFloat.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTPackedFloat {
 
diff --git a/src/main/java/org/lwjgl/opengl/EXTPixelBufferObject.java b/src/main/java/org/lwjglx/opengl/EXTPixelBufferObject.java
similarity index 74%
rename from src/main/java/org/lwjgl/opengl/EXTPixelBufferObject.java
rename to src/main/java/org/lwjglx/opengl/EXTPixelBufferObject.java
index b86543d63..62530001a 100644
--- a/src/main/java/org/lwjgl/opengl/EXTPixelBufferObject.java
+++ b/src/main/java/org/lwjglx/opengl/EXTPixelBufferObject.java
@@ -1,6 +1,6 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
-public class EXTPixelBufferObject extends org.lwjgl.opengl.ARBBufferObject {
+public class EXTPixelBufferObject extends ARBBufferObject {
 
     public static final int GL_PIXEL_PACK_BUFFER_BINDING_EXT = (int) 35053;
     public static final int GL_PIXEL_PACK_BUFFER_EXT = (int) 35051;
diff --git a/src/main/java/org/lwjgl/opengl/EXTPointParameters.java b/src/main/java/org/lwjglx/opengl/EXTPointParameters.java
similarity index 71%
rename from src/main/java/org/lwjgl/opengl/EXTPointParameters.java
rename to src/main/java/org/lwjglx/opengl/EXTPointParameters.java
index 598316bbe..2ee37f5c3 100644
--- a/src/main/java/org/lwjgl/opengl/EXTPointParameters.java
+++ b/src/main/java/org/lwjglx/opengl/EXTPointParameters.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTPointParameters {
 
@@ -8,10 +8,10 @@ public class EXTPointParameters {
     public static final int GL_POINT_SIZE_MIN_EXT = (int) 33062;
 
     public static void glPointParameterEXT(int pname, java.nio.FloatBuffer pfParams) {
-        org.lwjgl3.opengl.EXTPointParameters.glPointParameterfvEXT(pname, pfParams);
+        org.lwjgl.opengl.EXTPointParameters.glPointParameterfvEXT(pname, pfParams);
     }
 
     public static void glPointParameterfEXT(int pname, float param) {
-        org.lwjgl3.opengl.EXTPointParameters.glPointParameterfEXT(pname, param);
+        org.lwjgl.opengl.EXTPointParameters.glPointParameterfEXT(pname, param);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTProvokingVertex.java b/src/main/java/org/lwjglx/opengl/EXTProvokingVertex.java
similarity index 80%
rename from src/main/java/org/lwjgl/opengl/EXTProvokingVertex.java
rename to src/main/java/org/lwjglx/opengl/EXTProvokingVertex.java
index 5d041add6..329ddee26 100644
--- a/src/main/java/org/lwjgl/opengl/EXTProvokingVertex.java
+++ b/src/main/java/org/lwjglx/opengl/EXTProvokingVertex.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTProvokingVertex {
 
@@ -8,6 +8,6 @@ public class EXTProvokingVertex {
     public static final int GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT = (int) 36428;
 
     public static void glProvokingVertexEXT(int mode) {
-        org.lwjgl3.opengl.EXTProvokingVertex.glProvokingVertexEXT(mode);
+        org.lwjgl.opengl.EXTProvokingVertex.glProvokingVertexEXT(mode);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTSecondaryColor.java b/src/main/java/org/lwjglx/opengl/EXTSecondaryColor.java
similarity index 60%
rename from src/main/java/org/lwjgl/opengl/EXTSecondaryColor.java
rename to src/main/java/org/lwjglx/opengl/EXTSecondaryColor.java
index 42a3c4ff6..3fbbb5acf 100644
--- a/src/main/java/org/lwjgl/opengl/EXTSecondaryColor.java
+++ b/src/main/java/org/lwjglx/opengl/EXTSecondaryColor.java
@@ -1,6 +1,7 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
-import org.lwjgl.lwjgl3ify.BufferCasts;
+import org.lwjglx.MemoryUtil;
+import org.lwjglx.lwjgl3ify.BufferCasts;
 
 public class EXTSecondaryColor {
 
@@ -13,47 +14,47 @@ public class EXTSecondaryColor {
     public static final int GL_SECONDARY_COLOR_ARRAY_TYPE_EXT = (int) 33883;
 
     public static void glSecondaryColor3bEXT(byte red, byte green, byte blue) {
-        org.lwjgl3.opengl.EXTSecondaryColor.glSecondaryColor3bEXT(red, green, blue);
+        org.lwjgl.opengl.EXTSecondaryColor.glSecondaryColor3bEXT(red, green, blue);
     }
 
     public static void glSecondaryColor3dEXT(double red, double green, double blue) {
-        org.lwjgl3.opengl.EXTSecondaryColor.glSecondaryColor3dEXT(red, green, blue);
+        org.lwjgl.opengl.EXTSecondaryColor.glSecondaryColor3dEXT(red, green, blue);
     }
 
     public static void glSecondaryColor3fEXT(float red, float green, float blue) {
-        org.lwjgl3.opengl.EXTSecondaryColor.glSecondaryColor3fEXT(red, green, blue);
+        org.lwjgl.opengl.EXTSecondaryColor.glSecondaryColor3fEXT(red, green, blue);
     }
 
     public static void glSecondaryColor3ubEXT(byte red, byte green, byte blue) {
-        org.lwjgl3.opengl.EXTSecondaryColor.glSecondaryColor3ubEXT(red, green, blue);
+        org.lwjgl.opengl.EXTSecondaryColor.glSecondaryColor3ubEXT(red, green, blue);
     }
 
     public static void glSecondaryColorPointerEXT(int size, int type, int stride, long pPointer_buffer_offset) {
-        org.lwjgl3.opengl.EXTSecondaryColor.glSecondaryColorPointerEXT(size, type, stride, pPointer_buffer_offset);
+        org.lwjgl.opengl.EXTSecondaryColor.glSecondaryColorPointerEXT(size, type, stride, pPointer_buffer_offset);
     }
 
     public static void glSecondaryColorPointerEXT(int size, int stride, java.nio.DoubleBuffer pPointer) {
 
-        org.lwjgl3.opengl.EXTSecondaryColor.glSecondaryColorPointerEXT(
+        org.lwjgl.opengl.EXTSecondaryColor.glSecondaryColorPointerEXT(
                 size,
-                org.lwjgl3.opengl.GL11.GL_DOUBLE,
+                org.lwjgl.opengl.GL11.GL_DOUBLE,
                 stride,
                 BufferCasts.toByteBuffer(pPointer));
     }
 
     public static void glSecondaryColorPointerEXT(int size, int stride, java.nio.FloatBuffer pPointer) {
 
-        org.lwjgl3.opengl.EXTSecondaryColor
-                .glSecondaryColorPointerEXT(size, org.lwjgl3.opengl.GL11.GL_FLOAT, stride, pPointer);
+        org.lwjgl.opengl.EXTSecondaryColor
+                .glSecondaryColorPointerEXT(size, org.lwjgl.opengl.GL11.GL_FLOAT, stride, pPointer);
     }
 
     public static void glSecondaryColorPointerEXT(int size, boolean unsigned, int stride,
             java.nio.ByteBuffer pPointer) {
 
-        org.lwjgl3.opengl.EXTSecondaryColor.glSecondaryColorPointerEXT(
+        org.lwjgl.opengl.EXTSecondaryColor.glSecondaryColorPointerEXT(
                 size,
-                (unsigned ? org.lwjgl3.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl3.opengl.GL11.GL_BYTE),
+                (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl.opengl.GL11.GL_BYTE),
                 stride,
-                org.lwjgl.MemoryUtil.getAddress(pPointer));
+                MemoryUtil.getAddress(pPointer));
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTSeparateShaderObjects.java b/src/main/java/org/lwjglx/opengl/EXTSeparateShaderObjects.java
similarity index 53%
rename from src/main/java/org/lwjgl/opengl/EXTSeparateShaderObjects.java
rename to src/main/java/org/lwjglx/opengl/EXTSeparateShaderObjects.java
index e309c63ec..e33204d27 100644
--- a/src/main/java/org/lwjgl/opengl/EXTSeparateShaderObjects.java
+++ b/src/main/java/org/lwjglx/opengl/EXTSeparateShaderObjects.java
@@ -1,22 +1,22 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTSeparateShaderObjects {
 
     public static final int GL_ACTIVE_PROGRAM_EXT = (int) 35725;
 
     public static void glActiveProgramEXT(int program) {
-        org.lwjgl3.opengl.EXTSeparateShaderObjects.glActiveProgramEXT(program);
+        org.lwjgl.opengl.EXTSeparateShaderObjects.glActiveProgramEXT(program);
     }
 
     public static int glCreateShaderProgramEXT(int type, java.lang.CharSequence string) {
-        return org.lwjgl3.opengl.EXTSeparateShaderObjects.glCreateShaderProgramEXT(type, string);
+        return org.lwjgl.opengl.EXTSeparateShaderObjects.glCreateShaderProgramEXT(type, string);
     }
 
     public static int glCreateShaderProgramEXT(int type, java.nio.ByteBuffer string) {
-        return org.lwjgl3.opengl.EXTSeparateShaderObjects.glCreateShaderProgramEXT(type, string);
+        return org.lwjgl.opengl.EXTSeparateShaderObjects.glCreateShaderProgramEXT(type, string);
     }
 
     public static void glUseShaderProgramEXT(int type, int program) {
-        org.lwjgl3.opengl.EXTSeparateShaderObjects.glUseShaderProgramEXT(type, program);
+        org.lwjgl.opengl.EXTSeparateShaderObjects.glUseShaderProgramEXT(type, program);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTShaderImageLoadStore.java b/src/main/java/org/lwjglx/opengl/EXTShaderImageLoadStore.java
similarity index 96%
rename from src/main/java/org/lwjgl/opengl/EXTShaderImageLoadStore.java
rename to src/main/java/org/lwjglx/opengl/EXTShaderImageLoadStore.java
index fccf0b563..e8cf7d053 100644
--- a/src/main/java/org/lwjgl/opengl/EXTShaderImageLoadStore.java
+++ b/src/main/java/org/lwjglx/opengl/EXTShaderImageLoadStore.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTShaderImageLoadStore {
 
@@ -60,11 +60,11 @@ public class EXTShaderImageLoadStore {
 
     public static void glBindImageTextureEXT(int index, int texture, int level, boolean layered, int layer, int access,
             int format) {
-        org.lwjgl3.opengl.EXTShaderImageLoadStore
+        org.lwjgl.opengl.EXTShaderImageLoadStore
                 .glBindImageTextureEXT(index, texture, level, layered, layer, access, format);
     }
 
     public static void glMemoryBarrierEXT(int barriers) {
-        org.lwjgl3.opengl.EXTShaderImageLoadStore.glMemoryBarrierEXT(barriers);
+        org.lwjgl.opengl.EXTShaderImageLoadStore.glMemoryBarrierEXT(barriers);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTSharedTexturePalette.java b/src/main/java/org/lwjglx/opengl/EXTSharedTexturePalette.java
similarity index 81%
rename from src/main/java/org/lwjgl/opengl/EXTSharedTexturePalette.java
rename to src/main/java/org/lwjglx/opengl/EXTSharedTexturePalette.java
index 22473293d..20dd71eb3 100644
--- a/src/main/java/org/lwjgl/opengl/EXTSharedTexturePalette.java
+++ b/src/main/java/org/lwjglx/opengl/EXTSharedTexturePalette.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTSharedTexturePalette {
 
diff --git a/src/main/java/org/lwjgl/opengl/EXTStencilClearTag.java b/src/main/java/org/lwjglx/opengl/EXTStencilClearTag.java
similarity index 68%
rename from src/main/java/org/lwjgl/opengl/EXTStencilClearTag.java
rename to src/main/java/org/lwjglx/opengl/EXTStencilClearTag.java
index dcc3c4f65..a7471986f 100644
--- a/src/main/java/org/lwjgl/opengl/EXTStencilClearTag.java
+++ b/src/main/java/org/lwjglx/opengl/EXTStencilClearTag.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTStencilClearTag {
 
@@ -6,6 +6,6 @@ public class EXTStencilClearTag {
     public static final int GL_STENCIL_TAG_BITS_EXT = (int) 35058;
 
     public static void glStencilClearTagEXT(int stencilTagBits, int stencilClearTag) {
-        org.lwjgl3.opengl.EXTStencilClearTag.glStencilClearTagEXT(stencilTagBits, stencilClearTag);
+        org.lwjgl.opengl.EXTStencilClearTag.glStencilClearTagEXT(stencilTagBits, stencilClearTag);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTStencilTwoSide.java b/src/main/java/org/lwjglx/opengl/EXTStencilTwoSide.java
similarity index 70%
rename from src/main/java/org/lwjgl/opengl/EXTStencilTwoSide.java
rename to src/main/java/org/lwjglx/opengl/EXTStencilTwoSide.java
index efc4c8059..40091b724 100644
--- a/src/main/java/org/lwjgl/opengl/EXTStencilTwoSide.java
+++ b/src/main/java/org/lwjglx/opengl/EXTStencilTwoSide.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTStencilTwoSide {
 
@@ -6,6 +6,6 @@ public class EXTStencilTwoSide {
     public static final int GL_STENCIL_TEST_TWO_SIDE_EXT = (int) 35088;
 
     public static void glActiveStencilFaceEXT(int face) {
-        org.lwjgl3.opengl.EXTStencilTwoSide.glActiveStencilFaceEXT(face);
+        org.lwjgl.opengl.EXTStencilTwoSide.glActiveStencilFaceEXT(face);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTStencilWrap.java b/src/main/java/org/lwjglx/opengl/EXTStencilWrap.java
similarity index 85%
rename from src/main/java/org/lwjgl/opengl/EXTStencilWrap.java
rename to src/main/java/org/lwjglx/opengl/EXTStencilWrap.java
index f0b0f4193..076a4a43a 100644
--- a/src/main/java/org/lwjgl/opengl/EXTStencilWrap.java
+++ b/src/main/java/org/lwjglx/opengl/EXTStencilWrap.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTStencilWrap {
 
diff --git a/src/main/java/org/lwjgl/opengl/EXTTextureArray.java b/src/main/java/org/lwjglx/opengl/EXTTextureArray.java
similarity index 88%
rename from src/main/java/org/lwjgl/opengl/EXTTextureArray.java
rename to src/main/java/org/lwjglx/opengl/EXTTextureArray.java
index 645f6ca00..1d16fd3f3 100644
--- a/src/main/java/org/lwjgl/opengl/EXTTextureArray.java
+++ b/src/main/java/org/lwjglx/opengl/EXTTextureArray.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTTextureArray {
 
@@ -17,6 +17,6 @@ public class EXTTextureArray {
     public static final int GL_TEXTURE_BINDING_2D_ARRAY_EXT = (int) 35869;
 
     public static void glFramebufferTextureLayerEXT(int target, int attachment, int texture, int level, int layer) {
-        org.lwjgl3.opengl.EXTTextureArray.glFramebufferTextureLayerEXT(target, attachment, texture, level, layer);
+        org.lwjgl.opengl.EXTTextureArray.glFramebufferTextureLayerEXT(target, attachment, texture, level, layer);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTTextureBufferObject.java b/src/main/java/org/lwjglx/opengl/EXTTextureBufferObject.java
similarity index 80%
rename from src/main/java/org/lwjgl/opengl/EXTTextureBufferObject.java
rename to src/main/java/org/lwjglx/opengl/EXTTextureBufferObject.java
index 730e808c7..ed49521a9 100644
--- a/src/main/java/org/lwjgl/opengl/EXTTextureBufferObject.java
+++ b/src/main/java/org/lwjglx/opengl/EXTTextureBufferObject.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTTextureBufferObject {
 
@@ -9,6 +9,6 @@ public class EXTTextureBufferObject {
     public static final int GL_TEXTURE_BUFFER_FORMAT_EXT = (int) 35886;
 
     public static void glTexBufferEXT(int target, int internalformat, int buffer) {
-        org.lwjgl3.opengl.EXTTextureBufferObject.glTexBufferEXT(target, internalformat, buffer);
+        org.lwjgl.opengl.EXTTextureBufferObject.glTexBufferEXT(target, internalformat, buffer);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTTextureCompressionLATC.java b/src/main/java/org/lwjglx/opengl/EXTTextureCompressionLATC.java
similarity index 93%
rename from src/main/java/org/lwjgl/opengl/EXTTextureCompressionLATC.java
rename to src/main/java/org/lwjglx/opengl/EXTTextureCompressionLATC.java
index afbca45e4..f8db7df74 100644
--- a/src/main/java/org/lwjgl/opengl/EXTTextureCompressionLATC.java
+++ b/src/main/java/org/lwjglx/opengl/EXTTextureCompressionLATC.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTTextureCompressionLATC {
 
diff --git a/src/main/java/org/lwjgl/opengl/EXTTextureCompressionRGTC.java b/src/main/java/org/lwjglx/opengl/EXTTextureCompressionRGTC.java
similarity index 92%
rename from src/main/java/org/lwjgl/opengl/EXTTextureCompressionRGTC.java
rename to src/main/java/org/lwjglx/opengl/EXTTextureCompressionRGTC.java
index 4d2d50b19..c897e6b07 100644
--- a/src/main/java/org/lwjgl/opengl/EXTTextureCompressionRGTC.java
+++ b/src/main/java/org/lwjglx/opengl/EXTTextureCompressionRGTC.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTTextureCompressionRGTC {
 
diff --git a/src/main/java/org/lwjgl/opengl/EXTTextureCompressionS3TC.java b/src/main/java/org/lwjglx/opengl/EXTTextureCompressionS3TC.java
similarity index 92%
rename from src/main/java/org/lwjgl/opengl/EXTTextureCompressionS3TC.java
rename to src/main/java/org/lwjglx/opengl/EXTTextureCompressionS3TC.java
index 137b08817..78515b7af 100644
--- a/src/main/java/org/lwjgl/opengl/EXTTextureCompressionS3TC.java
+++ b/src/main/java/org/lwjglx/opengl/EXTTextureCompressionS3TC.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTTextureCompressionS3TC {
 
diff --git a/src/main/java/org/lwjgl/opengl/EXTTextureFilterAnisotropic.java b/src/main/java/org/lwjglx/opengl/EXTTextureFilterAnisotropic.java
similarity index 87%
rename from src/main/java/org/lwjgl/opengl/EXTTextureFilterAnisotropic.java
rename to src/main/java/org/lwjglx/opengl/EXTTextureFilterAnisotropic.java
index ed328ec34..e92f9013d 100644
--- a/src/main/java/org/lwjgl/opengl/EXTTextureFilterAnisotropic.java
+++ b/src/main/java/org/lwjglx/opengl/EXTTextureFilterAnisotropic.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTTextureFilterAnisotropic {
 
diff --git a/src/main/java/org/lwjgl/opengl/EXTTextureInteger.java b/src/main/java/org/lwjglx/opengl/EXTTextureInteger.java
similarity index 82%
rename from src/main/java/org/lwjgl/opengl/EXTTextureInteger.java
rename to src/main/java/org/lwjglx/opengl/EXTTextureInteger.java
index 401c59212..42073d39e 100644
--- a/src/main/java/org/lwjgl/opengl/EXTTextureInteger.java
+++ b/src/main/java/org/lwjglx/opengl/EXTTextureInteger.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTTextureInteger {
 
@@ -51,42 +51,42 @@ public class EXTTextureInteger {
     public static final int GL_RGB_INTEGER_EXT = (int) 36248;
 
     public static void glClearColorIiEXT(int r, int g, int b, int a) {
-        org.lwjgl3.opengl.EXTTextureInteger.glClearColorIiEXT(r, g, b, a);
+        org.lwjgl.opengl.EXTTextureInteger.glClearColorIiEXT(r, g, b, a);
     }
 
     public static void glClearColorIuiEXT(int r, int g, int b, int a) {
-        org.lwjgl3.opengl.EXTTextureInteger.glClearColorIuiEXT(r, g, b, a);
+        org.lwjgl.opengl.EXTTextureInteger.glClearColorIuiEXT(r, g, b, a);
     }
 
     public static void glGetTexParameterIEXT(int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTTextureInteger.glGetTexParameterIivEXT(target, pname, params);
+        org.lwjgl.opengl.EXTTextureInteger.glGetTexParameterIivEXT(target, pname, params);
     }
 
     public static int glGetTexParameterIiEXT(int target, int pname) {
-        return org.lwjgl3.opengl.EXTTextureInteger.glGetTexParameterIiEXT(target, pname);
+        return org.lwjgl.opengl.EXTTextureInteger.glGetTexParameterIiEXT(target, pname);
     }
 
     public static void glGetTexParameterIuEXT(int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTTextureInteger.glGetTexParameterIuivEXT(target, pname, params);
+        org.lwjgl.opengl.EXTTextureInteger.glGetTexParameterIuivEXT(target, pname, params);
     }
 
     public static int glGetTexParameterIuiEXT(int target, int pname) {
-        return org.lwjgl3.opengl.EXTTextureInteger.glGetTexParameterIuiEXT(target, pname);
+        return org.lwjgl.opengl.EXTTextureInteger.glGetTexParameterIuiEXT(target, pname);
     }
 
     public static void glTexParameterIEXT(int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTTextureInteger.glTexParameterIivEXT(target, pname, params);
+        org.lwjgl.opengl.EXTTextureInteger.glTexParameterIivEXT(target, pname, params);
     }
 
     public static void glTexParameterIiEXT(int target, int pname, int param) {
-        org.lwjgl3.opengl.EXTTextureInteger.glTexParameterIiEXT(target, pname, param);
+        org.lwjgl.opengl.EXTTextureInteger.glTexParameterIiEXT(target, pname, param);
     }
 
     public static void glTexParameterIuEXT(int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.EXTTextureInteger.glTexParameterIuivEXT(target, pname, params);
+        org.lwjgl.opengl.EXTTextureInteger.glTexParameterIuivEXT(target, pname, params);
     }
 
     public static void glTexParameterIuiEXT(int target, int pname, int param) {
-        org.lwjgl3.opengl.EXTTextureInteger.glTexParameterIuiEXT(target, pname, param);
+        org.lwjgl.opengl.EXTTextureInteger.glTexParameterIuiEXT(target, pname, param);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTTextureMirrorClamp.java b/src/main/java/org/lwjglx/opengl/EXTTextureMirrorClamp.java
similarity index 90%
rename from src/main/java/org/lwjgl/opengl/EXTTextureMirrorClamp.java
rename to src/main/java/org/lwjglx/opengl/EXTTextureMirrorClamp.java
index a8043eb0d..86e14a013 100644
--- a/src/main/java/org/lwjgl/opengl/EXTTextureMirrorClamp.java
+++ b/src/main/java/org/lwjglx/opengl/EXTTextureMirrorClamp.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTTextureMirrorClamp {
 
diff --git a/src/main/java/org/lwjgl/opengl/EXTTextureSRGB.java b/src/main/java/org/lwjglx/opengl/EXTTextureSRGB.java
similarity index 97%
rename from src/main/java/org/lwjgl/opengl/EXTTextureSRGB.java
rename to src/main/java/org/lwjglx/opengl/EXTTextureSRGB.java
index 71e442f4d..4e8e3d002 100644
--- a/src/main/java/org/lwjgl/opengl/EXTTextureSRGB.java
+++ b/src/main/java/org/lwjglx/opengl/EXTTextureSRGB.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTTextureSRGB {
 
diff --git a/src/main/java/org/lwjgl/opengl/EXTTextureSRGBDecode.java b/src/main/java/org/lwjglx/opengl/EXTTextureSRGBDecode.java
similarity index 89%
rename from src/main/java/org/lwjgl/opengl/EXTTextureSRGBDecode.java
rename to src/main/java/org/lwjglx/opengl/EXTTextureSRGBDecode.java
index 2ad4bce51..5e5c6c886 100644
--- a/src/main/java/org/lwjgl/opengl/EXTTextureSRGBDecode.java
+++ b/src/main/java/org/lwjglx/opengl/EXTTextureSRGBDecode.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTTextureSRGBDecode {
 
diff --git a/src/main/java/org/lwjgl/opengl/EXTTextureSharedExponent.java b/src/main/java/org/lwjglx/opengl/EXTTextureSharedExponent.java
similarity index 90%
rename from src/main/java/org/lwjgl/opengl/EXTTextureSharedExponent.java
rename to src/main/java/org/lwjglx/opengl/EXTTextureSharedExponent.java
index a61e9b816..58eeb0c6d 100644
--- a/src/main/java/org/lwjgl/opengl/EXTTextureSharedExponent.java
+++ b/src/main/java/org/lwjglx/opengl/EXTTextureSharedExponent.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTTextureSharedExponent {
 
diff --git a/src/main/java/org/lwjgl/opengl/EXTTextureSnorm.java b/src/main/java/org/lwjglx/opengl/EXTTextureSnorm.java
similarity index 98%
rename from src/main/java/org/lwjgl/opengl/EXTTextureSnorm.java
rename to src/main/java/org/lwjglx/opengl/EXTTextureSnorm.java
index 6061e3f48..91f8b6e43 100644
--- a/src/main/java/org/lwjgl/opengl/EXTTextureSnorm.java
+++ b/src/main/java/org/lwjglx/opengl/EXTTextureSnorm.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTTextureSnorm {
 
diff --git a/src/main/java/org/lwjgl/opengl/EXTTextureSwizzle.java b/src/main/java/org/lwjglx/opengl/EXTTextureSwizzle.java
similarity index 93%
rename from src/main/java/org/lwjgl/opengl/EXTTextureSwizzle.java
rename to src/main/java/org/lwjglx/opengl/EXTTextureSwizzle.java
index d815dd104..a5be2ca93 100644
--- a/src/main/java/org/lwjgl/opengl/EXTTextureSwizzle.java
+++ b/src/main/java/org/lwjglx/opengl/EXTTextureSwizzle.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTTextureSwizzle {
 
diff --git a/src/main/java/org/lwjgl/opengl/EXTTimerQuery.java b/src/main/java/org/lwjglx/opengl/EXTTimerQuery.java
similarity index 64%
rename from src/main/java/org/lwjgl/opengl/EXTTimerQuery.java
rename to src/main/java/org/lwjglx/opengl/EXTTimerQuery.java
index 40a30491b..2ceb1ba9e 100644
--- a/src/main/java/org/lwjgl/opengl/EXTTimerQuery.java
+++ b/src/main/java/org/lwjglx/opengl/EXTTimerQuery.java
@@ -1,14 +1,14 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTTimerQuery {
 
     public static final int GL_TIME_ELAPSED_EXT = (int) 35007;
 
     public static void glGetQueryObjectEXT(int id, int pname, java.nio.LongBuffer params) {
-        org.lwjgl3.opengl.EXTTimerQuery.glGetQueryObjecti64vEXT(id, pname, params);
+        org.lwjgl.opengl.EXTTimerQuery.glGetQueryObjecti64vEXT(id, pname, params);
     }
 
     public static void glGetQueryObjectuEXT(int id, int pname, java.nio.LongBuffer params) {
-        org.lwjgl3.opengl.EXTTimerQuery.glGetQueryObjectui64vEXT(id, pname, params);
+        org.lwjgl.opengl.EXTTimerQuery.glGetQueryObjectui64vEXT(id, pname, params);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTTransformFeedback.java b/src/main/java/org/lwjglx/opengl/EXTTransformFeedback.java
similarity index 77%
rename from src/main/java/org/lwjgl/opengl/EXTTransformFeedback.java
rename to src/main/java/org/lwjglx/opengl/EXTTransformFeedback.java
index 1aae8f949..40b18041c 100644
--- a/src/main/java/org/lwjgl/opengl/EXTTransformFeedback.java
+++ b/src/main/java/org/lwjglx/opengl/EXTTransformFeedback.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTTransformFeedback {
 
@@ -19,38 +19,38 @@ public class EXTTransformFeedback {
     public static final int GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT = (int) 35958;
 
     public static void glBeginTransformFeedbackEXT(int primitiveMode) {
-        org.lwjgl3.opengl.EXTTransformFeedback.glBeginTransformFeedbackEXT(primitiveMode);
+        org.lwjgl.opengl.EXTTransformFeedback.glBeginTransformFeedbackEXT(primitiveMode);
     }
 
     public static void glBindBufferBaseEXT(int target, int index, int buffer) {
-        org.lwjgl3.opengl.EXTTransformFeedback.glBindBufferBaseEXT(target, index, buffer);
+        org.lwjgl.opengl.EXTTransformFeedback.glBindBufferBaseEXT(target, index, buffer);
     }
 
     public static void glBindBufferOffsetEXT(int target, int index, int buffer, long offset) {
-        org.lwjgl3.opengl.EXTTransformFeedback.glBindBufferOffsetEXT(target, index, buffer, offset);
+        org.lwjgl.opengl.EXTTransformFeedback.glBindBufferOffsetEXT(target, index, buffer, offset);
     }
 
     public static void glBindBufferRangeEXT(int target, int index, int buffer, long offset, long size) {
-        org.lwjgl3.opengl.EXTTransformFeedback.glBindBufferRangeEXT(target, index, buffer, offset, size);
+        org.lwjgl.opengl.EXTTransformFeedback.glBindBufferRangeEXT(target, index, buffer, offset, size);
     }
 
     public static void glEndTransformFeedbackEXT() {
-        org.lwjgl3.opengl.EXTTransformFeedback.glEndTransformFeedbackEXT();
+        org.lwjgl.opengl.EXTTransformFeedback.glEndTransformFeedbackEXT();
     }
 
     public static java.lang.String glGetTransformFeedbackVaryingEXT(int program, int index, int bufSize,
             java.nio.IntBuffer size, java.nio.IntBuffer type) {
-        return org.lwjgl3.opengl.EXTTransformFeedback
+        return org.lwjgl.opengl.EXTTransformFeedback
                 .glGetTransformFeedbackVaryingEXT(program, index, bufSize, size, type);
     }
 
     public static void glGetTransformFeedbackVaryingEXT(int program, int index, java.nio.IntBuffer length,
             java.nio.IntBuffer size, java.nio.IntBuffer type, java.nio.ByteBuffer name) {
-        org.lwjgl3.opengl.EXTTransformFeedback
+        org.lwjgl.opengl.EXTTransformFeedback
                 .glGetTransformFeedbackVaryingEXT(program, index, length, size, type, name);
     }
 
     public static void glTransformFeedbackVaryingsEXT(int program, java.lang.CharSequence[] varyings, int bufferMode) {
-        org.lwjgl3.opengl.EXTTransformFeedback.glTransformFeedbackVaryingsEXT(program, varyings, bufferMode);
+        org.lwjgl.opengl.EXTTransformFeedback.glTransformFeedbackVaryingsEXT(program, varyings, bufferMode);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/EXTVertexAttrib64bit.java b/src/main/java/org/lwjglx/opengl/EXTVertexAttrib64bit.java
similarity index 68%
rename from src/main/java/org/lwjgl/opengl/EXTVertexAttrib64bit.java
rename to src/main/java/org/lwjglx/opengl/EXTVertexAttrib64bit.java
index 71b2d9dce..b591b7301 100644
--- a/src/main/java/org/lwjgl/opengl/EXTVertexAttrib64bit.java
+++ b/src/main/java/org/lwjglx/opengl/EXTVertexAttrib64bit.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class EXTVertexAttrib64bit {
 
@@ -16,48 +16,48 @@ public class EXTVertexAttrib64bit {
     public static final int GL_DOUBLE_VEC4_EXT = (int) 36862;
 
     public static void glGetVertexAttribLEXT(int index, int pname, java.nio.DoubleBuffer params) {
-        org.lwjgl3.opengl.EXTVertexAttrib64bit.glGetVertexAttribLdvEXT(index, pname, params);
+        org.lwjgl.opengl.EXTVertexAttrib64bit.glGetVertexAttribLdvEXT(index, pname, params);
     }
 
     public static void glVertexArrayVertexAttribLOffsetEXT(int vaobj, int buffer, int index, int size, int type,
             int stride, long offset) {
-        org.lwjgl3.opengl.EXTVertexAttrib64bit
+        org.lwjgl.opengl.EXTVertexAttrib64bit
                 .glVertexArrayVertexAttribLOffsetEXT(vaobj, buffer, index, size, type, stride, offset);
     }
 
     public static void glVertexAttribL1EXT(int index, java.nio.DoubleBuffer v) {
-        org.lwjgl3.opengl.EXTVertexAttrib64bit.glVertexAttribL1dvEXT(index, v);
+        org.lwjgl.opengl.EXTVertexAttrib64bit.glVertexAttribL1dvEXT(index, v);
     }
 
     public static void glVertexAttribL1dEXT(int index, double x) {
-        org.lwjgl3.opengl.EXTVertexAttrib64bit.glVertexAttribL1dEXT(index, x);
+        org.lwjgl.opengl.EXTVertexAttrib64bit.glVertexAttribL1dEXT(index, x);
     }
 
     public static void glVertexAttribL2EXT(int index, java.nio.DoubleBuffer v) {
-        org.lwjgl3.opengl.EXTVertexAttrib64bit.glVertexAttribL2dvEXT(index, v);
+        org.lwjgl.opengl.EXTVertexAttrib64bit.glVertexAttribL2dvEXT(index, v);
     }
 
     public static void glVertexAttribL2dEXT(int index, double x, double y) {
-        org.lwjgl3.opengl.EXTVertexAttrib64bit.glVertexAttribL2dEXT(index, x, y);
+        org.lwjgl.opengl.EXTVertexAttrib64bit.glVertexAttribL2dEXT(index, x, y);
     }
 
     public static void glVertexAttribL3EXT(int index, java.nio.DoubleBuffer v) {
-        org.lwjgl3.opengl.EXTVertexAttrib64bit.glVertexAttribL3dvEXT(index, v);
+        org.lwjgl.opengl.EXTVertexAttrib64bit.glVertexAttribL3dvEXT(index, v);
     }
 
     public static void glVertexAttribL3dEXT(int index, double x, double y, double z) {
-        org.lwjgl3.opengl.EXTVertexAttrib64bit.glVertexAttribL3dEXT(index, x, y, z);
+        org.lwjgl.opengl.EXTVertexAttrib64bit.glVertexAttribL3dEXT(index, x, y, z);
     }
 
     public static void glVertexAttribL4EXT(int index, java.nio.DoubleBuffer v) {
-        org.lwjgl3.opengl.EXTVertexAttrib64bit.glVertexAttribL4dvEXT(index, v);
+        org.lwjgl.opengl.EXTVertexAttrib64bit.glVertexAttribL4dvEXT(index, v);
     }
 
     public static void glVertexAttribL4dEXT(int index, double x, double y, double z, double w) {
-        org.lwjgl3.opengl.EXTVertexAttrib64bit.glVertexAttribL4dEXT(index, x, y, z, w);
+        org.lwjgl.opengl.EXTVertexAttrib64bit.glVertexAttribL4dEXT(index, x, y, z, w);
     }
 
     public static void glVertexAttribLPointerEXT(int index, int size, int stride, java.nio.DoubleBuffer pointer) {
-        org.lwjgl3.opengl.EXTVertexAttrib64bit.glVertexAttribLPointerEXT(index, size, stride, pointer);
+        org.lwjgl.opengl.EXTVertexAttrib64bit.glVertexAttribLPointerEXT(index, size, stride, pointer);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/GL11.java b/src/main/java/org/lwjglx/opengl/GL11.java
similarity index 74%
rename from src/main/java/org/lwjgl/opengl/GL11.java
rename to src/main/java/org/lwjglx/opengl/GL11.java
index 4edbc3881..95f1a82db 100644
--- a/src/main/java/org/lwjgl/opengl/GL11.java
+++ b/src/main/java/org/lwjglx/opengl/GL11.java
@@ -1,6 +1,7 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
-import org.lwjgl.lwjgl3ify.BufferCasts;
+import org.lwjglx.MemoryUtil;
+import org.lwjglx.lwjgl3ify.BufferCasts;
 
 public class GL11 {
 
@@ -538,118 +539,118 @@ public class GL11 {
     public static final int GL_ZOOM_Y = (int) 3351;
 
     public static void glAccum(int op, float value) {
-        org.lwjgl3.opengl.GL11.glAccum(op, value);
+        org.lwjgl.opengl.GL11.glAccum(op, value);
     }
 
     public static void glAlphaFunc(int func, float ref) {
-        org.lwjgl3.opengl.GL11.glAlphaFunc(func, ref);
+        org.lwjgl.opengl.GL11.glAlphaFunc(func, ref);
     }
 
     public static boolean glAreTexturesResident(java.nio.IntBuffer textures, java.nio.ByteBuffer residences) {
-        return org.lwjgl3.opengl.GL11.glAreTexturesResident(textures, residences);
+        return org.lwjgl.opengl.GL11.glAreTexturesResident(textures, residences);
     }
 
     public static void glArrayElement(int i) {
-        org.lwjgl3.opengl.GL11.glArrayElement(i);
+        org.lwjgl.opengl.GL11.glArrayElement(i);
     }
 
     public static void glBegin(int mode) {
-        org.lwjgl3.opengl.GL11.glBegin(mode);
+        org.lwjgl.opengl.GL11.glBegin(mode);
     }
 
     public static void glBindTexture(int target, int texture) {
-        org.lwjgl3.opengl.GL11.glBindTexture(target, texture);
+        org.lwjgl.opengl.GL11.glBindTexture(target, texture);
     }
 
     public static void glBitmap(int width, int height, float xorig, float yorig, float xmove, float ymove,
             long bitmap_buffer_offset) {
-        org.lwjgl3.opengl.GL11.glBitmap(width, height, xorig, yorig, xmove, ymove, bitmap_buffer_offset);
+        org.lwjgl.opengl.GL11.glBitmap(width, height, xorig, yorig, xmove, ymove, bitmap_buffer_offset);
     }
 
     public static void glBitmap(int width, int height, float xorig, float yorig, float xmove, float ymove,
             java.nio.ByteBuffer bitmap) {
-        org.lwjgl3.opengl.GL11.glBitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
+        org.lwjgl.opengl.GL11.glBitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
     }
 
     public static void glBlendFunc(int sfactor, int dfactor) {
-        org.lwjgl3.opengl.GL11.glBlendFunc(sfactor, dfactor);
+        org.lwjgl.opengl.GL11.glBlendFunc(sfactor, dfactor);
     }
 
     public static void glCallList(int list) {
-        org.lwjgl3.opengl.GL11.glCallList(list);
+        org.lwjgl.opengl.GL11.glCallList(list);
     }
 
     public static void glCallLists(java.nio.ByteBuffer lists) {
-        org.lwjgl3.opengl.GL11.glCallLists(lists);
+        org.lwjgl.opengl.GL11.glCallLists(lists);
     }
 
     public static void glCallLists(java.nio.IntBuffer lists) {
-        org.lwjgl3.opengl.GL11.glCallLists(lists);
+        org.lwjgl.opengl.GL11.glCallLists(lists);
     }
 
     public static void glCallLists(java.nio.ShortBuffer lists) {
-        org.lwjgl3.opengl.GL11.glCallLists(lists);
+        org.lwjgl.opengl.GL11.glCallLists(lists);
     }
 
     public static void glClear(int mask) {
-        org.lwjgl3.opengl.GL11.glClear(mask);
+        org.lwjgl.opengl.GL11.glClear(mask);
     }
 
     public static void glClearAccum(float red, float green, float blue, float alpha) {
-        org.lwjgl3.opengl.GL11.glClearAccum(red, green, blue, alpha);
+        org.lwjgl.opengl.GL11.glClearAccum(red, green, blue, alpha);
     }
 
     public static void glClearColor(float red, float green, float blue, float alpha) {
-        org.lwjgl3.opengl.GL11.glClearColor(red, green, blue, alpha);
+        org.lwjgl.opengl.GL11.glClearColor(red, green, blue, alpha);
     }
 
     public static void glClearDepth(double depth) {
-        org.lwjgl3.opengl.GL11.glClearDepth(depth);
+        org.lwjgl.opengl.GL11.glClearDepth(depth);
     }
 
     public static void glClearStencil(int s) {
-        org.lwjgl3.opengl.GL11.glClearStencil(s);
+        org.lwjgl.opengl.GL11.glClearStencil(s);
     }
 
     public static void glClipPlane(int plane, java.nio.DoubleBuffer equation) {
-        org.lwjgl3.opengl.GL11.glClipPlane(plane, equation);
+        org.lwjgl.opengl.GL11.glClipPlane(plane, equation);
     }
 
     public static void glColor3b(byte red, byte green, byte blue) {
-        org.lwjgl3.opengl.GL11.glColor3b(red, green, blue);
+        org.lwjgl.opengl.GL11.glColor3b(red, green, blue);
     }
 
     public static void glColor3d(double red, double green, double blue) {
-        org.lwjgl3.opengl.GL11.glColor3d(red, green, blue);
+        org.lwjgl.opengl.GL11.glColor3d(red, green, blue);
     }
 
     public static void glColor3f(float red, float green, float blue) {
-        org.lwjgl3.opengl.GL11.glColor3f(red, green, blue);
+        org.lwjgl.opengl.GL11.glColor3f(red, green, blue);
     }
 
     private static final int UNSIGNED_BYTE_TO_INT_RATIO = Integer.MAX_VALUE / 255;
 
     public static void glColor3ub(byte red, byte green, byte blue) {
-        org.lwjgl3.opengl.GL11.glColor3i(
+        org.lwjgl.opengl.GL11.glColor3i(
                 (red & 0xff) * UNSIGNED_BYTE_TO_INT_RATIO,
                 (green & 0xff) * UNSIGNED_BYTE_TO_INT_RATIO,
                 (blue & 0xff) * UNSIGNED_BYTE_TO_INT_RATIO);
     }
 
     public static void glColor4b(byte red, byte green, byte blue, byte alpha) {
-        org.lwjgl3.opengl.GL11.glColor4b(red, green, blue, alpha);
+        org.lwjgl.opengl.GL11.glColor4b(red, green, blue, alpha);
     }
 
     public static void glColor4d(double red, double green, double blue, double alpha) {
-        org.lwjgl3.opengl.GL11.glColor4d(red, green, blue, alpha);
+        org.lwjgl.opengl.GL11.glColor4d(red, green, blue, alpha);
     }
 
     public static void glColor4f(float red, float green, float blue, float alpha) {
-        org.lwjgl3.opengl.GL11.glColor4f(red, green, blue, alpha);
+        org.lwjgl.opengl.GL11.glColor4f(red, green, blue, alpha);
     }
 
     public static void glColor4ub(byte red, byte green, byte blue, byte alpha) {
-        org.lwjgl3.opengl.GL11.glColor4i(
+        org.lwjgl.opengl.GL11.glColor4i(
                 (red & 0xff) * UNSIGNED_BYTE_TO_INT_RATIO,
                 (green & 0xff) * UNSIGNED_BYTE_TO_INT_RATIO,
                 (blue & 0xff) * UNSIGNED_BYTE_TO_INT_RATIO,
@@ -657,1232 +658,1232 @@ public static void glColor4ub(byte red, byte green, byte blue, byte alpha) {
     }
 
     public static void glColorMask(boolean red, boolean green, boolean blue, boolean alpha) {
-        org.lwjgl3.opengl.GL11.glColorMask(red, green, blue, alpha);
+        org.lwjgl.opengl.GL11.glColorMask(red, green, blue, alpha);
     }
 
     public static void glColorMaterial(int face, int mode) {
-        org.lwjgl3.opengl.GL11.glColorMaterial(face, mode);
+        org.lwjgl.opengl.GL11.glColorMaterial(face, mode);
     }
 
     public static void glColorPointer(int size, int type, int stride, long pointer_buffer_offset) {
-        org.lwjgl3.opengl.GL11.glColorPointer(size, type, stride, pointer_buffer_offset);
+        org.lwjgl.opengl.GL11.glColorPointer(size, type, stride, pointer_buffer_offset);
     }
 
     public static void glColorPointer(int size, int type, int stride, java.nio.ByteBuffer pointer) {
-        org.lwjgl3.opengl.GL11.glColorPointer(size, type, stride, pointer);
+        org.lwjgl.opengl.GL11.glColorPointer(size, type, stride, pointer);
     }
 
     public static void glColorPointer(int size, int stride, java.nio.DoubleBuffer pointer) {
 
-        org.lwjgl3.opengl.GL11.glColorPointer(
+        org.lwjgl.opengl.GL11.glColorPointer(
                 size,
-                org.lwjgl3.opengl.GL11.GL_DOUBLE,
+                org.lwjgl.opengl.GL11.GL_DOUBLE,
                 stride,
                 BufferCasts.toByteBuffer(pointer));
     }
 
     public static void glColorPointer(int size, int stride, java.nio.FloatBuffer pointer) {
 
-        org.lwjgl3.opengl.GL11.glColorPointer(size, org.lwjgl3.opengl.GL11.GL_FLOAT, stride, pointer);
+        org.lwjgl.opengl.GL11.glColorPointer(size, org.lwjgl.opengl.GL11.GL_FLOAT, stride, pointer);
     }
 
     public static void glColorPointer(int size, boolean unsigned, int stride, java.nio.ByteBuffer pointer) {
 
-        org.lwjgl3.opengl.GL11.glColorPointer(
+        org.lwjgl.opengl.GL11.glColorPointer(
                 size,
-                (unsigned ? org.lwjgl3.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl3.opengl.GL11.GL_BYTE),
+                (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl.opengl.GL11.GL_BYTE),
                 stride,
-                org.lwjgl.MemoryUtil.getAddress(pointer));
+                MemoryUtil.getAddress(pointer));
     }
 
     public static void glCopyPixels(int x, int y, int width, int height, int type) {
-        org.lwjgl3.opengl.GL11.glCopyPixels(x, y, width, height, type);
+        org.lwjgl.opengl.GL11.glCopyPixels(x, y, width, height, type);
     }
 
     public static void glCopyTexImage1D(int target, int level, int internalFormat, int x, int y, int width,
             int border) {
-        org.lwjgl3.opengl.GL11.glCopyTexImage1D(target, level, internalFormat, x, y, width, border);
+        org.lwjgl.opengl.GL11.glCopyTexImage1D(target, level, internalFormat, x, y, width, border);
     }
 
     public static void glCopyTexImage2D(int target, int level, int internalFormat, int x, int y, int width, int height,
             int border) {
-        org.lwjgl3.opengl.GL11.glCopyTexImage2D(target, level, internalFormat, x, y, width, height, border);
+        org.lwjgl.opengl.GL11.glCopyTexImage2D(target, level, internalFormat, x, y, width, height, border);
     }
 
     public static void glCopyTexSubImage1D(int target, int level, int xoffset, int x, int y, int width) {
-        org.lwjgl3.opengl.GL11.glCopyTexSubImage1D(target, level, xoffset, x, y, width);
+        org.lwjgl.opengl.GL11.glCopyTexSubImage1D(target, level, xoffset, x, y, width);
     }
 
     public static void glCopyTexSubImage2D(int target, int level, int xoffset, int yoffset, int x, int y, int width,
             int height) {
-        org.lwjgl3.opengl.GL11.glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+        org.lwjgl.opengl.GL11.glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
     }
 
     public static void glCullFace(int mode) {
-        org.lwjgl3.opengl.GL11.glCullFace(mode);
+        org.lwjgl.opengl.GL11.glCullFace(mode);
     }
 
     public static void glDeleteLists(int list, int range) {
-        org.lwjgl3.opengl.GL11.glDeleteLists(list, range);
+        org.lwjgl.opengl.GL11.glDeleteLists(list, range);
     }
 
     public static void glDeleteTextures(int texture) {
-        org.lwjgl3.opengl.GL11.glDeleteTextures(texture);
+        org.lwjgl.opengl.GL11.glDeleteTextures(texture);
     }
 
     public static void glDeleteTextures(java.nio.IntBuffer textures) {
-        org.lwjgl3.opengl.GL11.glDeleteTextures(textures);
+        org.lwjgl.opengl.GL11.glDeleteTextures(textures);
     }
 
     public static void glDepthFunc(int func) {
-        org.lwjgl3.opengl.GL11.glDepthFunc(func);
+        org.lwjgl.opengl.GL11.glDepthFunc(func);
     }
 
     public static void glDepthMask(boolean flag) {
-        org.lwjgl3.opengl.GL11.glDepthMask(flag);
+        org.lwjgl.opengl.GL11.glDepthMask(flag);
     }
 
     public static void glDepthRange(double zNear, double zFar) {
-        org.lwjgl3.opengl.GL11.glDepthRange(zNear, zFar);
+        org.lwjgl.opengl.GL11.glDepthRange(zNear, zFar);
     }
 
     public static void glDisable(int cap) {
-        org.lwjgl3.opengl.GL11.glDisable(cap);
+        org.lwjgl.opengl.GL11.glDisable(cap);
     }
 
     public static void glDisableClientState(int cap) {
-        org.lwjgl3.opengl.GL11.glDisableClientState(cap);
+        org.lwjgl.opengl.GL11.glDisableClientState(cap);
     }
 
     public static void glDrawArrays(int mode, int first, int count) {
-        org.lwjgl3.opengl.GL11.glDrawArrays(mode, first, count);
+        org.lwjgl.opengl.GL11.glDrawArrays(mode, first, count);
     }
 
     public static void glDrawBuffer(int mode) {
-        org.lwjgl3.opengl.GL11.glDrawBuffer(mode);
+        org.lwjgl.opengl.GL11.glDrawBuffer(mode);
     }
 
     public static void glDrawElements(int mode, int indices_count, int type, long indices_buffer_offset) {
-        org.lwjgl3.opengl.GL11.glDrawElements(mode, indices_count, type, indices_buffer_offset);
+        org.lwjgl.opengl.GL11.glDrawElements(mode, indices_count, type, indices_buffer_offset);
     }
 
     public static void glDrawElements(int mode, int count, int type, java.nio.ByteBuffer indices) {
 
-        org.lwjgl3.opengl.GL11.glDrawElements(mode, count, type, org.lwjgl.MemoryUtil.getAddress(indices));
+        org.lwjgl.opengl.GL11.glDrawElements(mode, count, type, MemoryUtil.getAddress(indices));
     }
 
     public static void glDrawElements(int mode, java.nio.ByteBuffer indices) {
-        org.lwjgl3.opengl.GL11.glDrawElements(mode, indices);
+        org.lwjgl.opengl.GL11.glDrawElements(mode, indices);
     }
 
     public static void glDrawElements(int mode, java.nio.IntBuffer indices) {
-        org.lwjgl3.opengl.GL11.glDrawElements(mode, indices);
+        org.lwjgl.opengl.GL11.glDrawElements(mode, indices);
     }
 
     public static void glDrawElements(int mode, java.nio.ShortBuffer indices) {
-        org.lwjgl3.opengl.GL11.glDrawElements(mode, indices);
+        org.lwjgl.opengl.GL11.glDrawElements(mode, indices);
     }
 
     public static void glDrawPixels(int width, int height, int format, int type, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.GL11.glDrawPixels(width, height, format, type, pixels_buffer_offset);
+        org.lwjgl.opengl.GL11.glDrawPixels(width, height, format, type, pixels_buffer_offset);
     }
 
     public static void glDrawPixels(int width, int height, int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glDrawPixels(width, height, format, type, pixels);
+        org.lwjgl.opengl.GL11.glDrawPixels(width, height, format, type, pixels);
     }
 
     public static void glDrawPixels(int width, int height, int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glDrawPixels(width, height, format, type, pixels);
+        org.lwjgl.opengl.GL11.glDrawPixels(width, height, format, type, pixels);
     }
 
     public static void glDrawPixels(int width, int height, int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glDrawPixels(width, height, format, type, pixels);
+        org.lwjgl.opengl.GL11.glDrawPixels(width, height, format, type, pixels);
     }
 
     public static void glEdgeFlag(boolean flag) {
-        org.lwjgl3.opengl.GL11.glEdgeFlag(flag);
+        org.lwjgl.opengl.GL11.glEdgeFlag(flag);
     }
 
     public static void glEdgeFlagPointer(int stride, long pointer_buffer_offset) {
-        org.lwjgl3.opengl.GL11.glEdgeFlagPointer(stride, pointer_buffer_offset);
+        org.lwjgl.opengl.GL11.glEdgeFlagPointer(stride, pointer_buffer_offset);
     }
 
     public static void glEdgeFlagPointer(int stride, java.nio.ByteBuffer pointer) {
-        org.lwjgl3.opengl.GL11.glEdgeFlagPointer(stride, pointer);
+        org.lwjgl.opengl.GL11.glEdgeFlagPointer(stride, pointer);
     }
 
     public static void glEnable(int cap) {
-        org.lwjgl3.opengl.GL11.glEnable(cap);
+        org.lwjgl.opengl.GL11.glEnable(cap);
     }
 
     public static void glEnableClientState(int cap) {
-        org.lwjgl3.opengl.GL11.glEnableClientState(cap);
+        org.lwjgl.opengl.GL11.glEnableClientState(cap);
     }
 
     public static void glEnd() {
-        org.lwjgl3.opengl.GL11.glEnd();
+        org.lwjgl.opengl.GL11.glEnd();
     }
 
     public static void glEndList() {
-        org.lwjgl3.opengl.GL11.glEndList();
+        org.lwjgl.opengl.GL11.glEndList();
     }
 
     public static void glEvalCoord1d(double u) {
-        org.lwjgl3.opengl.GL11.glEvalCoord1d(u);
+        org.lwjgl.opengl.GL11.glEvalCoord1d(u);
     }
 
     public static void glEvalCoord1f(float u) {
-        org.lwjgl3.opengl.GL11.glEvalCoord1f(u);
+        org.lwjgl.opengl.GL11.glEvalCoord1f(u);
     }
 
     public static void glEvalCoord2d(double u, double v) {
-        org.lwjgl3.opengl.GL11.glEvalCoord2d(u, v);
+        org.lwjgl.opengl.GL11.glEvalCoord2d(u, v);
     }
 
     public static void glEvalCoord2f(float u, float v) {
-        org.lwjgl3.opengl.GL11.glEvalCoord2f(u, v);
+        org.lwjgl.opengl.GL11.glEvalCoord2f(u, v);
     }
 
     public static void glEvalMesh1(int mode, int i1, int i2) {
-        org.lwjgl3.opengl.GL11.glEvalMesh1(mode, i1, i2);
+        org.lwjgl.opengl.GL11.glEvalMesh1(mode, i1, i2);
     }
 
     public static void glEvalMesh2(int mode, int i1, int i2, int j1, int j2) {
-        org.lwjgl3.opengl.GL11.glEvalMesh2(mode, i1, i2, j1, j2);
+        org.lwjgl.opengl.GL11.glEvalMesh2(mode, i1, i2, j1, j2);
     }
 
     public static void glEvalPoint1(int i) {
-        org.lwjgl3.opengl.GL11.glEvalPoint1(i);
+        org.lwjgl.opengl.GL11.glEvalPoint1(i);
     }
 
     public static void glEvalPoint2(int i, int j) {
-        org.lwjgl3.opengl.GL11.glEvalPoint2(i, j);
+        org.lwjgl.opengl.GL11.glEvalPoint2(i, j);
     }
 
     public static void glFeedbackBuffer(int type, java.nio.FloatBuffer buffer) {
-        org.lwjgl3.opengl.GL11.glFeedbackBuffer(type, buffer);
+        org.lwjgl.opengl.GL11.glFeedbackBuffer(type, buffer);
     }
 
     public static void glFinish() {
-        org.lwjgl3.opengl.GL11.glFinish();
+        org.lwjgl.opengl.GL11.glFinish();
     }
 
     public static void glFlush() {
-        org.lwjgl3.opengl.GL11.glFlush();
+        org.lwjgl.opengl.GL11.glFlush();
     }
 
     public static void glFog(int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.GL11.glFogfv(pname, params);
+        org.lwjgl.opengl.GL11.glFogfv(pname, params);
     }
 
     public static void glFog(int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL11.glFogiv(pname, params);
+        org.lwjgl.opengl.GL11.glFogiv(pname, params);
     }
 
     public static void glFogf(int pname, float param) {
-        org.lwjgl3.opengl.GL11.glFogf(pname, param);
+        org.lwjgl.opengl.GL11.glFogf(pname, param);
     }
 
     public static void glFogi(int pname, int param) {
-        org.lwjgl3.opengl.GL11.glFogi(pname, param);
+        org.lwjgl.opengl.GL11.glFogi(pname, param);
     }
 
     public static void glFrontFace(int mode) {
-        org.lwjgl3.opengl.GL11.glFrontFace(mode);
+        org.lwjgl.opengl.GL11.glFrontFace(mode);
     }
 
     public static void glFrustum(double left, double right, double bottom, double top, double zNear, double zFar) {
-        org.lwjgl3.opengl.GL11.glFrustum(left, right, bottom, top, zNear, zFar);
+        org.lwjgl.opengl.GL11.glFrustum(left, right, bottom, top, zNear, zFar);
     }
 
     public static int glGenLists(int range) {
-        return org.lwjgl3.opengl.GL11.glGenLists(range);
+        return org.lwjgl.opengl.GL11.glGenLists(range);
     }
 
     public static int glGenTextures() {
-        return org.lwjgl3.opengl.GL11.glGenTextures();
+        return org.lwjgl.opengl.GL11.glGenTextures();
     }
 
     public static void glGenTextures(java.nio.IntBuffer textures) {
-        org.lwjgl3.opengl.GL11.glGenTextures(textures);
+        org.lwjgl.opengl.GL11.glGenTextures(textures);
     }
 
     public static boolean glGetBoolean(int pname) {
-        return org.lwjgl3.opengl.GL11.glGetBoolean(pname);
+        return org.lwjgl.opengl.GL11.glGetBoolean(pname);
     }
 
     public static void glGetBoolean(int pname, java.nio.ByteBuffer params) {
-        org.lwjgl3.opengl.GL11.glGetBooleanv(pname, params);
+        org.lwjgl.opengl.GL11.glGetBooleanv(pname, params);
     }
 
     public static void glGetClipPlane(int plane, java.nio.DoubleBuffer equation) {
-        org.lwjgl3.opengl.GL11.glGetClipPlane(plane, equation);
+        org.lwjgl.opengl.GL11.glGetClipPlane(plane, equation);
     }
 
     public static double glGetDouble(int pname) {
-        return org.lwjgl3.opengl.GL11.glGetDouble(pname);
+        return org.lwjgl.opengl.GL11.glGetDouble(pname);
     }
 
     public static void glGetDouble(int pname, java.nio.DoubleBuffer params) {
-        org.lwjgl3.opengl.GL11.glGetDoublev(pname, params);
+        org.lwjgl.opengl.GL11.glGetDoublev(pname, params);
     }
 
     public static int glGetError() {
-        return org.lwjgl3.opengl.GL11.glGetError();
+        return org.lwjgl.opengl.GL11.glGetError();
     }
 
     public static float glGetFloat(int pname) {
-        return org.lwjgl3.opengl.GL11.glGetFloat(pname);
+        return org.lwjgl.opengl.GL11.glGetFloat(pname);
     }
 
     public static void glGetFloat(int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.GL11.glGetFloatv(pname, params);
+        org.lwjgl.opengl.GL11.glGetFloatv(pname, params);
     }
 
     public static int glGetInteger(int pname) {
-        return org.lwjgl3.opengl.GL11.glGetInteger(pname);
+        return org.lwjgl.opengl.GL11.glGetInteger(pname);
     }
 
     public static void glGetInteger(int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL11.glGetIntegerv(pname, params);
+        org.lwjgl.opengl.GL11.glGetIntegerv(pname, params);
     }
 
     public static void glGetLight(int light, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.GL11.glGetLightfv(light, pname, params);
+        org.lwjgl.opengl.GL11.glGetLightfv(light, pname, params);
     }
 
     public static void glGetLight(int light, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL11.glGetLightiv(light, pname, params);
+        org.lwjgl.opengl.GL11.glGetLightiv(light, pname, params);
     }
 
     public static void glGetMap(int target, int query, java.nio.DoubleBuffer v) {
-        org.lwjgl3.opengl.GL11.glGetMapdv(target, query, v);
+        org.lwjgl.opengl.GL11.glGetMapdv(target, query, v);
     }
 
     public static void glGetMap(int target, int query, java.nio.FloatBuffer v) {
-        org.lwjgl3.opengl.GL11.glGetMapfv(target, query, v);
+        org.lwjgl.opengl.GL11.glGetMapfv(target, query, v);
     }
 
     public static void glGetMap(int target, int query, java.nio.IntBuffer v) {
-        org.lwjgl3.opengl.GL11.glGetMapiv(target, query, v);
+        org.lwjgl.opengl.GL11.glGetMapiv(target, query, v);
     }
 
     public static void glGetMaterial(int face, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.GL11.glGetMaterialfv(face, pname, params);
+        org.lwjgl.opengl.GL11.glGetMaterialfv(face, pname, params);
     }
 
     public static void glGetMaterial(int face, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL11.glGetMaterialiv(face, pname, params);
+        org.lwjgl.opengl.GL11.glGetMaterialiv(face, pname, params);
     }
 
     public static void glGetPixelMap(int map, java.nio.FloatBuffer values) {
-        org.lwjgl3.opengl.GL11.glGetPixelMapfv(map, values);
+        org.lwjgl.opengl.GL11.glGetPixelMapfv(map, values);
     }
 
     public static void glGetPixelMapfv(int map, long values_buffer_offset) {
-        org.lwjgl3.opengl.GL11.glGetPixelMapfv(map, values_buffer_offset);
+        org.lwjgl.opengl.GL11.glGetPixelMapfv(map, values_buffer_offset);
     }
 
     public static void glGetPixelMapu(int map, java.nio.IntBuffer values) {
-        org.lwjgl3.opengl.GL11.glGetPixelMapuiv(map, values);
+        org.lwjgl.opengl.GL11.glGetPixelMapuiv(map, values);
     }
 
     public static void glGetPixelMapu(int map, java.nio.ShortBuffer values) {
-        org.lwjgl3.opengl.GL11.glGetPixelMapusv(map, values);
+        org.lwjgl.opengl.GL11.glGetPixelMapusv(map, values);
     }
 
     public static void glGetPixelMapuiv(int map, long values_buffer_offset) {
-        org.lwjgl3.opengl.GL11.glGetPixelMapuiv(map, values_buffer_offset);
+        org.lwjgl.opengl.GL11.glGetPixelMapuiv(map, values_buffer_offset);
     }
 
     public static void glGetPixelMapusv(int map, long values_buffer_offset) {
-        org.lwjgl3.opengl.GL11.glGetPixelMapusv(map, values_buffer_offset);
+        org.lwjgl.opengl.GL11.glGetPixelMapusv(map, values_buffer_offset);
     }
 
     public static void glGetPolygonStipple(long mask_buffer_offset) {
-        org.lwjgl3.opengl.GL11.glGetPolygonStipple(mask_buffer_offset);
+        org.lwjgl.opengl.GL11.glGetPolygonStipple(mask_buffer_offset);
     }
 
     public static void glGetPolygonStipple(java.nio.ByteBuffer mask) {
-        org.lwjgl3.opengl.GL11.glGetPolygonStipple(mask);
+        org.lwjgl.opengl.GL11.glGetPolygonStipple(mask);
     }
 
     public static java.lang.String glGetString(int name) {
-        return org.lwjgl3.opengl.GL11.glGetString(name);
+        return org.lwjgl.opengl.GL11.glGetString(name);
     }
 
     public static void glGetTexEnv(int coord, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.GL11.glGetTexEnvfv(coord, pname, params);
+        org.lwjgl.opengl.GL11.glGetTexEnvfv(coord, pname, params);
     }
 
     public static void glGetTexEnv(int coord, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL11.glGetTexEnviv(coord, pname, params);
+        org.lwjgl.opengl.GL11.glGetTexEnviv(coord, pname, params);
     }
 
     public static float glGetTexEnvf(int coord, int pname) {
-        return org.lwjgl3.opengl.GL11.glGetTexEnvf(coord, pname);
+        return org.lwjgl.opengl.GL11.glGetTexEnvf(coord, pname);
     }
 
     public static int glGetTexEnvi(int coord, int pname) {
-        return org.lwjgl3.opengl.GL11.glGetTexEnvi(coord, pname);
+        return org.lwjgl.opengl.GL11.glGetTexEnvi(coord, pname);
     }
 
     public static void glGetTexGen(int coord, int pname, java.nio.DoubleBuffer params) {
-        org.lwjgl3.opengl.GL11.glGetTexGendv(coord, pname, params);
+        org.lwjgl.opengl.GL11.glGetTexGendv(coord, pname, params);
     }
 
     public static void glGetTexGen(int coord, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.GL11.glGetTexGenfv(coord, pname, params);
+        org.lwjgl.opengl.GL11.glGetTexGenfv(coord, pname, params);
     }
 
     public static void glGetTexGen(int coord, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL11.glGetTexGeniv(coord, pname, params);
+        org.lwjgl.opengl.GL11.glGetTexGeniv(coord, pname, params);
     }
 
     public static double glGetTexGend(int coord, int pname) {
-        return org.lwjgl3.opengl.GL11.glGetTexGend(coord, pname);
+        return org.lwjgl.opengl.GL11.glGetTexGend(coord, pname);
     }
 
     public static float glGetTexGenf(int coord, int pname) {
-        return org.lwjgl3.opengl.GL11.glGetTexGenf(coord, pname);
+        return org.lwjgl.opengl.GL11.glGetTexGenf(coord, pname);
     }
 
     public static int glGetTexGeni(int coord, int pname) {
-        return org.lwjgl3.opengl.GL11.glGetTexGeni(coord, pname);
+        return org.lwjgl.opengl.GL11.glGetTexGeni(coord, pname);
     }
 
     public static void glGetTexImage(int target, int level, int format, int type, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.GL11.glGetTexImage(target, level, format, type, pixels_buffer_offset);
+        org.lwjgl.opengl.GL11.glGetTexImage(target, level, format, type, pixels_buffer_offset);
     }
 
     public static void glGetTexImage(int target, int level, int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glGetTexImage(target, level, format, type, pixels);
+        org.lwjgl.opengl.GL11.glGetTexImage(target, level, format, type, pixels);
     }
 
     public static void glGetTexImage(int target, int level, int format, int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glGetTexImage(target, level, format, type, pixels);
+        org.lwjgl.opengl.GL11.glGetTexImage(target, level, format, type, pixels);
     }
 
     public static void glGetTexImage(int target, int level, int format, int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glGetTexImage(target, level, format, type, pixels);
+        org.lwjgl.opengl.GL11.glGetTexImage(target, level, format, type, pixels);
     }
 
     public static void glGetTexImage(int target, int level, int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glGetTexImage(target, level, format, type, pixels);
+        org.lwjgl.opengl.GL11.glGetTexImage(target, level, format, type, pixels);
     }
 
     public static void glGetTexImage(int target, int level, int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glGetTexImage(target, level, format, type, pixels);
+        org.lwjgl.opengl.GL11.glGetTexImage(target, level, format, type, pixels);
     }
 
     public static void glGetTexLevelParameter(int target, int level, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.GL11.glGetTexLevelParameterfv(target, level, pname, params);
+        org.lwjgl.opengl.GL11.glGetTexLevelParameterfv(target, level, pname, params);
     }
 
     public static void glGetTexLevelParameter(int target, int level, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL11.glGetTexLevelParameteriv(target, level, pname, params);
+        org.lwjgl.opengl.GL11.glGetTexLevelParameteriv(target, level, pname, params);
     }
 
     public static float glGetTexLevelParameterf(int target, int level, int pname) {
-        return org.lwjgl3.opengl.GL11.glGetTexLevelParameterf(target, level, pname);
+        return org.lwjgl.opengl.GL11.glGetTexLevelParameterf(target, level, pname);
     }
 
     public static int glGetTexLevelParameteri(int target, int level, int pname) {
-        return org.lwjgl3.opengl.GL11.glGetTexLevelParameteri(target, level, pname);
+        return org.lwjgl.opengl.GL11.glGetTexLevelParameteri(target, level, pname);
     }
 
     public static void glGetTexParameter(int target, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.GL11.glGetTexParameterfv(target, pname, params);
+        org.lwjgl.opengl.GL11.glGetTexParameterfv(target, pname, params);
     }
 
     public static void glGetTexParameter(int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL11.glGetTexParameteriv(target, pname, params);
+        org.lwjgl.opengl.GL11.glGetTexParameteriv(target, pname, params);
     }
 
     public static float glGetTexParameterf(int target, int pname) {
-        return org.lwjgl3.opengl.GL11.glGetTexParameterf(target, pname);
+        return org.lwjgl.opengl.GL11.glGetTexParameterf(target, pname);
     }
 
     public static int glGetTexParameteri(int target, int pname) {
-        return org.lwjgl3.opengl.GL11.glGetTexParameteri(target, pname);
+        return org.lwjgl.opengl.GL11.glGetTexParameteri(target, pname);
     }
 
     public static void glHint(int target, int mode) {
-        org.lwjgl3.opengl.GL11.glHint(target, mode);
+        org.lwjgl.opengl.GL11.glHint(target, mode);
     }
 
     public static void glInitNames() {
-        org.lwjgl3.opengl.GL11.glInitNames();
+        org.lwjgl.opengl.GL11.glInitNames();
     }
 
     public static void glInterleavedArrays(int format, int stride, long pointer_buffer_offset) {
-        org.lwjgl3.opengl.GL11.glInterleavedArrays(format, stride, pointer_buffer_offset);
+        org.lwjgl.opengl.GL11.glInterleavedArrays(format, stride, pointer_buffer_offset);
     }
 
     public static void glInterleavedArrays(int format, int stride, java.nio.ByteBuffer pointer) {
-        org.lwjgl3.opengl.GL11.glInterleavedArrays(format, stride, pointer);
+        org.lwjgl.opengl.GL11.glInterleavedArrays(format, stride, pointer);
     }
 
     public static void glInterleavedArrays(int format, int stride, java.nio.DoubleBuffer pointer) {
-        org.lwjgl3.opengl.GL11.glInterleavedArrays(format, stride, pointer);
+        org.lwjgl.opengl.GL11.glInterleavedArrays(format, stride, pointer);
     }
 
     public static void glInterleavedArrays(int format, int stride, java.nio.FloatBuffer pointer) {
-        org.lwjgl3.opengl.GL11.glInterleavedArrays(format, stride, pointer);
+        org.lwjgl.opengl.GL11.glInterleavedArrays(format, stride, pointer);
     }
 
     public static void glInterleavedArrays(int format, int stride, java.nio.IntBuffer pointer) {
-        org.lwjgl3.opengl.GL11.glInterleavedArrays(format, stride, pointer);
+        org.lwjgl.opengl.GL11.glInterleavedArrays(format, stride, pointer);
     }
 
     public static void glInterleavedArrays(int format, int stride, java.nio.ShortBuffer pointer) {
-        org.lwjgl3.opengl.GL11.glInterleavedArrays(format, stride, pointer);
+        org.lwjgl.opengl.GL11.glInterleavedArrays(format, stride, pointer);
     }
 
     public static boolean glIsEnabled(int cap) {
-        return org.lwjgl3.opengl.GL11.glIsEnabled(cap);
+        return org.lwjgl.opengl.GL11.glIsEnabled(cap);
     }
 
     public static boolean glIsList(int list) {
-        return org.lwjgl3.opengl.GL11.glIsList(list);
+        return org.lwjgl.opengl.GL11.glIsList(list);
     }
 
     public static boolean glIsTexture(int texture) {
-        return org.lwjgl3.opengl.GL11.glIsTexture(texture);
+        return org.lwjgl.opengl.GL11.glIsTexture(texture);
     }
 
     public static void glLight(int light, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.GL11.glLightfv(light, pname, params);
+        org.lwjgl.opengl.GL11.glLightfv(light, pname, params);
     }
 
     public static void glLight(int light, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL11.glLightiv(light, pname, params);
+        org.lwjgl.opengl.GL11.glLightiv(light, pname, params);
     }
 
     public static void glLightModel(int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.GL11.glLightModelfv(pname, params);
+        org.lwjgl.opengl.GL11.glLightModelfv(pname, params);
     }
 
     public static void glLightModel(int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL11.glLightModeliv(pname, params);
+        org.lwjgl.opengl.GL11.glLightModeliv(pname, params);
     }
 
     public static void glLightModelf(int pname, float param) {
-        org.lwjgl3.opengl.GL11.glLightModelf(pname, param);
+        org.lwjgl.opengl.GL11.glLightModelf(pname, param);
     }
 
     public static void glLightModeli(int pname, int param) {
-        org.lwjgl3.opengl.GL11.glLightModeli(pname, param);
+        org.lwjgl.opengl.GL11.glLightModeli(pname, param);
     }
 
     public static void glLightf(int light, int pname, float param) {
-        org.lwjgl3.opengl.GL11.glLightf(light, pname, param);
+        org.lwjgl.opengl.GL11.glLightf(light, pname, param);
     }
 
     public static void glLighti(int light, int pname, int param) {
-        org.lwjgl3.opengl.GL11.glLighti(light, pname, param);
+        org.lwjgl.opengl.GL11.glLighti(light, pname, param);
     }
 
     public static void glLineStipple(int factor, short pattern) {
-        org.lwjgl3.opengl.GL11.glLineStipple(factor, pattern);
+        org.lwjgl.opengl.GL11.glLineStipple(factor, pattern);
     }
 
     public static void glLineWidth(float width) {
-        org.lwjgl3.opengl.GL11.glLineWidth(width);
+        org.lwjgl.opengl.GL11.glLineWidth(width);
     }
 
     public static void glListBase(int base) {
-        org.lwjgl3.opengl.GL11.glListBase(base);
+        org.lwjgl.opengl.GL11.glListBase(base);
     }
 
     public static void glLoadIdentity() {
-        org.lwjgl3.opengl.GL11.glLoadIdentity();
+        org.lwjgl.opengl.GL11.glLoadIdentity();
     }
 
     public static void glLoadMatrix(java.nio.DoubleBuffer m) {
-        org.lwjgl3.opengl.GL11.glLoadMatrixd(m);
+        org.lwjgl.opengl.GL11.glLoadMatrixd(m);
     }
 
     public static void glLoadMatrix(java.nio.FloatBuffer m) {
-        org.lwjgl3.opengl.GL11.glLoadMatrixf(m);
+        org.lwjgl.opengl.GL11.glLoadMatrixf(m);
     }
 
     public static void glLoadName(int name) {
-        org.lwjgl3.opengl.GL11.glLoadName(name);
+        org.lwjgl.opengl.GL11.glLoadName(name);
     }
 
     public static void glLogicOp(int opcode) {
-        org.lwjgl3.opengl.GL11.glLogicOp(opcode);
+        org.lwjgl.opengl.GL11.glLogicOp(opcode);
     }
 
     public static void glMap1d(int target, double u1, double u2, int stride, int order, java.nio.DoubleBuffer points) {
-        org.lwjgl3.opengl.GL11.glMap1d(target, u1, u2, stride, order, points);
+        org.lwjgl.opengl.GL11.glMap1d(target, u1, u2, stride, order, points);
     }
 
     public static void glMap1f(int target, float u1, float u2, int stride, int order, java.nio.FloatBuffer points) {
-        org.lwjgl3.opengl.GL11.glMap1f(target, u1, u2, stride, order, points);
+        org.lwjgl.opengl.GL11.glMap1f(target, u1, u2, stride, order, points);
     }
 
     public static void glMap2d(int target, double u1, double u2, int ustride, int uorder, double v1, double v2,
             int vstride, int vorder, java.nio.DoubleBuffer points) {
-        org.lwjgl3.opengl.GL11.glMap2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+        org.lwjgl.opengl.GL11.glMap2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
     }
 
     public static void glMap2f(int target, float u1, float u2, int ustride, int uorder, float v1, float v2, int vstride,
             int vorder, java.nio.FloatBuffer points) {
-        org.lwjgl3.opengl.GL11.glMap2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+        org.lwjgl.opengl.GL11.glMap2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
     }
 
     public static void glMapGrid1d(int un, double u1, double u2) {
-        org.lwjgl3.opengl.GL11.glMapGrid1d(un, u1, u2);
+        org.lwjgl.opengl.GL11.glMapGrid1d(un, u1, u2);
     }
 
     public static void glMapGrid1f(int un, float u1, float u2) {
-        org.lwjgl3.opengl.GL11.glMapGrid1f(un, u1, u2);
+        org.lwjgl.opengl.GL11.glMapGrid1f(un, u1, u2);
     }
 
     public static void glMapGrid2d(int un, double u1, double u2, int vn, double v1, double v2) {
-        org.lwjgl3.opengl.GL11.glMapGrid2d(un, u1, u2, vn, v1, v2);
+        org.lwjgl.opengl.GL11.glMapGrid2d(un, u1, u2, vn, v1, v2);
     }
 
     public static void glMapGrid2f(int un, float u1, float u2, int vn, float v1, float v2) {
-        org.lwjgl3.opengl.GL11.glMapGrid2f(un, u1, u2, vn, v1, v2);
+        org.lwjgl.opengl.GL11.glMapGrid2f(un, u1, u2, vn, v1, v2);
     }
 
     public static void glMaterial(int face, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.GL11.glMaterialfv(face, pname, params);
+        org.lwjgl.opengl.GL11.glMaterialfv(face, pname, params);
     }
 
     public static void glMaterial(int face, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL11.glMaterialiv(face, pname, params);
+        org.lwjgl.opengl.GL11.glMaterialiv(face, pname, params);
     }
 
     public static void glMaterialf(int face, int pname, float param) {
-        org.lwjgl3.opengl.GL11.glMaterialf(face, pname, param);
+        org.lwjgl.opengl.GL11.glMaterialf(face, pname, param);
     }
 
     public static void glMateriali(int face, int pname, int param) {
-        org.lwjgl3.opengl.GL11.glMateriali(face, pname, param);
+        org.lwjgl.opengl.GL11.glMateriali(face, pname, param);
     }
 
     public static void glMatrixMode(int mode) {
-        org.lwjgl3.opengl.GL11.glMatrixMode(mode);
+        org.lwjgl.opengl.GL11.glMatrixMode(mode);
     }
 
     public static void glMultMatrix(java.nio.DoubleBuffer m) {
-        org.lwjgl3.opengl.GL11.glMultMatrixd(m);
+        org.lwjgl.opengl.GL11.glMultMatrixd(m);
     }
 
     public static void glMultMatrix(java.nio.FloatBuffer m) {
-        org.lwjgl3.opengl.GL11.glMultMatrixf(m);
+        org.lwjgl.opengl.GL11.glMultMatrixf(m);
     }
 
     public static void glNewList(int list, int mode) {
-        org.lwjgl3.opengl.GL11.glNewList(list, mode);
+        org.lwjgl.opengl.GL11.glNewList(list, mode);
     }
 
     public static void glNormal3b(byte nx, byte ny, byte nz) {
-        org.lwjgl3.opengl.GL11.glNormal3b(nx, ny, nz);
+        org.lwjgl.opengl.GL11.glNormal3b(nx, ny, nz);
     }
 
     public static void glNormal3d(double nx, double ny, double nz) {
-        org.lwjgl3.opengl.GL11.glNormal3d(nx, ny, nz);
+        org.lwjgl.opengl.GL11.glNormal3d(nx, ny, nz);
     }
 
     public static void glNormal3f(float nx, float ny, float nz) {
-        org.lwjgl3.opengl.GL11.glNormal3f(nx, ny, nz);
+        org.lwjgl.opengl.GL11.glNormal3f(nx, ny, nz);
     }
 
     public static void glNormal3i(int nx, int ny, int nz) {
-        org.lwjgl3.opengl.GL11.glNormal3i(nx, ny, nz);
+        org.lwjgl.opengl.GL11.glNormal3i(nx, ny, nz);
     }
 
     public static void glNormalPointer(int type, int stride, long pointer_buffer_offset) {
-        org.lwjgl3.opengl.GL11.glNormalPointer(type, stride, pointer_buffer_offset);
+        org.lwjgl.opengl.GL11.glNormalPointer(type, stride, pointer_buffer_offset);
     }
 
     public static void glNormalPointer(int type, int stride, java.nio.ByteBuffer pointer) {
-        org.lwjgl3.opengl.GL11.glNormalPointer(type, stride, pointer);
+        org.lwjgl.opengl.GL11.glNormalPointer(type, stride, pointer);
     }
 
     public static void glNormalPointer(int stride, java.nio.ByteBuffer pointer) {
 
-        org.lwjgl3.opengl.GL11.glNormalPointer(org.lwjgl3.opengl.GL11.GL_BYTE, stride, pointer);
+        org.lwjgl.opengl.GL11.glNormalPointer(org.lwjgl.opengl.GL11.GL_BYTE, stride, pointer);
     }
 
     public static void glNormalPointer(int stride, java.nio.DoubleBuffer pointer) {
 
-        org.lwjgl3.opengl.GL11.glNormalPointer(
-                org.lwjgl3.opengl.GL11.GL_DOUBLE,
+        org.lwjgl.opengl.GL11.glNormalPointer(
+                org.lwjgl.opengl.GL11.GL_DOUBLE,
                 stride,
                 BufferCasts.toByteBuffer(pointer));
     }
 
     public static void glNormalPointer(int stride, java.nio.FloatBuffer pointer) {
 
-        org.lwjgl3.opengl.GL11.glNormalPointer(org.lwjgl3.opengl.GL11.GL_FLOAT, stride, pointer);
+        org.lwjgl.opengl.GL11.glNormalPointer(org.lwjgl.opengl.GL11.GL_FLOAT, stride, pointer);
     }
 
     public static void glNormalPointer(int stride, java.nio.IntBuffer pointer) {
 
-        org.lwjgl3.opengl.GL11.glNormalPointer(org.lwjgl3.opengl.GL11.GL_INT, stride, pointer);
+        org.lwjgl.opengl.GL11.glNormalPointer(org.lwjgl.opengl.GL11.GL_INT, stride, pointer);
     }
 
     public static void glOrtho(double left, double right, double bottom, double top, double zNear, double zFar) {
-        org.lwjgl3.opengl.GL11.glOrtho(left, right, bottom, top, zNear, zFar);
+        org.lwjgl.opengl.GL11.glOrtho(left, right, bottom, top, zNear, zFar);
     }
 
     public static void glPassThrough(float token) {
-        org.lwjgl3.opengl.GL11.glPassThrough(token);
+        org.lwjgl.opengl.GL11.glPassThrough(token);
     }
 
     public static void glPixelMap(int map, java.nio.FloatBuffer values) {
-        org.lwjgl3.opengl.GL11.glPixelMapfv(map, values);
+        org.lwjgl.opengl.GL11.glPixelMapfv(map, values);
     }
 
     public static void glPixelMapfv(int map, int values_mapsize, long values_buffer_offset) {
-        org.lwjgl3.opengl.GL11.glPixelMapfv(map, values_mapsize, values_buffer_offset);
+        org.lwjgl.opengl.GL11.glPixelMapfv(map, values_mapsize, values_buffer_offset);
     }
 
     public static void glPixelMapu(int map, java.nio.IntBuffer values) {
-        org.lwjgl3.opengl.GL11.glPixelMapuiv(map, values);
+        org.lwjgl.opengl.GL11.glPixelMapuiv(map, values);
     }
 
     public static void glPixelMapu(int map, java.nio.ShortBuffer values) {
-        org.lwjgl3.opengl.GL11.glPixelMapusv(map, values);
+        org.lwjgl.opengl.GL11.glPixelMapusv(map, values);
     }
 
     public static void glPixelMapuiv(int map, int values_mapsize, long values_buffer_offset) {
-        org.lwjgl3.opengl.GL11.glPixelMapuiv(map, values_mapsize, values_buffer_offset);
+        org.lwjgl.opengl.GL11.glPixelMapuiv(map, values_mapsize, values_buffer_offset);
     }
 
     public static void glPixelMapusv(int map, int values_mapsize, long values_buffer_offset) {
-        org.lwjgl3.opengl.GL11.glPixelMapusv(map, values_mapsize, values_buffer_offset);
+        org.lwjgl.opengl.GL11.glPixelMapusv(map, values_mapsize, values_buffer_offset);
     }
 
     public static void glPixelStoref(int pname, float param) {
-        org.lwjgl3.opengl.GL11.glPixelStoref(pname, param);
+        org.lwjgl.opengl.GL11.glPixelStoref(pname, param);
     }
 
     public static void glPixelStorei(int pname, int param) {
-        org.lwjgl3.opengl.GL11.glPixelStorei(pname, param);
+        org.lwjgl.opengl.GL11.glPixelStorei(pname, param);
     }
 
     public static void glPixelTransferf(int pname, float param) {
-        org.lwjgl3.opengl.GL11.glPixelTransferf(pname, param);
+        org.lwjgl.opengl.GL11.glPixelTransferf(pname, param);
     }
 
     public static void glPixelTransferi(int pname, int param) {
-        org.lwjgl3.opengl.GL11.glPixelTransferi(pname, param);
+        org.lwjgl.opengl.GL11.glPixelTransferi(pname, param);
     }
 
     public static void glPixelZoom(float xfactor, float yfactor) {
-        org.lwjgl3.opengl.GL11.glPixelZoom(xfactor, yfactor);
+        org.lwjgl.opengl.GL11.glPixelZoom(xfactor, yfactor);
     }
 
     public static void glPointSize(float size) {
-        org.lwjgl3.opengl.GL11.glPointSize(size);
+        org.lwjgl.opengl.GL11.glPointSize(size);
     }
 
     public static void glPolygonMode(int face, int mode) {
-        org.lwjgl3.opengl.GL11.glPolygonMode(face, mode);
+        org.lwjgl.opengl.GL11.glPolygonMode(face, mode);
     }
 
     public static void glPolygonOffset(float factor, float units) {
-        org.lwjgl3.opengl.GL11.glPolygonOffset(factor, units);
+        org.lwjgl.opengl.GL11.glPolygonOffset(factor, units);
     }
 
     public static void glPolygonStipple(long mask_buffer_offset) {
-        org.lwjgl3.opengl.GL11.glPolygonStipple(mask_buffer_offset);
+        org.lwjgl.opengl.GL11.glPolygonStipple(mask_buffer_offset);
     }
 
     public static void glPolygonStipple(java.nio.ByteBuffer mask) {
-        org.lwjgl3.opengl.GL11.glPolygonStipple(mask);
+        org.lwjgl.opengl.GL11.glPolygonStipple(mask);
     }
 
     public static void glPopAttrib() {
-        org.lwjgl3.opengl.GL11.glPopAttrib();
+        org.lwjgl.opengl.GL11.glPopAttrib();
     }
 
     public static void glPopClientAttrib() {
-        org.lwjgl3.opengl.GL11.glPopClientAttrib();
+        org.lwjgl.opengl.GL11.glPopClientAttrib();
     }
 
     public static void glPopMatrix() {
-        org.lwjgl3.opengl.GL11.glPopMatrix();
+        org.lwjgl.opengl.GL11.glPopMatrix();
     }
 
     public static void glPopName() {
-        org.lwjgl3.opengl.GL11.glPopName();
+        org.lwjgl.opengl.GL11.glPopName();
     }
 
     public static void glPrioritizeTextures(java.nio.IntBuffer textures, java.nio.FloatBuffer priorities) {
-        org.lwjgl3.opengl.GL11.glPrioritizeTextures(textures, priorities);
+        org.lwjgl.opengl.GL11.glPrioritizeTextures(textures, priorities);
     }
 
     public static void glPushAttrib(int mask) {
-        org.lwjgl3.opengl.GL11.glPushAttrib(mask);
+        org.lwjgl.opengl.GL11.glPushAttrib(mask);
     }
 
     public static void glPushClientAttrib(int mask) {
-        org.lwjgl3.opengl.GL11.glPushClientAttrib(mask);
+        org.lwjgl.opengl.GL11.glPushClientAttrib(mask);
     }
 
     public static void glPushMatrix() {
-        org.lwjgl3.opengl.GL11.glPushMatrix();
+        org.lwjgl.opengl.GL11.glPushMatrix();
     }
 
     public static void glPushName(int name) {
-        org.lwjgl3.opengl.GL11.glPushName(name);
+        org.lwjgl.opengl.GL11.glPushName(name);
     }
 
     public static void glRasterPos2d(double x, double y) {
-        org.lwjgl3.opengl.GL11.glRasterPos2d(x, y);
+        org.lwjgl.opengl.GL11.glRasterPos2d(x, y);
     }
 
     public static void glRasterPos2f(float x, float y) {
-        org.lwjgl3.opengl.GL11.glRasterPos2f(x, y);
+        org.lwjgl.opengl.GL11.glRasterPos2f(x, y);
     }
 
     public static void glRasterPos2i(int x, int y) {
-        org.lwjgl3.opengl.GL11.glRasterPos2i(x, y);
+        org.lwjgl.opengl.GL11.glRasterPos2i(x, y);
     }
 
     public static void glRasterPos3d(double x, double y, double z) {
-        org.lwjgl3.opengl.GL11.glRasterPos3d(x, y, z);
+        org.lwjgl.opengl.GL11.glRasterPos3d(x, y, z);
     }
 
     public static void glRasterPos3f(float x, float y, float z) {
-        org.lwjgl3.opengl.GL11.glRasterPos3f(x, y, z);
+        org.lwjgl.opengl.GL11.glRasterPos3f(x, y, z);
     }
 
     public static void glRasterPos3i(int x, int y, int z) {
-        org.lwjgl3.opengl.GL11.glRasterPos3i(x, y, z);
+        org.lwjgl.opengl.GL11.glRasterPos3i(x, y, z);
     }
 
     public static void glRasterPos4d(double x, double y, double z, double w) {
-        org.lwjgl3.opengl.GL11.glRasterPos4d(x, y, z, w);
+        org.lwjgl.opengl.GL11.glRasterPos4d(x, y, z, w);
     }
 
     public static void glRasterPos4f(float x, float y, float z, float w) {
-        org.lwjgl3.opengl.GL11.glRasterPos4f(x, y, z, w);
+        org.lwjgl.opengl.GL11.glRasterPos4f(x, y, z, w);
     }
 
     public static void glRasterPos4i(int x, int y, int z, int w) {
-        org.lwjgl3.opengl.GL11.glRasterPos4i(x, y, z, w);
+        org.lwjgl.opengl.GL11.glRasterPos4i(x, y, z, w);
     }
 
     public static void glReadBuffer(int mode) {
-        org.lwjgl3.opengl.GL11.glReadBuffer(mode);
+        org.lwjgl.opengl.GL11.glReadBuffer(mode);
     }
 
     public static void glReadPixels(int x, int y, int width, int height, int format, int type,
             long pixels_buffer_offset) {
-        org.lwjgl3.opengl.GL11.glReadPixels(x, y, width, height, format, type, pixels_buffer_offset);
+        org.lwjgl.opengl.GL11.glReadPixels(x, y, width, height, format, type, pixels_buffer_offset);
     }
 
     public static void glReadPixels(int x, int y, int width, int height, int format, int type,
             java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glReadPixels(x, y, width, height, format, type, pixels);
+        org.lwjgl.opengl.GL11.glReadPixels(x, y, width, height, format, type, pixels);
     }
 
     public static void glReadPixels(int x, int y, int width, int height, int format, int type,
             java.nio.DoubleBuffer pixels) {
 
-        org.lwjgl3.opengl.GL11.glReadPixels(x, y, width, height, format, type, org.lwjgl.MemoryUtil.getAddress(pixels));
+        org.lwjgl.opengl.GL11.glReadPixels(x, y, width, height, format, type, MemoryUtil.getAddress(pixels));
     }
 
     public static void glReadPixels(int x, int y, int width, int height, int format, int type,
             java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glReadPixels(x, y, width, height, format, type, pixels);
+        org.lwjgl.opengl.GL11.glReadPixels(x, y, width, height, format, type, pixels);
     }
 
     public static void glReadPixels(int x, int y, int width, int height, int format, int type,
             java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glReadPixels(x, y, width, height, format, type, pixels);
+        org.lwjgl.opengl.GL11.glReadPixels(x, y, width, height, format, type, pixels);
     }
 
     public static void glReadPixels(int x, int y, int width, int height, int format, int type,
             java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glReadPixels(x, y, width, height, format, type, pixels);
+        org.lwjgl.opengl.GL11.glReadPixels(x, y, width, height, format, type, pixels);
     }
 
     public static void glRectd(double x1, double y1, double x2, double y2) {
-        org.lwjgl3.opengl.GL11.glRectd(x1, y1, x2, y2);
+        org.lwjgl.opengl.GL11.glRectd(x1, y1, x2, y2);
     }
 
     public static void glRectf(float x1, float y1, float x2, float y2) {
-        org.lwjgl3.opengl.GL11.glRectf(x1, y1, x2, y2);
+        org.lwjgl.opengl.GL11.glRectf(x1, y1, x2, y2);
     }
 
     public static void glRecti(int x1, int y1, int x2, int y2) {
-        org.lwjgl3.opengl.GL11.glRecti(x1, y1, x2, y2);
+        org.lwjgl.opengl.GL11.glRecti(x1, y1, x2, y2);
     }
 
     public static int glRenderMode(int mode) {
-        return org.lwjgl3.opengl.GL11.glRenderMode(mode);
+        return org.lwjgl.opengl.GL11.glRenderMode(mode);
     }
 
     public static void glRotated(double angle, double x, double y, double z) {
-        org.lwjgl3.opengl.GL11.glRotated(angle, x, y, z);
+        org.lwjgl.opengl.GL11.glRotated(angle, x, y, z);
     }
 
     public static void glRotatef(float angle, float x, float y, float z) {
-        org.lwjgl3.opengl.GL11.glRotatef(angle, x, y, z);
+        org.lwjgl.opengl.GL11.glRotatef(angle, x, y, z);
     }
 
     public static void glScaled(double x, double y, double z) {
-        org.lwjgl3.opengl.GL11.glScaled(x, y, z);
+        org.lwjgl.opengl.GL11.glScaled(x, y, z);
     }
 
     public static void glScalef(float x, float y, float z) {
-        org.lwjgl3.opengl.GL11.glScalef(x, y, z);
+        org.lwjgl.opengl.GL11.glScalef(x, y, z);
     }
 
     public static void glScissor(int x, int y, int width, int height) {
-        org.lwjgl3.opengl.GL11.glScissor(x, y, width, height);
+        org.lwjgl.opengl.GL11.glScissor(x, y, width, height);
     }
 
     public static void glSelectBuffer(java.nio.IntBuffer buffer) {
-        org.lwjgl3.opengl.GL11.glSelectBuffer(buffer);
+        org.lwjgl.opengl.GL11.glSelectBuffer(buffer);
     }
 
     public static void glShadeModel(int mode) {
-        org.lwjgl3.opengl.GL11.glShadeModel(mode);
+        org.lwjgl.opengl.GL11.glShadeModel(mode);
     }
 
     public static void glStencilFunc(int func, int ref, int mask) {
-        org.lwjgl3.opengl.GL11.glStencilFunc(func, ref, mask);
+        org.lwjgl.opengl.GL11.glStencilFunc(func, ref, mask);
     }
 
     public static void glStencilMask(int mask) {
-        org.lwjgl3.opengl.GL11.glStencilMask(mask);
+        org.lwjgl.opengl.GL11.glStencilMask(mask);
     }
 
     public static void glStencilOp(int fail, int zfail, int zpass) {
-        org.lwjgl3.opengl.GL11.glStencilOp(fail, zfail, zpass);
+        org.lwjgl.opengl.GL11.glStencilOp(fail, zfail, zpass);
     }
 
     public static void glTexCoord1d(double s) {
-        org.lwjgl3.opengl.GL11.glTexCoord1d(s);
+        org.lwjgl.opengl.GL11.glTexCoord1d(s);
     }
 
     public static void glTexCoord1f(float s) {
-        org.lwjgl3.opengl.GL11.glTexCoord1f(s);
+        org.lwjgl.opengl.GL11.glTexCoord1f(s);
     }
 
     public static void glTexCoord2d(double s, double t) {
-        org.lwjgl3.opengl.GL11.glTexCoord2d(s, t);
+        org.lwjgl.opengl.GL11.glTexCoord2d(s, t);
     }
 
     public static void glTexCoord2f(float s, float t) {
-        org.lwjgl3.opengl.GL11.glTexCoord2f(s, t);
+        org.lwjgl.opengl.GL11.glTexCoord2f(s, t);
     }
 
     public static void glTexCoord3d(double s, double t, double r) {
-        org.lwjgl3.opengl.GL11.glTexCoord3d(s, t, r);
+        org.lwjgl.opengl.GL11.glTexCoord3d(s, t, r);
     }
 
     public static void glTexCoord3f(float s, float t, float r) {
-        org.lwjgl3.opengl.GL11.glTexCoord3f(s, t, r);
+        org.lwjgl.opengl.GL11.glTexCoord3f(s, t, r);
     }
 
     public static void glTexCoord4d(double s, double t, double r, double q) {
-        org.lwjgl3.opengl.GL11.glTexCoord4d(s, t, r, q);
+        org.lwjgl.opengl.GL11.glTexCoord4d(s, t, r, q);
     }
 
     public static void glTexCoord4f(float s, float t, float r, float q) {
-        org.lwjgl3.opengl.GL11.glTexCoord4f(s, t, r, q);
+        org.lwjgl.opengl.GL11.glTexCoord4f(s, t, r, q);
     }
 
     public static void glTexCoordPointer(int size, int type, int stride, long pointer_buffer_offset) {
-        org.lwjgl3.opengl.GL11.glTexCoordPointer(size, type, stride, pointer_buffer_offset);
+        org.lwjgl.opengl.GL11.glTexCoordPointer(size, type, stride, pointer_buffer_offset);
     }
 
     public static void glTexCoordPointer(int size, int type, int stride, java.nio.ByteBuffer pointer) {
-        org.lwjgl3.opengl.GL11.glTexCoordPointer(size, type, stride, pointer);
+        org.lwjgl.opengl.GL11.glTexCoordPointer(size, type, stride, pointer);
     }
 
     public static void glTexCoordPointer(int size, int stride, java.nio.DoubleBuffer pointer) {
 
-        org.lwjgl3.opengl.GL11.glTexCoordPointer(
+        org.lwjgl.opengl.GL11.glTexCoordPointer(
                 size,
-                org.lwjgl3.opengl.GL11.GL_DOUBLE,
+                org.lwjgl.opengl.GL11.GL_DOUBLE,
                 stride,
                 BufferCasts.toByteBuffer(pointer));
     }
 
     public static void glTexCoordPointer(int size, int stride, java.nio.FloatBuffer pointer) {
 
-        org.lwjgl3.opengl.GL11.glTexCoordPointer(size, org.lwjgl3.opengl.GL11.GL_FLOAT, stride, pointer);
+        org.lwjgl.opengl.GL11.glTexCoordPointer(size, org.lwjgl.opengl.GL11.GL_FLOAT, stride, pointer);
     }
 
     public static void glTexCoordPointer(int size, int stride, java.nio.IntBuffer pointer) {
 
-        org.lwjgl3.opengl.GL11.glTexCoordPointer(size, org.lwjgl3.opengl.GL11.GL_INT, stride, pointer);
+        org.lwjgl.opengl.GL11.glTexCoordPointer(size, org.lwjgl.opengl.GL11.GL_INT, stride, pointer);
     }
 
     public static void glTexCoordPointer(int size, int stride, java.nio.ShortBuffer pointer) {
 
-        org.lwjgl3.opengl.GL11.glTexCoordPointer(size, org.lwjgl3.opengl.GL11.GL_SHORT, stride, pointer);
+        org.lwjgl.opengl.GL11.glTexCoordPointer(size, org.lwjgl.opengl.GL11.GL_SHORT, stride, pointer);
     }
 
     public static void glTexEnv(int target, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.GL11.glTexEnvfv(target, pname, params);
+        org.lwjgl.opengl.GL11.glTexEnvfv(target, pname, params);
     }
 
     public static void glTexEnv(int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL11.glTexEnviv(target, pname, params);
+        org.lwjgl.opengl.GL11.glTexEnviv(target, pname, params);
     }
 
     public static void glTexEnvf(int target, int pname, float param) {
-        org.lwjgl3.opengl.GL11.glTexEnvf(target, pname, param);
+        org.lwjgl.opengl.GL11.glTexEnvf(target, pname, param);
     }
 
     public static void glTexEnvi(int target, int pname, int param) {
-        org.lwjgl3.opengl.GL11.glTexEnvi(target, pname, param);
+        org.lwjgl.opengl.GL11.glTexEnvi(target, pname, param);
     }
 
     public static void glTexGen(int coord, int pname, java.nio.DoubleBuffer params) {
-        org.lwjgl3.opengl.GL11.glTexGendv(coord, pname, params);
+        org.lwjgl.opengl.GL11.glTexGendv(coord, pname, params);
     }
 
     public static void glTexGen(int coord, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.GL11.glTexGenfv(coord, pname, params);
+        org.lwjgl.opengl.GL11.glTexGenfv(coord, pname, params);
     }
 
     public static void glTexGen(int coord, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL11.glTexGeniv(coord, pname, params);
+        org.lwjgl.opengl.GL11.glTexGeniv(coord, pname, params);
     }
 
     public static void glTexGend(int coord, int pname, double param) {
-        org.lwjgl3.opengl.GL11.glTexGend(coord, pname, param);
+        org.lwjgl.opengl.GL11.glTexGend(coord, pname, param);
     }
 
     public static void glTexGenf(int coord, int pname, float param) {
-        org.lwjgl3.opengl.GL11.glTexGenf(coord, pname, param);
+        org.lwjgl.opengl.GL11.glTexGenf(coord, pname, param);
     }
 
     public static void glTexGeni(int coord, int pname, int param) {
-        org.lwjgl3.opengl.GL11.glTexGeni(coord, pname, param);
+        org.lwjgl.opengl.GL11.glTexGeni(coord, pname, param);
     }
 
     public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format,
             int type, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.GL11
+        org.lwjgl.opengl.GL11
                 .glTexImage1D(target, level, internalformat, width, border, format, type, pixels_buffer_offset);
     }
 
     public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format,
             int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glTexImage1D(target, level, internalformat, width, border, format, type, pixels);
+        org.lwjgl.opengl.GL11.glTexImage1D(target, level, internalformat, width, border, format, type, pixels);
     }
 
     public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format,
             int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glTexImage1D(target, level, internalformat, width, border, format, type, pixels);
+        org.lwjgl.opengl.GL11.glTexImage1D(target, level, internalformat, width, border, format, type, pixels);
     }
 
     public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format,
             int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glTexImage1D(target, level, internalformat, width, border, format, type, pixels);
+        org.lwjgl.opengl.GL11.glTexImage1D(target, level, internalformat, width, border, format, type, pixels);
     }
 
     public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format,
             int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glTexImage1D(target, level, internalformat, width, border, format, type, pixels);
+        org.lwjgl.opengl.GL11.glTexImage1D(target, level, internalformat, width, border, format, type, pixels);
     }
 
     public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format,
             int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glTexImage1D(target, level, internalformat, width, border, format, type, pixels);
+        org.lwjgl.opengl.GL11.glTexImage1D(target, level, internalformat, width, border, format, type, pixels);
     }
 
     public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border,
             int format, int type, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.GL11
+        org.lwjgl.opengl.GL11
                 .glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels_buffer_offset);
     }
 
     public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border,
             int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+        org.lwjgl.opengl.GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
     }
 
     public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border,
             int format, int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+        org.lwjgl.opengl.GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
     }
 
     public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border,
             int format, int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+        org.lwjgl.opengl.GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
     }
 
     public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border,
             int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+        org.lwjgl.opengl.GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
     }
 
     public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border,
             int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+        org.lwjgl.opengl.GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
     }
 
     public static void glTexParameter(int target, int pname, java.nio.FloatBuffer param) {
-        org.lwjgl3.opengl.GL11.glTexParameterfv(target, pname, param);
+        org.lwjgl.opengl.GL11.glTexParameterfv(target, pname, param);
     }
 
     public static void glTexParameter(int target, int pname, java.nio.IntBuffer param) {
-        org.lwjgl3.opengl.GL11.glTexParameteriv(target, pname, param);
+        org.lwjgl.opengl.GL11.glTexParameteriv(target, pname, param);
     }
 
     public static void glTexParameterf(int target, int pname, float param) {
-        org.lwjgl3.opengl.GL11.glTexParameterf(target, pname, param);
+        org.lwjgl.opengl.GL11.glTexParameterf(target, pname, param);
     }
 
     public static void glTexParameteri(int target, int pname, int param) {
-        org.lwjgl3.opengl.GL11.glTexParameteri(target, pname, param);
+        org.lwjgl.opengl.GL11.glTexParameteri(target, pname, param);
     }
 
     public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type,
             long pixels_buffer_offset) {
-        org.lwjgl3.opengl.GL11.glTexSubImage1D(target, level, xoffset, width, format, type, pixels_buffer_offset);
+        org.lwjgl.opengl.GL11.glTexSubImage1D(target, level, xoffset, width, format, type, pixels_buffer_offset);
     }
 
     public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type,
             java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glTexSubImage1D(target, level, xoffset, width, format, type, pixels);
+        org.lwjgl.opengl.GL11.glTexSubImage1D(target, level, xoffset, width, format, type, pixels);
     }
 
     public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type,
             java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glTexSubImage1D(target, level, xoffset, width, format, type, pixels);
+        org.lwjgl.opengl.GL11.glTexSubImage1D(target, level, xoffset, width, format, type, pixels);
     }
 
     public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type,
             java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glTexSubImage1D(target, level, xoffset, width, format, type, pixels);
+        org.lwjgl.opengl.GL11.glTexSubImage1D(target, level, xoffset, width, format, type, pixels);
     }
 
     public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type,
             java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glTexSubImage1D(target, level, xoffset, width, format, type, pixels);
+        org.lwjgl.opengl.GL11.glTexSubImage1D(target, level, xoffset, width, format, type, pixels);
     }
 
     public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type,
             java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glTexSubImage1D(target, level, xoffset, width, format, type, pixels);
+        org.lwjgl.opengl.GL11.glTexSubImage1D(target, level, xoffset, width, format, type, pixels);
     }
 
     public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height,
             int format, int type, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.GL11
+        org.lwjgl.opengl.GL11
                 .glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels_buffer_offset);
     }
 
     public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height,
             int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+        org.lwjgl.opengl.GL11.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height,
             int format, int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+        org.lwjgl.opengl.GL11.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height,
             int format, int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+        org.lwjgl.opengl.GL11.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height,
             int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+        org.lwjgl.opengl.GL11.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height,
             int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.GL11.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+        org.lwjgl.opengl.GL11.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glTranslated(double x, double y, double z) {
-        org.lwjgl3.opengl.GL11.glTranslated(x, y, z);
+        org.lwjgl.opengl.GL11.glTranslated(x, y, z);
     }
 
     public static void glTranslatef(float x, float y, float z) {
-        org.lwjgl3.opengl.GL11.glTranslatef(x, y, z);
+        org.lwjgl.opengl.GL11.glTranslatef(x, y, z);
     }
 
     public static void glVertex2d(double x, double y) {
-        org.lwjgl3.opengl.GL11.glVertex2d(x, y);
+        org.lwjgl.opengl.GL11.glVertex2d(x, y);
     }
 
     public static void glVertex2f(float x, float y) {
-        org.lwjgl3.opengl.GL11.glVertex2f(x, y);
+        org.lwjgl.opengl.GL11.glVertex2f(x, y);
     }
 
     public static void glVertex2i(int x, int y) {
-        org.lwjgl3.opengl.GL11.glVertex2i(x, y);
+        org.lwjgl.opengl.GL11.glVertex2i(x, y);
     }
 
     public static void glVertex3d(double x, double y, double z) {
-        org.lwjgl3.opengl.GL11.glVertex3d(x, y, z);
+        org.lwjgl.opengl.GL11.glVertex3d(x, y, z);
     }
 
     public static void glVertex3f(float x, float y, float z) {
-        org.lwjgl3.opengl.GL11.glVertex3f(x, y, z);
+        org.lwjgl.opengl.GL11.glVertex3f(x, y, z);
     }
 
     public static void glVertex3i(int x, int y, int z) {
-        org.lwjgl3.opengl.GL11.glVertex3i(x, y, z);
+        org.lwjgl.opengl.GL11.glVertex3i(x, y, z);
     }
 
     public static void glVertex4d(double x, double y, double z, double w) {
-        org.lwjgl3.opengl.GL11.glVertex4d(x, y, z, w);
+        org.lwjgl.opengl.GL11.glVertex4d(x, y, z, w);
     }
 
     public static void glVertex4f(float x, float y, float z, float w) {
-        org.lwjgl3.opengl.GL11.glVertex4f(x, y, z, w);
+        org.lwjgl.opengl.GL11.glVertex4f(x, y, z, w);
     }
 
     public static void glVertex4i(int x, int y, int z, int w) {
-        org.lwjgl3.opengl.GL11.glVertex4i(x, y, z, w);
+        org.lwjgl.opengl.GL11.glVertex4i(x, y, z, w);
     }
 
     public static void glVertexPointer(int size, int type, int stride, long pointer_buffer_offset) {
-        org.lwjgl3.opengl.GL11.glVertexPointer(size, type, stride, pointer_buffer_offset);
+        org.lwjgl.opengl.GL11.glVertexPointer(size, type, stride, pointer_buffer_offset);
     }
 
     public static void glVertexPointer(int size, int type, int stride, java.nio.ByteBuffer pointer) {
-        org.lwjgl3.opengl.GL11.glVertexPointer(size, type, stride, pointer);
+        org.lwjgl.opengl.GL11.glVertexPointer(size, type, stride, pointer);
     }
 
     public static void glVertexPointer(int size, int stride, java.nio.DoubleBuffer pointer) {
 
-        org.lwjgl3.opengl.GL11.glVertexPointer(
+        org.lwjgl.opengl.GL11.glVertexPointer(
                 size,
-                org.lwjgl3.opengl.GL11.GL_DOUBLE,
+                org.lwjgl.opengl.GL11.GL_DOUBLE,
                 stride,
                 BufferCasts.toByteBuffer(pointer));
     }
 
     public static void glVertexPointer(int size, int stride, java.nio.FloatBuffer pointer) {
 
-        org.lwjgl3.opengl.GL11.glVertexPointer(size, org.lwjgl3.opengl.GL11.GL_FLOAT, stride, pointer);
+        org.lwjgl.opengl.GL11.glVertexPointer(size, org.lwjgl.opengl.GL11.GL_FLOAT, stride, pointer);
     }
 
     public static void glVertexPointer(int size, int stride, java.nio.IntBuffer pointer) {
 
-        org.lwjgl3.opengl.GL11.glVertexPointer(size, org.lwjgl3.opengl.GL11.GL_INT, stride, pointer);
+        org.lwjgl.opengl.GL11.glVertexPointer(size, org.lwjgl.opengl.GL11.GL_INT, stride, pointer);
     }
 
     public static void glVertexPointer(int size, int stride, java.nio.ShortBuffer pointer) {
 
-        org.lwjgl3.opengl.GL11.glVertexPointer(size, org.lwjgl3.opengl.GL11.GL_SHORT, stride, pointer);
+        org.lwjgl.opengl.GL11.glVertexPointer(size, org.lwjgl.opengl.GL11.GL_SHORT, stride, pointer);
     }
 
     public static void glViewport(int x, int y, int width, int height) {
-        org.lwjgl3.opengl.GL11.glViewport(x, y, width, height);
+        org.lwjgl.opengl.GL11.glViewport(x, y, width, height);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/GL12.java b/src/main/java/org/lwjglx/opengl/GL12.java
similarity index 89%
rename from src/main/java/org/lwjgl/opengl/GL12.java
rename to src/main/java/org/lwjglx/opengl/GL12.java
index 1389deb09..93d32e60d 100644
--- a/src/main/java/org/lwjgl/opengl/GL12.java
+++ b/src/main/java/org/lwjglx/opengl/GL12.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class GL12 {
 
@@ -46,29 +46,29 @@ public class GL12 {
 
     public static void glCopyTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int x, int y,
             int width, int height) {
-        org.lwjgl3.opengl.GL12.glCopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+        org.lwjgl.opengl.GL12.glCopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
     }
 
     public static void glDrawRangeElements(int mode, int start, int end, int indices_count, int type,
             long indices_buffer_offset) {
-        org.lwjgl3.opengl.GL12.glDrawRangeElements(mode, start, end, indices_count, type, indices_buffer_offset);
+        org.lwjgl.opengl.GL12.glDrawRangeElements(mode, start, end, indices_count, type, indices_buffer_offset);
     }
 
     public static void glDrawRangeElements(int mode, int start, int end, java.nio.ByteBuffer indices) {
-        org.lwjgl3.opengl.GL12.glDrawRangeElements(mode, start, end, indices);
+        org.lwjgl.opengl.GL12.glDrawRangeElements(mode, start, end, indices);
     }
 
     public static void glDrawRangeElements(int mode, int start, int end, java.nio.IntBuffer indices) {
-        org.lwjgl3.opengl.GL12.glDrawRangeElements(mode, start, end, indices);
+        org.lwjgl.opengl.GL12.glDrawRangeElements(mode, start, end, indices);
     }
 
     public static void glDrawRangeElements(int mode, int start, int end, java.nio.ShortBuffer indices) {
-        org.lwjgl3.opengl.GL12.glDrawRangeElements(mode, start, end, indices);
+        org.lwjgl.opengl.GL12.glDrawRangeElements(mode, start, end, indices);
     }
 
     public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth,
             int border, int format, int type, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.GL12.glTexImage3D(
+        org.lwjgl.opengl.GL12.glTexImage3D(
                 target,
                 level,
                 internalFormat,
@@ -83,37 +83,37 @@ public static void glTexImage3D(int target, int level, int internalFormat, int w
 
     public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth,
             int border, int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.GL12
+        org.lwjgl.opengl.GL12
                 .glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels);
     }
 
     public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth,
             int border, int format, int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.GL12
+        org.lwjgl.opengl.GL12
                 .glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels);
     }
 
     public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth,
             int border, int format, int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.GL12
+        org.lwjgl.opengl.GL12
                 .glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels);
     }
 
     public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth,
             int border, int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.GL12
+        org.lwjgl.opengl.GL12
                 .glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels);
     }
 
     public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth,
             int border, int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.GL12
+        org.lwjgl.opengl.GL12
                 .glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels);
     }
 
     public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.GL12.glTexSubImage3D(
+        org.lwjgl.opengl.GL12.glTexSubImage3D(
                 target,
                 level,
                 xoffset,
@@ -129,31 +129,31 @@ public static void glTexSubImage3D(int target, int level, int xoffset, int yoffs
 
     public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.GL12
+        org.lwjgl.opengl.GL12
                 .glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
     }
 
     public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.GL12
+        org.lwjgl.opengl.GL12
                 .glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
     }
 
     public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.GL12
+        org.lwjgl.opengl.GL12
                 .glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
     }
 
     public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.GL12
+        org.lwjgl.opengl.GL12
                 .glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
     }
 
     public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.GL12
+        org.lwjgl.opengl.GL12
                 .glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/GL13.java b/src/main/java/org/lwjglx/opengl/GL13.java
similarity index 83%
rename from src/main/java/org/lwjgl/opengl/GL13.java
rename to src/main/java/org/lwjglx/opengl/GL13.java
index ee750d116..ce00643d5 100644
--- a/src/main/java/org/lwjgl/opengl/GL13.java
+++ b/src/main/java/org/lwjglx/opengl/GL13.java
@@ -1,4 +1,6 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
+
+import org.lwjglx.MemoryUtil;
 
 public class GL13 {
 
@@ -100,16 +102,16 @@ public class GL13 {
     public static final int GL_TRANSPOSE_TEXTURE_MATRIX = (int) 34021;
 
     public static void glActiveTexture(int texture) {
-        org.lwjgl3.opengl.GL13.glActiveTexture(texture);
+        org.lwjgl.opengl.GL13.glActiveTexture(texture);
     }
 
     public static void glClientActiveTexture(int texture) {
-        org.lwjgl3.opengl.GL13.glClientActiveTexture(texture);
+        org.lwjgl.opengl.GL13.glClientActiveTexture(texture);
     }
 
     public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border,
             int data_imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.GL13.glCompressedTexImage1D(
+        org.lwjgl.opengl.GL13.glCompressedTexImage1D(
                 target,
                 level,
                 internalformat,
@@ -121,12 +123,12 @@ public static void glCompressedTexImage1D(int target, int level, int internalfor
 
     public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border,
             java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.GL13.glCompressedTexImage1D(target, level, internalformat, width, border, data);
+        org.lwjgl.opengl.GL13.glCompressedTexImage1D(target, level, internalformat, width, border, data);
     }
 
     public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height,
             int border, int data_imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.GL13.glCompressedTexImage2D(
+        org.lwjgl.opengl.GL13.glCompressedTexImage2D(
                 target,
                 level,
                 internalformat,
@@ -139,12 +141,12 @@ public static void glCompressedTexImage2D(int target, int level, int internalfor
 
     public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height,
             int border, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.GL13.glCompressedTexImage2D(target, level, internalformat, width, height, border, data);
+        org.lwjgl.opengl.GL13.glCompressedTexImage2D(target, level, internalformat, width, height, border, data);
     }
 
     public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height,
             int depth, int border, int data_imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.GL13.glCompressedTexImage3D(
+        org.lwjgl.opengl.GL13.glCompressedTexImage3D(
                 target,
                 level,
                 internalformat,
@@ -158,23 +160,23 @@ public static void glCompressedTexImage3D(int target, int level, int internalfor
 
     public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height,
             int depth, int border, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.GL13.glCompressedTexImage3D(target, level, internalformat, width, height, depth, border, data);
+        org.lwjgl.opengl.GL13.glCompressedTexImage3D(target, level, internalformat, width, height, depth, border, data);
     }
 
     public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format,
             int data_imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.GL13
+        org.lwjgl.opengl.GL13
                 .glCompressedTexSubImage1D(target, level, xoffset, width, format, data_imageSize, data_buffer_offset);
     }
 
     public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format,
             java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.GL13.glCompressedTexSubImage1D(target, level, xoffset, width, format, data);
+        org.lwjgl.opengl.GL13.glCompressedTexSubImage1D(target, level, xoffset, width, format, data);
     }
 
     public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height,
             int format, int data_imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.GL13.glCompressedTexSubImage2D(
+        org.lwjgl.opengl.GL13.glCompressedTexSubImage2D(
                 target,
                 level,
                 xoffset,
@@ -188,12 +190,12 @@ public static void glCompressedTexSubImage2D(int target, int level, int xoffset,
 
     public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height,
             int format, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.GL13.glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, data);
+        org.lwjgl.opengl.GL13.glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, data);
     }
 
     public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, int format, int data_imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.GL13.glCompressedTexSubImage3D(
+        org.lwjgl.opengl.GL13.glCompressedTexSubImage3D(
                 target,
                 level,
                 xoffset,
@@ -209,7 +211,7 @@ public static void glCompressedTexSubImage3D(int target, int level, int xoffset,
 
     public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, int format, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.GL13.glCompressedTexSubImage3D(
+        org.lwjgl.opengl.GL13.glCompressedTexSubImage3D(
                 target,
                 level,
                 xoffset,
@@ -223,72 +225,72 @@ public static void glCompressedTexSubImage3D(int target, int level, int xoffset,
     }
 
     public static void glGetCompressedTexImage(int target, int lod, long img_buffer_offset) {
-        org.lwjgl3.opengl.GL13.glGetCompressedTexImage(target, lod, img_buffer_offset);
+        org.lwjgl.opengl.GL13.glGetCompressedTexImage(target, lod, img_buffer_offset);
     }
 
     public static void glGetCompressedTexImage(int target, int lod, java.nio.ByteBuffer img) {
-        org.lwjgl3.opengl.GL13.glGetCompressedTexImage(target, lod, img);
+        org.lwjgl.opengl.GL13.glGetCompressedTexImage(target, lod, img);
     }
 
     public static void glGetCompressedTexImage(int target, int lod, java.nio.IntBuffer img) {
 
-        org.lwjgl3.opengl.GL13.glGetCompressedTexImage(target, lod, org.lwjgl.MemoryUtil.getAddress(img));
+        org.lwjgl.opengl.GL13.glGetCompressedTexImage(target, lod, MemoryUtil.getAddress(img));
     }
 
     public static void glGetCompressedTexImage(int target, int lod, java.nio.ShortBuffer img) {
 
-        org.lwjgl3.opengl.GL13.glGetCompressedTexImage(target, lod, org.lwjgl.MemoryUtil.getAddress(img));
+        org.lwjgl.opengl.GL13.glGetCompressedTexImage(target, lod, MemoryUtil.getAddress(img));
     }
 
     public static void glLoadTransposeMatrix(java.nio.DoubleBuffer m) {
-        org.lwjgl3.opengl.GL13.glLoadTransposeMatrixd(m);
+        org.lwjgl.opengl.GL13.glLoadTransposeMatrixd(m);
     }
 
     public static void glLoadTransposeMatrix(java.nio.FloatBuffer m) {
-        org.lwjgl3.opengl.GL13.glLoadTransposeMatrixf(m);
+        org.lwjgl.opengl.GL13.glLoadTransposeMatrixf(m);
     }
 
     public static void glMultTransposeMatrix(java.nio.DoubleBuffer m) {
-        org.lwjgl3.opengl.GL13.glMultTransposeMatrixd(m);
+        org.lwjgl.opengl.GL13.glMultTransposeMatrixd(m);
     }
 
     public static void glMultTransposeMatrix(java.nio.FloatBuffer m) {
-        org.lwjgl3.opengl.GL13.glMultTransposeMatrixf(m);
+        org.lwjgl.opengl.GL13.glMultTransposeMatrixf(m);
     }
 
     public static void glMultiTexCoord1d(int target, double s) {
-        org.lwjgl3.opengl.GL13.glMultiTexCoord1d(target, s);
+        org.lwjgl.opengl.GL13.glMultiTexCoord1d(target, s);
     }
 
     public static void glMultiTexCoord1f(int target, float s) {
-        org.lwjgl3.opengl.GL13.glMultiTexCoord1f(target, s);
+        org.lwjgl.opengl.GL13.glMultiTexCoord1f(target, s);
     }
 
     public static void glMultiTexCoord2d(int target, double s, double t) {
-        org.lwjgl3.opengl.GL13.glMultiTexCoord2d(target, s, t);
+        org.lwjgl.opengl.GL13.glMultiTexCoord2d(target, s, t);
     }
 
     public static void glMultiTexCoord2f(int target, float s, float t) {
-        org.lwjgl3.opengl.GL13.glMultiTexCoord2f(target, s, t);
+        org.lwjgl.opengl.GL13.glMultiTexCoord2f(target, s, t);
     }
 
     public static void glMultiTexCoord3d(int target, double s, double t, double r) {
-        org.lwjgl3.opengl.GL13.glMultiTexCoord3d(target, s, t, r);
+        org.lwjgl.opengl.GL13.glMultiTexCoord3d(target, s, t, r);
     }
 
     public static void glMultiTexCoord3f(int target, float s, float t, float r) {
-        org.lwjgl3.opengl.GL13.glMultiTexCoord3f(target, s, t, r);
+        org.lwjgl.opengl.GL13.glMultiTexCoord3f(target, s, t, r);
     }
 
     public static void glMultiTexCoord4d(int target, double s, double t, double r, double q) {
-        org.lwjgl3.opengl.GL13.glMultiTexCoord4d(target, s, t, r, q);
+        org.lwjgl.opengl.GL13.glMultiTexCoord4d(target, s, t, r, q);
     }
 
     public static void glMultiTexCoord4f(int target, float s, float t, float r, float q) {
-        org.lwjgl3.opengl.GL13.glMultiTexCoord4f(target, s, t, r, q);
+        org.lwjgl.opengl.GL13.glMultiTexCoord4f(target, s, t, r, q);
     }
 
     public static void glSampleCoverage(float value, boolean invert) {
-        org.lwjgl3.opengl.GL13.glSampleCoverage(value, invert);
+        org.lwjgl.opengl.GL13.glSampleCoverage(value, invert);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/GL14.java b/src/main/java/org/lwjglx/opengl/GL14.java
similarity index 72%
rename from src/main/java/org/lwjgl/opengl/GL14.java
rename to src/main/java/org/lwjglx/opengl/GL14.java
index fd12b128d..fb938e7c6 100644
--- a/src/main/java/org/lwjgl/opengl/GL14.java
+++ b/src/main/java/org/lwjglx/opengl/GL14.java
@@ -1,6 +1,7 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
-import org.lwjgl.lwjgl3ify.BufferCasts;
+import org.lwjglx.MemoryUtil;
+import org.lwjglx.lwjgl3ify.BufferCasts;
 
 public class GL14 {
 
@@ -52,126 +53,126 @@ public class GL14 {
     public static final int GL_TEXTURE_LOD_BIAS = (int) 34049;
 
     public static void glBlendColor(float red, float green, float blue, float alpha) {
-        org.lwjgl3.opengl.GL14.glBlendColor(red, green, blue, alpha);
+        org.lwjgl.opengl.GL14.glBlendColor(red, green, blue, alpha);
     }
 
     public static void glBlendEquation(int mode) {
-        org.lwjgl3.opengl.GL14.glBlendEquation(mode);
+        org.lwjgl.opengl.GL14.glBlendEquation(mode);
     }
 
     public static void glBlendFuncSeparate(int sfactorRGB, int dfactorRGB, int sfactorAlpha, int dfactorAlpha) {
-        org.lwjgl3.opengl.GL14.glBlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+        org.lwjgl.opengl.GL14.glBlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
     }
 
     public static void glFogCoordPointer(int type, int stride, long data_buffer_offset) {
-        org.lwjgl3.opengl.GL14.glFogCoordPointer(type, stride, data_buffer_offset);
+        org.lwjgl.opengl.GL14.glFogCoordPointer(type, stride, data_buffer_offset);
     }
 
     public static void glFogCoordPointer(int stride, java.nio.DoubleBuffer data) {
 
-        org.lwjgl3.opengl.GL14.glFogCoordPointer(
-                org.lwjgl3.opengl.GL11.GL_DOUBLE,
+        org.lwjgl.opengl.GL14.glFogCoordPointer(
+                org.lwjgl.opengl.GL11.GL_DOUBLE,
                 stride,
                 BufferCasts.toByteBuffer(data));
     }
 
     public static void glFogCoordPointer(int stride, java.nio.FloatBuffer data) {
 
-        org.lwjgl3.opengl.GL14.glFogCoordPointer(org.lwjgl3.opengl.GL11.GL_FLOAT, stride, data);
+        org.lwjgl.opengl.GL14.glFogCoordPointer(org.lwjgl.opengl.GL11.GL_FLOAT, stride, data);
     }
 
     public static void glFogCoordd(double coord) {
-        org.lwjgl3.opengl.GL14.glFogCoordd(coord);
+        org.lwjgl.opengl.GL14.glFogCoordd(coord);
     }
 
     public static void glFogCoordf(float coord) {
-        org.lwjgl3.opengl.GL14.glFogCoordf(coord);
+        org.lwjgl.opengl.GL14.glFogCoordf(coord);
     }
 
     public static void glMultiDrawArrays(int mode, java.nio.IntBuffer piFirst, java.nio.IntBuffer piCount) {
-        org.lwjgl3.opengl.GL14.glMultiDrawArrays(mode, piFirst, piCount);
+        org.lwjgl.opengl.GL14.glMultiDrawArrays(mode, piFirst, piCount);
     }
 
     public static void glPointParameter(int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.GL14.glPointParameterfv(pname, params);
+        org.lwjgl.opengl.GL14.glPointParameterfv(pname, params);
     }
 
     public static void glPointParameter(int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL14.glPointParameteriv(pname, params);
+        org.lwjgl.opengl.GL14.glPointParameteriv(pname, params);
     }
 
     public static void glPointParameterf(int pname, float param) {
-        org.lwjgl3.opengl.GL14.glPointParameterf(pname, param);
+        org.lwjgl.opengl.GL14.glPointParameterf(pname, param);
     }
 
     public static void glPointParameteri(int pname, int param) {
-        org.lwjgl3.opengl.GL14.glPointParameteri(pname, param);
+        org.lwjgl.opengl.GL14.glPointParameteri(pname, param);
     }
 
     public static void glSecondaryColor3b(byte red, byte green, byte blue) {
-        org.lwjgl3.opengl.GL14.glSecondaryColor3b(red, green, blue);
+        org.lwjgl.opengl.GL14.glSecondaryColor3b(red, green, blue);
     }
 
     public static void glSecondaryColor3d(double red, double green, double blue) {
-        org.lwjgl3.opengl.GL14.glSecondaryColor3d(red, green, blue);
+        org.lwjgl.opengl.GL14.glSecondaryColor3d(red, green, blue);
     }
 
     public static void glSecondaryColor3f(float red, float green, float blue) {
-        org.lwjgl3.opengl.GL14.glSecondaryColor3f(red, green, blue);
+        org.lwjgl.opengl.GL14.glSecondaryColor3f(red, green, blue);
     }
 
     public static void glSecondaryColor3ub(byte red, byte green, byte blue) {
-        org.lwjgl3.opengl.GL14.glSecondaryColor3ub(red, green, blue);
+        org.lwjgl.opengl.GL14.glSecondaryColor3ub(red, green, blue);
     }
 
     public static void glSecondaryColorPointer(int size, int type, int stride, long data_buffer_offset) {
-        org.lwjgl3.opengl.GL14.glSecondaryColorPointer(size, type, stride, data_buffer_offset);
+        org.lwjgl.opengl.GL14.glSecondaryColorPointer(size, type, stride, data_buffer_offset);
     }
 
     public static void glSecondaryColorPointer(int size, int stride, java.nio.DoubleBuffer data) {
 
-        org.lwjgl3.opengl.GL14.glSecondaryColorPointer(
+        org.lwjgl.opengl.GL14.glSecondaryColorPointer(
                 size,
-                org.lwjgl3.opengl.GL11.GL_DOUBLE,
+                org.lwjgl.opengl.GL11.GL_DOUBLE,
                 stride,
                 BufferCasts.toByteBuffer(data));
     }
 
     public static void glSecondaryColorPointer(int size, int stride, java.nio.FloatBuffer data) {
 
-        org.lwjgl3.opengl.GL14.glSecondaryColorPointer(size, org.lwjgl3.opengl.GL11.GL_FLOAT, stride, data);
+        org.lwjgl.opengl.GL14.glSecondaryColorPointer(size, org.lwjgl.opengl.GL11.GL_FLOAT, stride, data);
     }
 
     public static void glSecondaryColorPointer(int size, boolean unsigned, int stride, java.nio.ByteBuffer data) {
 
-        org.lwjgl3.opengl.GL14.glSecondaryColorPointer(
+        org.lwjgl.opengl.GL14.glSecondaryColorPointer(
                 size,
-                (unsigned ? org.lwjgl3.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl3.opengl.GL11.GL_BYTE),
+                (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl.opengl.GL11.GL_BYTE),
                 stride,
-                org.lwjgl.MemoryUtil.getAddress(data));
+                MemoryUtil.getAddress(data));
     }
 
     public static void glWindowPos2d(double x, double y) {
-        org.lwjgl3.opengl.GL14.glWindowPos2d(x, y);
+        org.lwjgl.opengl.GL14.glWindowPos2d(x, y);
     }
 
     public static void glWindowPos2f(float x, float y) {
-        org.lwjgl3.opengl.GL14.glWindowPos2f(x, y);
+        org.lwjgl.opengl.GL14.glWindowPos2f(x, y);
     }
 
     public static void glWindowPos2i(int x, int y) {
-        org.lwjgl3.opengl.GL14.glWindowPos2i(x, y);
+        org.lwjgl.opengl.GL14.glWindowPos2i(x, y);
     }
 
     public static void glWindowPos3d(double x, double y, double z) {
-        org.lwjgl3.opengl.GL14.glWindowPos3d(x, y, z);
+        org.lwjgl.opengl.GL14.glWindowPos3d(x, y, z);
     }
 
     public static void glWindowPos3f(float x, float y, float z) {
-        org.lwjgl3.opengl.GL14.glWindowPos3f(x, y, z);
+        org.lwjgl.opengl.GL14.glWindowPos3f(x, y, z);
     }
 
     public static void glWindowPos3i(int x, int y, int z) {
-        org.lwjgl3.opengl.GL14.glWindowPos3i(x, y, z);
+        org.lwjgl.opengl.GL14.glWindowPos3i(x, y, z);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/GL15.java b/src/main/java/org/lwjglx/opengl/GL15.java
similarity index 71%
rename from src/main/java/org/lwjgl/opengl/GL15.java
rename to src/main/java/org/lwjglx/opengl/GL15.java
index cdb16438a..f869fb18d 100644
--- a/src/main/java/org/lwjgl/opengl/GL15.java
+++ b/src/main/java/org/lwjglx/opengl/GL15.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class GL15 {
 
@@ -54,162 +54,162 @@ public class GL15 {
     public static final int GL_WRITE_ONLY = (int) 35001;
 
     public static void glBeginQuery(int target, int id) {
-        org.lwjgl3.opengl.GL15.glBeginQuery(target, id);
+        org.lwjgl.opengl.GL15.glBeginQuery(target, id);
     }
 
     public static void glBindBuffer(int target, int buffer) {
-        org.lwjgl3.opengl.GL15.glBindBuffer(target, buffer);
+        org.lwjgl.opengl.GL15.glBindBuffer(target, buffer);
     }
 
     public static void glBufferData(int target, long data_size, int usage) {
-        org.lwjgl3.opengl.GL15.glBufferData(target, data_size, usage);
+        org.lwjgl.opengl.GL15.glBufferData(target, data_size, usage);
     }
 
     public static void glBufferData(int target, java.nio.ByteBuffer data, int usage) {
-        org.lwjgl3.opengl.GL15.glBufferData(target, data, usage);
+        org.lwjgl.opengl.GL15.glBufferData(target, data, usage);
     }
 
     public static void glBufferData(int target, java.nio.DoubleBuffer data, int usage) {
-        org.lwjgl3.opengl.GL15.glBufferData(target, data, usage);
+        org.lwjgl.opengl.GL15.glBufferData(target, data, usage);
     }
 
     public static void glBufferData(int target, java.nio.FloatBuffer data, int usage) {
-        org.lwjgl3.opengl.GL15.glBufferData(target, data, usage);
+        org.lwjgl.opengl.GL15.glBufferData(target, data, usage);
     }
 
     public static void glBufferData(int target, java.nio.IntBuffer data, int usage) {
-        org.lwjgl3.opengl.GL15.glBufferData(target, data, usage);
+        org.lwjgl.opengl.GL15.glBufferData(target, data, usage);
     }
 
     public static void glBufferData(int target, java.nio.ShortBuffer data, int usage) {
-        org.lwjgl3.opengl.GL15.glBufferData(target, data, usage);
+        org.lwjgl.opengl.GL15.glBufferData(target, data, usage);
     }
 
     public static void glBufferSubData(int target, long offset, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.GL15.glBufferSubData(target, offset, data);
+        org.lwjgl.opengl.GL15.glBufferSubData(target, offset, data);
     }
 
     public static void glBufferSubData(int target, long offset, java.nio.DoubleBuffer data) {
-        org.lwjgl3.opengl.GL15.glBufferSubData(target, offset, data);
+        org.lwjgl.opengl.GL15.glBufferSubData(target, offset, data);
     }
 
     public static void glBufferSubData(int target, long offset, java.nio.FloatBuffer data) {
-        org.lwjgl3.opengl.GL15.glBufferSubData(target, offset, data);
+        org.lwjgl.opengl.GL15.glBufferSubData(target, offset, data);
     }
 
     public static void glBufferSubData(int target, long offset, java.nio.IntBuffer data) {
-        org.lwjgl3.opengl.GL15.glBufferSubData(target, offset, data);
+        org.lwjgl.opengl.GL15.glBufferSubData(target, offset, data);
     }
 
     public static void glBufferSubData(int target, long offset, java.nio.ShortBuffer data) {
-        org.lwjgl3.opengl.GL15.glBufferSubData(target, offset, data);
+        org.lwjgl.opengl.GL15.glBufferSubData(target, offset, data);
     }
 
     public static void glDeleteBuffers(int buffer) {
-        org.lwjgl3.opengl.GL15.glDeleteBuffers(buffer);
+        org.lwjgl.opengl.GL15.glDeleteBuffers(buffer);
     }
 
     public static void glDeleteBuffers(java.nio.IntBuffer buffers) {
-        org.lwjgl3.opengl.GL15.glDeleteBuffers(buffers);
+        org.lwjgl.opengl.GL15.glDeleteBuffers(buffers);
     }
 
     public static void glDeleteQueries(int id) {
-        org.lwjgl3.opengl.GL15.glDeleteQueries(id);
+        org.lwjgl.opengl.GL15.glDeleteQueries(id);
     }
 
     public static void glDeleteQueries(java.nio.IntBuffer ids) {
-        org.lwjgl3.opengl.GL15.glDeleteQueries(ids);
+        org.lwjgl.opengl.GL15.glDeleteQueries(ids);
     }
 
     public static void glEndQuery(int target) {
-        org.lwjgl3.opengl.GL15.glEndQuery(target);
+        org.lwjgl.opengl.GL15.glEndQuery(target);
     }
 
     public static int glGenBuffers() {
-        return org.lwjgl3.opengl.GL15.glGenBuffers();
+        return org.lwjgl.opengl.GL15.glGenBuffers();
     }
 
     public static void glGenBuffers(java.nio.IntBuffer buffers) {
-        org.lwjgl3.opengl.GL15.glGenBuffers(buffers);
+        org.lwjgl.opengl.GL15.glGenBuffers(buffers);
     }
 
     public static int glGenQueries() {
-        return org.lwjgl3.opengl.GL15.glGenQueries();
+        return org.lwjgl.opengl.GL15.glGenQueries();
     }
 
     public static void glGenQueries(java.nio.IntBuffer ids) {
-        org.lwjgl3.opengl.GL15.glGenQueries(ids);
+        org.lwjgl.opengl.GL15.glGenQueries(ids);
     }
 
     public static void glGetBufferParameter(int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL15.glGetBufferParameteriv(target, pname, params);
+        org.lwjgl.opengl.GL15.glGetBufferParameteriv(target, pname, params);
     }
 
     public static int glGetBufferParameteri(int target, int pname) {
-        return org.lwjgl3.opengl.GL15.glGetBufferParameteri(target, pname);
+        return org.lwjgl.opengl.GL15.glGetBufferParameteri(target, pname);
     }
 
     public static void glGetBufferSubData(int target, long offset, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.GL15.glGetBufferSubData(target, offset, data);
+        org.lwjgl.opengl.GL15.glGetBufferSubData(target, offset, data);
     }
 
     public static void glGetBufferSubData(int target, long offset, java.nio.DoubleBuffer data) {
-        org.lwjgl3.opengl.GL15.glGetBufferSubData(target, offset, data);
+        org.lwjgl.opengl.GL15.glGetBufferSubData(target, offset, data);
     }
 
     public static void glGetBufferSubData(int target, long offset, java.nio.FloatBuffer data) {
-        org.lwjgl3.opengl.GL15.glGetBufferSubData(target, offset, data);
+        org.lwjgl.opengl.GL15.glGetBufferSubData(target, offset, data);
     }
 
     public static void glGetBufferSubData(int target, long offset, java.nio.IntBuffer data) {
-        org.lwjgl3.opengl.GL15.glGetBufferSubData(target, offset, data);
+        org.lwjgl.opengl.GL15.glGetBufferSubData(target, offset, data);
     }
 
     public static void glGetBufferSubData(int target, long offset, java.nio.ShortBuffer data) {
-        org.lwjgl3.opengl.GL15.glGetBufferSubData(target, offset, data);
+        org.lwjgl.opengl.GL15.glGetBufferSubData(target, offset, data);
     }
 
     public static void glGetQuery(int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL15.glGetQueryiv(target, pname, params);
+        org.lwjgl.opengl.GL15.glGetQueryiv(target, pname, params);
     }
 
     public static void glGetQueryObject(int id, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL15.glGetQueryObjectiv(id, pname, params);
+        org.lwjgl.opengl.GL15.glGetQueryObjectiv(id, pname, params);
     }
 
     public static int glGetQueryObjecti(int id, int pname) {
-        return org.lwjgl3.opengl.GL15.glGetQueryObjecti(id, pname);
+        return org.lwjgl.opengl.GL15.glGetQueryObjecti(id, pname);
     }
 
     public static void glGetQueryObjectu(int id, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL15.glGetQueryObjectuiv(id, pname, params);
+        org.lwjgl.opengl.GL15.glGetQueryObjectuiv(id, pname, params);
     }
 
     public static int glGetQueryObjectui(int id, int pname) {
-        return org.lwjgl3.opengl.GL15.glGetQueryObjectui(id, pname);
+        return org.lwjgl.opengl.GL15.glGetQueryObjectui(id, pname);
     }
 
     public static int glGetQueryi(int target, int pname) {
-        return org.lwjgl3.opengl.GL15.glGetQueryi(target, pname);
+        return org.lwjgl.opengl.GL15.glGetQueryi(target, pname);
     }
 
     public static boolean glIsBuffer(int buffer) {
-        return org.lwjgl3.opengl.GL15.glIsBuffer(buffer);
+        return org.lwjgl.opengl.GL15.glIsBuffer(buffer);
     }
 
     public static boolean glIsQuery(int id) {
-        return org.lwjgl3.opengl.GL15.glIsQuery(id);
+        return org.lwjgl.opengl.GL15.glIsQuery(id);
     }
 
     public static java.nio.ByteBuffer glMapBuffer(int target, int access, long length, java.nio.ByteBuffer old_buffer) {
-        return org.lwjgl3.opengl.GL15.glMapBuffer(target, access, length, old_buffer);
+        return org.lwjgl.opengl.GL15.glMapBuffer(target, access, length, old_buffer);
     }
 
     public static java.nio.ByteBuffer glMapBuffer(int target, int access, java.nio.ByteBuffer old_buffer) {
-        return org.lwjgl3.opengl.GL15.glMapBuffer(target, access, old_buffer);
+        return org.lwjgl.opengl.GL15.glMapBuffer(target, access, old_buffer);
     }
 
     public static boolean glUnmapBuffer(int target) {
-        return org.lwjgl3.opengl.GL15.glUnmapBuffer(target);
+        return org.lwjgl.opengl.GL15.glUnmapBuffer(target);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/GL15x.java b/src/main/java/org/lwjglx/opengl/GL15x.java
similarity index 75%
rename from src/main/java/org/lwjgl/opengl/GL15x.java
rename to src/main/java/org/lwjglx/opengl/GL15x.java
index f3ee36c9f..415ee14ac 100644
--- a/src/main/java/org/lwjgl/opengl/GL15x.java
+++ b/src/main/java/org/lwjglx/opengl/GL15x.java
@@ -1,10 +1,10 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 import java.nio.ByteBuffer;
 
-import org.lwjgl3.BufferUtils;
-import org.lwjgl3.PointerBuffer;
-import org.lwjgl3.opengl.GL15;
+import org.lwjgl.BufferUtils;
+import org.lwjgl.PointerBuffer;
+import org.lwjgl.opengl.GL15;
 
 public class GL15x {
 
diff --git a/src/main/java/org/lwjgl/opengl/GL20.java b/src/main/java/org/lwjglx/opengl/GL20.java
similarity index 68%
rename from src/main/java/org/lwjgl/opengl/GL20.java
rename to src/main/java/org/lwjglx/opengl/GL20.java
index 67eee3fb2..26d70c00c 100644
--- a/src/main/java/org/lwjgl/opengl/GL20.java
+++ b/src/main/java/org/lwjglx/opengl/GL20.java
@@ -1,6 +1,7 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
-import org.lwjgl.lwjgl3ify.BufferCasts;
+import org.lwjglx.MemoryUtil;
+import org.lwjglx.lwjgl3ify.BufferCasts;
 
 public class GL20 {
 
@@ -91,345 +92,345 @@ public class GL20 {
     public static final int GL_VERTEX_SHADER = (int) 35633;
 
     public static void glAttachShader(int program, int shader) {
-        org.lwjgl3.opengl.GL20.glAttachShader(program, shader);
+        org.lwjgl.opengl.GL20.glAttachShader(program, shader);
     }
 
     public static void glBindAttribLocation(int program, int index, java.lang.CharSequence name) {
-        org.lwjgl3.opengl.GL20.glBindAttribLocation(program, index, name);
+        org.lwjgl.opengl.GL20.glBindAttribLocation(program, index, name);
     }
 
     public static void glBindAttribLocation(int program, int index, java.nio.ByteBuffer name) {
-        org.lwjgl3.opengl.GL20.glBindAttribLocation(program, index, name);
+        org.lwjgl.opengl.GL20.glBindAttribLocation(program, index, name);
     }
 
     public static void glBlendEquationSeparate(int modeRGB, int modeAlpha) {
-        org.lwjgl3.opengl.GL20.glBlendEquationSeparate(modeRGB, modeAlpha);
+        org.lwjgl.opengl.GL20.glBlendEquationSeparate(modeRGB, modeAlpha);
     }
 
     public static void glCompileShader(int shader) {
-        org.lwjgl3.opengl.GL20.glCompileShader(shader);
+        org.lwjgl.opengl.GL20.glCompileShader(shader);
     }
 
     public static int glCreateProgram() {
-        return org.lwjgl3.opengl.GL20.glCreateProgram();
+        return org.lwjgl.opengl.GL20.glCreateProgram();
     }
 
     public static int glCreateShader(int type) {
-        return org.lwjgl3.opengl.GL20.glCreateShader(type);
+        return org.lwjgl.opengl.GL20.glCreateShader(type);
     }
 
     public static void glDeleteProgram(int program) {
-        org.lwjgl3.opengl.GL20.glDeleteProgram(program);
+        org.lwjgl.opengl.GL20.glDeleteProgram(program);
     }
 
     public static void glDeleteShader(int shader) {
-        org.lwjgl3.opengl.GL20.glDeleteShader(shader);
+        org.lwjgl.opengl.GL20.glDeleteShader(shader);
     }
 
     public static void glDetachShader(int program, int shader) {
-        org.lwjgl3.opengl.GL20.glDetachShader(program, shader);
+        org.lwjgl.opengl.GL20.glDetachShader(program, shader);
     }
 
     public static void glDisableVertexAttribArray(int index) {
-        org.lwjgl3.opengl.GL20.glDisableVertexAttribArray(index);
+        org.lwjgl.opengl.GL20.glDisableVertexAttribArray(index);
     }
 
     public static void glDrawBuffers(int buffer) {
-        org.lwjgl3.opengl.GL20.glDrawBuffers(buffer);
+        org.lwjgl.opengl.GL20.glDrawBuffers(buffer);
     }
 
     public static void glDrawBuffers(java.nio.IntBuffer buffers) {
-        org.lwjgl3.opengl.GL20.glDrawBuffers(buffers);
+        org.lwjgl.opengl.GL20.glDrawBuffers(buffers);
     }
 
     public static void glEnableVertexAttribArray(int index) {
-        org.lwjgl3.opengl.GL20.glEnableVertexAttribArray(index);
+        org.lwjgl.opengl.GL20.glEnableVertexAttribArray(index);
     }
 
     public static void glGetActiveAttrib(int program, int index, java.nio.IntBuffer length, java.nio.IntBuffer size,
             java.nio.IntBuffer type, java.nio.ByteBuffer name) {
-        org.lwjgl3.opengl.GL20.glGetActiveAttrib(program, index, length, size, type, name);
+        org.lwjgl.opengl.GL20.glGetActiveAttrib(program, index, length, size, type, name);
     }
 
     public static String glGetActiveUniform(int program, int index, int maxLength) {
-        return org.lwjgl3.opengl.GL31C.glGetActiveUniformName(program, index, maxLength);
+        return org.lwjgl.opengl.GL31C.glGetActiveUniformName(program, index, maxLength);
     }
 
     public static void glGetActiveUniform(int program, int index, java.nio.IntBuffer length, java.nio.IntBuffer size,
             java.nio.IntBuffer type, java.nio.ByteBuffer name) {
-        org.lwjgl3.opengl.GL20.glGetActiveUniform(program, index, length, size, type, name);
+        org.lwjgl.opengl.GL20.glGetActiveUniform(program, index, length, size, type, name);
     }
 
     public static void glGetAttachedShaders(int program, java.nio.IntBuffer count, java.nio.IntBuffer shaders) {
-        org.lwjgl3.opengl.GL20.glGetAttachedShaders(program, count, shaders);
+        org.lwjgl.opengl.GL20.glGetAttachedShaders(program, count, shaders);
     }
 
     public static int glGetAttribLocation(int program, java.lang.CharSequence name) {
-        return org.lwjgl3.opengl.GL20.glGetAttribLocation(program, name);
+        return org.lwjgl.opengl.GL20.glGetAttribLocation(program, name);
     }
 
     public static int glGetAttribLocation(int program, java.nio.ByteBuffer name) {
-        return org.lwjgl3.opengl.GL20.glGetAttribLocation(program, name);
+        return org.lwjgl.opengl.GL20.glGetAttribLocation(program, name);
     }
 
     public static void glGetProgram(int program, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL20.glGetProgramiv(program, pname, params);
+        org.lwjgl.opengl.GL20.glGetProgramiv(program, pname, params);
     }
 
     public static java.lang.String glGetProgramInfoLog(int program, int maxLength) {
-        return org.lwjgl3.opengl.GL20.glGetProgramInfoLog(program, maxLength);
+        return org.lwjgl.opengl.GL20.glGetProgramInfoLog(program, maxLength);
     }
 
     public static void glGetProgramInfoLog(int program, java.nio.IntBuffer length, java.nio.ByteBuffer infoLog) {
-        org.lwjgl3.opengl.GL20.glGetProgramInfoLog(program, length, infoLog);
+        org.lwjgl.opengl.GL20.glGetProgramInfoLog(program, length, infoLog);
     }
 
     public static int glGetProgrami(int program, int pname) {
-        return org.lwjgl3.opengl.GL20.glGetProgrami(program, pname);
+        return org.lwjgl.opengl.GL20.glGetProgrami(program, pname);
     }
 
     public static void glGetShader(int shader, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL20.glGetShaderiv(shader, pname, params);
+        org.lwjgl.opengl.GL20.glGetShaderiv(shader, pname, params);
     }
 
     public static java.lang.String glGetShaderInfoLog(int shader, int maxLength) {
-        return org.lwjgl3.opengl.GL20.glGetShaderInfoLog(shader, maxLength);
+        return org.lwjgl.opengl.GL20.glGetShaderInfoLog(shader, maxLength);
     }
 
     public static void glGetShaderInfoLog(int shader, java.nio.IntBuffer length, java.nio.ByteBuffer infoLog) {
-        org.lwjgl3.opengl.GL20.glGetShaderInfoLog(shader, length, infoLog);
+        org.lwjgl.opengl.GL20.glGetShaderInfoLog(shader, length, infoLog);
     }
 
     public static java.lang.String glGetShaderSource(int shader, int maxLength) {
-        return org.lwjgl3.opengl.GL20.glGetShaderSource(shader, maxLength);
+        return org.lwjgl.opengl.GL20.glGetShaderSource(shader, maxLength);
     }
 
     public static void glGetShaderSource(int shader, java.nio.IntBuffer length, java.nio.ByteBuffer source) {
-        org.lwjgl3.opengl.GL20.glGetShaderSource(shader, length, source);
+        org.lwjgl.opengl.GL20.glGetShaderSource(shader, length, source);
     }
 
     public static int glGetShaderi(int shader, int pname) {
-        return org.lwjgl3.opengl.GL20.glGetShaderi(shader, pname);
+        return org.lwjgl.opengl.GL20.glGetShaderi(shader, pname);
     }
 
     public static void glGetUniform(int program, int location, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.GL20.glGetUniformfv(program, location, params);
+        org.lwjgl.opengl.GL20.glGetUniformfv(program, location, params);
     }
 
     public static void glGetUniform(int program, int location, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL20.glGetUniformiv(program, location, params);
+        org.lwjgl.opengl.GL20.glGetUniformiv(program, location, params);
     }
 
     public static int glGetUniformLocation(int program, java.lang.CharSequence name) {
-        return org.lwjgl3.opengl.GL20.glGetUniformLocation(program, name);
+        return org.lwjgl.opengl.GL20.glGetUniformLocation(program, name);
     }
 
     public static int glGetUniformLocation(int program, java.nio.ByteBuffer name) {
-        return org.lwjgl3.opengl.GL20.glGetUniformLocation(program, name);
+        return org.lwjgl.opengl.GL20.glGetUniformLocation(program, name);
     }
 
     public static void glGetVertexAttrib(int index, int pname, java.nio.DoubleBuffer params) {
-        org.lwjgl3.opengl.GL20.glGetVertexAttribdv(index, pname, params);
+        org.lwjgl.opengl.GL20.glGetVertexAttribdv(index, pname, params);
     }
 
     public static void glGetVertexAttrib(int index, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.GL20.glGetVertexAttribfv(index, pname, params);
+        org.lwjgl.opengl.GL20.glGetVertexAttribfv(index, pname, params);
     }
 
     public static void glGetVertexAttrib(int index, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL20.glGetVertexAttribiv(index, pname, params);
+        org.lwjgl.opengl.GL20.glGetVertexAttribiv(index, pname, params);
     }
 
     public static boolean glIsProgram(int program) {
-        return org.lwjgl3.opengl.GL20.glIsProgram(program);
+        return org.lwjgl.opengl.GL20.glIsProgram(program);
     }
 
     public static boolean glIsShader(int shader) {
-        return org.lwjgl3.opengl.GL20.glIsShader(shader);
+        return org.lwjgl.opengl.GL20.glIsShader(shader);
     }
 
     public static void glLinkProgram(int program) {
-        org.lwjgl3.opengl.GL20.glLinkProgram(program);
+        org.lwjgl.opengl.GL20.glLinkProgram(program);
     }
 
     public static void glShaderSource(int shader, java.lang.CharSequence string) {
-        org.lwjgl3.opengl.GL20.glShaderSource(shader, string);
+        org.lwjgl.opengl.GL20.glShaderSource(shader, string);
     }
 
     public static void glShaderSource(int shader, java.nio.ByteBuffer string) {
 
-        org.lwjgl3.opengl.GL20.glShaderSource(shader, BufferCasts.bufferToCharSeq(string));
+        org.lwjgl.opengl.GL20.glShaderSource(shader, BufferCasts.bufferToCharSeq(string));
     }
 
     public static void glShaderSource(int shader, java.lang.CharSequence[] strings) {
-        org.lwjgl3.opengl.GL20.glShaderSource(shader, strings);
+        org.lwjgl.opengl.GL20.glShaderSource(shader, strings);
     }
 
     public static void glStencilFuncSeparate(int face, int func, int ref, int mask) {
-        org.lwjgl3.opengl.GL20.glStencilFuncSeparate(face, func, ref, mask);
+        org.lwjgl.opengl.GL20.glStencilFuncSeparate(face, func, ref, mask);
     }
 
     public static void glStencilMaskSeparate(int face, int mask) {
-        org.lwjgl3.opengl.GL20.glStencilMaskSeparate(face, mask);
+        org.lwjgl.opengl.GL20.glStencilMaskSeparate(face, mask);
     }
 
     public static void glStencilOpSeparate(int face, int sfail, int dpfail, int dppass) {
-        org.lwjgl3.opengl.GL20.glStencilOpSeparate(face, sfail, dpfail, dppass);
+        org.lwjgl.opengl.GL20.glStencilOpSeparate(face, sfail, dpfail, dppass);
     }
 
     public static void glUniform1(int location, java.nio.FloatBuffer values) {
-        org.lwjgl3.opengl.GL20.glUniform1fv(location, values);
+        org.lwjgl.opengl.GL20.glUniform1fv(location, values);
     }
 
     public static void glUniform1(int location, java.nio.IntBuffer values) {
-        org.lwjgl3.opengl.GL20.glUniform1iv(location, values);
+        org.lwjgl.opengl.GL20.glUniform1iv(location, values);
     }
 
     public static void glUniform1f(int location, float v0) {
-        org.lwjgl3.opengl.GL20.glUniform1f(location, v0);
+        org.lwjgl.opengl.GL20.glUniform1f(location, v0);
     }
 
     public static void glUniform1i(int location, int v0) {
-        org.lwjgl3.opengl.GL20.glUniform1i(location, v0);
+        org.lwjgl.opengl.GL20.glUniform1i(location, v0);
     }
 
     public static void glUniform2(int location, java.nio.FloatBuffer values) {
-        org.lwjgl3.opengl.GL20.glUniform2fv(location, values);
+        org.lwjgl.opengl.GL20.glUniform2fv(location, values);
     }
 
     public static void glUniform2(int location, java.nio.IntBuffer values) {
-        org.lwjgl3.opengl.GL20.glUniform2iv(location, values);
+        org.lwjgl.opengl.GL20.glUniform2iv(location, values);
     }
 
     public static void glUniform2f(int location, float v0, float v1) {
-        org.lwjgl3.opengl.GL20.glUniform2f(location, v0, v1);
+        org.lwjgl.opengl.GL20.glUniform2f(location, v0, v1);
     }
 
     public static void glUniform2i(int location, int v0, int v1) {
-        org.lwjgl3.opengl.GL20.glUniform2i(location, v0, v1);
+        org.lwjgl.opengl.GL20.glUniform2i(location, v0, v1);
     }
 
     public static void glUniform3(int location, java.nio.FloatBuffer values) {
-        org.lwjgl3.opengl.GL20.glUniform3fv(location, values);
+        org.lwjgl.opengl.GL20.glUniform3fv(location, values);
     }
 
     public static void glUniform3(int location, java.nio.IntBuffer values) {
-        org.lwjgl3.opengl.GL20.glUniform3iv(location, values);
+        org.lwjgl.opengl.GL20.glUniform3iv(location, values);
     }
 
     public static void glUniform3f(int location, float v0, float v1, float v2) {
-        org.lwjgl3.opengl.GL20.glUniform3f(location, v0, v1, v2);
+        org.lwjgl.opengl.GL20.glUniform3f(location, v0, v1, v2);
     }
 
     public static void glUniform3i(int location, int v0, int v1, int v2) {
-        org.lwjgl3.opengl.GL20.glUniform3i(location, v0, v1, v2);
+        org.lwjgl.opengl.GL20.glUniform3i(location, v0, v1, v2);
     }
 
     public static void glUniform4(int location, java.nio.FloatBuffer values) {
-        org.lwjgl3.opengl.GL20.glUniform4fv(location, values);
+        org.lwjgl.opengl.GL20.glUniform4fv(location, values);
     }
 
     public static void glUniform4(int location, java.nio.IntBuffer values) {
-        org.lwjgl3.opengl.GL20.glUniform4iv(location, values);
+        org.lwjgl.opengl.GL20.glUniform4iv(location, values);
     }
 
     public static void glUniform4f(int location, float v0, float v1, float v2, float v3) {
-        org.lwjgl3.opengl.GL20.glUniform4f(location, v0, v1, v2, v3);
+        org.lwjgl.opengl.GL20.glUniform4f(location, v0, v1, v2, v3);
     }
 
     public static void glUniform4i(int location, int v0, int v1, int v2, int v3) {
-        org.lwjgl3.opengl.GL20.glUniform4i(location, v0, v1, v2, v3);
+        org.lwjgl.opengl.GL20.glUniform4i(location, v0, v1, v2, v3);
     }
 
     public static void glUniformMatrix2(int location, boolean transpose, java.nio.FloatBuffer matrices) {
-        org.lwjgl3.opengl.GL20.glUniformMatrix2fv(location, transpose, matrices);
+        org.lwjgl.opengl.GL20.glUniformMatrix2fv(location, transpose, matrices);
     }
 
     public static void glUniformMatrix3(int location, boolean transpose, java.nio.FloatBuffer matrices) {
-        org.lwjgl3.opengl.GL20.glUniformMatrix3fv(location, transpose, matrices);
+        org.lwjgl.opengl.GL20.glUniformMatrix3fv(location, transpose, matrices);
     }
 
     public static void glUniformMatrix4(int location, boolean transpose, java.nio.FloatBuffer matrices) {
-        org.lwjgl3.opengl.GL20.glUniformMatrix4fv(location, transpose, matrices);
+        org.lwjgl.opengl.GL20.glUniformMatrix4fv(location, transpose, matrices);
     }
 
     public static void glUseProgram(int program) {
-        org.lwjgl3.opengl.GL20.glUseProgram(program);
+        org.lwjgl.opengl.GL20.glUseProgram(program);
     }
 
     public static void glValidateProgram(int program) {
-        org.lwjgl3.opengl.GL20.glValidateProgram(program);
+        org.lwjgl.opengl.GL20.glValidateProgram(program);
     }
 
     public static void glVertexAttrib1d(int index, double x) {
-        org.lwjgl3.opengl.GL20.glVertexAttrib1d(index, x);
+        org.lwjgl.opengl.GL20.glVertexAttrib1d(index, x);
     }
 
     public static void glVertexAttrib1f(int index, float x) {
-        org.lwjgl3.opengl.GL20.glVertexAttrib1f(index, x);
+        org.lwjgl.opengl.GL20.glVertexAttrib1f(index, x);
     }
 
     public static void glVertexAttrib1s(int index, short x) {
-        org.lwjgl3.opengl.GL20.glVertexAttrib1s(index, x);
+        org.lwjgl.opengl.GL20.glVertexAttrib1s(index, x);
     }
 
     public static void glVertexAttrib2d(int index, double x, double y) {
-        org.lwjgl3.opengl.GL20.glVertexAttrib2d(index, x, y);
+        org.lwjgl.opengl.GL20.glVertexAttrib2d(index, x, y);
     }
 
     public static void glVertexAttrib2f(int index, float x, float y) {
-        org.lwjgl3.opengl.GL20.glVertexAttrib2f(index, x, y);
+        org.lwjgl.opengl.GL20.glVertexAttrib2f(index, x, y);
     }
 
     public static void glVertexAttrib2s(int index, short x, short y) {
-        org.lwjgl3.opengl.GL20.glVertexAttrib2s(index, x, y);
+        org.lwjgl.opengl.GL20.glVertexAttrib2s(index, x, y);
     }
 
     public static void glVertexAttrib3d(int index, double x, double y, double z) {
-        org.lwjgl3.opengl.GL20.glVertexAttrib3d(index, x, y, z);
+        org.lwjgl.opengl.GL20.glVertexAttrib3d(index, x, y, z);
     }
 
     public static void glVertexAttrib3f(int index, float x, float y, float z) {
-        org.lwjgl3.opengl.GL20.glVertexAttrib3f(index, x, y, z);
+        org.lwjgl.opengl.GL20.glVertexAttrib3f(index, x, y, z);
     }
 
     public static void glVertexAttrib3s(int index, short x, short y, short z) {
-        org.lwjgl3.opengl.GL20.glVertexAttrib3s(index, x, y, z);
+        org.lwjgl.opengl.GL20.glVertexAttrib3s(index, x, y, z);
     }
 
     public static void glVertexAttrib4Nub(int index, byte x, byte y, byte z, byte w) {
-        org.lwjgl3.opengl.GL20.glVertexAttrib4Nub(index, x, y, z, w);
+        org.lwjgl.opengl.GL20.glVertexAttrib4Nub(index, x, y, z, w);
     }
 
     public static void glVertexAttrib4d(int index, double x, double y, double z, double w) {
-        org.lwjgl3.opengl.GL20.glVertexAttrib4d(index, x, y, z, w);
+        org.lwjgl.opengl.GL20.glVertexAttrib4d(index, x, y, z, w);
     }
 
     public static void glVertexAttrib4f(int index, float x, float y, float z, float w) {
-        org.lwjgl3.opengl.GL20.glVertexAttrib4f(index, x, y, z, w);
+        org.lwjgl.opengl.GL20.glVertexAttrib4f(index, x, y, z, w);
     }
 
     public static void glVertexAttrib4s(int index, short x, short y, short z, short w) {
-        org.lwjgl3.opengl.GL20.glVertexAttrib4s(index, x, y, z, w);
+        org.lwjgl.opengl.GL20.glVertexAttrib4s(index, x, y, z, w);
     }
 
     public static void glVertexAttribPointer(int index, int size, int type, boolean normalized, int stride,
             long buffer_buffer_offset) {
-        org.lwjgl3.opengl.GL20.glVertexAttribPointer(index, size, type, normalized, stride, buffer_buffer_offset);
+        org.lwjgl.opengl.GL20.glVertexAttribPointer(index, size, type, normalized, stride, buffer_buffer_offset);
     }
 
     public static void glVertexAttribPointer(int index, int size, int type, boolean normalized, int stride,
             java.nio.ByteBuffer buffer) {
-        org.lwjgl3.opengl.GL20.glVertexAttribPointer(index, size, type, normalized, stride, buffer);
+        org.lwjgl.opengl.GL20.glVertexAttribPointer(index, size, type, normalized, stride, buffer);
     }
 
     public static void glVertexAttribPointer(int index, int size, boolean normalized, int stride,
             java.nio.DoubleBuffer buffer) {
 
-        org.lwjgl3.opengl.GL20.glVertexAttribPointer(
+        org.lwjgl.opengl.GL20.glVertexAttribPointer(
                 index,
                 size,
-                org.lwjgl3.opengl.GL11.GL_DOUBLE,
+                org.lwjgl.opengl.GL11.GL_DOUBLE,
                 normalized,
                 stride,
                 BufferCasts.toByteBuffer(buffer));
@@ -438,43 +439,43 @@ public static void glVertexAttribPointer(int index, int size, boolean normalized
     public static void glVertexAttribPointer(int index, int size, boolean normalized, int stride,
             java.nio.FloatBuffer buffer) {
 
-        org.lwjgl3.opengl.GL20
-                .glVertexAttribPointer(index, size, org.lwjgl3.opengl.GL11.GL_FLOAT, normalized, stride, buffer);
+        org.lwjgl.opengl.GL20
+                .glVertexAttribPointer(index, size, org.lwjgl.opengl.GL11.GL_FLOAT, normalized, stride, buffer);
     }
 
     public static void glVertexAttribPointer(int index, int size, boolean unsigned, boolean normalized, int stride,
             java.nio.ByteBuffer buffer) {
 
-        org.lwjgl3.opengl.GL20.glVertexAttribPointer(
+        org.lwjgl.opengl.GL20.glVertexAttribPointer(
                 index,
                 size,
-                (unsigned ? org.lwjgl3.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl3.opengl.GL11.GL_BYTE),
+                (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE : org.lwjgl.opengl.GL11.GL_BYTE),
                 normalized,
                 stride,
-                org.lwjgl.MemoryUtil.getAddress(buffer));
+                MemoryUtil.getAddress(buffer));
     }
 
     public static void glVertexAttribPointer(int index, int size, boolean unsigned, boolean normalized, int stride,
             java.nio.IntBuffer buffer) {
 
-        org.lwjgl3.opengl.GL20.glVertexAttribPointer(
+        org.lwjgl.opengl.GL20.glVertexAttribPointer(
                 index,
                 size,
-                (unsigned ? org.lwjgl3.opengl.GL11.GL_UNSIGNED_INT : org.lwjgl3.opengl.GL11.GL_INT),
+                (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_INT : org.lwjgl.opengl.GL11.GL_INT),
                 normalized,
                 stride,
-                org.lwjgl.MemoryUtil.getAddress(buffer));
+                MemoryUtil.getAddress(buffer));
     }
 
     public static void glVertexAttribPointer(int index, int size, boolean unsigned, boolean normalized, int stride,
             java.nio.ShortBuffer buffer) {
 
-        org.lwjgl3.opengl.GL20.glVertexAttribPointer(
+        org.lwjgl.opengl.GL20.glVertexAttribPointer(
                 index,
                 size,
-                (unsigned ? org.lwjgl3.opengl.GL11.GL_UNSIGNED_SHORT : org.lwjgl3.opengl.GL11.GL_SHORT),
+                (unsigned ? org.lwjgl.opengl.GL11.GL_UNSIGNED_SHORT : org.lwjgl.opengl.GL11.GL_SHORT),
                 normalized,
                 stride,
-                org.lwjgl.MemoryUtil.getAddress(buffer));
+                MemoryUtil.getAddress(buffer));
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/GL20x.java b/src/main/java/org/lwjglx/opengl/GL20x.java
similarity index 88%
rename from src/main/java/org/lwjgl/opengl/GL20x.java
rename to src/main/java/org/lwjglx/opengl/GL20x.java
index c42b3eb25..f2f30810c 100644
--- a/src/main/java/org/lwjgl/opengl/GL20x.java
+++ b/src/main/java/org/lwjglx/opengl/GL20x.java
@@ -1,14 +1,14 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
 import java.nio.ShortBuffer;
 
-import org.lwjgl3.BufferUtils;
-import org.lwjgl3.PointerBuffer;
-import org.lwjgl3.opengl.GL11;
-import org.lwjgl3.opengl.GL20;
-import org.lwjgl3.system.MemoryUtil;
+import org.lwjgl.BufferUtils;
+import org.lwjgl.PointerBuffer;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL20;
+import org.lwjgl.system.MemoryUtil;
 
 public class GL20x {
 
@@ -52,6 +52,6 @@ public static void glShaderSource(int shader, java.nio.ByteBuffer string) {
 
         strings.put(0, string);
         lengths.put(0, new String(string.array()).length()); // source.length());
-        org.lwjgl3.opengl.GL20.glShaderSource(shader, strings, lengths);
+        org.lwjgl.opengl.GL20.glShaderSource(shader, strings, lengths);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/GL21.java b/src/main/java/org/lwjglx/opengl/GL21.java
similarity index 80%
rename from src/main/java/org/lwjgl/opengl/GL21.java
rename to src/main/java/org/lwjglx/opengl/GL21.java
index 7e06787eb..b99ce2588 100644
--- a/src/main/java/org/lwjgl/opengl/GL21.java
+++ b/src/main/java/org/lwjglx/opengl/GL21.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class GL21 {
 
@@ -27,26 +27,26 @@ public class GL21 {
     public static final int GL_SRGB_ALPHA = (int) 35906;
 
     public static void glUniformMatrix2x3(int location, boolean transpose, java.nio.FloatBuffer matrices) {
-        org.lwjgl3.opengl.GL21.glUniformMatrix2x3fv(location, transpose, matrices);
+        org.lwjgl.opengl.GL21.glUniformMatrix2x3fv(location, transpose, matrices);
     }
 
     public static void glUniformMatrix2x4(int location, boolean transpose, java.nio.FloatBuffer matrices) {
-        org.lwjgl3.opengl.GL21.glUniformMatrix2x4fv(location, transpose, matrices);
+        org.lwjgl.opengl.GL21.glUniformMatrix2x4fv(location, transpose, matrices);
     }
 
     public static void glUniformMatrix3x2(int location, boolean transpose, java.nio.FloatBuffer matrices) {
-        org.lwjgl3.opengl.GL21.glUniformMatrix3x2fv(location, transpose, matrices);
+        org.lwjgl.opengl.GL21.glUniformMatrix3x2fv(location, transpose, matrices);
     }
 
     public static void glUniformMatrix3x4(int location, boolean transpose, java.nio.FloatBuffer matrices) {
-        org.lwjgl3.opengl.GL21.glUniformMatrix3x4fv(location, transpose, matrices);
+        org.lwjgl.opengl.GL21.glUniformMatrix3x4fv(location, transpose, matrices);
     }
 
     public static void glUniformMatrix4x2(int location, boolean transpose, java.nio.FloatBuffer matrices) {
-        org.lwjgl3.opengl.GL21.glUniformMatrix4x2fv(location, transpose, matrices);
+        org.lwjgl.opengl.GL21.glUniformMatrix4x2fv(location, transpose, matrices);
     }
 
     public static void glUniformMatrix4x3(int location, boolean transpose, java.nio.FloatBuffer matrices) {
-        org.lwjgl3.opengl.GL21.glUniformMatrix4x3fv(location, transpose, matrices);
+        org.lwjgl.opengl.GL21.glUniformMatrix4x3fv(location, transpose, matrices);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/GL30.java b/src/main/java/org/lwjglx/opengl/GL30.java
similarity index 77%
rename from src/main/java/org/lwjgl/opengl/GL30.java
rename to src/main/java/org/lwjglx/opengl/GL30.java
index 6ad277cde..4971598c7 100644
--- a/src/main/java/org/lwjgl/opengl/GL30.java
+++ b/src/main/java/org/lwjglx/opengl/GL30.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class GL30 {
 
@@ -243,417 +243,417 @@ public class GL30 {
     public static final int GL_VERTEX_ATTRIB_ARRAY_INTEGER = (int) 35069;
 
     public static void glBeginConditionalRender(int id, int mode) {
-        org.lwjgl3.opengl.GL30.glBeginConditionalRender(id, mode);
+        org.lwjgl.opengl.GL30.glBeginConditionalRender(id, mode);
     }
 
     public static void glBeginTransformFeedback(int primitiveMode) {
-        org.lwjgl3.opengl.GL30.glBeginTransformFeedback(primitiveMode);
+        org.lwjgl.opengl.GL30.glBeginTransformFeedback(primitiveMode);
     }
 
     public static void glBindBufferBase(int target, int index, int buffer) {
-        org.lwjgl3.opengl.GL30.glBindBufferBase(target, index, buffer);
+        org.lwjgl.opengl.GL30.glBindBufferBase(target, index, buffer);
     }
 
     public static void glBindBufferRange(int target, int index, int buffer, long offset, long size) {
-        org.lwjgl3.opengl.GL30.glBindBufferRange(target, index, buffer, offset, size);
+        org.lwjgl.opengl.GL30.glBindBufferRange(target, index, buffer, offset, size);
     }
 
     public static void glBindFragDataLocation(int program, int colorNumber, java.lang.CharSequence name) {
-        org.lwjgl3.opengl.GL30.glBindFragDataLocation(program, colorNumber, name);
+        org.lwjgl.opengl.GL30.glBindFragDataLocation(program, colorNumber, name);
     }
 
     public static void glBindFragDataLocation(int program, int colorNumber, java.nio.ByteBuffer name) {
-        org.lwjgl3.opengl.GL30.glBindFragDataLocation(program, colorNumber, name);
+        org.lwjgl.opengl.GL30.glBindFragDataLocation(program, colorNumber, name);
     }
 
     public static void glBindFramebuffer(int target, int framebuffer) {
-        org.lwjgl3.opengl.GL30.glBindFramebuffer(target, framebuffer);
+        org.lwjgl.opengl.GL30.glBindFramebuffer(target, framebuffer);
     }
 
     public static void glBindRenderbuffer(int target, int renderbuffer) {
-        org.lwjgl3.opengl.GL30.glBindRenderbuffer(target, renderbuffer);
+        org.lwjgl.opengl.GL30.glBindRenderbuffer(target, renderbuffer);
     }
 
     public static void glBindVertexArray(int array) {
-        org.lwjgl3.opengl.GL30.glBindVertexArray(array);
+        org.lwjgl.opengl.GL30.glBindVertexArray(array);
     }
 
     public static void glBlitFramebuffer(int srcX0, int srcY0, int srcX1, int srcY1, int dstX0, int dstY0, int dstX1,
             int dstY1, int mask, int filter) {
-        org.lwjgl3.opengl.GL30.glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+        org.lwjgl.opengl.GL30.glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
     }
 
     public static int glCheckFramebufferStatus(int target) {
-        return org.lwjgl3.opengl.GL30.glCheckFramebufferStatus(target);
+        return org.lwjgl.opengl.GL30.glCheckFramebufferStatus(target);
     }
 
     public static void glClampColor(int target, int clamp) {
-        org.lwjgl3.opengl.GL30.glClampColor(target, clamp);
+        org.lwjgl.opengl.GL30.glClampColor(target, clamp);
     }
 
     public static void glClearBuffer(int buffer, int drawbuffer, java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.GL30.glClearBufferfv(buffer, drawbuffer, value);
+        org.lwjgl.opengl.GL30.glClearBufferfv(buffer, drawbuffer, value);
     }
 
     public static void glClearBuffer(int buffer, int drawbuffer, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.GL30.glClearBufferiv(buffer, drawbuffer, value);
+        org.lwjgl.opengl.GL30.glClearBufferiv(buffer, drawbuffer, value);
     }
 
     public static void glClearBufferfi(int buffer, int drawbuffer, float depth, int stencil) {
-        org.lwjgl3.opengl.GL30.glClearBufferfi(buffer, drawbuffer, depth, stencil);
+        org.lwjgl.opengl.GL30.glClearBufferfi(buffer, drawbuffer, depth, stencil);
     }
 
     public static void glClearBufferu(int buffer, int drawbuffer, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.GL30.glClearBufferuiv(buffer, drawbuffer, value);
+        org.lwjgl.opengl.GL30.glClearBufferuiv(buffer, drawbuffer, value);
     }
 
     public static void glColorMaski(int buf, boolean r, boolean g, boolean b, boolean a) {
-        org.lwjgl3.opengl.GL30.glColorMaski(buf, r, g, b, a);
+        org.lwjgl.opengl.GL30.glColorMaski(buf, r, g, b, a);
     }
 
     public static void glDeleteFramebuffers(int framebuffer) {
-        org.lwjgl3.opengl.GL30.glDeleteFramebuffers(framebuffer);
+        org.lwjgl.opengl.GL30.glDeleteFramebuffers(framebuffer);
     }
 
     public static void glDeleteFramebuffers(java.nio.IntBuffer framebuffers) {
-        org.lwjgl3.opengl.GL30.glDeleteFramebuffers(framebuffers);
+        org.lwjgl.opengl.GL30.glDeleteFramebuffers(framebuffers);
     }
 
     public static void glDeleteRenderbuffers(int renderbuffer) {
-        org.lwjgl3.opengl.GL30.glDeleteRenderbuffers(renderbuffer);
+        org.lwjgl.opengl.GL30.glDeleteRenderbuffers(renderbuffer);
     }
 
     public static void glDeleteRenderbuffers(java.nio.IntBuffer renderbuffers) {
-        org.lwjgl3.opengl.GL30.glDeleteRenderbuffers(renderbuffers);
+        org.lwjgl.opengl.GL30.glDeleteRenderbuffers(renderbuffers);
     }
 
     public static void glDeleteVertexArrays(int array) {
-        org.lwjgl3.opengl.GL30.glDeleteVertexArrays(array);
+        org.lwjgl.opengl.GL30.glDeleteVertexArrays(array);
     }
 
     public static void glDeleteVertexArrays(java.nio.IntBuffer arrays) {
-        org.lwjgl3.opengl.GL30.glDeleteVertexArrays(arrays);
+        org.lwjgl.opengl.GL30.glDeleteVertexArrays(arrays);
     }
 
     public static void glDisablei(int target, int index) {
-        org.lwjgl3.opengl.GL30.glDisablei(target, index);
+        org.lwjgl.opengl.GL30.glDisablei(target, index);
     }
 
     public static void glEnablei(int target, int index) {
-        org.lwjgl3.opengl.GL30.glEnablei(target, index);
+        org.lwjgl.opengl.GL30.glEnablei(target, index);
     }
 
     public static void glEndConditionalRender() {
-        org.lwjgl3.opengl.GL30.glEndConditionalRender();
+        org.lwjgl.opengl.GL30.glEndConditionalRender();
     }
 
     public static void glEndTransformFeedback() {
-        org.lwjgl3.opengl.GL30.glEndTransformFeedback();
+        org.lwjgl.opengl.GL30.glEndTransformFeedback();
     }
 
     public static void glFlushMappedBufferRange(int target, long offset, long length) {
-        org.lwjgl3.opengl.GL30.glFlushMappedBufferRange(target, offset, length);
+        org.lwjgl.opengl.GL30.glFlushMappedBufferRange(target, offset, length);
     }
 
     public static void glFramebufferRenderbuffer(int target, int attachment, int renderbuffertarget, int renderbuffer) {
-        org.lwjgl3.opengl.GL30.glFramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
+        org.lwjgl.opengl.GL30.glFramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
     }
 
     public static void glFramebufferTexture1D(int target, int attachment, int textarget, int texture, int level) {
-        org.lwjgl3.opengl.GL30.glFramebufferTexture1D(target, attachment, textarget, texture, level);
+        org.lwjgl.opengl.GL30.glFramebufferTexture1D(target, attachment, textarget, texture, level);
     }
 
     public static void glFramebufferTexture2D(int target, int attachment, int textarget, int texture, int level) {
-        org.lwjgl3.opengl.GL30.glFramebufferTexture2D(target, attachment, textarget, texture, level);
+        org.lwjgl.opengl.GL30.glFramebufferTexture2D(target, attachment, textarget, texture, level);
     }
 
     public static void glFramebufferTexture3D(int target, int attachment, int textarget, int texture, int level,
             int zoffset) {
-        org.lwjgl3.opengl.GL30.glFramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
+        org.lwjgl.opengl.GL30.glFramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
     }
 
     public static void glFramebufferTextureLayer(int target, int attachment, int texture, int level, int layer) {
-        org.lwjgl3.opengl.GL30.glFramebufferTextureLayer(target, attachment, texture, level, layer);
+        org.lwjgl.opengl.GL30.glFramebufferTextureLayer(target, attachment, texture, level, layer);
     }
 
     public static int glGenFramebuffers() {
-        return org.lwjgl3.opengl.GL30.glGenFramebuffers();
+        return org.lwjgl.opengl.GL30.glGenFramebuffers();
     }
 
     public static void glGenFramebuffers(java.nio.IntBuffer framebuffers) {
-        org.lwjgl3.opengl.GL30.glGenFramebuffers(framebuffers);
+        org.lwjgl.opengl.GL30.glGenFramebuffers(framebuffers);
     }
 
     public static int glGenRenderbuffers() {
-        return org.lwjgl3.opengl.GL30.glGenRenderbuffers();
+        return org.lwjgl.opengl.GL30.glGenRenderbuffers();
     }
 
     public static void glGenRenderbuffers(java.nio.IntBuffer renderbuffers) {
-        org.lwjgl3.opengl.GL30.glGenRenderbuffers(renderbuffers);
+        org.lwjgl.opengl.GL30.glGenRenderbuffers(renderbuffers);
     }
 
     public static int glGenVertexArrays() {
-        return org.lwjgl3.opengl.GL30.glGenVertexArrays();
+        return org.lwjgl.opengl.GL30.glGenVertexArrays();
     }
 
     public static void glGenVertexArrays(java.nio.IntBuffer arrays) {
-        org.lwjgl3.opengl.GL30.glGenVertexArrays(arrays);
+        org.lwjgl.opengl.GL30.glGenVertexArrays(arrays);
     }
 
     public static void glGenerateMipmap(int target) {
-        org.lwjgl3.opengl.GL30.glGenerateMipmap(target);
+        org.lwjgl.opengl.GL30.glGenerateMipmap(target);
     }
 
     public static void glGetBoolean(int value, int index, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.GL30.glGetBooleani_v(value, index, data);
+        org.lwjgl.opengl.GL30.glGetBooleani_v(value, index, data);
     }
 
     public static int glGetFragDataLocation(int program, java.lang.CharSequence name) {
-        return org.lwjgl3.opengl.GL30.glGetFragDataLocation(program, name);
+        return org.lwjgl.opengl.GL30.glGetFragDataLocation(program, name);
     }
 
     public static int glGetFragDataLocation(int program, java.nio.ByteBuffer name) {
-        return org.lwjgl3.opengl.GL30.glGetFragDataLocation(program, name);
+        return org.lwjgl.opengl.GL30.glGetFragDataLocation(program, name);
     }
 
     public static void glGetFramebufferAttachmentParameter(int target, int attachment, int pname,
             java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL30.glGetFramebufferAttachmentParameteriv(target, attachment, pname, params);
+        org.lwjgl.opengl.GL30.glGetFramebufferAttachmentParameteriv(target, attachment, pname, params);
     }
 
     public static int glGetFramebufferAttachmentParameteri(int target, int attachment, int pname) {
-        return org.lwjgl3.opengl.GL30.glGetFramebufferAttachmentParameteri(target, attachment, pname);
+        return org.lwjgl.opengl.GL30.glGetFramebufferAttachmentParameteri(target, attachment, pname);
     }
 
     public static void glGetInteger(int value, int index, java.nio.IntBuffer data) {
-        org.lwjgl3.opengl.GL30.glGetIntegeri_v(value, index, data);
+        org.lwjgl.opengl.GL30.glGetIntegeri_v(value, index, data);
     }
 
     public static void glGetRenderbufferParameter(int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL30.glGetRenderbufferParameteriv(target, pname, params);
+        org.lwjgl.opengl.GL30.glGetRenderbufferParameteriv(target, pname, params);
     }
 
     public static int glGetRenderbufferParameteri(int target, int pname) {
-        return org.lwjgl3.opengl.GL30.glGetRenderbufferParameteri(target, pname);
+        return org.lwjgl.opengl.GL30.glGetRenderbufferParameteri(target, pname);
     }
 
     public static java.lang.String glGetStringi(int name, int index) {
-        return org.lwjgl3.opengl.GL30.glGetStringi(name, index);
+        return org.lwjgl.opengl.GL30.glGetStringi(name, index);
     }
 
     public static void glGetTexParameterI(int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL30.glGetTexParameterIiv(target, pname, params);
+        org.lwjgl.opengl.GL30.glGetTexParameterIiv(target, pname, params);
     }
 
     public static int glGetTexParameterIi(int target, int pname) {
-        return org.lwjgl3.opengl.GL30.glGetTexParameterIi(target, pname);
+        return org.lwjgl.opengl.GL30.glGetTexParameterIi(target, pname);
     }
 
     public static void glGetTexParameterIu(int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL30.glGetTexParameterIuiv(target, pname, params);
+        org.lwjgl.opengl.GL30.glGetTexParameterIuiv(target, pname, params);
     }
 
     public static int glGetTexParameterIui(int target, int pname) {
-        return org.lwjgl3.opengl.GL30.glGetTexParameterIui(target, pname);
+        return org.lwjgl.opengl.GL30.glGetTexParameterIui(target, pname);
     }
 
     public static java.lang.String glGetTransformFeedbackVarying(int program, int index, int bufSize,
             java.nio.IntBuffer size, java.nio.IntBuffer type) {
-        return org.lwjgl3.opengl.GL30.glGetTransformFeedbackVarying(program, index, bufSize, size, type);
+        return org.lwjgl.opengl.GL30.glGetTransformFeedbackVarying(program, index, bufSize, size, type);
     }
 
     public static void glGetTransformFeedbackVarying(int program, int index, java.nio.IntBuffer length,
             java.nio.IntBuffer size, java.nio.IntBuffer type, java.nio.ByteBuffer name) {
-        org.lwjgl3.opengl.GL30.glGetTransformFeedbackVarying(program, index, length, size, type, name);
+        org.lwjgl.opengl.GL30.glGetTransformFeedbackVarying(program, index, length, size, type, name);
     }
 
     public static void glGetUniformu(int program, int location, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL30.glGetUniformuiv(program, location, params);
+        org.lwjgl.opengl.GL30.glGetUniformuiv(program, location, params);
     }
 
     public static void glGetVertexAttribI(int index, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL30.glGetVertexAttribIiv(index, pname, params);
+        org.lwjgl.opengl.GL30.glGetVertexAttribIiv(index, pname, params);
     }
 
     public static void glGetVertexAttribIu(int index, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL30.glGetVertexAttribIuiv(index, pname, params);
+        org.lwjgl.opengl.GL30.glGetVertexAttribIuiv(index, pname, params);
     }
 
     public static boolean glIsEnabledi(int target, int index) {
-        return org.lwjgl3.opengl.GL30.glIsEnabledi(target, index);
+        return org.lwjgl.opengl.GL30.glIsEnabledi(target, index);
     }
 
     public static boolean glIsFramebuffer(int framebuffer) {
-        return org.lwjgl3.opengl.GL30.glIsFramebuffer(framebuffer);
+        return org.lwjgl.opengl.GL30.glIsFramebuffer(framebuffer);
     }
 
     public static boolean glIsRenderbuffer(int renderbuffer) {
-        return org.lwjgl3.opengl.GL30.glIsRenderbuffer(renderbuffer);
+        return org.lwjgl.opengl.GL30.glIsRenderbuffer(renderbuffer);
     }
 
     public static boolean glIsVertexArray(int array) {
-        return org.lwjgl3.opengl.GL30.glIsVertexArray(array);
+        return org.lwjgl.opengl.GL30.glIsVertexArray(array);
     }
 
     public static java.nio.ByteBuffer glMapBufferRange(int target, long offset, long length, int access,
             java.nio.ByteBuffer old_buffer) {
-        return org.lwjgl3.opengl.GL30.glMapBufferRange(target, offset, length, access, old_buffer);
+        return org.lwjgl.opengl.GL30.glMapBufferRange(target, offset, length, access, old_buffer);
     }
 
     public static void glRenderbufferStorage(int target, int internalformat, int width, int height) {
-        org.lwjgl3.opengl.GL30.glRenderbufferStorage(target, internalformat, width, height);
+        org.lwjgl.opengl.GL30.glRenderbufferStorage(target, internalformat, width, height);
     }
 
     public static void glRenderbufferStorageMultisample(int target, int samples, int internalformat, int width,
             int height) {
-        org.lwjgl3.opengl.GL30.glRenderbufferStorageMultisample(target, samples, internalformat, width, height);
+        org.lwjgl.opengl.GL30.glRenderbufferStorageMultisample(target, samples, internalformat, width, height);
     }
 
     public static void glTexParameterI(int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL30.glTexParameterIiv(target, pname, params);
+        org.lwjgl.opengl.GL30.glTexParameterIiv(target, pname, params);
     }
 
     public static void glTexParameterIi(int target, int pname, int param) {
-        org.lwjgl3.opengl.GL30.glTexParameterIi(target, pname, param);
+        org.lwjgl.opengl.GL30.glTexParameterIi(target, pname, param);
     }
 
     public static void glTexParameterIu(int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL30.glTexParameterIuiv(target, pname, params);
+        org.lwjgl.opengl.GL30.glTexParameterIuiv(target, pname, params);
     }
 
     public static void glTexParameterIui(int target, int pname, int param) {
-        org.lwjgl3.opengl.GL30.glTexParameterIui(target, pname, param);
+        org.lwjgl.opengl.GL30.glTexParameterIui(target, pname, param);
     }
 
     public static void glTransformFeedbackVaryings(int program, java.lang.CharSequence[] varyings, int bufferMode) {
-        org.lwjgl3.opengl.GL30.glTransformFeedbackVaryings(program, varyings, bufferMode);
+        org.lwjgl.opengl.GL30.glTransformFeedbackVaryings(program, varyings, bufferMode);
     }
 
     public static void glUniform1u(int location, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.GL30.glUniform1uiv(location, value);
+        org.lwjgl.opengl.GL30.glUniform1uiv(location, value);
     }
 
     public static void glUniform1ui(int location, int v0) {
-        org.lwjgl3.opengl.GL30.glUniform1ui(location, v0);
+        org.lwjgl.opengl.GL30.glUniform1ui(location, v0);
     }
 
     public static void glUniform2u(int location, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.GL30.glUniform2uiv(location, value);
+        org.lwjgl.opengl.GL30.glUniform2uiv(location, value);
     }
 
     public static void glUniform2ui(int location, int v0, int v1) {
-        org.lwjgl3.opengl.GL30.glUniform2ui(location, v0, v1);
+        org.lwjgl.opengl.GL30.glUniform2ui(location, v0, v1);
     }
 
     public static void glUniform3u(int location, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.GL30.glUniform3uiv(location, value);
+        org.lwjgl.opengl.GL30.glUniform3uiv(location, value);
     }
 
     public static void glUniform3ui(int location, int v0, int v1, int v2) {
-        org.lwjgl3.opengl.GL30.glUniform3ui(location, v0, v1, v2);
+        org.lwjgl.opengl.GL30.glUniform3ui(location, v0, v1, v2);
     }
 
     public static void glUniform4u(int location, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.GL30.glUniform4uiv(location, value);
+        org.lwjgl.opengl.GL30.glUniform4uiv(location, value);
     }
 
     public static void glUniform4ui(int location, int v0, int v1, int v2, int v3) {
-        org.lwjgl3.opengl.GL30.glUniform4ui(location, v0, v1, v2, v3);
+        org.lwjgl.opengl.GL30.glUniform4ui(location, v0, v1, v2, v3);
     }
 
     public static void glVertexAttribI1(int index, java.nio.IntBuffer v) {
-        org.lwjgl3.opengl.GL30.glVertexAttribI1iv(index, v);
+        org.lwjgl.opengl.GL30.glVertexAttribI1iv(index, v);
     }
 
     public static void glVertexAttribI1i(int index, int x) {
-        org.lwjgl3.opengl.GL30.glVertexAttribI1i(index, x);
+        org.lwjgl.opengl.GL30.glVertexAttribI1i(index, x);
     }
 
     public static void glVertexAttribI1u(int index, java.nio.IntBuffer v) {
-        org.lwjgl3.opengl.GL30.glVertexAttribI1uiv(index, v);
+        org.lwjgl.opengl.GL30.glVertexAttribI1uiv(index, v);
     }
 
     public static void glVertexAttribI1ui(int index, int x) {
-        org.lwjgl3.opengl.GL30.glVertexAttribI1ui(index, x);
+        org.lwjgl.opengl.GL30.glVertexAttribI1ui(index, x);
     }
 
     public static void glVertexAttribI2(int index, java.nio.IntBuffer v) {
-        org.lwjgl3.opengl.GL30.glVertexAttribI2iv(index, v);
+        org.lwjgl.opengl.GL30.glVertexAttribI2iv(index, v);
     }
 
     public static void glVertexAttribI2i(int index, int x, int y) {
-        org.lwjgl3.opengl.GL30.glVertexAttribI2i(index, x, y);
+        org.lwjgl.opengl.GL30.glVertexAttribI2i(index, x, y);
     }
 
     public static void glVertexAttribI2u(int index, java.nio.IntBuffer v) {
-        org.lwjgl3.opengl.GL30.glVertexAttribI2uiv(index, v);
+        org.lwjgl.opengl.GL30.glVertexAttribI2uiv(index, v);
     }
 
     public static void glVertexAttribI2ui(int index, int x, int y) {
-        org.lwjgl3.opengl.GL30.glVertexAttribI2ui(index, x, y);
+        org.lwjgl.opengl.GL30.glVertexAttribI2ui(index, x, y);
     }
 
     public static void glVertexAttribI3(int index, java.nio.IntBuffer v) {
-        org.lwjgl3.opengl.GL30.glVertexAttribI3iv(index, v);
+        org.lwjgl.opengl.GL30.glVertexAttribI3iv(index, v);
     }
 
     public static void glVertexAttribI3i(int index, int x, int y, int z) {
-        org.lwjgl3.opengl.GL30.glVertexAttribI3i(index, x, y, z);
+        org.lwjgl.opengl.GL30.glVertexAttribI3i(index, x, y, z);
     }
 
     public static void glVertexAttribI3u(int index, java.nio.IntBuffer v) {
-        org.lwjgl3.opengl.GL30.glVertexAttribI3uiv(index, v);
+        org.lwjgl.opengl.GL30.glVertexAttribI3uiv(index, v);
     }
 
     public static void glVertexAttribI3ui(int index, int x, int y, int z) {
-        org.lwjgl3.opengl.GL30.glVertexAttribI3ui(index, x, y, z);
+        org.lwjgl.opengl.GL30.glVertexAttribI3ui(index, x, y, z);
     }
 
     public static void glVertexAttribI4(int index, java.nio.ByteBuffer v) {
-        org.lwjgl3.opengl.GL30.glVertexAttribI4bv(index, v);
+        org.lwjgl.opengl.GL30.glVertexAttribI4bv(index, v);
     }
 
     public static void glVertexAttribI4(int index, java.nio.IntBuffer v) {
-        org.lwjgl3.opengl.GL30.glVertexAttribI4iv(index, v);
+        org.lwjgl.opengl.GL30.glVertexAttribI4iv(index, v);
     }
 
     public static void glVertexAttribI4(int index, java.nio.ShortBuffer v) {
-        org.lwjgl3.opengl.GL30.glVertexAttribI4sv(index, v);
+        org.lwjgl.opengl.GL30.glVertexAttribI4sv(index, v);
     }
 
     public static void glVertexAttribI4i(int index, int x, int y, int z, int w) {
-        org.lwjgl3.opengl.GL30.glVertexAttribI4i(index, x, y, z, w);
+        org.lwjgl.opengl.GL30.glVertexAttribI4i(index, x, y, z, w);
     }
 
     public static void glVertexAttribI4u(int index, java.nio.ByteBuffer v) {
-        org.lwjgl3.opengl.GL30.glVertexAttribI4ubv(index, v);
+        org.lwjgl.opengl.GL30.glVertexAttribI4ubv(index, v);
     }
 
     public static void glVertexAttribI4u(int index, java.nio.IntBuffer v) {
-        org.lwjgl3.opengl.GL30.glVertexAttribI4uiv(index, v);
+        org.lwjgl.opengl.GL30.glVertexAttribI4uiv(index, v);
     }
 
     public static void glVertexAttribI4u(int index, java.nio.ShortBuffer v) {
-        org.lwjgl3.opengl.GL30.glVertexAttribI4usv(index, v);
+        org.lwjgl.opengl.GL30.glVertexAttribI4usv(index, v);
     }
 
     public static void glVertexAttribI4ui(int index, int x, int y, int z, int w) {
-        org.lwjgl3.opengl.GL30.glVertexAttribI4ui(index, x, y, z, w);
+        org.lwjgl.opengl.GL30.glVertexAttribI4ui(index, x, y, z, w);
     }
 
     public static void glVertexAttribIPointer(int index, int size, int type, int stride, long buffer_buffer_offset) {
-        org.lwjgl3.opengl.GL30.glVertexAttribIPointer(index, size, type, stride, buffer_buffer_offset);
+        org.lwjgl.opengl.GL30.glVertexAttribIPointer(index, size, type, stride, buffer_buffer_offset);
     }
 
     public static void glVertexAttribIPointer(int index, int size, int type, int stride, java.nio.ByteBuffer buffer) {
-        org.lwjgl3.opengl.GL30.glVertexAttribIPointer(index, size, type, stride, buffer);
+        org.lwjgl.opengl.GL30.glVertexAttribIPointer(index, size, type, stride, buffer);
     }
 
     public static void glVertexAttribIPointer(int index, int size, int type, int stride, java.nio.IntBuffer buffer) {
-        org.lwjgl3.opengl.GL30.glVertexAttribIPointer(index, size, type, stride, buffer);
+        org.lwjgl.opengl.GL30.glVertexAttribIPointer(index, size, type, stride, buffer);
     }
 
     public static void glVertexAttribIPointer(int index, int size, int type, int stride, java.nio.ShortBuffer buffer) {
-        org.lwjgl3.opengl.GL30.glVertexAttribIPointer(index, size, type, stride, buffer);
+        org.lwjgl.opengl.GL30.glVertexAttribIPointer(index, size, type, stride, buffer);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/GL31.java b/src/main/java/org/lwjglx/opengl/GL31.java
similarity index 78%
rename from src/main/java/org/lwjgl/opengl/GL31.java
rename to src/main/java/org/lwjglx/opengl/GL31.java
index c7517dcdf..9ea233f4b 100644
--- a/src/main/java/org/lwjgl/opengl/GL31.java
+++ b/src/main/java/org/lwjglx/opengl/GL31.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class GL31 {
 
@@ -68,88 +68,88 @@ public class GL31 {
 
     public static void glCopyBufferSubData(int readtarget, int writetarget, long readoffset, long writeoffset,
             long size) {
-        org.lwjgl3.opengl.GL31.glCopyBufferSubData(readtarget, writetarget, readoffset, writeoffset, size);
+        org.lwjgl.opengl.GL31.glCopyBufferSubData(readtarget, writetarget, readoffset, writeoffset, size);
     }
 
     public static void glDrawArraysInstanced(int mode, int first, int count, int primcount) {
-        org.lwjgl3.opengl.GL31.glDrawArraysInstanced(mode, first, count, primcount);
+        org.lwjgl.opengl.GL31.glDrawArraysInstanced(mode, first, count, primcount);
     }
 
     public static void glDrawElementsInstanced(int mode, int indices_count, int type, long indices_buffer_offset,
             int primcount) {
-        org.lwjgl3.opengl.GL31.glDrawElementsInstanced(mode, indices_count, type, indices_buffer_offset, primcount);
+        org.lwjgl.opengl.GL31.glDrawElementsInstanced(mode, indices_count, type, indices_buffer_offset, primcount);
     }
 
     public static void glDrawElementsInstanced(int mode, java.nio.ByteBuffer indices, int primcount) {
-        org.lwjgl3.opengl.GL31.glDrawElementsInstanced(mode, indices, primcount);
+        org.lwjgl.opengl.GL31.glDrawElementsInstanced(mode, indices, primcount);
     }
 
     public static void glDrawElementsInstanced(int mode, java.nio.IntBuffer indices, int primcount) {
-        org.lwjgl3.opengl.GL31.glDrawElementsInstanced(mode, indices, primcount);
+        org.lwjgl.opengl.GL31.glDrawElementsInstanced(mode, indices, primcount);
     }
 
     public static void glDrawElementsInstanced(int mode, java.nio.ShortBuffer indices, int primcount) {
-        org.lwjgl3.opengl.GL31.glDrawElementsInstanced(mode, indices, primcount);
+        org.lwjgl.opengl.GL31.glDrawElementsInstanced(mode, indices, primcount);
     }
 
     public static void glGetActiveUniformBlock(int program, int uniformBlockIndex, int pname,
             java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL31.glGetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
+        org.lwjgl.opengl.GL31.glGetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
     }
 
     public static java.lang.String glGetActiveUniformBlockName(int program, int uniformBlockIndex, int bufSize) {
-        return org.lwjgl3.opengl.GL31.glGetActiveUniformBlockName(program, uniformBlockIndex, bufSize);
+        return org.lwjgl.opengl.GL31.glGetActiveUniformBlockName(program, uniformBlockIndex, bufSize);
     }
 
     public static void glGetActiveUniformBlockName(int program, int uniformBlockIndex, java.nio.IntBuffer length,
             java.nio.ByteBuffer uniformBlockName) {
-        org.lwjgl3.opengl.GL31.glGetActiveUniformBlockName(program, uniformBlockIndex, length, uniformBlockName);
+        org.lwjgl.opengl.GL31.glGetActiveUniformBlockName(program, uniformBlockIndex, length, uniformBlockName);
     }
 
     public static int glGetActiveUniformBlocki(int program, int uniformBlockIndex, int pname) {
-        return org.lwjgl3.opengl.GL31.glGetActiveUniformBlocki(program, uniformBlockIndex, pname);
+        return org.lwjgl.opengl.GL31.glGetActiveUniformBlocki(program, uniformBlockIndex, pname);
     }
 
     public static java.lang.String glGetActiveUniformName(int program, int uniformIndex, int bufSize) {
-        return org.lwjgl3.opengl.GL31.glGetActiveUniformName(program, uniformIndex, bufSize);
+        return org.lwjgl.opengl.GL31.glGetActiveUniformName(program, uniformIndex, bufSize);
     }
 
     public static void glGetActiveUniformName(int program, int uniformIndex, java.nio.IntBuffer length,
             java.nio.ByteBuffer uniformName) {
-        org.lwjgl3.opengl.GL31.glGetActiveUniformName(program, uniformIndex, length, uniformName);
+        org.lwjgl.opengl.GL31.glGetActiveUniformName(program, uniformIndex, length, uniformName);
     }
 
     public static void glGetActiveUniforms(int program, java.nio.IntBuffer uniformIndices, int pname,
             java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL31.glGetActiveUniformsiv(program, uniformIndices, pname, params);
+        org.lwjgl.opengl.GL31.glGetActiveUniformsiv(program, uniformIndices, pname, params);
     }
 
     public static int glGetActiveUniformsi(int program, int uniformIndex, int pname) {
-        return org.lwjgl3.opengl.GL31.glGetActiveUniformsi(program, uniformIndex, pname);
+        return org.lwjgl.opengl.GL31.glGetActiveUniformsi(program, uniformIndex, pname);
     }
 
     public static int glGetUniformBlockIndex(int program, java.lang.CharSequence uniformBlockName) {
-        return org.lwjgl3.opengl.GL31.glGetUniformBlockIndex(program, uniformBlockName);
+        return org.lwjgl.opengl.GL31.glGetUniformBlockIndex(program, uniformBlockName);
     }
 
     public static int glGetUniformBlockIndex(int program, java.nio.ByteBuffer uniformBlockName) {
-        return org.lwjgl3.opengl.GL31.glGetUniformBlockIndex(program, uniformBlockName);
+        return org.lwjgl.opengl.GL31.glGetUniformBlockIndex(program, uniformBlockName);
     }
 
     public static void glGetUniformIndices(int program, java.lang.CharSequence[] uniformNames,
             java.nio.IntBuffer uniformIndices) {
-        org.lwjgl3.opengl.GL31.glGetUniformIndices(program, uniformNames, uniformIndices);
+        org.lwjgl.opengl.GL31.glGetUniformIndices(program, uniformNames, uniformIndices);
     }
 
     public static void glPrimitiveRestartIndex(int index) {
-        org.lwjgl3.opengl.GL31.glPrimitiveRestartIndex(index);
+        org.lwjgl.opengl.GL31.glPrimitiveRestartIndex(index);
     }
 
     public static void glTexBuffer(int target, int internalformat, int buffer) {
-        org.lwjgl3.opengl.GL31.glTexBuffer(target, internalformat, buffer);
+        org.lwjgl.opengl.GL31.glTexBuffer(target, internalformat, buffer);
     }
 
     public static void glUniformBlockBinding(int program, int uniformBlockIndex, int uniformBlockBinding) {
-        org.lwjgl3.opengl.GL31.glUniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
+        org.lwjgl.opengl.GL31.glUniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/GL32.java b/src/main/java/org/lwjglx/opengl/GL32.java
similarity index 79%
rename from src/main/java/org/lwjgl/opengl/GL32.java
rename to src/main/java/org/lwjglx/opengl/GL32.java
index b121ecc11..ecf4baab7 100644
--- a/src/main/java/org/lwjgl/opengl/GL32.java
+++ b/src/main/java/org/lwjglx/opengl/GL32.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class GL32 {
 
@@ -69,24 +69,24 @@ public class GL32 {
 
     public static void glDrawElementsBaseVertex(int mode, int indices_count, int type, long indices_buffer_offset,
             int basevertex) {
-        org.lwjgl3.opengl.GL32.glDrawElementsBaseVertex(mode, indices_count, type, indices_buffer_offset, basevertex);
+        org.lwjgl.opengl.GL32.glDrawElementsBaseVertex(mode, indices_count, type, indices_buffer_offset, basevertex);
     }
 
     public static void glDrawElementsBaseVertex(int mode, java.nio.ByteBuffer indices, int basevertex) {
-        org.lwjgl3.opengl.GL32.glDrawElementsBaseVertex(mode, indices, basevertex);
+        org.lwjgl.opengl.GL32.glDrawElementsBaseVertex(mode, indices, basevertex);
     }
 
     public static void glDrawElementsBaseVertex(int mode, java.nio.IntBuffer indices, int basevertex) {
-        org.lwjgl3.opengl.GL32.glDrawElementsBaseVertex(mode, indices, basevertex);
+        org.lwjgl.opengl.GL32.glDrawElementsBaseVertex(mode, indices, basevertex);
     }
 
     public static void glDrawElementsBaseVertex(int mode, java.nio.ShortBuffer indices, int basevertex) {
-        org.lwjgl3.opengl.GL32.glDrawElementsBaseVertex(mode, indices, basevertex);
+        org.lwjgl.opengl.GL32.glDrawElementsBaseVertex(mode, indices, basevertex);
     }
 
     public static void glDrawElementsInstancedBaseVertex(int mode, int indices_count, int type,
             long indices_buffer_offset, int primcount, int basevertex) {
-        org.lwjgl3.opengl.GL32.glDrawElementsInstancedBaseVertex(
+        org.lwjgl.opengl.GL32.glDrawElementsInstancedBaseVertex(
                 mode,
                 indices_count,
                 type,
@@ -97,22 +97,22 @@ public static void glDrawElementsInstancedBaseVertex(int mode, int indices_count
 
     public static void glDrawElementsInstancedBaseVertex(int mode, java.nio.ByteBuffer indices, int primcount,
             int basevertex) {
-        org.lwjgl3.opengl.GL32.glDrawElementsInstancedBaseVertex(mode, indices, primcount, basevertex);
+        org.lwjgl.opengl.GL32.glDrawElementsInstancedBaseVertex(mode, indices, primcount, basevertex);
     }
 
     public static void glDrawElementsInstancedBaseVertex(int mode, java.nio.IntBuffer indices, int primcount,
             int basevertex) {
-        org.lwjgl3.opengl.GL32.glDrawElementsInstancedBaseVertex(mode, indices, primcount, basevertex);
+        org.lwjgl.opengl.GL32.glDrawElementsInstancedBaseVertex(mode, indices, primcount, basevertex);
     }
 
     public static void glDrawElementsInstancedBaseVertex(int mode, java.nio.ShortBuffer indices, int primcount,
             int basevertex) {
-        org.lwjgl3.opengl.GL32.glDrawElementsInstancedBaseVertex(mode, indices, primcount, basevertex);
+        org.lwjgl.opengl.GL32.glDrawElementsInstancedBaseVertex(mode, indices, primcount, basevertex);
     }
 
     public static void glDrawRangeElementsBaseVertex(int mode, int start, int end, int indices_count, int type,
             long indices_buffer_offset, int basevertex) {
-        org.lwjgl3.opengl.GL32.glDrawRangeElementsBaseVertex(
+        org.lwjgl.opengl.GL32.glDrawRangeElementsBaseVertex(
                 mode,
                 start,
                 end,
@@ -124,72 +124,72 @@ public static void glDrawRangeElementsBaseVertex(int mode, int start, int end, i
 
     public static void glDrawRangeElementsBaseVertex(int mode, int start, int end, java.nio.ByteBuffer indices,
             int basevertex) {
-        org.lwjgl3.opengl.GL32.glDrawRangeElementsBaseVertex(mode, start, end, indices, basevertex);
+        org.lwjgl.opengl.GL32.glDrawRangeElementsBaseVertex(mode, start, end, indices, basevertex);
     }
 
     public static void glDrawRangeElementsBaseVertex(int mode, int start, int end, java.nio.IntBuffer indices,
             int basevertex) {
-        org.lwjgl3.opengl.GL32.glDrawRangeElementsBaseVertex(mode, start, end, indices, basevertex);
+        org.lwjgl.opengl.GL32.glDrawRangeElementsBaseVertex(mode, start, end, indices, basevertex);
     }
 
     public static void glDrawRangeElementsBaseVertex(int mode, int start, int end, java.nio.ShortBuffer indices,
             int basevertex) {
-        org.lwjgl3.opengl.GL32.glDrawRangeElementsBaseVertex(mode, start, end, indices, basevertex);
+        org.lwjgl.opengl.GL32.glDrawRangeElementsBaseVertex(mode, start, end, indices, basevertex);
     }
 
-    public static org.lwjgl.opengl.GLSync glFenceSync(int condition, int flags) {
+    public static GLSync glFenceSync(int condition, int flags) {
 
-        org.lwjgl.opengl.GLSync returnValue = new org.lwjgl.opengl.GLSync(
-                org.lwjgl3.opengl.GL32.glFenceSync(condition, flags));
+        GLSync returnValue = new GLSync(
+                org.lwjgl.opengl.GL32.glFenceSync(condition, flags));
 
         return returnValue;
     }
 
     public static void glFramebufferTexture(int target, int attachment, int texture, int level) {
-        org.lwjgl3.opengl.GL32.glFramebufferTexture(target, attachment, texture, level);
+        org.lwjgl.opengl.GL32.glFramebufferTexture(target, attachment, texture, level);
     }
 
     public static void glGetBufferParameter(int target, int pname, java.nio.LongBuffer params) {
-        org.lwjgl3.opengl.GL32.glGetBufferParameteri64v(target, pname, params);
+        org.lwjgl.opengl.GL32.glGetBufferParameteri64v(target, pname, params);
     }
 
     public static long glGetBufferParameteri64(int target, int pname) {
-        return org.lwjgl3.opengl.GL32.glGetBufferParameteri64(target, pname);
+        return org.lwjgl.opengl.GL32.glGetBufferParameteri64(target, pname);
     }
 
     public static long glGetInteger64(int pname) {
-        return org.lwjgl3.opengl.GL32.glGetInteger64(pname);
+        return org.lwjgl.opengl.GL32.glGetInteger64(pname);
     }
 
     public static void glGetInteger64(int value, int index, java.nio.LongBuffer data) {
-        org.lwjgl3.opengl.GL32.glGetInteger64i_v(value, index, data);
+        org.lwjgl.opengl.GL32.glGetInteger64i_v(value, index, data);
     }
 
     public static void glGetInteger64(int pname, java.nio.LongBuffer data) {
-        org.lwjgl3.opengl.GL32.glGetInteger64v(pname, data);
+        org.lwjgl.opengl.GL32.glGetInteger64v(pname, data);
     }
 
     public static void glGetMultisample(int pname, int index, java.nio.FloatBuffer val) {
-        org.lwjgl3.opengl.GL32.glGetMultisamplefv(pname, index, val);
+        org.lwjgl.opengl.GL32.glGetMultisamplefv(pname, index, val);
     }
 
     public static void glProvokingVertex(int mode) {
-        org.lwjgl3.opengl.GL32.glProvokingVertex(mode);
+        org.lwjgl.opengl.GL32.glProvokingVertex(mode);
     }
 
     public static void glSampleMaski(int index, int mask) {
-        org.lwjgl3.opengl.GL32.glSampleMaski(index, mask);
+        org.lwjgl.opengl.GL32.glSampleMaski(index, mask);
     }
 
     public static void glTexImage2DMultisample(int target, int samples, int internalformat, int width, int height,
             boolean fixedsamplelocations) {
-        org.lwjgl3.opengl.GL32
+        org.lwjgl.opengl.GL32
                 .glTexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
     }
 
     public static void glTexImage3DMultisample(int target, int samples, int internalformat, int width, int height,
             int depth, boolean fixedsamplelocations) {
-        org.lwjgl3.opengl.GL32
+        org.lwjgl.opengl.GL32
                 .glTexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/GL33.java b/src/main/java/org/lwjglx/opengl/GL33.java
similarity index 61%
rename from src/main/java/org/lwjgl/opengl/GL33.java
rename to src/main/java/org/lwjglx/opengl/GL33.java
index a09b95cff..d6737543d 100644
--- a/src/main/java/org/lwjgl/opengl/GL33.java
+++ b/src/main/java/org/lwjglx/opengl/GL33.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class GL33 {
 
@@ -21,275 +21,275 @@ public class GL33 {
 
     public static void glBindFragDataLocationIndexed(int program, int colorNumber, int index,
             java.lang.CharSequence name) {
-        org.lwjgl3.opengl.GL33.glBindFragDataLocationIndexed(program, colorNumber, index, name);
+        org.lwjgl.opengl.GL33.glBindFragDataLocationIndexed(program, colorNumber, index, name);
     }
 
     public static void glBindFragDataLocationIndexed(int program, int colorNumber, int index,
             java.nio.ByteBuffer name) {
-        org.lwjgl3.opengl.GL33.glBindFragDataLocationIndexed(program, colorNumber, index, name);
+        org.lwjgl.opengl.GL33.glBindFragDataLocationIndexed(program, colorNumber, index, name);
     }
 
     public static void glBindSampler(int unit, int sampler) {
-        org.lwjgl3.opengl.GL33.glBindSampler(unit, sampler);
+        org.lwjgl.opengl.GL33.glBindSampler(unit, sampler);
     }
 
     public static void glColorP3u(int type, java.nio.IntBuffer color) {
-        org.lwjgl3.opengl.GL33.glColorP3uiv(type, color);
+        org.lwjgl.opengl.GL33.glColorP3uiv(type, color);
     }
 
     public static void glColorP3ui(int type, int color) {
-        org.lwjgl3.opengl.GL33.glColorP3ui(type, color);
+        org.lwjgl.opengl.GL33.glColorP3ui(type, color);
     }
 
     public static void glColorP4u(int type, java.nio.IntBuffer color) {
-        org.lwjgl3.opengl.GL33.glColorP4uiv(type, color);
+        org.lwjgl.opengl.GL33.glColorP4uiv(type, color);
     }
 
     public static void glColorP4ui(int type, int color) {
-        org.lwjgl3.opengl.GL33.glColorP4ui(type, color);
+        org.lwjgl.opengl.GL33.glColorP4ui(type, color);
     }
 
     public static void glDeleteSamplers(int sampler) {
-        org.lwjgl3.opengl.GL33.glDeleteSamplers(sampler);
+        org.lwjgl.opengl.GL33.glDeleteSamplers(sampler);
     }
 
     public static void glDeleteSamplers(java.nio.IntBuffer samplers) {
-        org.lwjgl3.opengl.GL33.glDeleteSamplers(samplers);
+        org.lwjgl.opengl.GL33.glDeleteSamplers(samplers);
     }
 
     public static int glGenSamplers() {
-        return org.lwjgl3.opengl.GL33.glGenSamplers();
+        return org.lwjgl.opengl.GL33.glGenSamplers();
     }
 
     public static void glGenSamplers(java.nio.IntBuffer samplers) {
-        org.lwjgl3.opengl.GL33.glGenSamplers(samplers);
+        org.lwjgl.opengl.GL33.glGenSamplers(samplers);
     }
 
     public static int glGetFragDataIndex(int program, java.lang.CharSequence name) {
-        return org.lwjgl3.opengl.GL33.glGetFragDataIndex(program, name);
+        return org.lwjgl.opengl.GL33.glGetFragDataIndex(program, name);
     }
 
     public static int glGetFragDataIndex(int program, java.nio.ByteBuffer name) {
-        return org.lwjgl3.opengl.GL33.glGetFragDataIndex(program, name);
+        return org.lwjgl.opengl.GL33.glGetFragDataIndex(program, name);
     }
 
     public static void glGetQueryObject(int id, int pname, java.nio.LongBuffer params) {
-        org.lwjgl3.opengl.GL33.glGetQueryObjecti64v(id, pname, params);
+        org.lwjgl.opengl.GL33.glGetQueryObjecti64v(id, pname, params);
     }
 
     public static long glGetQueryObjecti64(int id, int pname) {
-        return org.lwjgl3.opengl.GL33.glGetQueryObjecti64(id, pname);
+        return org.lwjgl.opengl.GL33.glGetQueryObjecti64(id, pname);
     }
 
     public static void glGetQueryObjectu(int id, int pname, java.nio.LongBuffer params) {
-        org.lwjgl3.opengl.GL33.glGetQueryObjectui64v(id, pname, params);
+        org.lwjgl.opengl.GL33.glGetQueryObjectui64v(id, pname, params);
     }
 
     public static long glGetQueryObjectui64(int id, int pname) {
-        return org.lwjgl3.opengl.GL33.glGetQueryObjectui64(id, pname);
+        return org.lwjgl.opengl.GL33.glGetQueryObjectui64(id, pname);
     }
 
     public static void glGetSamplerParameter(int sampler, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.GL33.glGetSamplerParameterfv(sampler, pname, params);
+        org.lwjgl.opengl.GL33.glGetSamplerParameterfv(sampler, pname, params);
     }
 
     public static void glGetSamplerParameter(int sampler, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL33.glGetSamplerParameteriv(sampler, pname, params);
+        org.lwjgl.opengl.GL33.glGetSamplerParameteriv(sampler, pname, params);
     }
 
     public static void glGetSamplerParameterI(int sampler, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL33.glGetSamplerParameterIiv(sampler, pname, params);
+        org.lwjgl.opengl.GL33.glGetSamplerParameterIiv(sampler, pname, params);
     }
 
     public static int glGetSamplerParameterIi(int sampler, int pname) {
-        return org.lwjgl3.opengl.GL33.glGetSamplerParameterIi(sampler, pname);
+        return org.lwjgl.opengl.GL33.glGetSamplerParameterIi(sampler, pname);
     }
 
     public static void glGetSamplerParameterIu(int sampler, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL33.glGetSamplerParameterIuiv(sampler, pname, params);
+        org.lwjgl.opengl.GL33.glGetSamplerParameterIuiv(sampler, pname, params);
     }
 
     public static int glGetSamplerParameterIui(int sampler, int pname) {
-        return org.lwjgl3.opengl.GL33.glGetSamplerParameterIui(sampler, pname);
+        return org.lwjgl.opengl.GL33.glGetSamplerParameterIui(sampler, pname);
     }
 
     public static float glGetSamplerParameterf(int sampler, int pname) {
-        return org.lwjgl3.opengl.GL33.glGetSamplerParameterf(sampler, pname);
+        return org.lwjgl.opengl.GL33.glGetSamplerParameterf(sampler, pname);
     }
 
     public static int glGetSamplerParameteri(int sampler, int pname) {
-        return org.lwjgl3.opengl.GL33.glGetSamplerParameteri(sampler, pname);
+        return org.lwjgl.opengl.GL33.glGetSamplerParameteri(sampler, pname);
     }
 
     public static boolean glIsSampler(int sampler) {
-        return org.lwjgl3.opengl.GL33.glIsSampler(sampler);
+        return org.lwjgl.opengl.GL33.glIsSampler(sampler);
     }
 
     public static void glMultiTexCoordP1u(int texture, int type, java.nio.IntBuffer coords) {
-        org.lwjgl3.opengl.GL33.glMultiTexCoordP1uiv(texture, type, coords);
+        org.lwjgl.opengl.GL33.glMultiTexCoordP1uiv(texture, type, coords);
     }
 
     public static void glMultiTexCoordP1ui(int texture, int type, int coords) {
-        org.lwjgl3.opengl.GL33.glMultiTexCoordP1ui(texture, type, coords);
+        org.lwjgl.opengl.GL33.glMultiTexCoordP1ui(texture, type, coords);
     }
 
     public static void glMultiTexCoordP2u(int texture, int type, java.nio.IntBuffer coords) {
-        org.lwjgl3.opengl.GL33.glMultiTexCoordP2uiv(texture, type, coords);
+        org.lwjgl.opengl.GL33.glMultiTexCoordP2uiv(texture, type, coords);
     }
 
     public static void glMultiTexCoordP2ui(int texture, int type, int coords) {
-        org.lwjgl3.opengl.GL33.glMultiTexCoordP2ui(texture, type, coords);
+        org.lwjgl.opengl.GL33.glMultiTexCoordP2ui(texture, type, coords);
     }
 
     public static void glMultiTexCoordP3u(int texture, int type, java.nio.IntBuffer coords) {
-        org.lwjgl3.opengl.GL33.glMultiTexCoordP3uiv(texture, type, coords);
+        org.lwjgl.opengl.GL33.glMultiTexCoordP3uiv(texture, type, coords);
     }
 
     public static void glMultiTexCoordP3ui(int texture, int type, int coords) {
-        org.lwjgl3.opengl.GL33.glMultiTexCoordP3ui(texture, type, coords);
+        org.lwjgl.opengl.GL33.glMultiTexCoordP3ui(texture, type, coords);
     }
 
     public static void glMultiTexCoordP4u(int texture, int type, java.nio.IntBuffer coords) {
-        org.lwjgl3.opengl.GL33.glMultiTexCoordP4uiv(texture, type, coords);
+        org.lwjgl.opengl.GL33.glMultiTexCoordP4uiv(texture, type, coords);
     }
 
     public static void glMultiTexCoordP4ui(int texture, int type, int coords) {
-        org.lwjgl3.opengl.GL33.glMultiTexCoordP4ui(texture, type, coords);
+        org.lwjgl.opengl.GL33.glMultiTexCoordP4ui(texture, type, coords);
     }
 
     public static void glNormalP3u(int type, java.nio.IntBuffer coords) {
-        org.lwjgl3.opengl.GL33.glNormalP3uiv(type, coords);
+        org.lwjgl.opengl.GL33.glNormalP3uiv(type, coords);
     }
 
     public static void glNormalP3ui(int type, int coords) {
-        org.lwjgl3.opengl.GL33.glNormalP3ui(type, coords);
+        org.lwjgl.opengl.GL33.glNormalP3ui(type, coords);
     }
 
     public static void glQueryCounter(int id, int target) {
-        org.lwjgl3.opengl.GL33.glQueryCounter(id, target);
+        org.lwjgl.opengl.GL33.glQueryCounter(id, target);
     }
 
     public static void glSamplerParameter(int sampler, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.GL33.glSamplerParameterfv(sampler, pname, params);
+        org.lwjgl.opengl.GL33.glSamplerParameterfv(sampler, pname, params);
     }
 
     public static void glSamplerParameter(int sampler, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL33.glSamplerParameteriv(sampler, pname, params);
+        org.lwjgl.opengl.GL33.glSamplerParameteriv(sampler, pname, params);
     }
 
     public static void glSamplerParameterI(int sampler, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL33.glSamplerParameterIiv(sampler, pname, params);
+        org.lwjgl.opengl.GL33.glSamplerParameterIiv(sampler, pname, params);
     }
 
     public static void glSamplerParameterIu(int sampler, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL33.glSamplerParameterIuiv(sampler, pname, params);
+        org.lwjgl.opengl.GL33.glSamplerParameterIuiv(sampler, pname, params);
     }
 
     public static void glSamplerParameterf(int sampler, int pname, float param) {
-        org.lwjgl3.opengl.GL33.glSamplerParameterf(sampler, pname, param);
+        org.lwjgl.opengl.GL33.glSamplerParameterf(sampler, pname, param);
     }
 
     public static void glSamplerParameteri(int sampler, int pname, int param) {
-        org.lwjgl3.opengl.GL33.glSamplerParameteri(sampler, pname, param);
+        org.lwjgl.opengl.GL33.glSamplerParameteri(sampler, pname, param);
     }
 
     public static void glSecondaryColorP3u(int type, java.nio.IntBuffer color) {
-        org.lwjgl3.opengl.GL33.glSecondaryColorP3uiv(type, color);
+        org.lwjgl.opengl.GL33.glSecondaryColorP3uiv(type, color);
     }
 
     public static void glSecondaryColorP3ui(int type, int color) {
-        org.lwjgl3.opengl.GL33.glSecondaryColorP3ui(type, color);
+        org.lwjgl.opengl.GL33.glSecondaryColorP3ui(type, color);
     }
 
     public static void glTexCoordP1u(int type, java.nio.IntBuffer coords) {
-        org.lwjgl3.opengl.GL33.glTexCoordP1uiv(type, coords);
+        org.lwjgl.opengl.GL33.glTexCoordP1uiv(type, coords);
     }
 
     public static void glTexCoordP1ui(int type, int coords) {
-        org.lwjgl3.opengl.GL33.glTexCoordP1ui(type, coords);
+        org.lwjgl.opengl.GL33.glTexCoordP1ui(type, coords);
     }
 
     public static void glTexCoordP2u(int type, java.nio.IntBuffer coords) {
-        org.lwjgl3.opengl.GL33.glTexCoordP2uiv(type, coords);
+        org.lwjgl.opengl.GL33.glTexCoordP2uiv(type, coords);
     }
 
     public static void glTexCoordP2ui(int type, int coords) {
-        org.lwjgl3.opengl.GL33.glTexCoordP2ui(type, coords);
+        org.lwjgl.opengl.GL33.glTexCoordP2ui(type, coords);
     }
 
     public static void glTexCoordP3u(int type, java.nio.IntBuffer coords) {
-        org.lwjgl3.opengl.GL33.glTexCoordP3uiv(type, coords);
+        org.lwjgl.opengl.GL33.glTexCoordP3uiv(type, coords);
     }
 
     public static void glTexCoordP3ui(int type, int coords) {
-        org.lwjgl3.opengl.GL33.glTexCoordP3ui(type, coords);
+        org.lwjgl.opengl.GL33.glTexCoordP3ui(type, coords);
     }
 
     public static void glTexCoordP4u(int type, java.nio.IntBuffer coords) {
-        org.lwjgl3.opengl.GL33.glTexCoordP4uiv(type, coords);
+        org.lwjgl.opengl.GL33.glTexCoordP4uiv(type, coords);
     }
 
     public static void glTexCoordP4ui(int type, int coords) {
-        org.lwjgl3.opengl.GL33.glTexCoordP4ui(type, coords);
+        org.lwjgl.opengl.GL33.glTexCoordP4ui(type, coords);
     }
 
     public static void glVertexAttribDivisor(int index, int divisor) {
-        org.lwjgl3.opengl.GL33.glVertexAttribDivisor(index, divisor);
+        org.lwjgl.opengl.GL33.glVertexAttribDivisor(index, divisor);
     }
 
     public static void glVertexAttribP1u(int index, int type, boolean normalized, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.GL33.glVertexAttribP1uiv(index, type, normalized, value);
+        org.lwjgl.opengl.GL33.glVertexAttribP1uiv(index, type, normalized, value);
     }
 
     public static void glVertexAttribP1ui(int index, int type, boolean normalized, int value) {
-        org.lwjgl3.opengl.GL33.glVertexAttribP1ui(index, type, normalized, value);
+        org.lwjgl.opengl.GL33.glVertexAttribP1ui(index, type, normalized, value);
     }
 
     public static void glVertexAttribP2u(int index, int type, boolean normalized, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.GL33.glVertexAttribP2uiv(index, type, normalized, value);
+        org.lwjgl.opengl.GL33.glVertexAttribP2uiv(index, type, normalized, value);
     }
 
     public static void glVertexAttribP2ui(int index, int type, boolean normalized, int value) {
-        org.lwjgl3.opengl.GL33.glVertexAttribP2ui(index, type, normalized, value);
+        org.lwjgl.opengl.GL33.glVertexAttribP2ui(index, type, normalized, value);
     }
 
     public static void glVertexAttribP3u(int index, int type, boolean normalized, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.GL33.glVertexAttribP3uiv(index, type, normalized, value);
+        org.lwjgl.opengl.GL33.glVertexAttribP3uiv(index, type, normalized, value);
     }
 
     public static void glVertexAttribP3ui(int index, int type, boolean normalized, int value) {
-        org.lwjgl3.opengl.GL33.glVertexAttribP3ui(index, type, normalized, value);
+        org.lwjgl.opengl.GL33.glVertexAttribP3ui(index, type, normalized, value);
     }
 
     public static void glVertexAttribP4u(int index, int type, boolean normalized, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.GL33.glVertexAttribP4uiv(index, type, normalized, value);
+        org.lwjgl.opengl.GL33.glVertexAttribP4uiv(index, type, normalized, value);
     }
 
     public static void glVertexAttribP4ui(int index, int type, boolean normalized, int value) {
-        org.lwjgl3.opengl.GL33.glVertexAttribP4ui(index, type, normalized, value);
+        org.lwjgl.opengl.GL33.glVertexAttribP4ui(index, type, normalized, value);
     }
 
     public static void glVertexP2u(int type, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.GL33.glVertexP2uiv(type, value);
+        org.lwjgl.opengl.GL33.glVertexP2uiv(type, value);
     }
 
     public static void glVertexP2ui(int type, int value) {
-        org.lwjgl3.opengl.GL33.glVertexP2ui(type, value);
+        org.lwjgl.opengl.GL33.glVertexP2ui(type, value);
     }
 
     public static void glVertexP3u(int type, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.GL33.glVertexP3uiv(type, value);
+        org.lwjgl.opengl.GL33.glVertexP3uiv(type, value);
     }
 
     public static void glVertexP3ui(int type, int value) {
-        org.lwjgl3.opengl.GL33.glVertexP3ui(type, value);
+        org.lwjgl.opengl.GL33.glVertexP3ui(type, value);
     }
 
     public static void glVertexP4u(int type, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.GL33.glVertexP4uiv(type, value);
+        org.lwjgl.opengl.GL33.glVertexP4uiv(type, value);
     }
 
     public static void glVertexP4ui(int type, int value) {
-        org.lwjgl3.opengl.GL33.glVertexP4ui(type, value);
+        org.lwjgl.opengl.GL33.glVertexP4ui(type, value);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/GL40.java b/src/main/java/org/lwjglx/opengl/GL40.java
similarity index 71%
rename from src/main/java/org/lwjgl/opengl/GL40.java
rename to src/main/java/org/lwjglx/opengl/GL40.java
index b6f775f10..0d6b2c0b1 100644
--- a/src/main/java/org/lwjgl/opengl/GL40.java
+++ b/src/main/java/org/lwjglx/opengl/GL40.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class GL40 {
 
@@ -84,246 +84,246 @@ public class GL40 {
     public static final int GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY = (int) 36879;
 
     public static void glBeginQueryIndexed(int target, int index, int id) {
-        org.lwjgl3.opengl.GL40.glBeginQueryIndexed(target, index, id);
+        org.lwjgl.opengl.GL40.glBeginQueryIndexed(target, index, id);
     }
 
     public static void glBindTransformFeedback(int target, int id) {
-        org.lwjgl3.opengl.GL40.glBindTransformFeedback(target, id);
+        org.lwjgl.opengl.GL40.glBindTransformFeedback(target, id);
     }
 
     public static void glBlendEquationSeparatei(int buf, int modeRGB, int modeAlpha) {
-        org.lwjgl3.opengl.GL40.glBlendEquationSeparatei(buf, modeRGB, modeAlpha);
+        org.lwjgl.opengl.GL40.glBlendEquationSeparatei(buf, modeRGB, modeAlpha);
     }
 
     public static void glBlendEquationi(int buf, int mode) {
-        org.lwjgl3.opengl.GL40.glBlendEquationi(buf, mode);
+        org.lwjgl.opengl.GL40.glBlendEquationi(buf, mode);
     }
 
     public static void glBlendFuncSeparatei(int buf, int srcRGB, int dstRGB, int srcAlpha, int dstAlpha) {
-        org.lwjgl3.opengl.GL40.glBlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+        org.lwjgl.opengl.GL40.glBlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
     }
 
     public static void glBlendFunci(int buf, int src, int dst) {
-        org.lwjgl3.opengl.GL40.glBlendFunci(buf, src, dst);
+        org.lwjgl.opengl.GL40.glBlendFunci(buf, src, dst);
     }
 
     public static void glDeleteTransformFeedbacks(int id) {
-        org.lwjgl3.opengl.GL40.glDeleteTransformFeedbacks(id);
+        org.lwjgl.opengl.GL40.glDeleteTransformFeedbacks(id);
     }
 
     public static void glDeleteTransformFeedbacks(java.nio.IntBuffer ids) {
-        org.lwjgl3.opengl.GL40.glDeleteTransformFeedbacks(ids);
+        org.lwjgl.opengl.GL40.glDeleteTransformFeedbacks(ids);
     }
 
     public static void glDrawArraysIndirect(int mode, long indirect_buffer_offset) {
-        org.lwjgl3.opengl.GL40.glDrawArraysIndirect(mode, indirect_buffer_offset);
+        org.lwjgl.opengl.GL40.glDrawArraysIndirect(mode, indirect_buffer_offset);
     }
 
     public static void glDrawArraysIndirect(int mode, java.nio.ByteBuffer indirect) {
-        org.lwjgl3.opengl.GL40.glDrawArraysIndirect(mode, indirect);
+        org.lwjgl.opengl.GL40.glDrawArraysIndirect(mode, indirect);
     }
 
     public static void glDrawArraysIndirect(int mode, java.nio.IntBuffer indirect) {
-        org.lwjgl3.opengl.GL40.glDrawArraysIndirect(mode, indirect);
+        org.lwjgl.opengl.GL40.glDrawArraysIndirect(mode, indirect);
     }
 
     public static void glDrawElementsIndirect(int mode, int type, long indirect_buffer_offset) {
-        org.lwjgl3.opengl.GL40.glDrawElementsIndirect(mode, type, indirect_buffer_offset);
+        org.lwjgl.opengl.GL40.glDrawElementsIndirect(mode, type, indirect_buffer_offset);
     }
 
     public static void glDrawElementsIndirect(int mode, int type, java.nio.ByteBuffer indirect) {
-        org.lwjgl3.opengl.GL40.glDrawElementsIndirect(mode, type, indirect);
+        org.lwjgl.opengl.GL40.glDrawElementsIndirect(mode, type, indirect);
     }
 
     public static void glDrawElementsIndirect(int mode, int type, java.nio.IntBuffer indirect) {
-        org.lwjgl3.opengl.GL40.glDrawElementsIndirect(mode, type, indirect);
+        org.lwjgl.opengl.GL40.glDrawElementsIndirect(mode, type, indirect);
     }
 
     public static void glDrawTransformFeedback(int mode, int id) {
-        org.lwjgl3.opengl.GL40.glDrawTransformFeedback(mode, id);
+        org.lwjgl.opengl.GL40.glDrawTransformFeedback(mode, id);
     }
 
     public static void glDrawTransformFeedbackStream(int mode, int id, int stream) {
-        org.lwjgl3.opengl.GL40.glDrawTransformFeedbackStream(mode, id, stream);
+        org.lwjgl.opengl.GL40.glDrawTransformFeedbackStream(mode, id, stream);
     }
 
     public static void glEndQueryIndexed(int target, int index) {
-        org.lwjgl3.opengl.GL40.glEndQueryIndexed(target, index);
+        org.lwjgl.opengl.GL40.glEndQueryIndexed(target, index);
     }
 
     public static int glGenTransformFeedbacks() {
-        return org.lwjgl3.opengl.GL40.glGenTransformFeedbacks();
+        return org.lwjgl.opengl.GL40.glGenTransformFeedbacks();
     }
 
     public static void glGenTransformFeedbacks(java.nio.IntBuffer ids) {
-        org.lwjgl3.opengl.GL40.glGenTransformFeedbacks(ids);
+        org.lwjgl.opengl.GL40.glGenTransformFeedbacks(ids);
     }
 
     public static java.lang.String glGetActiveSubroutineName(int program, int shadertype, int index, int bufsize) {
-        return org.lwjgl3.opengl.GL40.glGetActiveSubroutineName(program, shadertype, index, bufsize);
+        return org.lwjgl.opengl.GL40.glGetActiveSubroutineName(program, shadertype, index, bufsize);
     }
 
     public static void glGetActiveSubroutineName(int program, int shadertype, int index, java.nio.IntBuffer length,
             java.nio.ByteBuffer name) {
-        org.lwjgl3.opengl.GL40.glGetActiveSubroutineName(program, shadertype, index, length, name);
+        org.lwjgl.opengl.GL40.glGetActiveSubroutineName(program, shadertype, index, length, name);
     }
 
     public static void glGetActiveSubroutineUniform(int program, int shadertype, int index, int pname,
             java.nio.IntBuffer values) {
-        org.lwjgl3.opengl.GL40.glGetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
+        org.lwjgl.opengl.GL40.glGetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
     }
 
     public static java.lang.String glGetActiveSubroutineUniformName(int program, int shadertype, int index,
             int bufsize) {
-        return org.lwjgl3.opengl.GL40.glGetActiveSubroutineUniformName(program, shadertype, index, bufsize);
+        return org.lwjgl.opengl.GL40.glGetActiveSubroutineUniformName(program, shadertype, index, bufsize);
     }
 
     public static void glGetActiveSubroutineUniformName(int program, int shadertype, int index,
             java.nio.IntBuffer length, java.nio.ByteBuffer name) {
-        org.lwjgl3.opengl.GL40.glGetActiveSubroutineUniformName(program, shadertype, index, length, name);
+        org.lwjgl.opengl.GL40.glGetActiveSubroutineUniformName(program, shadertype, index, length, name);
     }
 
     public static int glGetActiveSubroutineUniformi(int program, int shadertype, int index, int pname) {
-        return org.lwjgl3.opengl.GL40.glGetActiveSubroutineUniformi(program, shadertype, index, pname);
+        return org.lwjgl.opengl.GL40.glGetActiveSubroutineUniformi(program, shadertype, index, pname);
     }
 
     public static void glGetProgramStage(int program, int shadertype, int pname, java.nio.IntBuffer values) {
-        org.lwjgl3.opengl.GL40.glGetProgramStageiv(program, shadertype, pname, values);
+        org.lwjgl.opengl.GL40.glGetProgramStageiv(program, shadertype, pname, values);
     }
 
     public static int glGetProgramStagei(int program, int shadertype, int pname) {
-        return org.lwjgl3.opengl.GL40.glGetProgramStagei(program, shadertype, pname);
+        return org.lwjgl.opengl.GL40.glGetProgramStagei(program, shadertype, pname);
     }
 
     public static void glGetQueryIndexed(int target, int index, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL40.glGetQueryIndexediv(target, index, pname, params);
+        org.lwjgl.opengl.GL40.glGetQueryIndexediv(target, index, pname, params);
     }
 
     public static int glGetQueryIndexedi(int target, int index, int pname) {
-        return org.lwjgl3.opengl.GL40.glGetQueryIndexedi(target, index, pname);
+        return org.lwjgl.opengl.GL40.glGetQueryIndexedi(target, index, pname);
     }
 
     public static int glGetSubroutineIndex(int program, int shadertype, java.lang.CharSequence name) {
-        return org.lwjgl3.opengl.GL40.glGetSubroutineIndex(program, shadertype, name);
+        return org.lwjgl.opengl.GL40.glGetSubroutineIndex(program, shadertype, name);
     }
 
     public static int glGetSubroutineIndex(int program, int shadertype, java.nio.ByteBuffer name) {
-        return org.lwjgl3.opengl.GL40.glGetSubroutineIndex(program, shadertype, name);
+        return org.lwjgl.opengl.GL40.glGetSubroutineIndex(program, shadertype, name);
     }
 
     public static int glGetSubroutineUniformLocation(int program, int shadertype, java.lang.CharSequence name) {
-        return org.lwjgl3.opengl.GL40.glGetSubroutineUniformLocation(program, shadertype, name);
+        return org.lwjgl.opengl.GL40.glGetSubroutineUniformLocation(program, shadertype, name);
     }
 
     public static int glGetSubroutineUniformLocation(int program, int shadertype, java.nio.ByteBuffer name) {
-        return org.lwjgl3.opengl.GL40.glGetSubroutineUniformLocation(program, shadertype, name);
+        return org.lwjgl.opengl.GL40.glGetSubroutineUniformLocation(program, shadertype, name);
     }
 
     public static void glGetUniform(int program, int location, java.nio.DoubleBuffer params) {
-        org.lwjgl3.opengl.GL40.glGetUniformdv(program, location, params);
+        org.lwjgl.opengl.GL40.glGetUniformdv(program, location, params);
     }
 
     public static void glGetUniformSubroutineu(int shadertype, int location, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL40.glGetUniformSubroutineuiv(shadertype, location, params);
+        org.lwjgl.opengl.GL40.glGetUniformSubroutineuiv(shadertype, location, params);
     }
 
     public static int glGetUniformSubroutineui(int shadertype, int location) {
-        return org.lwjgl3.opengl.GL40.glGetUniformSubroutineui(shadertype, location);
+        return org.lwjgl.opengl.GL40.glGetUniformSubroutineui(shadertype, location);
     }
 
     public static boolean glIsTransformFeedback(int id) {
-        return org.lwjgl3.opengl.GL40.glIsTransformFeedback(id);
+        return org.lwjgl.opengl.GL40.glIsTransformFeedback(id);
     }
 
     public static void glMinSampleShading(float value) {
-        org.lwjgl3.opengl.GL40.glMinSampleShading(value);
+        org.lwjgl.opengl.GL40.glMinSampleShading(value);
     }
 
     public static void glPatchParameter(int pname, java.nio.FloatBuffer values) {
-        org.lwjgl3.opengl.GL40.glPatchParameterfv(pname, values);
+        org.lwjgl.opengl.GL40.glPatchParameterfv(pname, values);
     }
 
     public static void glPatchParameteri(int pname, int value) {
-        org.lwjgl3.opengl.GL40.glPatchParameteri(pname, value);
+        org.lwjgl.opengl.GL40.glPatchParameteri(pname, value);
     }
 
     public static void glPauseTransformFeedback() {
-        org.lwjgl3.opengl.GL40.glPauseTransformFeedback();
+        org.lwjgl.opengl.GL40.glPauseTransformFeedback();
     }
 
     public static void glResumeTransformFeedback() {
-        org.lwjgl3.opengl.GL40.glResumeTransformFeedback();
+        org.lwjgl.opengl.GL40.glResumeTransformFeedback();
     }
 
     public static void glUniform1(int location, java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL40.glUniform1dv(location, value);
+        org.lwjgl.opengl.GL40.glUniform1dv(location, value);
     }
 
     public static void glUniform1d(int location, double x) {
-        org.lwjgl3.opengl.GL40.glUniform1d(location, x);
+        org.lwjgl.opengl.GL40.glUniform1d(location, x);
     }
 
     public static void glUniform2(int location, java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL40.glUniform2dv(location, value);
+        org.lwjgl.opengl.GL40.glUniform2dv(location, value);
     }
 
     public static void glUniform2d(int location, double x, double y) {
-        org.lwjgl3.opengl.GL40.glUniform2d(location, x, y);
+        org.lwjgl.opengl.GL40.glUniform2d(location, x, y);
     }
 
     public static void glUniform3(int location, java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL40.glUniform3dv(location, value);
+        org.lwjgl.opengl.GL40.glUniform3dv(location, value);
     }
 
     public static void glUniform3d(int location, double x, double y, double z) {
-        org.lwjgl3.opengl.GL40.glUniform3d(location, x, y, z);
+        org.lwjgl.opengl.GL40.glUniform3d(location, x, y, z);
     }
 
     public static void glUniform4(int location, java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL40.glUniform4dv(location, value);
+        org.lwjgl.opengl.GL40.glUniform4dv(location, value);
     }
 
     public static void glUniform4d(int location, double x, double y, double z, double w) {
-        org.lwjgl3.opengl.GL40.glUniform4d(location, x, y, z, w);
+        org.lwjgl.opengl.GL40.glUniform4d(location, x, y, z, w);
     }
 
     public static void glUniformMatrix2(int location, boolean transpose, java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL40.glUniformMatrix2dv(location, transpose, value);
+        org.lwjgl.opengl.GL40.glUniformMatrix2dv(location, transpose, value);
     }
 
     public static void glUniformMatrix2x3(int location, boolean transpose, java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL40.glUniformMatrix2x3dv(location, transpose, value);
+        org.lwjgl.opengl.GL40.glUniformMatrix2x3dv(location, transpose, value);
     }
 
     public static void glUniformMatrix2x4(int location, boolean transpose, java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL40.glUniformMatrix2x4dv(location, transpose, value);
+        org.lwjgl.opengl.GL40.glUniformMatrix2x4dv(location, transpose, value);
     }
 
     public static void glUniformMatrix3(int location, boolean transpose, java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL40.glUniformMatrix3dv(location, transpose, value);
+        org.lwjgl.opengl.GL40.glUniformMatrix3dv(location, transpose, value);
     }
 
     public static void glUniformMatrix3x2(int location, boolean transpose, java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL40.glUniformMatrix3x2dv(location, transpose, value);
+        org.lwjgl.opengl.GL40.glUniformMatrix3x2dv(location, transpose, value);
     }
 
     public static void glUniformMatrix3x4(int location, boolean transpose, java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL40.glUniformMatrix3x4dv(location, transpose, value);
+        org.lwjgl.opengl.GL40.glUniformMatrix3x4dv(location, transpose, value);
     }
 
     public static void glUniformMatrix4(int location, boolean transpose, java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL40.glUniformMatrix4dv(location, transpose, value);
+        org.lwjgl.opengl.GL40.glUniformMatrix4dv(location, transpose, value);
     }
 
     public static void glUniformMatrix4x2(int location, boolean transpose, java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL40.glUniformMatrix4x2dv(location, transpose, value);
+        org.lwjgl.opengl.GL40.glUniformMatrix4x2dv(location, transpose, value);
     }
 
     public static void glUniformMatrix4x3(int location, boolean transpose, java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL40.glUniformMatrix4x3dv(location, transpose, value);
+        org.lwjgl.opengl.GL40.glUniformMatrix4x3dv(location, transpose, value);
     }
 
     public static void glUniformSubroutinesu(int shadertype, java.nio.IntBuffer indices) {
-        org.lwjgl3.opengl.GL40.glUniformSubroutinesuiv(shadertype, indices);
+        org.lwjgl.opengl.GL40.glUniformSubroutinesuiv(shadertype, indices);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/GL41.java b/src/main/java/org/lwjglx/opengl/GL41.java
similarity index 63%
rename from src/main/java/org/lwjgl/opengl/GL41.java
rename to src/main/java/org/lwjglx/opengl/GL41.java
index 478f7df45..21795946f 100644
--- a/src/main/java/org/lwjgl/opengl/GL41.java
+++ b/src/main/java/org/lwjglx/opengl/GL41.java
@@ -1,6 +1,6 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
-import org.lwjgl.lwjgl3ify.BufferCasts;
+import org.lwjglx.lwjgl3ify.BufferCasts;
 
 public class GL41 {
 
@@ -40,399 +40,399 @@ public class GL41 {
     public static final int GL_VIEWPORT_SUBPIXEL_BITS = (int) 33372;
 
     public static void glActiveShaderProgram(int pipeline, int program) {
-        org.lwjgl3.opengl.GL41.glActiveShaderProgram(pipeline, program);
+        org.lwjgl.opengl.GL41.glActiveShaderProgram(pipeline, program);
     }
 
     public static void glBindProgramPipeline(int pipeline) {
-        org.lwjgl3.opengl.GL41.glBindProgramPipeline(pipeline);
+        org.lwjgl.opengl.GL41.glBindProgramPipeline(pipeline);
     }
 
     public static void glClearDepthf(float d) {
-        org.lwjgl3.opengl.GL41.glClearDepthf(d);
+        org.lwjgl.opengl.GL41.glClearDepthf(d);
     }
 
     public static int glCreateShaderProgram(int type, java.lang.CharSequence string) {
-        return org.lwjgl3.opengl.GL41.glCreateShaderProgramv(type, string);
+        return org.lwjgl.opengl.GL41.glCreateShaderProgramv(type, string);
     }
 
     public static int glCreateShaderProgram(int type, java.nio.ByteBuffer string) {
 
-        int returnValue = org.lwjgl3.opengl.GL41
+        int returnValue = org.lwjgl.opengl.GL41
                 .glCreateShaderProgramv(type, BufferCasts.bufferToCharSeq(string));
 
         return returnValue;
     }
 
     public static void glDeleteProgramPipelines(int pipeline) {
-        org.lwjgl3.opengl.GL41.glDeleteProgramPipelines(pipeline);
+        org.lwjgl.opengl.GL41.glDeleteProgramPipelines(pipeline);
     }
 
     public static void glDeleteProgramPipelines(java.nio.IntBuffer pipelines) {
-        org.lwjgl3.opengl.GL41.glDeleteProgramPipelines(pipelines);
+        org.lwjgl.opengl.GL41.glDeleteProgramPipelines(pipelines);
     }
 
     public static void glDepthRangeArray(int first, java.nio.DoubleBuffer v) {
-        org.lwjgl3.opengl.GL41.glDepthRangeArrayv(first, v);
+        org.lwjgl.opengl.GL41.glDepthRangeArrayv(first, v);
     }
 
     public static void glDepthRangeIndexed(int index, double n, double f) {
-        org.lwjgl3.opengl.GL41.glDepthRangeIndexed(index, n, f);
+        org.lwjgl.opengl.GL41.glDepthRangeIndexed(index, n, f);
     }
 
     public static void glDepthRangef(float n, float f) {
-        org.lwjgl3.opengl.GL41.glDepthRangef(n, f);
+        org.lwjgl.opengl.GL41.glDepthRangef(n, f);
     }
 
     public static int glGenProgramPipelines() {
-        return org.lwjgl3.opengl.GL41.glGenProgramPipelines();
+        return org.lwjgl.opengl.GL41.glGenProgramPipelines();
     }
 
     public static void glGenProgramPipelines(java.nio.IntBuffer pipelines) {
-        org.lwjgl3.opengl.GL41.glGenProgramPipelines(pipelines);
+        org.lwjgl.opengl.GL41.glGenProgramPipelines(pipelines);
     }
 
     public static void glGetDouble(int target, int index, java.nio.DoubleBuffer data) {
-        org.lwjgl3.opengl.GL41.glGetDoublei_v(target, index, data);
+        org.lwjgl.opengl.GL41.glGetDoublei_v(target, index, data);
     }
 
     public static void glGetFloat(int target, int index, java.nio.FloatBuffer data) {
-        org.lwjgl3.opengl.GL41.glGetFloati_v(target, index, data);
+        org.lwjgl.opengl.GL41.glGetFloati_v(target, index, data);
     }
 
     public static void glGetProgramBinary(int program, java.nio.IntBuffer length, java.nio.IntBuffer binaryFormat,
             java.nio.ByteBuffer binary) {
-        org.lwjgl3.opengl.GL41.glGetProgramBinary(program, length, binaryFormat, binary);
+        org.lwjgl.opengl.GL41.glGetProgramBinary(program, length, binaryFormat, binary);
     }
 
     public static void glGetProgramPipeline(int pipeline, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL41.glGetProgramPipelineiv(pipeline, pname, params);
+        org.lwjgl.opengl.GL41.glGetProgramPipelineiv(pipeline, pname, params);
     }
 
     public static java.lang.String glGetProgramPipelineInfoLog(int pipeline, int bufSize) {
-        return org.lwjgl3.opengl.GL41.glGetProgramPipelineInfoLog(pipeline, bufSize);
+        return org.lwjgl.opengl.GL41.glGetProgramPipelineInfoLog(pipeline, bufSize);
     }
 
     public static void glGetProgramPipelineInfoLog(int pipeline, java.nio.IntBuffer length,
             java.nio.ByteBuffer infoLog) {
-        org.lwjgl3.opengl.GL41.glGetProgramPipelineInfoLog(pipeline, length, infoLog);
+        org.lwjgl.opengl.GL41.glGetProgramPipelineInfoLog(pipeline, length, infoLog);
     }
 
     public static int glGetProgramPipelinei(int pipeline, int pname) {
-        return org.lwjgl3.opengl.GL41.glGetProgramPipelinei(pipeline, pname);
+        return org.lwjgl.opengl.GL41.glGetProgramPipelinei(pipeline, pname);
     }
 
     public static void glGetShaderPrecisionFormat(int shadertype, int precisiontype, java.nio.IntBuffer range,
             java.nio.IntBuffer precision) {
-        org.lwjgl3.opengl.GL41.glGetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
+        org.lwjgl.opengl.GL41.glGetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
     }
 
     public static void glGetVertexAttribL(int index, int pname, java.nio.DoubleBuffer params) {
-        org.lwjgl3.opengl.GL41.glGetVertexAttribLdv(index, pname, params);
+        org.lwjgl.opengl.GL41.glGetVertexAttribLdv(index, pname, params);
     }
 
     public static boolean glIsProgramPipeline(int pipeline) {
-        return org.lwjgl3.opengl.GL41.glIsProgramPipeline(pipeline);
+        return org.lwjgl.opengl.GL41.glIsProgramPipeline(pipeline);
     }
 
     public static void glProgramBinary(int program, int binaryFormat, java.nio.ByteBuffer binary) {
-        org.lwjgl3.opengl.GL41.glProgramBinary(program, binaryFormat, binary);
+        org.lwjgl.opengl.GL41.glProgramBinary(program, binaryFormat, binary);
     }
 
     public static void glProgramParameteri(int program, int pname, int value) {
-        org.lwjgl3.opengl.GL41.glProgramParameteri(program, pname, value);
+        org.lwjgl.opengl.GL41.glProgramParameteri(program, pname, value);
     }
 
     public static void glProgramUniform1(int program, int location, java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniform1dv(program, location, value);
+        org.lwjgl.opengl.GL41.glProgramUniform1dv(program, location, value);
     }
 
     public static void glProgramUniform1(int program, int location, java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniform1fv(program, location, value);
+        org.lwjgl.opengl.GL41.glProgramUniform1fv(program, location, value);
     }
 
     public static void glProgramUniform1(int program, int location, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniform1iv(program, location, value);
+        org.lwjgl.opengl.GL41.glProgramUniform1iv(program, location, value);
     }
 
     public static void glProgramUniform1d(int program, int location, double v0) {
-        org.lwjgl3.opengl.GL41.glProgramUniform1d(program, location, v0);
+        org.lwjgl.opengl.GL41.glProgramUniform1d(program, location, v0);
     }
 
     public static void glProgramUniform1f(int program, int location, float v0) {
-        org.lwjgl3.opengl.GL41.glProgramUniform1f(program, location, v0);
+        org.lwjgl.opengl.GL41.glProgramUniform1f(program, location, v0);
     }
 
     public static void glProgramUniform1i(int program, int location, int v0) {
-        org.lwjgl3.opengl.GL41.glProgramUniform1i(program, location, v0);
+        org.lwjgl.opengl.GL41.glProgramUniform1i(program, location, v0);
     }
 
     public static void glProgramUniform1u(int program, int location, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniform1uiv(program, location, value);
+        org.lwjgl.opengl.GL41.glProgramUniform1uiv(program, location, value);
     }
 
     public static void glProgramUniform1ui(int program, int location, int v0) {
-        org.lwjgl3.opengl.GL41.glProgramUniform1ui(program, location, v0);
+        org.lwjgl.opengl.GL41.glProgramUniform1ui(program, location, v0);
     }
 
     public static void glProgramUniform2(int program, int location, java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniform2dv(program, location, value);
+        org.lwjgl.opengl.GL41.glProgramUniform2dv(program, location, value);
     }
 
     public static void glProgramUniform2(int program, int location, java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniform2fv(program, location, value);
+        org.lwjgl.opengl.GL41.glProgramUniform2fv(program, location, value);
     }
 
     public static void glProgramUniform2(int program, int location, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniform2iv(program, location, value);
+        org.lwjgl.opengl.GL41.glProgramUniform2iv(program, location, value);
     }
 
     public static void glProgramUniform2d(int program, int location, double v0, double v1) {
-        org.lwjgl3.opengl.GL41.glProgramUniform2d(program, location, v0, v1);
+        org.lwjgl.opengl.GL41.glProgramUniform2d(program, location, v0, v1);
     }
 
     public static void glProgramUniform2f(int program, int location, float v0, float v1) {
-        org.lwjgl3.opengl.GL41.glProgramUniform2f(program, location, v0, v1);
+        org.lwjgl.opengl.GL41.glProgramUniform2f(program, location, v0, v1);
     }
 
     public static void glProgramUniform2i(int program, int location, int v0, int v1) {
-        org.lwjgl3.opengl.GL41.glProgramUniform2i(program, location, v0, v1);
+        org.lwjgl.opengl.GL41.glProgramUniform2i(program, location, v0, v1);
     }
 
     public static void glProgramUniform2u(int program, int location, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniform2uiv(program, location, value);
+        org.lwjgl.opengl.GL41.glProgramUniform2uiv(program, location, value);
     }
 
     public static void glProgramUniform2ui(int program, int location, int v0, int v1) {
-        org.lwjgl3.opengl.GL41.glProgramUniform2ui(program, location, v0, v1);
+        org.lwjgl.opengl.GL41.glProgramUniform2ui(program, location, v0, v1);
     }
 
     public static void glProgramUniform3(int program, int location, java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniform3dv(program, location, value);
+        org.lwjgl.opengl.GL41.glProgramUniform3dv(program, location, value);
     }
 
     public static void glProgramUniform3(int program, int location, java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniform3fv(program, location, value);
+        org.lwjgl.opengl.GL41.glProgramUniform3fv(program, location, value);
     }
 
     public static void glProgramUniform3(int program, int location, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniform3iv(program, location, value);
+        org.lwjgl.opengl.GL41.glProgramUniform3iv(program, location, value);
     }
 
     public static void glProgramUniform3d(int program, int location, double v0, double v1, double v2) {
-        org.lwjgl3.opengl.GL41.glProgramUniform3d(program, location, v0, v1, v2);
+        org.lwjgl.opengl.GL41.glProgramUniform3d(program, location, v0, v1, v2);
     }
 
     public static void glProgramUniform3f(int program, int location, float v0, float v1, float v2) {
-        org.lwjgl3.opengl.GL41.glProgramUniform3f(program, location, v0, v1, v2);
+        org.lwjgl.opengl.GL41.glProgramUniform3f(program, location, v0, v1, v2);
     }
 
     public static void glProgramUniform3i(int program, int location, int v0, int v1, int v2) {
-        org.lwjgl3.opengl.GL41.glProgramUniform3i(program, location, v0, v1, v2);
+        org.lwjgl.opengl.GL41.glProgramUniform3i(program, location, v0, v1, v2);
     }
 
     public static void glProgramUniform3u(int program, int location, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniform3uiv(program, location, value);
+        org.lwjgl.opengl.GL41.glProgramUniform3uiv(program, location, value);
     }
 
     public static void glProgramUniform3ui(int program, int location, int v0, int v1, int v2) {
-        org.lwjgl3.opengl.GL41.glProgramUniform3ui(program, location, v0, v1, v2);
+        org.lwjgl.opengl.GL41.glProgramUniform3ui(program, location, v0, v1, v2);
     }
 
     public static void glProgramUniform4(int program, int location, java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniform4dv(program, location, value);
+        org.lwjgl.opengl.GL41.glProgramUniform4dv(program, location, value);
     }
 
     public static void glProgramUniform4(int program, int location, java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniform4fv(program, location, value);
+        org.lwjgl.opengl.GL41.glProgramUniform4fv(program, location, value);
     }
 
     public static void glProgramUniform4(int program, int location, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniform4iv(program, location, value);
+        org.lwjgl.opengl.GL41.glProgramUniform4iv(program, location, value);
     }
 
     public static void glProgramUniform4d(int program, int location, double v0, double v1, double v2, double v3) {
-        org.lwjgl3.opengl.GL41.glProgramUniform4d(program, location, v0, v1, v2, v3);
+        org.lwjgl.opengl.GL41.glProgramUniform4d(program, location, v0, v1, v2, v3);
     }
 
     public static void glProgramUniform4f(int program, int location, float v0, float v1, float v2, float v3) {
-        org.lwjgl3.opengl.GL41.glProgramUniform4f(program, location, v0, v1, v2, v3);
+        org.lwjgl.opengl.GL41.glProgramUniform4f(program, location, v0, v1, v2, v3);
     }
 
     public static void glProgramUniform4i(int program, int location, int v0, int v1, int v2, int v3) {
-        org.lwjgl3.opengl.GL41.glProgramUniform4i(program, location, v0, v1, v2, v3);
+        org.lwjgl.opengl.GL41.glProgramUniform4i(program, location, v0, v1, v2, v3);
     }
 
     public static void glProgramUniform4u(int program, int location, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniform4uiv(program, location, value);
+        org.lwjgl.opengl.GL41.glProgramUniform4uiv(program, location, value);
     }
 
     public static void glProgramUniform4ui(int program, int location, int v0, int v1, int v2, int v3) {
-        org.lwjgl3.opengl.GL41.glProgramUniform4ui(program, location, v0, v1, v2, v3);
+        org.lwjgl.opengl.GL41.glProgramUniform4ui(program, location, v0, v1, v2, v3);
     }
 
     public static void glProgramUniformMatrix2(int program, int location, boolean transpose,
             java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniformMatrix2dv(program, location, transpose, value);
+        org.lwjgl.opengl.GL41.glProgramUniformMatrix2dv(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix2(int program, int location, boolean transpose,
             java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniformMatrix2fv(program, location, transpose, value);
+        org.lwjgl.opengl.GL41.glProgramUniformMatrix2fv(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix2x3(int program, int location, boolean transpose,
             java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniformMatrix2x3dv(program, location, transpose, value);
+        org.lwjgl.opengl.GL41.glProgramUniformMatrix2x3dv(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix2x3(int program, int location, boolean transpose,
             java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniformMatrix2x3fv(program, location, transpose, value);
+        org.lwjgl.opengl.GL41.glProgramUniformMatrix2x3fv(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix2x4(int program, int location, boolean transpose,
             java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniformMatrix2x4dv(program, location, transpose, value);
+        org.lwjgl.opengl.GL41.glProgramUniformMatrix2x4dv(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix2x4(int program, int location, boolean transpose,
             java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniformMatrix2x4fv(program, location, transpose, value);
+        org.lwjgl.opengl.GL41.glProgramUniformMatrix2x4fv(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix3(int program, int location, boolean transpose,
             java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniformMatrix3dv(program, location, transpose, value);
+        org.lwjgl.opengl.GL41.glProgramUniformMatrix3dv(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix3(int program, int location, boolean transpose,
             java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniformMatrix3fv(program, location, transpose, value);
+        org.lwjgl.opengl.GL41.glProgramUniformMatrix3fv(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix3x2(int program, int location, boolean transpose,
             java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniformMatrix3x2dv(program, location, transpose, value);
+        org.lwjgl.opengl.GL41.glProgramUniformMatrix3x2dv(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix3x2(int program, int location, boolean transpose,
             java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniformMatrix3x2fv(program, location, transpose, value);
+        org.lwjgl.opengl.GL41.glProgramUniformMatrix3x2fv(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix3x4(int program, int location, boolean transpose,
             java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniformMatrix3x4dv(program, location, transpose, value);
+        org.lwjgl.opengl.GL41.glProgramUniformMatrix3x4dv(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix3x4(int program, int location, boolean transpose,
             java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniformMatrix3x4fv(program, location, transpose, value);
+        org.lwjgl.opengl.GL41.glProgramUniformMatrix3x4fv(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix4(int program, int location, boolean transpose,
             java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniformMatrix4dv(program, location, transpose, value);
+        org.lwjgl.opengl.GL41.glProgramUniformMatrix4dv(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix4(int program, int location, boolean transpose,
             java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniformMatrix4fv(program, location, transpose, value);
+        org.lwjgl.opengl.GL41.glProgramUniformMatrix4fv(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix4x2(int program, int location, boolean transpose,
             java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniformMatrix4x2dv(program, location, transpose, value);
+        org.lwjgl.opengl.GL41.glProgramUniformMatrix4x2dv(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix4x2(int program, int location, boolean transpose,
             java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniformMatrix4x2fv(program, location, transpose, value);
+        org.lwjgl.opengl.GL41.glProgramUniformMatrix4x2fv(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix4x3(int program, int location, boolean transpose,
             java.nio.DoubleBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniformMatrix4x3dv(program, location, transpose, value);
+        org.lwjgl.opengl.GL41.glProgramUniformMatrix4x3dv(program, location, transpose, value);
     }
 
     public static void glProgramUniformMatrix4x3(int program, int location, boolean transpose,
             java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.GL41.glProgramUniformMatrix4x3fv(program, location, transpose, value);
+        org.lwjgl.opengl.GL41.glProgramUniformMatrix4x3fv(program, location, transpose, value);
     }
 
     public static void glReleaseShaderCompiler() {
-        org.lwjgl3.opengl.GL41.glReleaseShaderCompiler();
+        org.lwjgl.opengl.GL41.glReleaseShaderCompiler();
     }
 
     public static void glScissorArray(int first, java.nio.IntBuffer v) {
-        org.lwjgl3.opengl.GL41.glScissorArrayv(first, v);
+        org.lwjgl.opengl.GL41.glScissorArrayv(first, v);
     }
 
     public static void glScissorIndexed(int index, int left, int bottom, int width, int height) {
-        org.lwjgl3.opengl.GL41.glScissorIndexed(index, left, bottom, width, height);
+        org.lwjgl.opengl.GL41.glScissorIndexed(index, left, bottom, width, height);
     }
 
     public static void glScissorIndexed(int index, java.nio.IntBuffer v) {
-        org.lwjgl3.opengl.GL41.glScissorIndexedv(index, v);
+        org.lwjgl.opengl.GL41.glScissorIndexedv(index, v);
     }
 
     public static void glShaderBinary(java.nio.IntBuffer shaders, int binaryformat, java.nio.ByteBuffer binary) {
-        org.lwjgl3.opengl.GL41.glShaderBinary(shaders, binaryformat, binary);
+        org.lwjgl.opengl.GL41.glShaderBinary(shaders, binaryformat, binary);
     }
 
     public static void glUseProgramStages(int pipeline, int stages, int program) {
-        org.lwjgl3.opengl.GL41.glUseProgramStages(pipeline, stages, program);
+        org.lwjgl.opengl.GL41.glUseProgramStages(pipeline, stages, program);
     }
 
     public static void glValidateProgramPipeline(int pipeline) {
-        org.lwjgl3.opengl.GL41.glValidateProgramPipeline(pipeline);
+        org.lwjgl.opengl.GL41.glValidateProgramPipeline(pipeline);
     }
 
     public static void glVertexAttribL1(int index, java.nio.DoubleBuffer v) {
-        org.lwjgl3.opengl.GL41.glVertexAttribL1dv(index, v);
+        org.lwjgl.opengl.GL41.glVertexAttribL1dv(index, v);
     }
 
     public static void glVertexAttribL1d(int index, double x) {
-        org.lwjgl3.opengl.GL41.glVertexAttribL1d(index, x);
+        org.lwjgl.opengl.GL41.glVertexAttribL1d(index, x);
     }
 
     public static void glVertexAttribL2(int index, java.nio.DoubleBuffer v) {
-        org.lwjgl3.opengl.GL41.glVertexAttribL2dv(index, v);
+        org.lwjgl.opengl.GL41.glVertexAttribL2dv(index, v);
     }
 
     public static void glVertexAttribL2d(int index, double x, double y) {
-        org.lwjgl3.opengl.GL41.glVertexAttribL2d(index, x, y);
+        org.lwjgl.opengl.GL41.glVertexAttribL2d(index, x, y);
     }
 
     public static void glVertexAttribL3(int index, java.nio.DoubleBuffer v) {
-        org.lwjgl3.opengl.GL41.glVertexAttribL3dv(index, v);
+        org.lwjgl.opengl.GL41.glVertexAttribL3dv(index, v);
     }
 
     public static void glVertexAttribL3d(int index, double x, double y, double z) {
-        org.lwjgl3.opengl.GL41.glVertexAttribL3d(index, x, y, z);
+        org.lwjgl.opengl.GL41.glVertexAttribL3d(index, x, y, z);
     }
 
     public static void glVertexAttribL4(int index, java.nio.DoubleBuffer v) {
-        org.lwjgl3.opengl.GL41.glVertexAttribL4dv(index, v);
+        org.lwjgl.opengl.GL41.glVertexAttribL4dv(index, v);
     }
 
     public static void glVertexAttribL4d(int index, double x, double y, double z, double w) {
-        org.lwjgl3.opengl.GL41.glVertexAttribL4d(index, x, y, z, w);
+        org.lwjgl.opengl.GL41.glVertexAttribL4d(index, x, y, z, w);
     }
 
     public static void glVertexAttribLPointer(int index, int size, int stride, java.nio.DoubleBuffer pointer) {
-        org.lwjgl3.opengl.GL41.glVertexAttribLPointer(index, size, stride, pointer);
+        org.lwjgl.opengl.GL41.glVertexAttribLPointer(index, size, stride, pointer);
     }
 
     public static void glViewportArray(int first, java.nio.FloatBuffer v) {
-        org.lwjgl3.opengl.GL41.glViewportArrayv(first, v);
+        org.lwjgl.opengl.GL41.glViewportArrayv(first, v);
     }
 
     public static void glViewportIndexed(int index, java.nio.FloatBuffer v) {
-        org.lwjgl3.opengl.GL41.glViewportIndexedfv(index, v);
+        org.lwjgl.opengl.GL41.glViewportIndexedfv(index, v);
     }
 
     public static void glViewportIndexedf(int index, float x, float y, float w, float h) {
-        org.lwjgl3.opengl.GL41.glViewportIndexedf(index, x, y, w, h);
+        org.lwjgl.opengl.GL41.glViewportIndexedf(index, x, y, w, h);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/GL42.java b/src/main/java/org/lwjglx/opengl/GL42.java
similarity index 88%
rename from src/main/java/org/lwjgl/opengl/GL42.java
rename to src/main/java/org/lwjglx/opengl/GL42.java
index b95d95df1..be28458c7 100644
--- a/src/main/java/org/lwjgl/opengl/GL42.java
+++ b/src/main/java/org/lwjglx/opengl/GL42.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class GL42 {
 
@@ -113,17 +113,17 @@ public class GL42 {
 
     public static void glBindImageTexture(int unit, int texture, int level, boolean layered, int layer, int access,
             int format) {
-        org.lwjgl3.opengl.GL42.glBindImageTexture(unit, texture, level, layered, layer, access, format);
+        org.lwjgl.opengl.GL42.glBindImageTexture(unit, texture, level, layered, layer, access, format);
     }
 
     public static void glDrawArraysInstancedBaseInstance(int mode, int first, int count, int primcount,
             int baseinstance) {
-        org.lwjgl3.opengl.GL42.glDrawArraysInstancedBaseInstance(mode, first, count, primcount, baseinstance);
+        org.lwjgl.opengl.GL42.glDrawArraysInstancedBaseInstance(mode, first, count, primcount, baseinstance);
     }
 
     public static void glDrawElementsInstancedBaseInstance(int mode, int indices_count, int type,
             long indices_buffer_offset, int primcount, int baseinstance) {
-        org.lwjgl3.opengl.GL42.glDrawElementsInstancedBaseInstance(
+        org.lwjgl.opengl.GL42.glDrawElementsInstancedBaseInstance(
                 mode,
                 indices_count,
                 type,
@@ -134,22 +134,22 @@ public static void glDrawElementsInstancedBaseInstance(int mode, int indices_cou
 
     public static void glDrawElementsInstancedBaseInstance(int mode, java.nio.ByteBuffer indices, int primcount,
             int baseinstance) {
-        org.lwjgl3.opengl.GL42.glDrawElementsInstancedBaseInstance(mode, indices, primcount, baseinstance);
+        org.lwjgl.opengl.GL42.glDrawElementsInstancedBaseInstance(mode, indices, primcount, baseinstance);
     }
 
     public static void glDrawElementsInstancedBaseInstance(int mode, java.nio.IntBuffer indices, int primcount,
             int baseinstance) {
-        org.lwjgl3.opengl.GL42.glDrawElementsInstancedBaseInstance(mode, indices, primcount, baseinstance);
+        org.lwjgl.opengl.GL42.glDrawElementsInstancedBaseInstance(mode, indices, primcount, baseinstance);
     }
 
     public static void glDrawElementsInstancedBaseInstance(int mode, java.nio.ShortBuffer indices, int primcount,
             int baseinstance) {
-        org.lwjgl3.opengl.GL42.glDrawElementsInstancedBaseInstance(mode, indices, primcount, baseinstance);
+        org.lwjgl.opengl.GL42.glDrawElementsInstancedBaseInstance(mode, indices, primcount, baseinstance);
     }
 
     public static void glDrawElementsInstancedBaseVertexBaseInstance(int mode, int indices_count, int type,
             long indices_buffer_offset, int primcount, int basevertex, int baseinstance) {
-        org.lwjgl3.opengl.GL42.glDrawElementsInstancedBaseVertexBaseInstance(
+        org.lwjgl.opengl.GL42.glDrawElementsInstancedBaseVertexBaseInstance(
                 mode,
                 indices_count,
                 type,
@@ -161,52 +161,52 @@ public static void glDrawElementsInstancedBaseVertexBaseInstance(int mode, int i
 
     public static void glDrawElementsInstancedBaseVertexBaseInstance(int mode, java.nio.ByteBuffer indices,
             int primcount, int basevertex, int baseinstance) {
-        org.lwjgl3.opengl.GL42
+        org.lwjgl.opengl.GL42
                 .glDrawElementsInstancedBaseVertexBaseInstance(mode, indices, primcount, basevertex, baseinstance);
     }
 
     public static void glDrawElementsInstancedBaseVertexBaseInstance(int mode, java.nio.IntBuffer indices,
             int primcount, int basevertex, int baseinstance) {
-        org.lwjgl3.opengl.GL42
+        org.lwjgl.opengl.GL42
                 .glDrawElementsInstancedBaseVertexBaseInstance(mode, indices, primcount, basevertex, baseinstance);
     }
 
     public static void glDrawElementsInstancedBaseVertexBaseInstance(int mode, java.nio.ShortBuffer indices,
             int primcount, int basevertex, int baseinstance) {
-        org.lwjgl3.opengl.GL42
+        org.lwjgl.opengl.GL42
                 .glDrawElementsInstancedBaseVertexBaseInstance(mode, indices, primcount, basevertex, baseinstance);
     }
 
     public static void glDrawTransformFeedbackInstanced(int mode, int id, int primcount) {
-        org.lwjgl3.opengl.GL42.glDrawTransformFeedbackInstanced(mode, id, primcount);
+        org.lwjgl.opengl.GL42.glDrawTransformFeedbackInstanced(mode, id, primcount);
     }
 
     public static void glDrawTransformFeedbackStreamInstanced(int mode, int id, int stream, int primcount) {
-        org.lwjgl3.opengl.GL42.glDrawTransformFeedbackStreamInstanced(mode, id, stream, primcount);
+        org.lwjgl.opengl.GL42.glDrawTransformFeedbackStreamInstanced(mode, id, stream, primcount);
     }
 
     public static void glGetActiveAtomicCounterBuffer(int program, int bufferIndex, int pname,
             java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL42.glGetActiveAtomicCounterBufferiv(program, bufferIndex, pname, params);
+        org.lwjgl.opengl.GL42.glGetActiveAtomicCounterBufferiv(program, bufferIndex, pname, params);
     }
 
     public static void glGetInternalformat(int target, int internalformat, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL42.glGetInternalformativ(target, internalformat, pname, params);
+        org.lwjgl.opengl.GL42.glGetInternalformativ(target, internalformat, pname, params);
     }
 
     public static void glMemoryBarrier(int barriers) {
-        org.lwjgl3.opengl.GL42.glMemoryBarrier(barriers);
+        org.lwjgl.opengl.GL42.glMemoryBarrier(barriers);
     }
 
     public static void glTexStorage1D(int target, int levels, int internalformat, int width) {
-        org.lwjgl3.opengl.GL42.glTexStorage1D(target, levels, internalformat, width);
+        org.lwjgl.opengl.GL42.glTexStorage1D(target, levels, internalformat, width);
     }
 
     public static void glTexStorage2D(int target, int levels, int internalformat, int width, int height) {
-        org.lwjgl3.opengl.GL42.glTexStorage2D(target, levels, internalformat, width, height);
+        org.lwjgl.opengl.GL42.glTexStorage2D(target, levels, internalformat, width, height);
     }
 
     public static void glTexStorage3D(int target, int levels, int internalformat, int width, int height, int depth) {
-        org.lwjgl3.opengl.GL42.glTexStorage3D(target, levels, internalformat, width, height, depth);
+        org.lwjgl.opengl.GL42.glTexStorage3D(target, levels, internalformat, width, height, depth);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/GL43.java b/src/main/java/org/lwjglx/opengl/GL43.java
similarity index 83%
rename from src/main/java/org/lwjgl/opengl/GL43.java
rename to src/main/java/org/lwjglx/opengl/GL43.java
index b086d510c..d82e8732b 100644
--- a/src/main/java/org/lwjgl/opengl/GL43.java
+++ b/src/main/java/org/lwjglx/opengl/GL43.java
@@ -1,7 +1,6 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
-import org.lwjgl.BufferChecks;
-import org.lwjgl3.opengl.GLDebugMessageCallbackI;
+import org.lwjgl.opengl.GLDebugMessageCallbackI;
 
 public class GL43 {
 
@@ -266,23 +265,23 @@ public class GL43 {
     public static final int GL_VIEW_COMPATIBILITY_CLASS = (int) 33462;
 
     public static void glBindVertexBuffer(int bindingindex, int buffer, long offset, int stride) {
-        org.lwjgl3.opengl.GL43.glBindVertexBuffer(bindingindex, buffer, offset, stride);
+        org.lwjgl.opengl.GL43.glBindVertexBuffer(bindingindex, buffer, offset, stride);
     }
 
     public static void glClearBufferData(int target, int internalformat, int format, int type,
             java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.GL43.glClearBufferData(target, internalformat, format, type, data);
+        org.lwjgl.opengl.GL43.glClearBufferData(target, internalformat, format, type, data);
     }
 
     public static void glClearBufferSubData(int target, int internalformat, long offset, long size, int format,
             int type, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.GL43.glClearBufferSubData(target, internalformat, offset, size, format, type, data);
+        org.lwjgl.opengl.GL43.glClearBufferSubData(target, internalformat, offset, size, format, type, data);
     }
 
     public static void glCopyImageSubData(int srcName, int srcTarget, int srcLevel, int srcX, int srcY, int srcZ,
             int dstName, int dstTarget, int dstLevel, int dstX, int dstY, int dstZ, int srcWidth, int srcHeight,
             int srcDepth) {
-        org.lwjgl3.opengl.GL43.glCopyImageSubData(
+        org.lwjgl.opengl.GL43.glCopyImageSubData(
                 srcName,
                 srcTarget,
                 srcLevel,
@@ -303,229 +302,229 @@ public static void glCopyImageSubData(int srcName, int srcTarget, int srcLevel,
     public static void glDebugMessageCallback(KHRDebugCallback callback) {
         long userParam = callback == null ? 0 : CallbackUtil.createGlobalRef(callback.getHandler());
         CallbackUtil.registerContextCallbackKHR(userParam);
-        org.lwjgl3.opengl.GL43.nglDebugMessageCallback(callback == null ? 0 : callback.getPointer(), userParam);
+        org.lwjgl.opengl.GL43.nglDebugMessageCallback(callback == null ? 0 : callback.getPointer(), userParam);
     }
 
     public static void glDebugMessageControl(int source, int type, int severity, java.nio.IntBuffer ids,
             boolean enabled) {
-        org.lwjgl3.opengl.GL43.glDebugMessageControl(source, type, severity, ids, enabled);
+        org.lwjgl.opengl.GL43.glDebugMessageControl(source, type, severity, ids, enabled);
     }
 
     public static void glDebugMessageInsert(int source, int type, int id, int severity, java.lang.CharSequence buf) {
-        org.lwjgl3.opengl.GL43.glDebugMessageInsert(source, type, id, severity, buf);
+        org.lwjgl.opengl.GL43.glDebugMessageInsert(source, type, id, severity, buf);
     }
 
     public static void glDebugMessageInsert(int source, int type, int id, int severity, java.nio.ByteBuffer buf) {
-        org.lwjgl3.opengl.GL43.glDebugMessageInsert(source, type, id, severity, buf);
+        org.lwjgl.opengl.GL43.glDebugMessageInsert(source, type, id, severity, buf);
     }
 
     public static void glDispatchCompute(int num_groups_x, int num_groups_y, int num_groups_z) {
-        org.lwjgl3.opengl.GL43.glDispatchCompute(num_groups_x, num_groups_y, num_groups_z);
+        org.lwjgl.opengl.GL43.glDispatchCompute(num_groups_x, num_groups_y, num_groups_z);
     }
 
     public static void glDispatchComputeIndirect(long indirect) {
-        org.lwjgl3.opengl.GL43.glDispatchComputeIndirect(indirect);
+        org.lwjgl.opengl.GL43.glDispatchComputeIndirect(indirect);
     }
 
     public static void glFramebufferParameteri(int target, int pname, int param) {
-        org.lwjgl3.opengl.GL43.glFramebufferParameteri(target, pname, param);
+        org.lwjgl.opengl.GL43.glFramebufferParameteri(target, pname, param);
     }
 
     public static int glGetDebugMessageLog(int count, java.nio.IntBuffer sources, java.nio.IntBuffer types,
             java.nio.IntBuffer ids, java.nio.IntBuffer severities, java.nio.IntBuffer lengths,
             java.nio.ByteBuffer messageLog) {
-        return org.lwjgl3.opengl.GL43.glGetDebugMessageLog(count, sources, types, ids, severities, lengths, messageLog);
+        return org.lwjgl.opengl.GL43.glGetDebugMessageLog(count, sources, types, ids, severities, lengths, messageLog);
     }
 
     public static void glGetFramebufferParameter(int target, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL43.glGetFramebufferParameteriv(target, pname, params);
+        org.lwjgl.opengl.GL43.glGetFramebufferParameteriv(target, pname, params);
     }
 
     public static int glGetFramebufferParameteri(int target, int pname) {
-        return org.lwjgl3.opengl.GL43.glGetFramebufferParameteri(target, pname);
+        return org.lwjgl.opengl.GL43.glGetFramebufferParameteri(target, pname);
     }
 
     public static void glGetInternalformat(int target, int internalformat, int pname, java.nio.LongBuffer params) {
-        org.lwjgl3.opengl.GL43.glGetInternalformati64v(target, internalformat, pname, params);
+        org.lwjgl.opengl.GL43.glGetInternalformati64v(target, internalformat, pname, params);
     }
 
     public static long glGetInternalformati64(int target, int internalformat, int pname) {
-        return org.lwjgl3.opengl.GL43.glGetInternalformati64(target, internalformat, pname);
+        return org.lwjgl.opengl.GL43.glGetInternalformati64(target, internalformat, pname);
     }
 
     public static java.lang.String glGetObjectLabel(int identifier, int name, int bufSize) {
-        return org.lwjgl3.opengl.GL43.glGetObjectLabel(identifier, name, bufSize);
+        return org.lwjgl.opengl.GL43.glGetObjectLabel(identifier, name, bufSize);
     }
 
     public static void glGetObjectLabel(int identifier, int name, java.nio.IntBuffer length,
             java.nio.ByteBuffer label) {
-        org.lwjgl3.opengl.GL43.glGetObjectLabel(identifier, name, length, label);
+        org.lwjgl.opengl.GL43.glGetObjectLabel(identifier, name, length, label);
     }
 
     public static void glGetProgramInterface(int program, int programInterface, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL43.glGetProgramInterfaceiv(program, programInterface, pname, params);
+        org.lwjgl.opengl.GL43.glGetProgramInterfaceiv(program, programInterface, pname, params);
     }
 
     public static int glGetProgramInterfacei(int program, int programInterface, int pname) {
-        return org.lwjgl3.opengl.GL43.glGetProgramInterfacei(program, programInterface, pname);
+        return org.lwjgl.opengl.GL43.glGetProgramInterfacei(program, programInterface, pname);
     }
 
     public static void glGetProgramResource(int program, int programInterface, int index, java.nio.IntBuffer props,
             java.nio.IntBuffer length, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL43.glGetProgramResourceiv(program, programInterface, index, props, length, params);
+        org.lwjgl.opengl.GL43.glGetProgramResourceiv(program, programInterface, index, props, length, params);
     }
 
     public static int glGetProgramResourceIndex(int program, int programInterface, java.lang.CharSequence name) {
-        return org.lwjgl3.opengl.GL43.glGetProgramResourceIndex(program, programInterface, name);
+        return org.lwjgl.opengl.GL43.glGetProgramResourceIndex(program, programInterface, name);
     }
 
     public static int glGetProgramResourceIndex(int program, int programInterface, java.nio.ByteBuffer name) {
-        return org.lwjgl3.opengl.GL43.glGetProgramResourceIndex(program, programInterface, name);
+        return org.lwjgl.opengl.GL43.glGetProgramResourceIndex(program, programInterface, name);
     }
 
     public static int glGetProgramResourceLocation(int program, int programInterface, java.lang.CharSequence name) {
-        return org.lwjgl3.opengl.GL43.glGetProgramResourceLocation(program, programInterface, name);
+        return org.lwjgl.opengl.GL43.glGetProgramResourceLocation(program, programInterface, name);
     }
 
     public static int glGetProgramResourceLocation(int program, int programInterface, java.nio.ByteBuffer name) {
-        return org.lwjgl3.opengl.GL43.glGetProgramResourceLocation(program, programInterface, name);
+        return org.lwjgl.opengl.GL43.glGetProgramResourceLocation(program, programInterface, name);
     }
 
     public static int glGetProgramResourceLocationIndex(int program, int programInterface,
             java.lang.CharSequence name) {
-        return org.lwjgl3.opengl.GL43.glGetProgramResourceLocationIndex(program, programInterface, name);
+        return org.lwjgl.opengl.GL43.glGetProgramResourceLocationIndex(program, programInterface, name);
     }
 
     public static int glGetProgramResourceLocationIndex(int program, int programInterface, java.nio.ByteBuffer name) {
-        return org.lwjgl3.opengl.GL43.glGetProgramResourceLocationIndex(program, programInterface, name);
+        return org.lwjgl.opengl.GL43.glGetProgramResourceLocationIndex(program, programInterface, name);
     }
 
     public static java.lang.String glGetProgramResourceName(int program, int programInterface, int index, int bufSize) {
-        return org.lwjgl3.opengl.GL43.glGetProgramResourceName(program, programInterface, index, bufSize);
+        return org.lwjgl.opengl.GL43.glGetProgramResourceName(program, programInterface, index, bufSize);
     }
 
     public static void glGetProgramResourceName(int program, int programInterface, int index, java.nio.IntBuffer length,
             java.nio.ByteBuffer name) {
-        org.lwjgl3.opengl.GL43.glGetProgramResourceName(program, programInterface, index, length, name);
+        org.lwjgl.opengl.GL43.glGetProgramResourceName(program, programInterface, index, length, name);
     }
 
     public static void glInvalidateBufferData(int buffer) {
-        org.lwjgl3.opengl.GL43.glInvalidateBufferData(buffer);
+        org.lwjgl.opengl.GL43.glInvalidateBufferData(buffer);
     }
 
     public static void glInvalidateBufferSubData(int buffer, long offset, long length) {
-        org.lwjgl3.opengl.GL43.glInvalidateBufferSubData(buffer, offset, length);
+        org.lwjgl.opengl.GL43.glInvalidateBufferSubData(buffer, offset, length);
     }
 
     public static void glInvalidateFramebuffer(int target, java.nio.IntBuffer attachments) {
-        org.lwjgl3.opengl.GL43.glInvalidateFramebuffer(target, attachments);
+        org.lwjgl.opengl.GL43.glInvalidateFramebuffer(target, attachments);
     }
 
     public static void glInvalidateSubFramebuffer(int target, java.nio.IntBuffer attachments, int x, int y, int width,
             int height) {
-        org.lwjgl3.opengl.GL43.glInvalidateSubFramebuffer(target, attachments, x, y, width, height);
+        org.lwjgl.opengl.GL43.glInvalidateSubFramebuffer(target, attachments, x, y, width, height);
     }
 
     public static void glInvalidateTexImage(int texture, int level) {
-        org.lwjgl3.opengl.GL43.glInvalidateTexImage(texture, level);
+        org.lwjgl.opengl.GL43.glInvalidateTexImage(texture, level);
     }
 
     public static void glInvalidateTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth) {
-        org.lwjgl3.opengl.GL43.glInvalidateTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth);
+        org.lwjgl.opengl.GL43.glInvalidateTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth);
     }
 
     public static void glMultiDrawArraysIndirect(int mode, long indirect_buffer_offset, int primcount, int stride) {
-        org.lwjgl3.opengl.GL43.glMultiDrawArraysIndirect(mode, indirect_buffer_offset, primcount, stride);
+        org.lwjgl.opengl.GL43.glMultiDrawArraysIndirect(mode, indirect_buffer_offset, primcount, stride);
     }
 
     public static void glMultiDrawArraysIndirect(int mode, java.nio.ByteBuffer indirect, int primcount, int stride) {
-        org.lwjgl3.opengl.GL43.glMultiDrawArraysIndirect(mode, indirect, primcount, stride);
+        org.lwjgl.opengl.GL43.glMultiDrawArraysIndirect(mode, indirect, primcount, stride);
     }
 
     public static void glMultiDrawArraysIndirect(int mode, java.nio.IntBuffer indirect, int primcount, int stride) {
-        org.lwjgl3.opengl.GL43.glMultiDrawArraysIndirect(mode, indirect, primcount, stride);
+        org.lwjgl.opengl.GL43.glMultiDrawArraysIndirect(mode, indirect, primcount, stride);
     }
 
     public static void glMultiDrawElementsIndirect(int mode, int type, long indirect_buffer_offset, int primcount,
             int stride) {
-        org.lwjgl3.opengl.GL43.glMultiDrawElementsIndirect(mode, type, indirect_buffer_offset, primcount, stride);
+        org.lwjgl.opengl.GL43.glMultiDrawElementsIndirect(mode, type, indirect_buffer_offset, primcount, stride);
     }
 
     public static void glMultiDrawElementsIndirect(int mode, int type, java.nio.ByteBuffer indirect, int primcount,
             int stride) {
-        org.lwjgl3.opengl.GL43.glMultiDrawElementsIndirect(mode, type, indirect, primcount, stride);
+        org.lwjgl.opengl.GL43.glMultiDrawElementsIndirect(mode, type, indirect, primcount, stride);
     }
 
     public static void glMultiDrawElementsIndirect(int mode, int type, java.nio.IntBuffer indirect, int primcount,
             int stride) {
-        org.lwjgl3.opengl.GL43.glMultiDrawElementsIndirect(mode, type, indirect, primcount, stride);
+        org.lwjgl.opengl.GL43.glMultiDrawElementsIndirect(mode, type, indirect, primcount, stride);
     }
 
     public static void glObjectLabel(int identifier, int name, java.lang.CharSequence label) {
-        org.lwjgl3.opengl.GL43.glObjectLabel(identifier, name, label);
+        org.lwjgl.opengl.GL43.glObjectLabel(identifier, name, label);
     }
 
     public static void glObjectLabel(int identifier, int name, java.nio.ByteBuffer label) {
-        org.lwjgl3.opengl.GL43.glObjectLabel(identifier, name, label);
+        org.lwjgl.opengl.GL43.glObjectLabel(identifier, name, label);
     }
 
     public static void glPopDebugGroup() {
-        org.lwjgl3.opengl.GL43.glPopDebugGroup();
+        org.lwjgl.opengl.GL43.glPopDebugGroup();
     }
 
     public static void glPushDebugGroup(int source, int id, java.lang.CharSequence message) {
-        org.lwjgl3.opengl.GL43.glPushDebugGroup(source, id, message);
+        org.lwjgl.opengl.GL43.glPushDebugGroup(source, id, message);
     }
 
     public static void glPushDebugGroup(int source, int id, java.nio.ByteBuffer message) {
-        org.lwjgl3.opengl.GL43.glPushDebugGroup(source, id, message);
+        org.lwjgl.opengl.GL43.glPushDebugGroup(source, id, message);
     }
 
     public static void glShaderStorageBlockBinding(int program, int storageBlockIndex, int storageBlockBinding) {
-        org.lwjgl3.opengl.GL43.glShaderStorageBlockBinding(program, storageBlockIndex, storageBlockBinding);
+        org.lwjgl.opengl.GL43.glShaderStorageBlockBinding(program, storageBlockIndex, storageBlockBinding);
     }
 
     public static void glTexBufferRange(int target, int internalformat, int buffer, long offset, long size) {
-        org.lwjgl3.opengl.GL43.glTexBufferRange(target, internalformat, buffer, offset, size);
+        org.lwjgl.opengl.GL43.glTexBufferRange(target, internalformat, buffer, offset, size);
     }
 
     public static void glTexStorage2DMultisample(int target, int samples, int internalformat, int width, int height,
             boolean fixedsamplelocations) {
-        org.lwjgl3.opengl.GL43
+        org.lwjgl.opengl.GL43
                 .glTexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
     }
 
     public static void glTexStorage3DMultisample(int target, int samples, int internalformat, int width, int height,
             int depth, boolean fixedsamplelocations) {
-        org.lwjgl3.opengl.GL43
+        org.lwjgl.opengl.GL43
                 .glTexStorage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
     }
 
     public static void glTextureView(int texture, int target, int origtexture, int internalformat, int minlevel,
             int numlevels, int minlayer, int numlayers) {
-        org.lwjgl3.opengl.GL43
+        org.lwjgl.opengl.GL43
                 .glTextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers);
     }
 
     public static void glVertexAttribBinding(int attribindex, int bindingindex) {
-        org.lwjgl3.opengl.GL43.glVertexAttribBinding(attribindex, bindingindex);
+        org.lwjgl.opengl.GL43.glVertexAttribBinding(attribindex, bindingindex);
     }
 
     public static void glVertexAttribFormat(int attribindex, int size, int type, boolean normalized,
             int relativeoffset) {
-        org.lwjgl3.opengl.GL43.glVertexAttribFormat(attribindex, size, type, normalized, relativeoffset);
+        org.lwjgl.opengl.GL43.glVertexAttribFormat(attribindex, size, type, normalized, relativeoffset);
     }
 
     public static void glVertexAttribIFormat(int attribindex, int size, int type, int relativeoffset) {
-        org.lwjgl3.opengl.GL43.glVertexAttribIFormat(attribindex, size, type, relativeoffset);
+        org.lwjgl.opengl.GL43.glVertexAttribIFormat(attribindex, size, type, relativeoffset);
     }
 
     public static void glVertexAttribLFormat(int attribindex, int size, int type, int relativeoffset) {
-        org.lwjgl3.opengl.GL43.glVertexAttribLFormat(attribindex, size, type, relativeoffset);
+        org.lwjgl.opengl.GL43.glVertexAttribLFormat(attribindex, size, type, relativeoffset);
     }
 
     public static void glVertexBindingDivisor(int bindingindex, int divisor) {
-        org.lwjgl3.opengl.GL43.glVertexBindingDivisor(bindingindex, divisor);
+        org.lwjgl.opengl.GL43.glVertexBindingDivisor(bindingindex, divisor);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/GL44.java b/src/main/java/org/lwjglx/opengl/GL44.java
similarity index 81%
rename from src/main/java/org/lwjgl/opengl/GL44.java
rename to src/main/java/org/lwjglx/opengl/GL44.java
index 0c75703f4..4ae75d997 100644
--- a/src/main/java/org/lwjgl/opengl/GL44.java
+++ b/src/main/java/org/lwjglx/opengl/GL44.java
@@ -1,6 +1,6 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
-import org.lwjgl.lwjgl3ify.BufferCasts;
+import org.lwjglx.lwjgl3ify.BufferCasts;
 
 public class GL44 {
 
@@ -23,59 +23,59 @@ public class GL44 {
     public static final int GL_TRANSFORM_FEEDBACK_BUFFER_STRIDE = (int) 37708;
 
     public static void glBufferStorage(int target, long size, int flags) {
-        org.lwjgl3.opengl.GL44.glBufferStorage(target, size, flags);
+        org.lwjgl.opengl.GL44.glBufferStorage(target, size, flags);
     }
 
     public static void glBufferStorage(int target, java.nio.ByteBuffer data, int flags) {
-        org.lwjgl3.opengl.GL44.glBufferStorage(target, data, flags);
+        org.lwjgl.opengl.GL44.glBufferStorage(target, data, flags);
     }
 
     public static void glBufferStorage(int target, java.nio.DoubleBuffer data, int flags) {
-        org.lwjgl3.opengl.GL44.glBufferStorage(target, data, flags);
+        org.lwjgl.opengl.GL44.glBufferStorage(target, data, flags);
     }
 
     public static void glBufferStorage(int target, java.nio.FloatBuffer data, int flags) {
-        org.lwjgl3.opengl.GL44.glBufferStorage(target, data, flags);
+        org.lwjgl.opengl.GL44.glBufferStorage(target, data, flags);
     }
 
     public static void glBufferStorage(int target, java.nio.IntBuffer data, int flags) {
-        org.lwjgl3.opengl.GL44.glBufferStorage(target, data, flags);
+        org.lwjgl.opengl.GL44.glBufferStorage(target, data, flags);
     }
 
     public static void glBufferStorage(int target, java.nio.ShortBuffer data, int flags) {
-        org.lwjgl3.opengl.GL44.glBufferStorage(target, data, flags);
+        org.lwjgl.opengl.GL44.glBufferStorage(target, data, flags);
     }
 
     public static void glClearTexImage(int texture, int level, int format, int type, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.GL44.glClearTexImage(texture, level, format, type, data);
+        org.lwjgl.opengl.GL44.glClearTexImage(texture, level, format, type, data);
     }
 
     public static void glClearTexImage(int texture, int level, int format, int type, java.nio.DoubleBuffer data) {
-        org.lwjgl3.opengl.GL44.glClearTexImage(texture, level, format, type, data);
+        org.lwjgl.opengl.GL44.glClearTexImage(texture, level, format, type, data);
     }
 
     public static void glClearTexImage(int texture, int level, int format, int type, java.nio.FloatBuffer data) {
-        org.lwjgl3.opengl.GL44.glClearTexImage(texture, level, format, type, data);
+        org.lwjgl.opengl.GL44.glClearTexImage(texture, level, format, type, data);
     }
 
     public static void glClearTexImage(int texture, int level, int format, int type, java.nio.IntBuffer data) {
-        org.lwjgl3.opengl.GL44.glClearTexImage(texture, level, format, type, data);
+        org.lwjgl.opengl.GL44.glClearTexImage(texture, level, format, type, data);
     }
 
     public static void glClearTexImage(int texture, int level, int format, int type, java.nio.LongBuffer data) {
         final java.nio.ByteBuffer wrappedArg4 = BufferCasts.toByteBuffer(data);
 
-        org.lwjgl3.opengl.GL44.glClearTexImage(texture, level, format, type, wrappedArg4);
+        org.lwjgl.opengl.GL44.glClearTexImage(texture, level, format, type, wrappedArg4);
         BufferCasts.updateBuffer(data, wrappedArg4);
     }
 
     public static void glClearTexImage(int texture, int level, int format, int type, java.nio.ShortBuffer data) {
-        org.lwjgl3.opengl.GL44.glClearTexImage(texture, level, format, type, data);
+        org.lwjgl.opengl.GL44.glClearTexImage(texture, level, format, type, data);
     }
 
     public static void glClearTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.GL44.glClearTexSubImage(
+        org.lwjgl.opengl.GL44.glClearTexSubImage(
                 texture,
                 level,
                 xoffset,
@@ -91,7 +91,7 @@ public static void glClearTexSubImage(int texture, int level, int xoffset, int y
 
     public static void glClearTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.DoubleBuffer data) {
-        org.lwjgl3.opengl.GL44.glClearTexSubImage(
+        org.lwjgl.opengl.GL44.glClearTexSubImage(
                 texture,
                 level,
                 xoffset,
@@ -107,7 +107,7 @@ public static void glClearTexSubImage(int texture, int level, int xoffset, int y
 
     public static void glClearTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.FloatBuffer data) {
-        org.lwjgl3.opengl.GL44.glClearTexSubImage(
+        org.lwjgl.opengl.GL44.glClearTexSubImage(
                 texture,
                 level,
                 xoffset,
@@ -123,7 +123,7 @@ public static void glClearTexSubImage(int texture, int level, int xoffset, int y
 
     public static void glClearTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.IntBuffer data) {
-        org.lwjgl3.opengl.GL44.glClearTexSubImage(
+        org.lwjgl.opengl.GL44.glClearTexSubImage(
                 texture,
                 level,
                 xoffset,
@@ -141,7 +141,7 @@ public static void glClearTexSubImage(int texture, int level, int xoffset, int y
             int height, int depth, int format, int type, java.nio.LongBuffer data) {
         final java.nio.ByteBuffer wrappedArg10 = BufferCasts.toByteBuffer(data);
 
-        org.lwjgl3.opengl.GL44.glClearTexSubImage(
+        org.lwjgl.opengl.GL44.glClearTexSubImage(
                 texture,
                 level,
                 xoffset,
@@ -158,7 +158,7 @@ public static void glClearTexSubImage(int texture, int level, int xoffset, int y
 
     public static void glClearTexSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.ShortBuffer data) {
-        org.lwjgl3.opengl.GL44.glClearTexSubImage(
+        org.lwjgl.opengl.GL44.glClearTexSubImage(
                 texture,
                 level,
                 xoffset,
diff --git a/src/main/java/org/lwjgl/opengl/GL45.java b/src/main/java/org/lwjglx/opengl/GL45.java
similarity index 69%
rename from src/main/java/org/lwjgl/opengl/GL45.java
rename to src/main/java/org/lwjglx/opengl/GL45.java
index 7019d03c7..67ebc4f59 100644
--- a/src/main/java/org/lwjgl/opengl/GL45.java
+++ b/src/main/java/org/lwjglx/opengl/GL45.java
@@ -1,4 +1,6 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
+
+import org.lwjglx.MemoryUtil;
 
 public class GL45 {
 
@@ -27,12 +29,12 @@ public class GL45 {
     public static final int GL_ZERO_TO_ONE = (int) 37727;
 
     public static void glBindTextureUnit(int unit, int texture) {
-        org.lwjgl3.opengl.GL45.glBindTextureUnit(unit, texture);
+        org.lwjgl.opengl.GL45.glBindTextureUnit(unit, texture);
     }
 
     public static void glBlitNamedFramebuffer(int readFramebuffer, int drawFramebuffer, int srcX0, int srcY0, int srcX1,
             int srcY1, int dstX0, int dstY0, int dstX1, int dstY1, int mask, int filter) {
-        org.lwjgl3.opengl.GL45.glBlitNamedFramebuffer(
+        org.lwjgl.opengl.GL45.glBlitNamedFramebuffer(
                 readFramebuffer,
                 drawFramebuffer,
                 srcX0,
@@ -48,39 +50,39 @@ public static void glBlitNamedFramebuffer(int readFramebuffer, int drawFramebuff
     }
 
     public static int glCheckNamedFramebufferStatus(int framebuffer, int target) {
-        return org.lwjgl3.opengl.GL45.glCheckNamedFramebufferStatus(framebuffer, target);
+        return org.lwjgl.opengl.GL45.glCheckNamedFramebufferStatus(framebuffer, target);
     }
 
     public static void glClearNamedBufferData(int buffer, int internalformat, int format, int type,
             java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.GL45.glClearNamedBufferData(buffer, internalformat, format, type, data);
+        org.lwjgl.opengl.GL45.glClearNamedBufferData(buffer, internalformat, format, type, data);
     }
 
     public static void glClearNamedBufferSubData(int buffer, int internalformat, long offset, long size, int format,
             int type, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.GL45.glClearNamedBufferSubData(buffer, internalformat, offset, size, format, type, data);
+        org.lwjgl.opengl.GL45.glClearNamedBufferSubData(buffer, internalformat, offset, size, format, type, data);
     }
 
     public static void glClearNamedFramebuffer(int framebuffer, int buffer, int drawbuffer,
             java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.GL45.glClearNamedFramebufferfv(framebuffer, buffer, drawbuffer, value);
+        org.lwjgl.opengl.GL45.glClearNamedFramebufferfv(framebuffer, buffer, drawbuffer, value);
     }
 
     public static void glClearNamedFramebuffer(int framebuffer, int buffer, int drawbuffer, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.GL45.glClearNamedFramebufferiv(framebuffer, buffer, drawbuffer, value);
+        org.lwjgl.opengl.GL45.glClearNamedFramebufferiv(framebuffer, buffer, drawbuffer, value);
     }
 
     public static void glClearNamedFramebufferu(int framebuffer, int buffer, int drawbuffer, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.GL45.glClearNamedFramebufferuiv(framebuffer, buffer, drawbuffer, value);
+        org.lwjgl.opengl.GL45.glClearNamedFramebufferuiv(framebuffer, buffer, drawbuffer, value);
     }
 
     public static void glClipControl(int origin, int depth) {
-        org.lwjgl3.opengl.GL45.glClipControl(origin, depth);
+        org.lwjgl.opengl.GL45.glClipControl(origin, depth);
     }
 
     public static void glCompressedTextureSubImage1D(int texture, int level, int xoffset, int width, int format,
             int data_imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.GL45.glCompressedTextureSubImage1D(
+        org.lwjgl.opengl.GL45.glCompressedTextureSubImage1D(
                 texture,
                 level,
                 xoffset,
@@ -92,12 +94,12 @@ public static void glCompressedTextureSubImage1D(int texture, int level, int xof
 
     public static void glCompressedTextureSubImage1D(int texture, int level, int xoffset, int width, int format,
             java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.GL45.glCompressedTextureSubImage1D(texture, level, xoffset, width, format, data);
+        org.lwjgl.opengl.GL45.glCompressedTextureSubImage1D(texture, level, xoffset, width, format, data);
     }
 
     public static void glCompressedTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width,
             int height, int format, int data_imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.GL45.glCompressedTextureSubImage2D(
+        org.lwjgl.opengl.GL45.glCompressedTextureSubImage2D(
                 texture,
                 level,
                 xoffset,
@@ -111,13 +113,13 @@ public static void glCompressedTextureSubImage2D(int texture, int level, int xof
 
     public static void glCompressedTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width,
             int height, int format, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.GL45
+        org.lwjgl.opengl.GL45
                 .glCompressedTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, data);
     }
 
     public static void glCompressedTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, int format, int imageSize, long data_buffer_offset) {
-        org.lwjgl3.opengl.GL45.glCompressedTextureSubImage3D(
+        org.lwjgl.opengl.GL45.glCompressedTextureSubImage3D(
                 texture,
                 level,
                 xoffset,
@@ -134,7 +136,7 @@ public static void glCompressedTextureSubImage3D(int texture, int level, int xof
     public static void glCompressedTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, int format, int imageSize, java.nio.ByteBuffer data) {
 
-        org.lwjgl3.opengl.GL45.glCompressedTextureSubImage3D(
+        org.lwjgl.opengl.GL45.glCompressedTextureSubImage3D(
                 texture,
                 level,
                 xoffset,
@@ -145,128 +147,128 @@ public static void glCompressedTextureSubImage3D(int texture, int level, int xof
                 depth,
                 format,
                 imageSize,
-                org.lwjgl.MemoryUtil.getAddress(data));
+                MemoryUtil.getAddress(data));
     }
 
     public static void glCopyNamedBufferSubData(int readBuffer, int writeBuffer, long readOffset, long writeOffset,
             long size) {
-        org.lwjgl3.opengl.GL45.glCopyNamedBufferSubData(readBuffer, writeBuffer, readOffset, writeOffset, size);
+        org.lwjgl.opengl.GL45.glCopyNamedBufferSubData(readBuffer, writeBuffer, readOffset, writeOffset, size);
     }
 
     public static void glCopyTextureSubImage1D(int texture, int level, int xoffset, int x, int y, int width) {
-        org.lwjgl3.opengl.GL45.glCopyTextureSubImage1D(texture, level, xoffset, x, y, width);
+        org.lwjgl.opengl.GL45.glCopyTextureSubImage1D(texture, level, xoffset, x, y, width);
     }
 
     public static void glCopyTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int x, int y,
             int width, int height) {
-        org.lwjgl3.opengl.GL45.glCopyTextureSubImage2D(texture, level, xoffset, yoffset, x, y, width, height);
+        org.lwjgl.opengl.GL45.glCopyTextureSubImage2D(texture, level, xoffset, yoffset, x, y, width, height);
     }
 
     public static void glCopyTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int x,
             int y, int width, int height) {
-        org.lwjgl3.opengl.GL45.glCopyTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, x, y, width, height);
+        org.lwjgl.opengl.GL45.glCopyTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, x, y, width, height);
     }
 
     public static int glCreateBuffers() {
-        return org.lwjgl3.opengl.GL45.glCreateBuffers();
+        return org.lwjgl.opengl.GL45.glCreateBuffers();
     }
 
     public static void glCreateBuffers(java.nio.IntBuffer buffers) {
-        org.lwjgl3.opengl.GL45.glCreateBuffers(buffers);
+        org.lwjgl.opengl.GL45.glCreateBuffers(buffers);
     }
 
     public static int glCreateFramebuffers() {
-        return org.lwjgl3.opengl.GL45.glCreateFramebuffers();
+        return org.lwjgl.opengl.GL45.glCreateFramebuffers();
     }
 
     public static void glCreateFramebuffers(java.nio.IntBuffer framebuffers) {
-        org.lwjgl3.opengl.GL45.glCreateFramebuffers(framebuffers);
+        org.lwjgl.opengl.GL45.glCreateFramebuffers(framebuffers);
     }
 
     public static int glCreateProgramPipelines() {
-        return org.lwjgl3.opengl.GL45.glCreateProgramPipelines();
+        return org.lwjgl.opengl.GL45.glCreateProgramPipelines();
     }
 
     public static void glCreateProgramPipelines(java.nio.IntBuffer pipelines) {
-        org.lwjgl3.opengl.GL45.glCreateProgramPipelines(pipelines);
+        org.lwjgl.opengl.GL45.glCreateProgramPipelines(pipelines);
     }
 
     public static int glCreateQueries(int target) {
-        return org.lwjgl3.opengl.GL45.glCreateQueries(target);
+        return org.lwjgl.opengl.GL45.glCreateQueries(target);
     }
 
     public static void glCreateQueries(int target, java.nio.IntBuffer ids) {
-        org.lwjgl3.opengl.GL45.glCreateQueries(target, ids);
+        org.lwjgl.opengl.GL45.glCreateQueries(target, ids);
     }
 
     public static int glCreateRenderbuffers() {
-        return org.lwjgl3.opengl.GL45.glCreateRenderbuffers();
+        return org.lwjgl.opengl.GL45.glCreateRenderbuffers();
     }
 
     public static void glCreateRenderbuffers(java.nio.IntBuffer renderbuffers) {
-        org.lwjgl3.opengl.GL45.glCreateRenderbuffers(renderbuffers);
+        org.lwjgl.opengl.GL45.glCreateRenderbuffers(renderbuffers);
     }
 
     public static int glCreateSamplers() {
-        return org.lwjgl3.opengl.GL45.glCreateSamplers();
+        return org.lwjgl.opengl.GL45.glCreateSamplers();
     }
 
     public static void glCreateSamplers(java.nio.IntBuffer samplers) {
-        org.lwjgl3.opengl.GL45.glCreateSamplers(samplers);
+        org.lwjgl.opengl.GL45.glCreateSamplers(samplers);
     }
 
     public static int glCreateTextures(int target) {
-        return org.lwjgl3.opengl.GL45.glCreateTextures(target);
+        return org.lwjgl.opengl.GL45.glCreateTextures(target);
     }
 
     public static void glCreateTextures(int target, java.nio.IntBuffer textures) {
-        org.lwjgl3.opengl.GL45.glCreateTextures(target, textures);
+        org.lwjgl.opengl.GL45.glCreateTextures(target, textures);
     }
 
     public static int glCreateTransformFeedbacks() {
-        return org.lwjgl3.opengl.GL45.glCreateTransformFeedbacks();
+        return org.lwjgl.opengl.GL45.glCreateTransformFeedbacks();
     }
 
     public static void glCreateTransformFeedbacks(java.nio.IntBuffer ids) {
-        org.lwjgl3.opengl.GL45.glCreateTransformFeedbacks(ids);
+        org.lwjgl.opengl.GL45.glCreateTransformFeedbacks(ids);
     }
 
     public static int glCreateVertexArrays() {
-        return org.lwjgl3.opengl.GL45.glCreateVertexArrays();
+        return org.lwjgl.opengl.GL45.glCreateVertexArrays();
     }
 
     public static void glCreateVertexArrays(java.nio.IntBuffer arrays) {
-        org.lwjgl3.opengl.GL45.glCreateVertexArrays(arrays);
+        org.lwjgl.opengl.GL45.glCreateVertexArrays(arrays);
     }
 
     public static void glDisableVertexArrayAttrib(int vaobj, int index) {
-        org.lwjgl3.opengl.GL45.glDisableVertexArrayAttrib(vaobj, index);
+        org.lwjgl.opengl.GL45.glDisableVertexArrayAttrib(vaobj, index);
     }
 
     public static void glEnableVertexArrayAttrib(int vaobj, int index) {
-        org.lwjgl3.opengl.GL45.glEnableVertexArrayAttrib(vaobj, index);
+        org.lwjgl.opengl.GL45.glEnableVertexArrayAttrib(vaobj, index);
     }
 
     public static void glFlushMappedNamedBufferRange(int buffer, long offset, long length) {
-        org.lwjgl3.opengl.GL45.glFlushMappedNamedBufferRange(buffer, offset, length);
+        org.lwjgl.opengl.GL45.glFlushMappedNamedBufferRange(buffer, offset, length);
     }
 
     public static void glGenerateTextureMipmap(int texture) {
-        org.lwjgl3.opengl.GL45.glGenerateTextureMipmap(texture);
+        org.lwjgl.opengl.GL45.glGenerateTextureMipmap(texture);
     }
 
     public static void glGetCompressedTextureImage(int texture, int level, int pixels_bufSize,
             long pixels_buffer_offset) {
-        org.lwjgl3.opengl.GL45.glGetCompressedTextureImage(texture, level, pixels_bufSize, pixels_buffer_offset);
+        org.lwjgl.opengl.GL45.glGetCompressedTextureImage(texture, level, pixels_bufSize, pixels_buffer_offset);
     }
 
     public static void glGetCompressedTextureImage(int texture, int level, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glGetCompressedTextureImage(texture, level, pixels);
+        org.lwjgl.opengl.GL45.glGetCompressedTextureImage(texture, level, pixels);
     }
 
     public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, int pixels_bufSize, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.GL45.glGetCompressedTextureSubImage(
+        org.lwjgl.opengl.GL45.glGetCompressedTextureSubImage(
                 texture,
                 level,
                 xoffset,
@@ -281,7 +283,7 @@ public static void glGetCompressedTextureSubImage(int texture, int level, int xo
 
     public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glGetCompressedTextureSubImage(
+        org.lwjgl.opengl.GL45.glGetCompressedTextureSubImage(
                 texture,
                 level,
                 xoffset,
@@ -295,7 +297,7 @@ public static void glGetCompressedTextureSubImage(int texture, int level, int xo
 
     public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glGetCompressedTextureSubImage(
+        org.lwjgl.opengl.GL45.glGetCompressedTextureSubImage(
                 texture,
                 level,
                 xoffset,
@@ -309,7 +311,7 @@ public static void glGetCompressedTextureSubImage(int texture, int level, int xo
 
     public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glGetCompressedTextureSubImage(
+        org.lwjgl.opengl.GL45.glGetCompressedTextureSubImage(
                 texture,
                 level,
                 xoffset,
@@ -323,7 +325,7 @@ public static void glGetCompressedTextureSubImage(int texture, int level, int xo
 
     public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glGetCompressedTextureSubImage(
+        org.lwjgl.opengl.GL45.glGetCompressedTextureSubImage(
                 texture,
                 level,
                 xoffset,
@@ -337,7 +339,7 @@ public static void glGetCompressedTextureSubImage(int texture, int level, int xo
 
     public static void glGetCompressedTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset,
             int width, int height, int depth, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glGetCompressedTextureSubImage(
+        org.lwjgl.opengl.GL45.glGetCompressedTextureSubImage(
                 texture,
                 level,
                 xoffset,
@@ -350,134 +352,134 @@ public static void glGetCompressedTextureSubImage(int texture, int level, int xo
     }
 
     public static int glGetGraphicsResetStatus() {
-        return org.lwjgl3.opengl.GL45.glGetGraphicsResetStatus();
+        return org.lwjgl.opengl.GL45.glGetGraphicsResetStatus();
     }
 
     public static void glGetNamedBufferParameter(int buffer, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL45.glGetNamedBufferParameteriv(buffer, pname, params);
+        org.lwjgl.opengl.GL45.glGetNamedBufferParameteriv(buffer, pname, params);
     }
 
     public static void glGetNamedBufferParameter(int buffer, int pname, java.nio.LongBuffer params) {
-        org.lwjgl3.opengl.GL45.glGetNamedBufferParameteri64v(buffer, pname, params);
+        org.lwjgl.opengl.GL45.glGetNamedBufferParameteri64v(buffer, pname, params);
     }
 
     public static long glGetNamedBufferParameteri64(int buffer, int pname) {
-        return org.lwjgl3.opengl.GL45.glGetNamedBufferParameteri64(buffer, pname);
+        return org.lwjgl.opengl.GL45.glGetNamedBufferParameteri64(buffer, pname);
     }
 
     public static int glGetNamedBufferParameteri(int buffer, int pname) {
-        return org.lwjgl3.opengl.GL45.glGetNamedBufferParameteri(buffer, pname);
+        return org.lwjgl.opengl.GL45.glGetNamedBufferParameteri(buffer, pname);
     }
 
     public static void glGetNamedBufferSubData(int buffer, long offset, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.GL45.glGetNamedBufferSubData(buffer, offset, data);
+        org.lwjgl.opengl.GL45.glGetNamedBufferSubData(buffer, offset, data);
     }
 
     public static void glGetNamedBufferSubData(int buffer, long offset, java.nio.DoubleBuffer data) {
-        org.lwjgl3.opengl.GL45.glGetNamedBufferSubData(buffer, offset, data);
+        org.lwjgl.opengl.GL45.glGetNamedBufferSubData(buffer, offset, data);
     }
 
     public static void glGetNamedBufferSubData(int buffer, long offset, java.nio.FloatBuffer data) {
-        org.lwjgl3.opengl.GL45.glGetNamedBufferSubData(buffer, offset, data);
+        org.lwjgl.opengl.GL45.glGetNamedBufferSubData(buffer, offset, data);
     }
 
     public static void glGetNamedBufferSubData(int buffer, long offset, java.nio.IntBuffer data) {
-        org.lwjgl3.opengl.GL45.glGetNamedBufferSubData(buffer, offset, data);
+        org.lwjgl.opengl.GL45.glGetNamedBufferSubData(buffer, offset, data);
     }
 
     public static void glGetNamedBufferSubData(int buffer, long offset, java.nio.ShortBuffer data) {
-        org.lwjgl3.opengl.GL45.glGetNamedBufferSubData(buffer, offset, data);
+        org.lwjgl.opengl.GL45.glGetNamedBufferSubData(buffer, offset, data);
     }
 
     public static void glGetNamedFramebufferAttachmentParameter(int framebuffer, int attachment, int pname,
             java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL45.glGetNamedFramebufferAttachmentParameteriv(framebuffer, attachment, pname, params);
+        org.lwjgl.opengl.GL45.glGetNamedFramebufferAttachmentParameteriv(framebuffer, attachment, pname, params);
     }
 
     public static void glGetNamedFramebufferParameter(int framebuffer, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL45.glGetNamedFramebufferParameteriv(framebuffer, pname, params);
+        org.lwjgl.opengl.GL45.glGetNamedFramebufferParameteriv(framebuffer, pname, params);
     }
 
     public static void glGetNamedRenderbufferParameter(int renderbuffer, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL45.glGetNamedRenderbufferParameteriv(renderbuffer, pname, params);
+        org.lwjgl.opengl.GL45.glGetNamedRenderbufferParameteriv(renderbuffer, pname, params);
     }
 
     public static void glGetTextureImage(int texture, int level, int format, int type, int pixels_bufSize,
             long pixels_buffer_offset) {
-        org.lwjgl3.opengl.GL45.glGetTextureImage(texture, level, format, type, pixels_bufSize, pixels_buffer_offset);
+        org.lwjgl.opengl.GL45.glGetTextureImage(texture, level, format, type, pixels_bufSize, pixels_buffer_offset);
     }
 
     public static void glGetTextureImage(int texture, int level, int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glGetTextureImage(texture, level, format, type, pixels);
+        org.lwjgl.opengl.GL45.glGetTextureImage(texture, level, format, type, pixels);
     }
 
     public static void glGetTextureImage(int texture, int level, int format, int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glGetTextureImage(texture, level, format, type, pixels);
+        org.lwjgl.opengl.GL45.glGetTextureImage(texture, level, format, type, pixels);
     }
 
     public static void glGetTextureImage(int texture, int level, int format, int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glGetTextureImage(texture, level, format, type, pixels);
+        org.lwjgl.opengl.GL45.glGetTextureImage(texture, level, format, type, pixels);
     }
 
     public static void glGetTextureImage(int texture, int level, int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glGetTextureImage(texture, level, format, type, pixels);
+        org.lwjgl.opengl.GL45.glGetTextureImage(texture, level, format, type, pixels);
     }
 
     public static void glGetTextureImage(int texture, int level, int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glGetTextureImage(texture, level, format, type, pixels);
+        org.lwjgl.opengl.GL45.glGetTextureImage(texture, level, format, type, pixels);
     }
 
     public static void glGetTextureLevelParameter(int texture, int level, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.GL45.glGetTextureLevelParameterfv(texture, level, pname, params);
+        org.lwjgl.opengl.GL45.glGetTextureLevelParameterfv(texture, level, pname, params);
     }
 
     public static void glGetTextureLevelParameter(int texture, int level, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL45.glGetTextureLevelParameteriv(texture, level, pname, params);
+        org.lwjgl.opengl.GL45.glGetTextureLevelParameteriv(texture, level, pname, params);
     }
 
     public static float glGetTextureLevelParameterf(int texture, int level, int pname) {
-        return org.lwjgl3.opengl.GL45.glGetTextureLevelParameterf(texture, level, pname);
+        return org.lwjgl.opengl.GL45.glGetTextureLevelParameterf(texture, level, pname);
     }
 
     public static int glGetTextureLevelParameteri(int texture, int level, int pname) {
-        return org.lwjgl3.opengl.GL45.glGetTextureLevelParameteri(texture, level, pname);
+        return org.lwjgl.opengl.GL45.glGetTextureLevelParameteri(texture, level, pname);
     }
 
     public static void glGetTextureParameter(int texture, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.GL45.glGetTextureParameterfv(texture, pname, params);
+        org.lwjgl.opengl.GL45.glGetTextureParameterfv(texture, pname, params);
     }
 
     public static void glGetTextureParameter(int texture, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL45.glGetTextureParameteriv(texture, pname, params);
+        org.lwjgl.opengl.GL45.glGetTextureParameteriv(texture, pname, params);
     }
 
     public static void glGetTextureParameterI(int texture, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL45.glGetTextureParameterIiv(texture, pname, params);
+        org.lwjgl.opengl.GL45.glGetTextureParameterIiv(texture, pname, params);
     }
 
     public static int glGetTextureParameterIi(int texture, int pname) {
-        return org.lwjgl3.opengl.GL45.glGetTextureParameterIi(texture, pname);
+        return org.lwjgl.opengl.GL45.glGetTextureParameterIi(texture, pname);
     }
 
     public static void glGetTextureParameterIu(int texture, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL45.glGetTextureParameterIuiv(texture, pname, params);
+        org.lwjgl.opengl.GL45.glGetTextureParameterIuiv(texture, pname, params);
     }
 
     public static int glGetTextureParameterIui(int texture, int pname) {
-        return org.lwjgl3.opengl.GL45.glGetTextureParameterIui(texture, pname);
+        return org.lwjgl.opengl.GL45.glGetTextureParameterIui(texture, pname);
     }
 
     public static float glGetTextureParameterf(int texture, int pname) {
-        return org.lwjgl3.opengl.GL45.glGetTextureParameterf(texture, pname);
+        return org.lwjgl.opengl.GL45.glGetTextureParameterf(texture, pname);
     }
 
     public static int glGetTextureParameteri(int texture, int pname) {
-        return org.lwjgl3.opengl.GL45.glGetTextureParameteri(texture, pname);
+        return org.lwjgl.opengl.GL45.glGetTextureParameteri(texture, pname);
     }
 
     public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, int pixels_bufSize, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.GL45.glGetTextureSubImage(
+        org.lwjgl.opengl.GL45.glGetTextureSubImage(
                 texture,
                 level,
                 xoffset,
@@ -494,7 +496,7 @@ public static void glGetTextureSubImage(int texture, int level, int xoffset, int
 
     public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glGetTextureSubImage(
+        org.lwjgl.opengl.GL45.glGetTextureSubImage(
                 texture,
                 level,
                 xoffset,
@@ -510,7 +512,7 @@ public static void glGetTextureSubImage(int texture, int level, int xoffset, int
 
     public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glGetTextureSubImage(
+        org.lwjgl.opengl.GL45.glGetTextureSubImage(
                 texture,
                 level,
                 xoffset,
@@ -526,7 +528,7 @@ public static void glGetTextureSubImage(int texture, int level, int xoffset, int
 
     public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glGetTextureSubImage(
+        org.lwjgl.opengl.GL45.glGetTextureSubImage(
                 texture,
                 level,
                 xoffset,
@@ -542,7 +544,7 @@ public static void glGetTextureSubImage(int texture, int level, int xoffset, int
 
     public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glGetTextureSubImage(
+        org.lwjgl.opengl.GL45.glGetTextureSubImage(
                 texture,
                 level,
                 xoffset,
@@ -558,7 +560,7 @@ public static void glGetTextureSubImage(int texture, int level, int xoffset, int
 
     public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glGetTextureSubImage(
+        org.lwjgl.opengl.GL45.glGetTextureSubImage(
                 texture,
                 level,
                 xoffset,
@@ -573,275 +575,275 @@ public static void glGetTextureSubImage(int texture, int level, int xoffset, int
     }
 
     public static void glGetTransformFeedback(int xfb, int pname, int index, java.nio.IntBuffer param) {
-        org.lwjgl3.opengl.GL45.glGetTransformFeedbacki_v(xfb, pname, index, param);
+        org.lwjgl.opengl.GL45.glGetTransformFeedbacki_v(xfb, pname, index, param);
     }
 
     public static void glGetTransformFeedback(int xfb, int pname, int index, java.nio.LongBuffer param) {
-        org.lwjgl3.opengl.GL45.glGetTransformFeedbacki64_v(xfb, pname, index, param);
+        org.lwjgl.opengl.GL45.glGetTransformFeedbacki64_v(xfb, pname, index, param);
     }
 
     public static void glGetTransformFeedback(int xfb, int pname, java.nio.IntBuffer param) {
-        org.lwjgl3.opengl.GL45.glGetTransformFeedbackiv(xfb, pname, param);
+        org.lwjgl.opengl.GL45.glGetTransformFeedbackiv(xfb, pname, param);
     }
 
     public static long glGetTransformFeedbacki64(int xfb, int pname, int index) {
-        return org.lwjgl3.opengl.GL45.glGetTransformFeedbacki64(xfb, pname, index);
+        return org.lwjgl.opengl.GL45.glGetTransformFeedbacki64(xfb, pname, index);
     }
 
     public static int glGetTransformFeedbacki(int xfb, int pname) {
-        return org.lwjgl3.opengl.GL45.glGetTransformFeedbacki(xfb, pname);
+        return org.lwjgl.opengl.GL45.glGetTransformFeedbacki(xfb, pname);
     }
 
     public static int glGetTransformFeedbacki(int xfb, int pname, int index) {
-        return org.lwjgl3.opengl.GL45.glGetTransformFeedbacki(xfb, pname, index);
+        return org.lwjgl.opengl.GL45.glGetTransformFeedbacki(xfb, pname, index);
     }
 
     public static void glGetVertexArray(int vaobj, int pname, java.nio.IntBuffer param) {
-        org.lwjgl3.opengl.GL45.glGetVertexArrayiv(vaobj, pname, param);
+        org.lwjgl.opengl.GL45.glGetVertexArrayiv(vaobj, pname, param);
     }
 
     public static long glGetVertexArrayIndexed64i(int vaobj, int index, int pname) {
-        return org.lwjgl3.opengl.GL45.glGetVertexArrayIndexed64i(vaobj, index, pname);
+        return org.lwjgl.opengl.GL45.glGetVertexArrayIndexed64i(vaobj, index, pname);
     }
 
     public static void glGetVertexArrayIndexed64i(int vaobj, int index, int pname, java.nio.LongBuffer param) {
-        org.lwjgl3.opengl.GL45.glGetVertexArrayIndexed64iv(vaobj, index, pname, param);
+        org.lwjgl.opengl.GL45.glGetVertexArrayIndexed64iv(vaobj, index, pname, param);
     }
 
     public static void glGetVertexArrayIndexed(int vaobj, int index, int pname, java.nio.IntBuffer param) {
-        org.lwjgl3.opengl.GL45.glGetVertexArrayIndexediv(vaobj, index, pname, param);
+        org.lwjgl.opengl.GL45.glGetVertexArrayIndexediv(vaobj, index, pname, param);
     }
 
     public static void glGetnUniform(int program, int location, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.GL45.glGetnUniformfv(program, location, params);
+        org.lwjgl.opengl.GL45.glGetnUniformfv(program, location, params);
     }
 
     public static void glGetnUniform(int program, int location, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL45.glGetnUniformiv(program, location, params);
+        org.lwjgl.opengl.GL45.glGetnUniformiv(program, location, params);
     }
 
     public static void glGetnUniformu(int program, int location, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL45.glGetnUniformuiv(program, location, params);
+        org.lwjgl.opengl.GL45.glGetnUniformuiv(program, location, params);
     }
 
     public static void glInvalidateNamedFramebufferData(int framebuffer, java.nio.IntBuffer attachments) {
-        org.lwjgl3.opengl.GL45.glInvalidateNamedFramebufferData(framebuffer, attachments);
+        org.lwjgl.opengl.GL45.glInvalidateNamedFramebufferData(framebuffer, attachments);
     }
 
     public static void glInvalidateNamedFramebufferSubData(int framebuffer, java.nio.IntBuffer attachments, int x,
             int y, int width, int height) {
-        org.lwjgl3.opengl.GL45.glInvalidateNamedFramebufferSubData(framebuffer, attachments, x, y, width, height);
+        org.lwjgl.opengl.GL45.glInvalidateNamedFramebufferSubData(framebuffer, attachments, x, y, width, height);
     }
 
     public static java.nio.ByteBuffer glMapNamedBuffer(int buffer, int access, long length,
             java.nio.ByteBuffer old_buffer) {
-        return org.lwjgl3.opengl.GL45.glMapNamedBuffer(buffer, access, length, old_buffer);
+        return org.lwjgl.opengl.GL45.glMapNamedBuffer(buffer, access, length, old_buffer);
     }
 
     public static java.nio.ByteBuffer glMapNamedBuffer(int buffer, int access, java.nio.ByteBuffer old_buffer) {
-        return org.lwjgl3.opengl.GL45.glMapNamedBuffer(buffer, access, old_buffer);
+        return org.lwjgl.opengl.GL45.glMapNamedBuffer(buffer, access, old_buffer);
     }
 
     public static java.nio.ByteBuffer glMapNamedBufferRange(int buffer, long offset, long length, int access,
             java.nio.ByteBuffer old_buffer) {
-        return org.lwjgl3.opengl.GL45.glMapNamedBufferRange(buffer, offset, length, access, old_buffer);
+        return org.lwjgl.opengl.GL45.glMapNamedBufferRange(buffer, offset, length, access, old_buffer);
     }
 
     public static void glMemoryBarrierByRegion(int barriers) {
-        org.lwjgl3.opengl.GL45.glMemoryBarrierByRegion(barriers);
+        org.lwjgl.opengl.GL45.glMemoryBarrierByRegion(barriers);
     }
 
     public static void glNamedBufferData(int buffer, long data_size, int usage) {
-        org.lwjgl3.opengl.GL45.glNamedBufferData(buffer, data_size, usage);
+        org.lwjgl.opengl.GL45.glNamedBufferData(buffer, data_size, usage);
     }
 
     public static void glNamedBufferData(int buffer, java.nio.ByteBuffer data, int usage) {
-        org.lwjgl3.opengl.GL45.glNamedBufferData(buffer, data, usage);
+        org.lwjgl.opengl.GL45.glNamedBufferData(buffer, data, usage);
     }
 
     public static void glNamedBufferData(int buffer, java.nio.DoubleBuffer data, int usage) {
-        org.lwjgl3.opengl.GL45.glNamedBufferData(buffer, data, usage);
+        org.lwjgl.opengl.GL45.glNamedBufferData(buffer, data, usage);
     }
 
     public static void glNamedBufferData(int buffer, java.nio.FloatBuffer data, int usage) {
-        org.lwjgl3.opengl.GL45.glNamedBufferData(buffer, data, usage);
+        org.lwjgl.opengl.GL45.glNamedBufferData(buffer, data, usage);
     }
 
     public static void glNamedBufferData(int buffer, java.nio.IntBuffer data, int usage) {
-        org.lwjgl3.opengl.GL45.glNamedBufferData(buffer, data, usage);
+        org.lwjgl.opengl.GL45.glNamedBufferData(buffer, data, usage);
     }
 
     public static void glNamedBufferData(int buffer, java.nio.ShortBuffer data, int usage) {
-        org.lwjgl3.opengl.GL45.glNamedBufferData(buffer, data, usage);
+        org.lwjgl.opengl.GL45.glNamedBufferData(buffer, data, usage);
     }
 
     public static void glNamedBufferStorage(int buffer, long size, int flags) {
-        org.lwjgl3.opengl.GL45.glNamedBufferStorage(buffer, size, flags);
+        org.lwjgl.opengl.GL45.glNamedBufferStorage(buffer, size, flags);
     }
 
     public static void glNamedBufferStorage(int buffer, java.nio.ByteBuffer data, int flags) {
-        org.lwjgl3.opengl.GL45.glNamedBufferStorage(buffer, data, flags);
+        org.lwjgl.opengl.GL45.glNamedBufferStorage(buffer, data, flags);
     }
 
     public static void glNamedBufferStorage(int buffer, java.nio.DoubleBuffer data, int flags) {
-        org.lwjgl3.opengl.GL45.glNamedBufferStorage(buffer, data, flags);
+        org.lwjgl.opengl.GL45.glNamedBufferStorage(buffer, data, flags);
     }
 
     public static void glNamedBufferStorage(int buffer, java.nio.FloatBuffer data, int flags) {
-        org.lwjgl3.opengl.GL45.glNamedBufferStorage(buffer, data, flags);
+        org.lwjgl.opengl.GL45.glNamedBufferStorage(buffer, data, flags);
     }
 
     public static void glNamedBufferStorage(int buffer, java.nio.IntBuffer data, int flags) {
-        org.lwjgl3.opengl.GL45.glNamedBufferStorage(buffer, data, flags);
+        org.lwjgl.opengl.GL45.glNamedBufferStorage(buffer, data, flags);
     }
 
     public static void glNamedBufferStorage(int buffer, java.nio.ShortBuffer data, int flags) {
-        org.lwjgl3.opengl.GL45.glNamedBufferStorage(buffer, data, flags);
+        org.lwjgl.opengl.GL45.glNamedBufferStorage(buffer, data, flags);
     }
 
     public static void glNamedBufferSubData(int buffer, long offset, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.GL45.glNamedBufferSubData(buffer, offset, data);
+        org.lwjgl.opengl.GL45.glNamedBufferSubData(buffer, offset, data);
     }
 
     public static void glNamedBufferSubData(int buffer, long offset, java.nio.DoubleBuffer data) {
-        org.lwjgl3.opengl.GL45.glNamedBufferSubData(buffer, offset, data);
+        org.lwjgl.opengl.GL45.glNamedBufferSubData(buffer, offset, data);
     }
 
     public static void glNamedBufferSubData(int buffer, long offset, java.nio.FloatBuffer data) {
-        org.lwjgl3.opengl.GL45.glNamedBufferSubData(buffer, offset, data);
+        org.lwjgl.opengl.GL45.glNamedBufferSubData(buffer, offset, data);
     }
 
     public static void glNamedBufferSubData(int buffer, long offset, java.nio.IntBuffer data) {
-        org.lwjgl3.opengl.GL45.glNamedBufferSubData(buffer, offset, data);
+        org.lwjgl.opengl.GL45.glNamedBufferSubData(buffer, offset, data);
     }
 
     public static void glNamedBufferSubData(int buffer, long offset, java.nio.ShortBuffer data) {
-        org.lwjgl3.opengl.GL45.glNamedBufferSubData(buffer, offset, data);
+        org.lwjgl.opengl.GL45.glNamedBufferSubData(buffer, offset, data);
     }
 
     public static void glNamedFramebufferDrawBuffer(int framebuffer, int mode) {
-        org.lwjgl3.opengl.GL45.glNamedFramebufferDrawBuffer(framebuffer, mode);
+        org.lwjgl.opengl.GL45.glNamedFramebufferDrawBuffer(framebuffer, mode);
     }
 
     public static void glNamedFramebufferDrawBuffers(int framebuffer, java.nio.IntBuffer bufs) {
-        org.lwjgl3.opengl.GL45.glNamedFramebufferDrawBuffers(framebuffer, bufs);
+        org.lwjgl.opengl.GL45.glNamedFramebufferDrawBuffers(framebuffer, bufs);
     }
 
     public static void glNamedFramebufferParameteri(int framebuffer, int pname, int param) {
-        org.lwjgl3.opengl.GL45.glNamedFramebufferParameteri(framebuffer, pname, param);
+        org.lwjgl.opengl.GL45.glNamedFramebufferParameteri(framebuffer, pname, param);
     }
 
     public static void glNamedFramebufferReadBuffer(int framebuffer, int mode) {
-        org.lwjgl3.opengl.GL45.glNamedFramebufferReadBuffer(framebuffer, mode);
+        org.lwjgl.opengl.GL45.glNamedFramebufferReadBuffer(framebuffer, mode);
     }
 
     public static void glNamedFramebufferRenderbuffer(int framebuffer, int attachment, int renderbuffertarget,
             int renderbuffer) {
-        org.lwjgl3.opengl.GL45.glNamedFramebufferRenderbuffer(framebuffer, attachment, renderbuffertarget, renderbuffer);
+        org.lwjgl.opengl.GL45.glNamedFramebufferRenderbuffer(framebuffer, attachment, renderbuffertarget, renderbuffer);
     }
 
     public static void glNamedFramebufferTexture(int framebuffer, int attachment, int texture, int level) {
-        org.lwjgl3.opengl.GL45.glNamedFramebufferTexture(framebuffer, attachment, texture, level);
+        org.lwjgl.opengl.GL45.glNamedFramebufferTexture(framebuffer, attachment, texture, level);
     }
 
     public static void glNamedFramebufferTextureLayer(int framebuffer, int attachment, int texture, int level,
             int layer) {
-        org.lwjgl3.opengl.GL45.glNamedFramebufferTextureLayer(framebuffer, attachment, texture, level, layer);
+        org.lwjgl.opengl.GL45.glNamedFramebufferTextureLayer(framebuffer, attachment, texture, level, layer);
     }
 
     public static void glNamedRenderbufferStorage(int renderbuffer, int internalformat, int width, int height) {
-        org.lwjgl3.opengl.GL45.glNamedRenderbufferStorage(renderbuffer, internalformat, width, height);
+        org.lwjgl.opengl.GL45.glNamedRenderbufferStorage(renderbuffer, internalformat, width, height);
     }
 
     public static void glNamedRenderbufferStorageMultisample(int renderbuffer, int samples, int internalformat,
             int width, int height) {
-        org.lwjgl3.opengl.GL45
+        org.lwjgl.opengl.GL45
                 .glNamedRenderbufferStorageMultisample(renderbuffer, samples, internalformat, width, height);
     }
 
     public static void glReadnPixels(int x, int y, int width, int height, int format, int type, int pixels_bufSize,
             long pixels_buffer_offset) {
-        org.lwjgl3.opengl.GL45.glReadnPixels(x, y, width, height, format, type, pixels_bufSize, pixels_buffer_offset);
+        org.lwjgl.opengl.GL45.glReadnPixels(x, y, width, height, format, type, pixels_bufSize, pixels_buffer_offset);
     }
 
     public static void glReadnPixels(int x, int y, int width, int height, int format, int type,
             java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glReadnPixels(x, y, width, height, format, type, pixels);
+        org.lwjgl.opengl.GL45.glReadnPixels(x, y, width, height, format, type, pixels);
     }
 
     public static void glReadnPixels(int x, int y, int width, int height, int format, int type,
             java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glReadnPixels(x, y, width, height, format, type, pixels);
+        org.lwjgl.opengl.GL45.glReadnPixels(x, y, width, height, format, type, pixels);
     }
 
     public static void glReadnPixels(int x, int y, int width, int height, int format, int type,
             java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glReadnPixels(x, y, width, height, format, type, pixels);
+        org.lwjgl.opengl.GL45.glReadnPixels(x, y, width, height, format, type, pixels);
     }
 
     public static void glReadnPixels(int x, int y, int width, int height, int format, int type,
             java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glReadnPixels(x, y, width, height, format, type, pixels);
+        org.lwjgl.opengl.GL45.glReadnPixels(x, y, width, height, format, type, pixels);
     }
 
     public static void glTextureBarrier() {
-        org.lwjgl3.opengl.GL45.glTextureBarrier();
+        org.lwjgl.opengl.GL45.glTextureBarrier();
     }
 
     public static void glTextureBuffer(int texture, int internalformat, int buffer) {
-        org.lwjgl3.opengl.GL45.glTextureBuffer(texture, internalformat, buffer);
+        org.lwjgl.opengl.GL45.glTextureBuffer(texture, internalformat, buffer);
     }
 
     public static void glTextureBufferRange(int texture, int internalformat, int buffer, long offset, long size) {
-        org.lwjgl3.opengl.GL45.glTextureBufferRange(texture, internalformat, buffer, offset, size);
+        org.lwjgl.opengl.GL45.glTextureBufferRange(texture, internalformat, buffer, offset, size);
     }
 
     public static void glTextureParameter(int texture, int pname, java.nio.FloatBuffer params) {
-        org.lwjgl3.opengl.GL45.glTextureParameterfv(texture, pname, params);
+        org.lwjgl.opengl.GL45.glTextureParameterfv(texture, pname, params);
     }
 
     public static void glTextureParameter(int texture, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL45.glTextureParameteriv(texture, pname, params);
+        org.lwjgl.opengl.GL45.glTextureParameteriv(texture, pname, params);
     }
 
     public static void glTextureParameterI(int texture, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL45.glTextureParameterIiv(texture, pname, params);
+        org.lwjgl.opengl.GL45.glTextureParameterIiv(texture, pname, params);
     }
 
     public static void glTextureParameterIu(int texture, int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.GL45.glTextureParameterIuiv(texture, pname, params);
+        org.lwjgl.opengl.GL45.glTextureParameterIuiv(texture, pname, params);
     }
 
     public static void glTextureParameterf(int texture, int pname, float param) {
-        org.lwjgl3.opengl.GL45.glTextureParameterf(texture, pname, param);
+        org.lwjgl.opengl.GL45.glTextureParameterf(texture, pname, param);
     }
 
     public static void glTextureParameteri(int texture, int pname, int param) {
-        org.lwjgl3.opengl.GL45.glTextureParameteri(texture, pname, param);
+        org.lwjgl.opengl.GL45.glTextureParameteri(texture, pname, param);
     }
 
     public static void glTextureStorage1D(int texture, int levels, int internalformat, int width) {
-        org.lwjgl3.opengl.GL45.glTextureStorage1D(texture, levels, internalformat, width);
+        org.lwjgl.opengl.GL45.glTextureStorage1D(texture, levels, internalformat, width);
     }
 
     public static void glTextureStorage2D(int texture, int levels, int internalformat, int width, int height) {
-        org.lwjgl3.opengl.GL45.glTextureStorage2D(texture, levels, internalformat, width, height);
+        org.lwjgl.opengl.GL45.glTextureStorage2D(texture, levels, internalformat, width, height);
     }
 
     public static void glTextureStorage2DMultisample(int texture, int samples, int internalformat, int width,
             int height, boolean fixedsamplelocations) {
-        org.lwjgl3.opengl.GL45
+        org.lwjgl.opengl.GL45
                 .glTextureStorage2DMultisample(texture, samples, internalformat, width, height, fixedsamplelocations);
     }
 
     public static void glTextureStorage3D(int texture, int levels, int internalformat, int width, int height,
             int depth) {
-        org.lwjgl3.opengl.GL45.glTextureStorage3D(texture, levels, internalformat, width, height, depth);
+        org.lwjgl.opengl.GL45.glTextureStorage3D(texture, levels, internalformat, width, height, depth);
     }
 
     public static void glTextureStorage3DMultisample(int texture, int samples, int internalformat, int width,
             int height, int depth, boolean fixedsamplelocations) {
-        org.lwjgl3.opengl.GL45.glTextureStorage3DMultisample(
+        org.lwjgl.opengl.GL45.glTextureStorage3DMultisample(
                 texture,
                 samples,
                 internalformat,
@@ -853,37 +855,37 @@ public static void glTextureStorage3DMultisample(int texture, int samples, int i
 
     public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type,
             long pixels_buffer_offset) {
-        org.lwjgl3.opengl.GL45.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels_buffer_offset);
+        org.lwjgl.opengl.GL45.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels_buffer_offset);
     }
 
     public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type,
             java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
+        org.lwjgl.opengl.GL45.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
     }
 
     public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type,
             java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
+        org.lwjgl.opengl.GL45.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
     }
 
     public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type,
             java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
+        org.lwjgl.opengl.GL45.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
     }
 
     public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type,
             java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
+        org.lwjgl.opengl.GL45.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
     }
 
     public static void glTextureSubImage1D(int texture, int level, int xoffset, int width, int format, int type,
             java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
+        org.lwjgl.opengl.GL45.glTextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
     }
 
     public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height,
             int format, int type, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.GL45.glTextureSubImage2D(
+        org.lwjgl.opengl.GL45.glTextureSubImage2D(
                 texture,
                 level,
                 xoffset,
@@ -897,37 +899,37 @@ public static void glTextureSubImage2D(int texture, int level, int xoffset, int
 
     public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height,
             int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.GL45
+        org.lwjgl.opengl.GL45
                 .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height,
             int format, int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.GL45
+        org.lwjgl.opengl.GL45
                 .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height,
             int format, int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.GL45
+        org.lwjgl.opengl.GL45
                 .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height,
             int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.GL45
+        org.lwjgl.opengl.GL45
                 .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glTextureSubImage2D(int texture, int level, int xoffset, int yoffset, int width, int height,
             int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.GL45
+        org.lwjgl.opengl.GL45
                 .glTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels);
     }
 
     public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, long pixels_buffer_offset) {
-        org.lwjgl3.opengl.GL45.glTextureSubImage3D(
+        org.lwjgl.opengl.GL45.glTextureSubImage3D(
                 texture,
                 level,
                 xoffset,
@@ -943,7 +945,7 @@ public static void glTextureSubImage3D(int texture, int level, int xoffset, int
 
     public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glTextureSubImage3D(
+        org.lwjgl.opengl.GL45.glTextureSubImage3D(
                 texture,
                 level,
                 xoffset,
@@ -959,7 +961,7 @@ public static void glTextureSubImage3D(int texture, int level, int xoffset, int
 
     public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.DoubleBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glTextureSubImage3D(
+        org.lwjgl.opengl.GL45.glTextureSubImage3D(
                 texture,
                 level,
                 xoffset,
@@ -975,7 +977,7 @@ public static void glTextureSubImage3D(int texture, int level, int xoffset, int
 
     public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glTextureSubImage3D(
+        org.lwjgl.opengl.GL45.glTextureSubImage3D(
                 texture,
                 level,
                 xoffset,
@@ -991,7 +993,7 @@ public static void glTextureSubImage3D(int texture, int level, int xoffset, int
 
     public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glTextureSubImage3D(
+        org.lwjgl.opengl.GL45.glTextureSubImage3D(
                 texture,
                 level,
                 xoffset,
@@ -1007,7 +1009,7 @@ public static void glTextureSubImage3D(int texture, int level, int xoffset, int
 
     public static void glTextureSubImage3D(int texture, int level, int xoffset, int yoffset, int zoffset, int width,
             int height, int depth, int format, int type, java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.GL45.glTextureSubImage3D(
+        org.lwjgl.opengl.GL45.glTextureSubImage3D(
                 texture,
                 level,
                 xoffset,
@@ -1022,43 +1024,43 @@ public static void glTextureSubImage3D(int texture, int level, int xoffset, int
     }
 
     public static void glTransformFeedbackBufferBase(int xfb, int index, int buffer) {
-        org.lwjgl3.opengl.GL45.glTransformFeedbackBufferBase(xfb, index, buffer);
+        org.lwjgl.opengl.GL45.glTransformFeedbackBufferBase(xfb, index, buffer);
     }
 
     public static void glTransformFeedbackBufferRange(int xfb, int index, int buffer, long offset, long size) {
-        org.lwjgl3.opengl.GL45.glTransformFeedbackBufferRange(xfb, index, buffer, offset, size);
+        org.lwjgl.opengl.GL45.glTransformFeedbackBufferRange(xfb, index, buffer, offset, size);
     }
 
     public static boolean glUnmapNamedBuffer(int buffer) {
-        return org.lwjgl3.opengl.GL45.glUnmapNamedBuffer(buffer);
+        return org.lwjgl.opengl.GL45.glUnmapNamedBuffer(buffer);
     }
 
     public static void glVertexArrayAttribBinding(int vaobj, int attribindex, int bindingindex) {
-        org.lwjgl3.opengl.GL45.glVertexArrayAttribBinding(vaobj, attribindex, bindingindex);
+        org.lwjgl.opengl.GL45.glVertexArrayAttribBinding(vaobj, attribindex, bindingindex);
     }
 
     public static void glVertexArrayAttribFormat(int vaobj, int attribindex, int size, int type, boolean normalized,
             int relativeoffset) {
-        org.lwjgl3.opengl.GL45.glVertexArrayAttribFormat(vaobj, attribindex, size, type, normalized, relativeoffset);
+        org.lwjgl.opengl.GL45.glVertexArrayAttribFormat(vaobj, attribindex, size, type, normalized, relativeoffset);
     }
 
     public static void glVertexArrayAttribIFormat(int vaobj, int attribindex, int size, int type, int relativeoffset) {
-        org.lwjgl3.opengl.GL45.glVertexArrayAttribIFormat(vaobj, attribindex, size, type, relativeoffset);
+        org.lwjgl.opengl.GL45.glVertexArrayAttribIFormat(vaobj, attribindex, size, type, relativeoffset);
     }
 
     public static void glVertexArrayAttribLFormat(int vaobj, int attribindex, int size, int type, int relativeoffset) {
-        org.lwjgl3.opengl.GL45.glVertexArrayAttribLFormat(vaobj, attribindex, size, type, relativeoffset);
+        org.lwjgl.opengl.GL45.glVertexArrayAttribLFormat(vaobj, attribindex, size, type, relativeoffset);
     }
 
     public static void glVertexArrayBindingDivisor(int vaobj, int bindingindex, int divisor) {
-        org.lwjgl3.opengl.GL45.glVertexArrayBindingDivisor(vaobj, bindingindex, divisor);
+        org.lwjgl.opengl.GL45.glVertexArrayBindingDivisor(vaobj, bindingindex, divisor);
     }
 
     public static void glVertexArrayElementBuffer(int vaobj, int buffer) {
-        org.lwjgl3.opengl.GL45.glVertexArrayElementBuffer(vaobj, buffer);
+        org.lwjgl.opengl.GL45.glVertexArrayElementBuffer(vaobj, buffer);
     }
 
     public static void glVertexArrayVertexBuffer(int vaobj, int bindingindex, int buffer, long offset, int stride) {
-        org.lwjgl3.opengl.GL45.glVertexArrayVertexBuffer(vaobj, bindingindex, buffer, offset, stride);
+        org.lwjgl.opengl.GL45.glVertexArrayVertexBuffer(vaobj, bindingindex, buffer, offset, stride);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/GLContext.java b/src/main/java/org/lwjglx/opengl/GLContext.java
similarity index 88%
rename from src/main/java/org/lwjgl/opengl/GLContext.java
rename to src/main/java/org/lwjglx/opengl/GLContext.java
index 70093d1ec..4c7f7dd31 100644
--- a/src/main/java/org/lwjgl/opengl/GLContext.java
+++ b/src/main/java/org/lwjglx/opengl/GLContext.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class GLContext {
 
diff --git a/src/main/java/org/lwjgl/opengl/GLSync.java b/src/main/java/org/lwjglx/opengl/GLSync.java
similarity index 96%
rename from src/main/java/org/lwjgl/opengl/GLSync.java
rename to src/main/java/org/lwjglx/opengl/GLSync.java
index 647e1f28c..0b59ccf81 100644
--- a/src/main/java/org/lwjgl/opengl/GLSync.java
+++ b/src/main/java/org/lwjglx/opengl/GLSync.java
@@ -13,9 +13,9 @@
  * 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.opengl;
+package org.lwjglx.opengl;
 
-import org.lwjgl.PointerWrapperAbstract;
+import org.lwjglx.PointerWrapperAbstract;
 
 /**
  * This class is a wrapper around a GLsync pointer.
diff --git a/src/main/java/org/lwjglx/opengl/GREMEDYFrameTerminator.java b/src/main/java/org/lwjglx/opengl/GREMEDYFrameTerminator.java
new file mode 100644
index 000000000..33e43a874
--- /dev/null
+++ b/src/main/java/org/lwjglx/opengl/GREMEDYFrameTerminator.java
@@ -0,0 +1,8 @@
+package org.lwjglx.opengl;
+
+public class GREMEDYFrameTerminator {
+
+    public static void glFrameTerminatorGREMEDY() {
+        org.lwjgl.opengl.GREMEDYFrameTerminator.glFrameTerminatorGREMEDY();
+    }
+}
diff --git a/src/main/java/org/lwjgl/opengl/GREMEDYStringMarker.java b/src/main/java/org/lwjglx/opengl/GREMEDYStringMarker.java
similarity index 53%
rename from src/main/java/org/lwjgl/opengl/GREMEDYStringMarker.java
rename to src/main/java/org/lwjglx/opengl/GREMEDYStringMarker.java
index 3c8f71bc4..b1ab69b4c 100644
--- a/src/main/java/org/lwjgl/opengl/GREMEDYStringMarker.java
+++ b/src/main/java/org/lwjglx/opengl/GREMEDYStringMarker.java
@@ -1,12 +1,12 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class GREMEDYStringMarker {
 
     public static void glStringMarkerGREMEDY(java.lang.CharSequence string) {
-        org.lwjgl3.opengl.GREMEDYStringMarker.glStringMarkerGREMEDY(string);
+        org.lwjgl.opengl.GREMEDYStringMarker.glStringMarkerGREMEDY(string);
     }
 
     public static void glStringMarkerGREMEDY(java.nio.ByteBuffer string) {
-        org.lwjgl3.opengl.GREMEDYStringMarker.glStringMarkerGREMEDY(string);
+        org.lwjgl.opengl.GREMEDYStringMarker.glStringMarkerGREMEDY(string);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/GlobalLock.java b/src/main/java/org/lwjglx/opengl/GlobalLock.java
similarity index 98%
rename from src/main/java/org/lwjgl/opengl/GlobalLock.java
rename to src/main/java/org/lwjglx/opengl/GlobalLock.java
index 1ae3488a6..42af3ded1 100644
--- a/src/main/java/org/lwjgl/opengl/GlobalLock.java
+++ b/src/main/java/org/lwjglx/opengl/GlobalLock.java
@@ -13,7 +13,7 @@
  * 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.opengl;
+package org.lwjglx.opengl;
 
 /**
  * This class contains the global lock that LWJGL will use to synchronize access to Display.
diff --git a/src/main/java/org/lwjgl/opengl/INTELMapTexture.java b/src/main/java/org/lwjglx/opengl/INTELMapTexture.java
similarity index 71%
rename from src/main/java/org/lwjgl/opengl/INTELMapTexture.java
rename to src/main/java/org/lwjglx/opengl/INTELMapTexture.java
index 92cc87b67..59afc1de5 100644
--- a/src/main/java/org/lwjgl/opengl/INTELMapTexture.java
+++ b/src/main/java/org/lwjglx/opengl/INTELMapTexture.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class INTELMapTexture {
 
@@ -8,10 +8,10 @@ public class INTELMapTexture {
     public static final int GL_TEXTURE_MEMORY_LAYOUT_INTEL = (int) 33791;
 
     public static void glSyncTextureINTEL(int texture) {
-        org.lwjgl3.opengl.INTELMapTexture.glSyncTextureINTEL(texture);
+        org.lwjgl.opengl.INTELMapTexture.glSyncTextureINTEL(texture);
     }
 
     public static void glUnmapTexture2DINTEL(int texture, int level) {
-        org.lwjgl3.opengl.INTELMapTexture.glUnmapTexture2DINTEL(texture, level);
+        org.lwjgl.opengl.INTELMapTexture.glUnmapTexture2DINTEL(texture, level);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/InputImplementation.java b/src/main/java/org/lwjglx/opengl/InputImplementation.java
similarity index 98%
rename from src/main/java/org/lwjgl/opengl/InputImplementation.java
rename to src/main/java/org/lwjglx/opengl/InputImplementation.java
index ccb7cce12..a846eab74 100644
--- a/src/main/java/org/lwjgl/opengl/InputImplementation.java
+++ b/src/main/java/org/lwjglx/opengl/InputImplementation.java
@@ -13,7 +13,7 @@
  * 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.opengl;
+package org.lwjglx.opengl;
 
 /**
  * This is the input implementation interface. Mouse and Keyboard delegates to implementors of this interface. There is
@@ -24,7 +24,7 @@
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
 
-import org.lwjgl.LWJGLException;
+import org.lwjglx.LWJGLException;
 
 public interface InputImplementation {
 
diff --git a/src/main/java/org/lwjgl/opengl/KHRContextFlushControl.java b/src/main/java/org/lwjglx/opengl/KHRContextFlushControl.java
similarity index 87%
rename from src/main/java/org/lwjgl/opengl/KHRContextFlushControl.java
rename to src/main/java/org/lwjglx/opengl/KHRContextFlushControl.java
index e76ec47b5..44d1363f0 100644
--- a/src/main/java/org/lwjgl/opengl/KHRContextFlushControl.java
+++ b/src/main/java/org/lwjglx/opengl/KHRContextFlushControl.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class KHRContextFlushControl {
 
diff --git a/src/main/java/org/lwjgl/opengl/KHRDebug.java b/src/main/java/org/lwjglx/opengl/KHRDebug.java
similarity index 82%
rename from src/main/java/org/lwjgl/opengl/KHRDebug.java
rename to src/main/java/org/lwjglx/opengl/KHRDebug.java
index 76a43db08..6b899ffe0 100644
--- a/src/main/java/org/lwjgl/opengl/KHRDebug.java
+++ b/src/main/java/org/lwjglx/opengl/KHRDebug.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class KHRDebug {
 
@@ -43,50 +43,50 @@ public class KHRDebug {
 
     public static void glDebugMessageControl(int source, int type, int severity, java.nio.IntBuffer ids,
             boolean enabled) {
-        org.lwjgl3.opengl.KHRDebug.glDebugMessageControl(source, type, severity, ids, enabled);
+        org.lwjgl.opengl.KHRDebug.glDebugMessageControl(source, type, severity, ids, enabled);
     }
 
     public static void glDebugMessageInsert(int source, int type, int id, int severity, java.lang.CharSequence buf) {
-        org.lwjgl3.opengl.KHRDebug.glDebugMessageInsert(source, type, id, severity, buf);
+        org.lwjgl.opengl.KHRDebug.glDebugMessageInsert(source, type, id, severity, buf);
     }
 
     public static void glDebugMessageInsert(int source, int type, int id, int severity, java.nio.ByteBuffer buf) {
-        org.lwjgl3.opengl.KHRDebug.glDebugMessageInsert(source, type, id, severity, buf);
+        org.lwjgl.opengl.KHRDebug.glDebugMessageInsert(source, type, id, severity, buf);
     }
 
     public static int glGetDebugMessageLog(int count, java.nio.IntBuffer sources, java.nio.IntBuffer types,
             java.nio.IntBuffer ids, java.nio.IntBuffer severities, java.nio.IntBuffer lengths,
             java.nio.ByteBuffer messageLog) {
-        return org.lwjgl3.opengl.KHRDebug
+        return org.lwjgl.opengl.KHRDebug
                 .glGetDebugMessageLog(count, sources, types, ids, severities, lengths, messageLog);
     }
 
     public static java.lang.String glGetObjectLabel(int identifier, int name, int bufSize) {
-        return org.lwjgl3.opengl.KHRDebug.glGetObjectLabel(identifier, name, bufSize);
+        return org.lwjgl.opengl.KHRDebug.glGetObjectLabel(identifier, name, bufSize);
     }
 
     public static void glGetObjectLabel(int identifier, int name, java.nio.IntBuffer length,
             java.nio.ByteBuffer label) {
-        org.lwjgl3.opengl.KHRDebug.glGetObjectLabel(identifier, name, length, label);
+        org.lwjgl.opengl.KHRDebug.glGetObjectLabel(identifier, name, length, label);
     }
 
     public static void glObjectLabel(int identifier, int name, java.lang.CharSequence label) {
-        org.lwjgl3.opengl.KHRDebug.glObjectLabel(identifier, name, label);
+        org.lwjgl.opengl.KHRDebug.glObjectLabel(identifier, name, label);
     }
 
     public static void glObjectLabel(int identifier, int name, java.nio.ByteBuffer label) {
-        org.lwjgl3.opengl.KHRDebug.glObjectLabel(identifier, name, label);
+        org.lwjgl.opengl.KHRDebug.glObjectLabel(identifier, name, label);
     }
 
     public static void glPopDebugGroup() {
-        org.lwjgl3.opengl.KHRDebug.glPopDebugGroup();
+        org.lwjgl.opengl.KHRDebug.glPopDebugGroup();
     }
 
     public static void glPushDebugGroup(int source, int id, java.lang.CharSequence message) {
-        org.lwjgl3.opengl.KHRDebug.glPushDebugGroup(source, id, message);
+        org.lwjgl.opengl.KHRDebug.glPushDebugGroup(source, id, message);
     }
 
     public static void glPushDebugGroup(int source, int id, java.nio.ByteBuffer message) {
-        org.lwjgl3.opengl.KHRDebug.glPushDebugGroup(source, id, message);
+        org.lwjgl.opengl.KHRDebug.glPushDebugGroup(source, id, message);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/KHRDebugCallback.java b/src/main/java/org/lwjglx/opengl/KHRDebugCallback.java
similarity index 97%
rename from src/main/java/org/lwjgl/opengl/KHRDebugCallback.java
rename to src/main/java/org/lwjglx/opengl/KHRDebugCallback.java
index 1c42ffd0e..f04dc28e9 100644
--- a/src/main/java/org/lwjgl/opengl/KHRDebugCallback.java
+++ b/src/main/java/org/lwjglx/opengl/KHRDebugCallback.java
@@ -29,9 +29,9 @@
  * 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.opengl;
+package org.lwjglx.opengl;
 
-import org.lwjgl.PointerWrapperAbstract;
+import org.lwjglx.PointerWrapperAbstract;
 
 /**
  * Instances of this class are needed to use the callback functionality of the KHR_debug extension.
@@ -75,7 +75,7 @@ public final class KHRDebugCallback extends PointerWrapperAbstract {
         long pointer = 0;
         try {
             // Call reflectively so that we can compile this class for the Generator.
-            pointer = (Long)Class.forName("org.lwjgl.opengl.CallbackUtil").getDeclaredMethod("getDebugCallbackKHR").invoke(null);
+            pointer = (Long)Class.forName("org.lwjglx.opengl.CallbackUtil").getDeclaredMethod("getDebugCallbackKHR").invoke(null);
         } catch (Exception e) {
             // ignore
         }
diff --git a/src/main/java/org/lwjgl/opengl/KHRRobustness.java b/src/main/java/org/lwjglx/opengl/KHRRobustness.java
similarity index 73%
rename from src/main/java/org/lwjgl/opengl/KHRRobustness.java
rename to src/main/java/org/lwjglx/opengl/KHRRobustness.java
index 0906b6358..75bbaad77 100644
--- a/src/main/java/org/lwjgl/opengl/KHRRobustness.java
+++ b/src/main/java/org/lwjglx/opengl/KHRRobustness.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class KHRRobustness {
 
@@ -12,32 +12,32 @@ public class KHRRobustness {
     public static final int GL_UNKNOWN_CONTEXT_RESET = (int) 33365;
 
     public static int glGetGraphicsResetStatus() {
-        return org.lwjgl3.opengl.KHRRobustness.glGetGraphicsResetStatus();
+        return org.lwjgl.opengl.KHRRobustness.glGetGraphicsResetStatus();
     }
 
     public static void glReadnPixels(int x, int y, int width, int height, int format, int type, int pixels_bufSize,
             long pixels_buffer_offset) {
-        org.lwjgl3.opengl.KHRRobustness
+        org.lwjgl.opengl.KHRRobustness
                 .glReadnPixels(x, y, width, height, format, type, pixels_bufSize, pixels_buffer_offset);
     }
 
     public static void glReadnPixels(int x, int y, int width, int height, int format, int type,
             java.nio.ByteBuffer pixels) {
-        org.lwjgl3.opengl.KHRRobustness.glReadnPixels(x, y, width, height, format, type, pixels);
+        org.lwjgl.opengl.KHRRobustness.glReadnPixels(x, y, width, height, format, type, pixels);
     }
 
     public static void glReadnPixels(int x, int y, int width, int height, int format, int type,
             java.nio.FloatBuffer pixels) {
-        org.lwjgl3.opengl.KHRRobustness.glReadnPixels(x, y, width, height, format, type, pixels);
+        org.lwjgl.opengl.KHRRobustness.glReadnPixels(x, y, width, height, format, type, pixels);
     }
 
     public static void glReadnPixels(int x, int y, int width, int height, int format, int type,
             java.nio.IntBuffer pixels) {
-        org.lwjgl3.opengl.KHRRobustness.glReadnPixels(x, y, width, height, format, type, pixels);
+        org.lwjgl.opengl.KHRRobustness.glReadnPixels(x, y, width, height, format, type, pixels);
     }
 
     public static void glReadnPixels(int x, int y, int width, int height, int format, int type,
             java.nio.ShortBuffer pixels) {
-        org.lwjgl3.opengl.KHRRobustness.glReadnPixels(x, y, width, height, format, type, pixels);
+        org.lwjgl.opengl.KHRRobustness.glReadnPixels(x, y, width, height, format, type, pixels);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/NVBindlessMultiDrawIndirect.java b/src/main/java/org/lwjglx/opengl/NVBindlessMultiDrawIndirect.java
similarity index 80%
rename from src/main/java/org/lwjgl/opengl/NVBindlessMultiDrawIndirect.java
rename to src/main/java/org/lwjglx/opengl/NVBindlessMultiDrawIndirect.java
index 9de6d78fa..05cc187a8 100644
--- a/src/main/java/org/lwjgl/opengl/NVBindlessMultiDrawIndirect.java
+++ b/src/main/java/org/lwjglx/opengl/NVBindlessMultiDrawIndirect.java
@@ -1,10 +1,10 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVBindlessMultiDrawIndirect {
 
     public static void glMultiDrawArraysIndirectBindlessNV(int mode, long indirect_buffer_offset, int drawCount,
             int stride, int vertexBufferCount) {
-        org.lwjgl3.opengl.NVBindlessMultiDrawIndirect.glMultiDrawArraysIndirectBindlessNV(
+        org.lwjgl.opengl.NVBindlessMultiDrawIndirect.glMultiDrawArraysIndirectBindlessNV(
                 mode,
                 indirect_buffer_offset,
                 drawCount,
@@ -14,13 +14,13 @@ public static void glMultiDrawArraysIndirectBindlessNV(int mode, long indirect_b
 
     public static void glMultiDrawArraysIndirectBindlessNV(int mode, java.nio.ByteBuffer indirect, int drawCount,
             int stride, int vertexBufferCount) {
-        org.lwjgl3.opengl.NVBindlessMultiDrawIndirect
+        org.lwjgl.opengl.NVBindlessMultiDrawIndirect
                 .glMultiDrawArraysIndirectBindlessNV(mode, indirect, drawCount, stride, vertexBufferCount);
     }
 
     public static void glMultiDrawElementsIndirectBindlessNV(int mode, int type, long indirect_buffer_offset,
             int drawCount, int stride, int vertexBufferCount) {
-        org.lwjgl3.opengl.NVBindlessMultiDrawIndirect.glMultiDrawElementsIndirectBindlessNV(
+        org.lwjgl.opengl.NVBindlessMultiDrawIndirect.glMultiDrawElementsIndirectBindlessNV(
                 mode,
                 type,
                 indirect_buffer_offset,
@@ -31,7 +31,7 @@ public static void glMultiDrawElementsIndirectBindlessNV(int mode, int type, lon
 
     public static void glMultiDrawElementsIndirectBindlessNV(int mode, int type, java.nio.ByteBuffer indirect,
             int drawCount, int stride, int vertexBufferCount) {
-        org.lwjgl3.opengl.NVBindlessMultiDrawIndirect
+        org.lwjgl.opengl.NVBindlessMultiDrawIndirect
                 .glMultiDrawElementsIndirectBindlessNV(mode, type, indirect, drawCount, stride, vertexBufferCount);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/NVBindlessTexture.java b/src/main/java/org/lwjglx/opengl/NVBindlessTexture.java
similarity index 50%
rename from src/main/java/org/lwjgl/opengl/NVBindlessTexture.java
rename to src/main/java/org/lwjglx/opengl/NVBindlessTexture.java
index d3ba28402..c69eab029 100644
--- a/src/main/java/org/lwjgl/opengl/NVBindlessTexture.java
+++ b/src/main/java/org/lwjglx/opengl/NVBindlessTexture.java
@@ -1,56 +1,56 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVBindlessTexture {
 
     public static long glGetImageHandleNV(int texture, int level, boolean layered, int layer, int format) {
-        return org.lwjgl3.opengl.NVBindlessTexture.glGetImageHandleNV(texture, level, layered, layer, format);
+        return org.lwjgl.opengl.NVBindlessTexture.glGetImageHandleNV(texture, level, layered, layer, format);
     }
 
     public static long glGetTextureHandleNV(int texture) {
-        return org.lwjgl3.opengl.NVBindlessTexture.glGetTextureHandleNV(texture);
+        return org.lwjgl.opengl.NVBindlessTexture.glGetTextureHandleNV(texture);
     }
 
     public static long glGetTextureSamplerHandleNV(int texture, int sampler) {
-        return org.lwjgl3.opengl.NVBindlessTexture.glGetTextureSamplerHandleNV(texture, sampler);
+        return org.lwjgl.opengl.NVBindlessTexture.glGetTextureSamplerHandleNV(texture, sampler);
     }
 
     public static boolean glIsImageHandleResidentNV(long handle) {
-        return org.lwjgl3.opengl.NVBindlessTexture.glIsImageHandleResidentNV(handle);
+        return org.lwjgl.opengl.NVBindlessTexture.glIsImageHandleResidentNV(handle);
     }
 
     public static boolean glIsTextureHandleResidentNV(long handle) {
-        return org.lwjgl3.opengl.NVBindlessTexture.glIsTextureHandleResidentNV(handle);
+        return org.lwjgl.opengl.NVBindlessTexture.glIsTextureHandleResidentNV(handle);
     }
 
     public static void glMakeImageHandleNonResidentNV(long handle) {
-        org.lwjgl3.opengl.NVBindlessTexture.glMakeImageHandleNonResidentNV(handle);
+        org.lwjgl.opengl.NVBindlessTexture.glMakeImageHandleNonResidentNV(handle);
     }
 
     public static void glMakeImageHandleResidentNV(long handle, int access) {
-        org.lwjgl3.opengl.NVBindlessTexture.glMakeImageHandleResidentNV(handle, access);
+        org.lwjgl.opengl.NVBindlessTexture.glMakeImageHandleResidentNV(handle, access);
     }
 
     public static void glMakeTextureHandleNonResidentNV(long handle) {
-        org.lwjgl3.opengl.NVBindlessTexture.glMakeTextureHandleNonResidentNV(handle);
+        org.lwjgl.opengl.NVBindlessTexture.glMakeTextureHandleNonResidentNV(handle);
     }
 
     public static void glMakeTextureHandleResidentNV(long handle) {
-        org.lwjgl3.opengl.NVBindlessTexture.glMakeTextureHandleResidentNV(handle);
+        org.lwjgl.opengl.NVBindlessTexture.glMakeTextureHandleResidentNV(handle);
     }
 
     public static void glProgramUniformHandleuNV(int program, int location, java.nio.LongBuffer values) {
-        org.lwjgl3.opengl.NVBindlessTexture.glProgramUniformHandleui64vNV(program, location, values);
+        org.lwjgl.opengl.NVBindlessTexture.glProgramUniformHandleui64vNV(program, location, values);
     }
 
     public static void glProgramUniformHandleui64NV(int program, int location, long value) {
-        org.lwjgl3.opengl.NVBindlessTexture.glProgramUniformHandleui64NV(program, location, value);
+        org.lwjgl.opengl.NVBindlessTexture.glProgramUniformHandleui64NV(program, location, value);
     }
 
     public static void glUniformHandleuNV(int location, java.nio.LongBuffer value) {
-        org.lwjgl3.opengl.NVBindlessTexture.glUniformHandleui64vNV(location, value);
+        org.lwjgl.opengl.NVBindlessTexture.glUniformHandleui64vNV(location, value);
     }
 
     public static void glUniformHandleui64NV(int location, long value) {
-        org.lwjgl3.opengl.NVBindlessTexture.glUniformHandleui64NV(location, value);
+        org.lwjgl.opengl.NVBindlessTexture.glUniformHandleui64NV(location, value);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/NVBlendEquationAdvanced.java b/src/main/java/org/lwjglx/opengl/NVBlendEquationAdvanced.java
similarity index 94%
rename from src/main/java/org/lwjgl/opengl/NVBlendEquationAdvanced.java
rename to src/main/java/org/lwjglx/opengl/NVBlendEquationAdvanced.java
index ee973d486..e53ba14bf 100644
--- a/src/main/java/org/lwjgl/opengl/NVBlendEquationAdvanced.java
+++ b/src/main/java/org/lwjglx/opengl/NVBlendEquationAdvanced.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVBlendEquationAdvanced {
 
@@ -50,10 +50,10 @@ public class NVBlendEquationAdvanced {
     public static final int GL_VIVIDLIGHT_NV = (int) 37542;
 
     public static void glBlendBarrierNV() {
-        org.lwjgl3.opengl.NVBlendEquationAdvanced.glBlendBarrierNV();
+        org.lwjgl.opengl.NVBlendEquationAdvanced.glBlendBarrierNV();
     }
 
     public static void glBlendParameteriNV(int pname, int value) {
-        org.lwjgl3.opengl.NVBlendEquationAdvanced.glBlendParameteriNV(pname, value);
+        org.lwjgl.opengl.NVBlendEquationAdvanced.glBlendParameteriNV(pname, value);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/NVConditionalRender.java b/src/main/java/org/lwjglx/opengl/NVConditionalRender.java
similarity index 70%
rename from src/main/java/org/lwjgl/opengl/NVConditionalRender.java
rename to src/main/java/org/lwjglx/opengl/NVConditionalRender.java
index 4668275c8..d9d6e93c6 100644
--- a/src/main/java/org/lwjgl/opengl/NVConditionalRender.java
+++ b/src/main/java/org/lwjglx/opengl/NVConditionalRender.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVConditionalRender {
 
@@ -8,10 +8,10 @@ public class NVConditionalRender {
     public static final int GL_QUERY_WAIT_NV = (int) 36371;
 
     public static void glBeginConditionalRenderNV(int id, int mode) {
-        org.lwjgl3.opengl.NVConditionalRender.glBeginConditionalRenderNV(id, mode);
+        org.lwjgl.opengl.NVConditionalRender.glBeginConditionalRenderNV(id, mode);
     }
 
     public static void glEndConditionalRenderNV() {
-        org.lwjgl3.opengl.NVConditionalRender.glEndConditionalRenderNV();
+        org.lwjgl.opengl.NVConditionalRender.glEndConditionalRenderNV();
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/NVCopyDepthToColor.java b/src/main/java/org/lwjglx/opengl/NVCopyDepthToColor.java
similarity index 86%
rename from src/main/java/org/lwjgl/opengl/NVCopyDepthToColor.java
rename to src/main/java/org/lwjglx/opengl/NVCopyDepthToColor.java
index 7c7add0b2..2f5e9ae39 100644
--- a/src/main/java/org/lwjgl/opengl/NVCopyDepthToColor.java
+++ b/src/main/java/org/lwjglx/opengl/NVCopyDepthToColor.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVCopyDepthToColor {
 
diff --git a/src/main/java/org/lwjgl/opengl/NVCopyImage.java b/src/main/java/org/lwjglx/opengl/NVCopyImage.java
similarity index 88%
rename from src/main/java/org/lwjgl/opengl/NVCopyImage.java
rename to src/main/java/org/lwjglx/opengl/NVCopyImage.java
index de8b7c4c7..d3674d830 100644
--- a/src/main/java/org/lwjgl/opengl/NVCopyImage.java
+++ b/src/main/java/org/lwjglx/opengl/NVCopyImage.java
@@ -1,10 +1,10 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVCopyImage {
 
     public static void glCopyImageSubDataNV(int srcName, int srcTarget, int srcLevel, int srcX, int srcY, int srcZ,
             int dstName, int dstTarget, int dstLevel, int dstX, int dstY, int dstZ, int width, int height, int depth) {
-        org.lwjgl3.opengl.NVCopyImage.glCopyImageSubDataNV(
+        org.lwjgl.opengl.NVCopyImage.glCopyImageSubDataNV(
                 srcName,
                 srcTarget,
                 srcLevel,
diff --git a/src/main/java/org/lwjgl/opengl/NVDeepTexture3D.java b/src/main/java/org/lwjglx/opengl/NVDeepTexture3D.java
similarity index 87%
rename from src/main/java/org/lwjgl/opengl/NVDeepTexture3D.java
rename to src/main/java/org/lwjglx/opengl/NVDeepTexture3D.java
index 5d7308f53..51220570a 100644
--- a/src/main/java/org/lwjgl/opengl/NVDeepTexture3D.java
+++ b/src/main/java/org/lwjglx/opengl/NVDeepTexture3D.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVDeepTexture3D {
 
diff --git a/src/main/java/org/lwjgl/opengl/NVDepthBufferFloat.java b/src/main/java/org/lwjglx/opengl/NVDepthBufferFloat.java
similarity index 69%
rename from src/main/java/org/lwjgl/opengl/NVDepthBufferFloat.java
rename to src/main/java/org/lwjglx/opengl/NVDepthBufferFloat.java
index 6e1cf8c82..3a56f5ff4 100644
--- a/src/main/java/org/lwjgl/opengl/NVDepthBufferFloat.java
+++ b/src/main/java/org/lwjglx/opengl/NVDepthBufferFloat.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVDepthBufferFloat {
 
@@ -8,14 +8,14 @@ public class NVDepthBufferFloat {
     public static final int GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV = (int) 36269;
 
     public static void glClearDepthdNV(double d) {
-        org.lwjgl3.opengl.NVDepthBufferFloat.glClearDepthdNV(d);
+        org.lwjgl.opengl.NVDepthBufferFloat.glClearDepthdNV(d);
     }
 
     public static void glDepthBoundsdNV(double zmin, double zmax) {
-        org.lwjgl3.opengl.NVDepthBufferFloat.glDepthBoundsdNV(zmin, zmax);
+        org.lwjgl.opengl.NVDepthBufferFloat.glDepthBoundsdNV(zmin, zmax);
     }
 
     public static void glDepthRangedNV(double n, double f) {
-        org.lwjgl3.opengl.NVDepthBufferFloat.glDepthRangedNV(n, f);
+        org.lwjgl.opengl.NVDepthBufferFloat.glDepthRangedNV(n, f);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/NVDepthClamp.java b/src/main/java/org/lwjglx/opengl/NVDepthClamp.java
similarity index 77%
rename from src/main/java/org/lwjgl/opengl/NVDepthClamp.java
rename to src/main/java/org/lwjglx/opengl/NVDepthClamp.java
index 3bb9067d2..29f572a6e 100644
--- a/src/main/java/org/lwjgl/opengl/NVDepthClamp.java
+++ b/src/main/java/org/lwjglx/opengl/NVDepthClamp.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVDepthClamp {
 
diff --git a/src/main/java/org/lwjgl/opengl/NVDrawTexture.java b/src/main/java/org/lwjglx/opengl/NVDrawTexture.java
similarity index 60%
rename from src/main/java/org/lwjgl/opengl/NVDrawTexture.java
rename to src/main/java/org/lwjglx/opengl/NVDrawTexture.java
index da65f7a1d..022536acf 100644
--- a/src/main/java/org/lwjgl/opengl/NVDrawTexture.java
+++ b/src/main/java/org/lwjglx/opengl/NVDrawTexture.java
@@ -1,9 +1,9 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVDrawTexture {
 
     public static void glDrawTextureNV(int texture, int sampler, float x0, float y0, float x1, float y1, float z,
             float s0, float t0, float s1, float t1) {
-        org.lwjgl3.opengl.NVDrawTexture.glDrawTextureNV(texture, sampler, x0, y0, x1, y1, z, s0, t0, s1, t1);
+        org.lwjgl.opengl.NVDrawTexture.glDrawTextureNV(texture, sampler, x0, y0, x1, y1, z, s0, t0, s1, t1);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/NVExplicitMultisample.java b/src/main/java/org/lwjglx/opengl/NVExplicitMultisample.java
similarity index 77%
rename from src/main/java/org/lwjgl/opengl/NVExplicitMultisample.java
rename to src/main/java/org/lwjglx/opengl/NVExplicitMultisample.java
index 51d16389e..fb909af44 100644
--- a/src/main/java/org/lwjgl/opengl/NVExplicitMultisample.java
+++ b/src/main/java/org/lwjglx/opengl/NVExplicitMultisample.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVExplicitMultisample {
 
@@ -14,14 +14,14 @@ public class NVExplicitMultisample {
     public static final int GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV = (int) 36440;
 
     public static void glGetMultisampleNV(int pname, int index, java.nio.FloatBuffer val) {
-        org.lwjgl3.opengl.NVExplicitMultisample.glGetMultisamplefvNV(pname, index, val);
+        org.lwjgl.opengl.NVExplicitMultisample.glGetMultisamplefvNV(pname, index, val);
     }
 
     public static void glSampleMaskIndexedNV(int index, int mask) {
-        org.lwjgl3.opengl.NVExplicitMultisample.glSampleMaskIndexedNV(index, mask);
+        org.lwjgl.opengl.NVExplicitMultisample.glSampleMaskIndexedNV(index, mask);
     }
 
     public static void glTexRenderbufferNV(int target, int renderbuffer) {
-        org.lwjgl3.opengl.NVExplicitMultisample.glTexRenderbufferNV(target, renderbuffer);
+        org.lwjgl.opengl.NVExplicitMultisample.glTexRenderbufferNV(target, renderbuffer);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/NVFence.java b/src/main/java/org/lwjglx/opengl/NVFence.java
similarity index 58%
rename from src/main/java/org/lwjgl/opengl/NVFence.java
rename to src/main/java/org/lwjglx/opengl/NVFence.java
index b412d14f3..5df2868bf 100644
--- a/src/main/java/org/lwjgl/opengl/NVFence.java
+++ b/src/main/java/org/lwjglx/opengl/NVFence.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVFence {
 
@@ -7,38 +7,38 @@ public class NVFence {
     public static final int GL_FENCE_STATUS_NV = (int) 34035;
 
     public static void glDeleteFencesNV(int fence) {
-        org.lwjgl3.opengl.NVFence.glDeleteFencesNV(fence);
+        org.lwjgl.opengl.NVFence.glDeleteFencesNV(fence);
     }
 
     public static void glDeleteFencesNV(java.nio.IntBuffer piFences) {
-        org.lwjgl3.opengl.NVFence.glDeleteFencesNV(piFences);
+        org.lwjgl.opengl.NVFence.glDeleteFencesNV(piFences);
     }
 
     public static void glFinishFenceNV(int fence) {
-        org.lwjgl3.opengl.NVFence.glFinishFenceNV(fence);
+        org.lwjgl.opengl.NVFence.glFinishFenceNV(fence);
     }
 
     public static int glGenFencesNV() {
-        return org.lwjgl3.opengl.NVFence.glGenFencesNV();
+        return org.lwjgl.opengl.NVFence.glGenFencesNV();
     }
 
     public static void glGenFencesNV(java.nio.IntBuffer piFences) {
-        org.lwjgl3.opengl.NVFence.glGenFencesNV(piFences);
+        org.lwjgl.opengl.NVFence.glGenFencesNV(piFences);
     }
 
     public static void glGetFenceivNV(int fence, int pname, java.nio.IntBuffer piParams) {
-        org.lwjgl3.opengl.NVFence.glGetFenceivNV(fence, pname, piParams);
+        org.lwjgl.opengl.NVFence.glGetFenceivNV(fence, pname, piParams);
     }
 
     public static boolean glIsFenceNV(int fence) {
-        return org.lwjgl3.opengl.NVFence.glIsFenceNV(fence);
+        return org.lwjgl.opengl.NVFence.glIsFenceNV(fence);
     }
 
     public static void glSetFenceNV(int fence, int condition) {
-        org.lwjgl3.opengl.NVFence.glSetFenceNV(fence, condition);
+        org.lwjgl.opengl.NVFence.glSetFenceNV(fence, condition);
     }
 
     public static boolean glTestFenceNV(int fence) {
-        return org.lwjgl3.opengl.NVFence.glTestFenceNV(fence);
+        return org.lwjgl.opengl.NVFence.glTestFenceNV(fence);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/NVFloatBuffer.java b/src/main/java/org/lwjglx/opengl/NVFloatBuffer.java
similarity index 97%
rename from src/main/java/org/lwjgl/opengl/NVFloatBuffer.java
rename to src/main/java/org/lwjglx/opengl/NVFloatBuffer.java
index bbd74300b..827880c63 100644
--- a/src/main/java/org/lwjgl/opengl/NVFloatBuffer.java
+++ b/src/main/java/org/lwjglx/opengl/NVFloatBuffer.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVFloatBuffer {
 
diff --git a/src/main/java/org/lwjgl/opengl/NVFogDistance.java b/src/main/java/org/lwjglx/opengl/NVFogDistance.java
similarity index 89%
rename from src/main/java/org/lwjgl/opengl/NVFogDistance.java
rename to src/main/java/org/lwjglx/opengl/NVFogDistance.java
index 9d40551bb..d5419bb9b 100644
--- a/src/main/java/org/lwjgl/opengl/NVFogDistance.java
+++ b/src/main/java/org/lwjglx/opengl/NVFogDistance.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVFogDistance {
 
diff --git a/src/main/java/org/lwjgl/opengl/NVFramebufferMultisampleCoverage.java b/src/main/java/org/lwjglx/opengl/NVFramebufferMultisampleCoverage.java
similarity index 84%
rename from src/main/java/org/lwjgl/opengl/NVFramebufferMultisampleCoverage.java
rename to src/main/java/org/lwjglx/opengl/NVFramebufferMultisampleCoverage.java
index 04d929bda..dab444606 100644
--- a/src/main/java/org/lwjgl/opengl/NVFramebufferMultisampleCoverage.java
+++ b/src/main/java/org/lwjglx/opengl/NVFramebufferMultisampleCoverage.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVFramebufferMultisampleCoverage {
 
@@ -9,7 +9,7 @@ public class NVFramebufferMultisampleCoverage {
 
     public static void glRenderbufferStorageMultisampleCoverageNV(int target, int coverageSamples, int colorSamples,
             int internalformat, int width, int height) {
-        org.lwjgl3.opengl.NVFramebufferMultisampleCoverage.glRenderbufferStorageMultisampleCoverageNV(
+        org.lwjgl.opengl.NVFramebufferMultisampleCoverage.glRenderbufferStorageMultisampleCoverageNV(
                 target,
                 coverageSamples,
                 colorSamples,
diff --git a/src/main/java/org/lwjgl/opengl/NVHalfFloat.java b/src/main/java/org/lwjglx/opengl/NVHalfFloat.java
similarity index 54%
rename from src/main/java/org/lwjgl/opengl/NVHalfFloat.java
rename to src/main/java/org/lwjglx/opengl/NVHalfFloat.java
index cba6cfe1e..6a55de7ec 100644
--- a/src/main/java/org/lwjgl/opengl/NVHalfFloat.java
+++ b/src/main/java/org/lwjglx/opengl/NVHalfFloat.java
@@ -1,106 +1,106 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVHalfFloat {
 
     public static final int GL_HALF_FLOAT_NV = (int) 5131;
 
     public static void glColor3hNV(short red, short green, short blue) {
-        org.lwjgl3.opengl.NVHalfFloat.glColor3hNV(red, green, blue);
+        org.lwjgl.opengl.NVHalfFloat.glColor3hNV(red, green, blue);
     }
 
     public static void glColor4hNV(short red, short green, short blue, short alpha) {
-        org.lwjgl3.opengl.NVHalfFloat.glColor4hNV(red, green, blue, alpha);
+        org.lwjgl.opengl.NVHalfFloat.glColor4hNV(red, green, blue, alpha);
     }
 
     public static void glFogCoordhNV(short fog) {
-        org.lwjgl3.opengl.NVHalfFloat.glFogCoordhNV(fog);
+        org.lwjgl.opengl.NVHalfFloat.glFogCoordhNV(fog);
     }
 
     public static void glMultiTexCoord1hNV(int target, short s) {
-        org.lwjgl3.opengl.NVHalfFloat.glMultiTexCoord1hNV(target, s);
+        org.lwjgl.opengl.NVHalfFloat.glMultiTexCoord1hNV(target, s);
     }
 
     public static void glMultiTexCoord2hNV(int target, short s, short t) {
-        org.lwjgl3.opengl.NVHalfFloat.glMultiTexCoord2hNV(target, s, t);
+        org.lwjgl.opengl.NVHalfFloat.glMultiTexCoord2hNV(target, s, t);
     }
 
     public static void glMultiTexCoord3hNV(int target, short s, short t, short r) {
-        org.lwjgl3.opengl.NVHalfFloat.glMultiTexCoord3hNV(target, s, t, r);
+        org.lwjgl.opengl.NVHalfFloat.glMultiTexCoord3hNV(target, s, t, r);
     }
 
     public static void glMultiTexCoord4hNV(int target, short s, short t, short r, short q) {
-        org.lwjgl3.opengl.NVHalfFloat.glMultiTexCoord4hNV(target, s, t, r, q);
+        org.lwjgl.opengl.NVHalfFloat.glMultiTexCoord4hNV(target, s, t, r, q);
     }
 
     public static void glNormal3hNV(short nx, short ny, short nz) {
-        org.lwjgl3.opengl.NVHalfFloat.glNormal3hNV(nx, ny, nz);
+        org.lwjgl.opengl.NVHalfFloat.glNormal3hNV(nx, ny, nz);
     }
 
     public static void glSecondaryColor3hNV(short red, short green, short blue) {
-        org.lwjgl3.opengl.NVHalfFloat.glSecondaryColor3hNV(red, green, blue);
+        org.lwjgl.opengl.NVHalfFloat.glSecondaryColor3hNV(red, green, blue);
     }
 
     public static void glTexCoord1hNV(short s) {
-        org.lwjgl3.opengl.NVHalfFloat.glTexCoord1hNV(s);
+        org.lwjgl.opengl.NVHalfFloat.glTexCoord1hNV(s);
     }
 
     public static void glTexCoord2hNV(short s, short t) {
-        org.lwjgl3.opengl.NVHalfFloat.glTexCoord2hNV(s, t);
+        org.lwjgl.opengl.NVHalfFloat.glTexCoord2hNV(s, t);
     }
 
     public static void glTexCoord3hNV(short s, short t, short r) {
-        org.lwjgl3.opengl.NVHalfFloat.glTexCoord3hNV(s, t, r);
+        org.lwjgl.opengl.NVHalfFloat.glTexCoord3hNV(s, t, r);
     }
 
     public static void glTexCoord4hNV(short s, short t, short r, short q) {
-        org.lwjgl3.opengl.NVHalfFloat.glTexCoord4hNV(s, t, r, q);
+        org.lwjgl.opengl.NVHalfFloat.glTexCoord4hNV(s, t, r, q);
     }
 
     public static void glVertex2hNV(short x, short y) {
-        org.lwjgl3.opengl.NVHalfFloat.glVertex2hNV(x, y);
+        org.lwjgl.opengl.NVHalfFloat.glVertex2hNV(x, y);
     }
 
     public static void glVertex3hNV(short x, short y, short z) {
-        org.lwjgl3.opengl.NVHalfFloat.glVertex3hNV(x, y, z);
+        org.lwjgl.opengl.NVHalfFloat.glVertex3hNV(x, y, z);
     }
 
     public static void glVertex4hNV(short x, short y, short z, short w) {
-        org.lwjgl3.opengl.NVHalfFloat.glVertex4hNV(x, y, z, w);
+        org.lwjgl.opengl.NVHalfFloat.glVertex4hNV(x, y, z, w);
     }
 
     public static void glVertexAttrib1hNV(int index, short x) {
-        org.lwjgl3.opengl.NVHalfFloat.glVertexAttrib1hNV(index, x);
+        org.lwjgl.opengl.NVHalfFloat.glVertexAttrib1hNV(index, x);
     }
 
     public static void glVertexAttrib2hNV(int index, short x, short y) {
-        org.lwjgl3.opengl.NVHalfFloat.glVertexAttrib2hNV(index, x, y);
+        org.lwjgl.opengl.NVHalfFloat.glVertexAttrib2hNV(index, x, y);
     }
 
     public static void glVertexAttrib3hNV(int index, short x, short y, short z) {
-        org.lwjgl3.opengl.NVHalfFloat.glVertexAttrib3hNV(index, x, y, z);
+        org.lwjgl.opengl.NVHalfFloat.glVertexAttrib3hNV(index, x, y, z);
     }
 
     public static void glVertexAttrib4hNV(int index, short x, short y, short z, short w) {
-        org.lwjgl3.opengl.NVHalfFloat.glVertexAttrib4hNV(index, x, y, z, w);
+        org.lwjgl.opengl.NVHalfFloat.glVertexAttrib4hNV(index, x, y, z, w);
     }
 
     public static void glVertexAttribs1NV(int index, java.nio.ShortBuffer attribs) {
-        org.lwjgl3.opengl.NVHalfFloat.glVertexAttribs1hvNV(index, attribs);
+        org.lwjgl.opengl.NVHalfFloat.glVertexAttribs1hvNV(index, attribs);
     }
 
     public static void glVertexAttribs2NV(int index, java.nio.ShortBuffer attribs) {
-        org.lwjgl3.opengl.NVHalfFloat.glVertexAttribs2hvNV(index, attribs);
+        org.lwjgl.opengl.NVHalfFloat.glVertexAttribs2hvNV(index, attribs);
     }
 
     public static void glVertexAttribs3NV(int index, java.nio.ShortBuffer attribs) {
-        org.lwjgl3.opengl.NVHalfFloat.glVertexAttribs3hvNV(index, attribs);
+        org.lwjgl.opengl.NVHalfFloat.glVertexAttribs3hvNV(index, attribs);
     }
 
     public static void glVertexAttribs4NV(int index, java.nio.ShortBuffer attribs) {
-        org.lwjgl3.opengl.NVHalfFloat.glVertexAttribs4hvNV(index, attribs);
+        org.lwjgl.opengl.NVHalfFloat.glVertexAttribs4hvNV(index, attribs);
     }
 
     public static void glVertexWeighthNV(short weight) {
-        org.lwjgl3.opengl.NVHalfFloat.glVertexWeighthNV(weight);
+        org.lwjgl.opengl.NVHalfFloat.glVertexWeighthNV(weight);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/NVLightMaxExponent.java b/src/main/java/org/lwjglx/opengl/NVLightMaxExponent.java
similarity index 86%
rename from src/main/java/org/lwjgl/opengl/NVLightMaxExponent.java
rename to src/main/java/org/lwjglx/opengl/NVLightMaxExponent.java
index c1f41b3e4..d3c860508 100644
--- a/src/main/java/org/lwjgl/opengl/NVLightMaxExponent.java
+++ b/src/main/java/org/lwjglx/opengl/NVLightMaxExponent.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVLightMaxExponent {
 
diff --git a/src/main/java/org/lwjgl/opengl/NVMultisampleCoverage.java b/src/main/java/org/lwjglx/opengl/NVMultisampleCoverage.java
similarity index 86%
rename from src/main/java/org/lwjgl/opengl/NVMultisampleCoverage.java
rename to src/main/java/org/lwjglx/opengl/NVMultisampleCoverage.java
index 7e72f091e..11804691a 100644
--- a/src/main/java/org/lwjgl/opengl/NVMultisampleCoverage.java
+++ b/src/main/java/org/lwjglx/opengl/NVMultisampleCoverage.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVMultisampleCoverage {
 
diff --git a/src/main/java/org/lwjgl/opengl/NVMultisampleFilterHint.java b/src/main/java/org/lwjglx/opengl/NVMultisampleFilterHint.java
similarity index 81%
rename from src/main/java/org/lwjgl/opengl/NVMultisampleFilterHint.java
rename to src/main/java/org/lwjglx/opengl/NVMultisampleFilterHint.java
index 53e7e88ac..b9a896d2b 100644
--- a/src/main/java/org/lwjgl/opengl/NVMultisampleFilterHint.java
+++ b/src/main/java/org/lwjglx/opengl/NVMultisampleFilterHint.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVMultisampleFilterHint {
 
diff --git a/src/main/java/org/lwjgl/opengl/NVPackedDepthStencil.java b/src/main/java/org/lwjglx/opengl/NVPackedDepthStencil.java
similarity index 86%
rename from src/main/java/org/lwjgl/opengl/NVPackedDepthStencil.java
rename to src/main/java/org/lwjglx/opengl/NVPackedDepthStencil.java
index 94657f289..9c2520e74 100644
--- a/src/main/java/org/lwjgl/opengl/NVPackedDepthStencil.java
+++ b/src/main/java/org/lwjglx/opengl/NVPackedDepthStencil.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVPackedDepthStencil {
 
diff --git a/src/main/java/org/lwjgl/opengl/NVPathRendering.java b/src/main/java/org/lwjglx/opengl/NVPathRendering.java
similarity index 80%
rename from src/main/java/org/lwjgl/opengl/NVPathRendering.java
rename to src/main/java/org/lwjglx/opengl/NVPathRendering.java
index bd6aa37b8..cffd97d13 100644
--- a/src/main/java/org/lwjgl/opengl/NVPathRendering.java
+++ b/src/main/java/org/lwjglx/opengl/NVPathRendering.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVPathRendering {
 
@@ -130,100 +130,100 @@ public class NVPathRendering {
     public static final int GL_VERTICAL_LINE_TO_NV = (int) 8;
 
     public static void glCopyPathNV(int resultPath, int srcPath) {
-        org.lwjgl3.opengl.NVPathRendering.glCopyPathNV(resultPath, srcPath);
+        org.lwjgl.opengl.NVPathRendering.glCopyPathNV(resultPath, srcPath);
     }
 
     public static void glCoverFillPathInstancedNV(int pathNameType, java.nio.ByteBuffer paths, int pathBase,
             int coverMode, int transformType, java.nio.FloatBuffer transformValues) {
-        org.lwjgl3.opengl.NVPathRendering
+        org.lwjgl.opengl.NVPathRendering
                 .glCoverFillPathInstancedNV(pathNameType, paths, pathBase, coverMode, transformType, transformValues);
     }
 
     public static void glCoverFillPathNV(int path, int coverMode) {
-        org.lwjgl3.opengl.NVPathRendering.glCoverFillPathNV(path, coverMode);
+        org.lwjgl.opengl.NVPathRendering.glCoverFillPathNV(path, coverMode);
     }
 
     public static void glCoverStrokePathInstancedNV(int pathNameType, java.nio.ByteBuffer paths, int pathBase,
             int coverMode, int transformType, java.nio.FloatBuffer transformValues) {
-        org.lwjgl3.opengl.NVPathRendering
+        org.lwjgl.opengl.NVPathRendering
                 .glCoverStrokePathInstancedNV(pathNameType, paths, pathBase, coverMode, transformType, transformValues);
     }
 
     public static void glCoverStrokePathNV(int name, int coverMode) {
-        org.lwjgl3.opengl.NVPathRendering.glCoverStrokePathNV(name, coverMode);
+        org.lwjgl.opengl.NVPathRendering.glCoverStrokePathNV(name, coverMode);
     }
 
     public static void glDeletePathsNV(int path, int range) {
-        org.lwjgl3.opengl.NVPathRendering.glDeletePathsNV(path, range);
+        org.lwjgl.opengl.NVPathRendering.glDeletePathsNV(path, range);
     }
 
     public static int glGenPathsNV(int range) {
-        return org.lwjgl3.opengl.NVPathRendering.glGenPathsNV(range);
+        return org.lwjgl.opengl.NVPathRendering.glGenPathsNV(range);
     }
 
     public static void glGetPathColorGenNV(int color, int pname, java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.NVPathRendering.glGetPathColorGenfvNV(color, pname, value);
+        org.lwjgl.opengl.NVPathRendering.glGetPathColorGenfvNV(color, pname, value);
     }
 
     public static void glGetPathColorGenNV(int color, int pname, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.NVPathRendering.glGetPathColorGenivNV(color, pname, value);
+        org.lwjgl.opengl.NVPathRendering.glGetPathColorGenivNV(color, pname, value);
     }
 
     public static float glGetPathColorGenfNV(int color, int pname) {
-        return org.lwjgl3.opengl.NVPathRendering.glGetPathColorGenfNV(color, pname);
+        return org.lwjgl.opengl.NVPathRendering.glGetPathColorGenfNV(color, pname);
     }
 
     public static int glGetPathColorGeniNV(int color, int pname) {
-        return org.lwjgl3.opengl.NVPathRendering.glGetPathColorGeniNV(color, pname);
+        return org.lwjgl.opengl.NVPathRendering.glGetPathColorGeniNV(color, pname);
     }
 
     public static void glGetPathCommandsNV(int name, java.nio.ByteBuffer commands) {
-        org.lwjgl3.opengl.NVPathRendering.glGetPathCommandsNV(name, commands);
+        org.lwjgl.opengl.NVPathRendering.glGetPathCommandsNV(name, commands);
     }
 
     public static void glGetPathCoordsNV(int name, java.nio.FloatBuffer coords) {
-        org.lwjgl3.opengl.NVPathRendering.glGetPathCoordsNV(name, coords);
+        org.lwjgl.opengl.NVPathRendering.glGetPathCoordsNV(name, coords);
     }
 
     public static void glGetPathDashArrayNV(int name, java.nio.FloatBuffer dashArray) {
-        org.lwjgl3.opengl.NVPathRendering.glGetPathDashArrayNV(name, dashArray);
+        org.lwjgl.opengl.NVPathRendering.glGetPathDashArrayNV(name, dashArray);
     }
 
     public static float glGetPathLengthNV(int path, int startSegment, int numSegments) {
-        return org.lwjgl3.opengl.NVPathRendering.glGetPathLengthNV(path, startSegment, numSegments);
+        return org.lwjgl.opengl.NVPathRendering.glGetPathLengthNV(path, startSegment, numSegments);
     }
 
     public static void glGetPathMetricRangeNV(int metricQueryMask, int fistPathName, int numPaths, int stride,
             java.nio.FloatBuffer metrics) {
-        org.lwjgl3.opengl.NVPathRendering
+        org.lwjgl.opengl.NVPathRendering
                 .glGetPathMetricRangeNV(metricQueryMask, fistPathName, numPaths, stride, metrics);
     }
 
     public static void glGetPathMetricsNV(int metricQueryMask, int pathNameType, java.nio.ByteBuffer paths,
             int pathBase, int stride, java.nio.FloatBuffer metrics) {
-        org.lwjgl3.opengl.NVPathRendering
+        org.lwjgl.opengl.NVPathRendering
                 .glGetPathMetricsNV(metricQueryMask, pathNameType, paths, pathBase, stride, metrics);
     }
 
     public static void glGetPathParameterNV(int name, int param, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.NVPathRendering.glGetPathParameterivNV(name, param, value);
+        org.lwjgl.opengl.NVPathRendering.glGetPathParameterivNV(name, param, value);
     }
 
     public static float glGetPathParameterfNV(int name, int param) {
-        return org.lwjgl3.opengl.NVPathRendering.glGetPathParameterfNV(name, param);
+        return org.lwjgl.opengl.NVPathRendering.glGetPathParameterfNV(name, param);
     }
 
     public static void glGetPathParameterfvNV(int name, int param, java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.NVPathRendering.glGetPathParameterfvNV(name, param, value);
+        org.lwjgl.opengl.NVPathRendering.glGetPathParameterfvNV(name, param, value);
     }
 
     public static int glGetPathParameteriNV(int name, int param) {
-        return org.lwjgl3.opengl.NVPathRendering.glGetPathParameteriNV(name, param);
+        return org.lwjgl.opengl.NVPathRendering.glGetPathParameteriNV(name, param);
     }
 
     public static void glGetPathSpacingNV(int pathListMode, int pathNameType, java.nio.ByteBuffer paths, int pathBase,
             float advanceScale, float kerningScale, int transformType, java.nio.FloatBuffer returnedSpacing) {
-        org.lwjgl3.opengl.NVPathRendering.glGetPathSpacingNV(
+        org.lwjgl.opengl.NVPathRendering.glGetPathSpacingNV(
                 pathListMode,
                 pathNameType,
                 paths,
@@ -235,66 +235,66 @@ public static void glGetPathSpacingNV(int pathListMode, int pathNameType, java.n
     }
 
     public static void glGetPathTexGenNV(int texCoordSet, int pname, java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.NVPathRendering.glGetPathTexGenfvNV(texCoordSet, pname, value);
+        org.lwjgl.opengl.NVPathRendering.glGetPathTexGenfvNV(texCoordSet, pname, value);
     }
 
     public static void glGetPathTexGenNV(int texCoordSet, int pname, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.NVPathRendering.glGetPathTexGenivNV(texCoordSet, pname, value);
+        org.lwjgl.opengl.NVPathRendering.glGetPathTexGenivNV(texCoordSet, pname, value);
     }
 
     public static float glGetPathTexGenfNV(int texCoordSet, int pname) {
-        return org.lwjgl3.opengl.NVPathRendering.glGetPathTexGenfNV(texCoordSet, pname);
+        return org.lwjgl.opengl.NVPathRendering.glGetPathTexGenfNV(texCoordSet, pname);
     }
 
     public static int glGetPathTexGeniNV(int texCoordSet, int pname) {
-        return org.lwjgl3.opengl.NVPathRendering.glGetPathTexGeniNV(texCoordSet, pname);
+        return org.lwjgl.opengl.NVPathRendering.glGetPathTexGeniNV(texCoordSet, pname);
     }
 
     public static void glInterpolatePathsNV(int resultPath, int pathA, int pathB, float weight) {
-        org.lwjgl3.opengl.NVPathRendering.glInterpolatePathsNV(resultPath, pathA, pathB, weight);
+        org.lwjgl.opengl.NVPathRendering.glInterpolatePathsNV(resultPath, pathA, pathB, weight);
     }
 
     public static boolean glIsPathNV(int path) {
-        return org.lwjgl3.opengl.NVPathRendering.glIsPathNV(path);
+        return org.lwjgl.opengl.NVPathRendering.glIsPathNV(path);
     }
 
     public static boolean glIsPointInFillPathNV(int path, int mask, float x, float y) {
-        return org.lwjgl3.opengl.NVPathRendering.glIsPointInFillPathNV(path, mask, x, y);
+        return org.lwjgl.opengl.NVPathRendering.glIsPointInFillPathNV(path, mask, x, y);
     }
 
     public static boolean glIsPointInStrokePathNV(int path, float x, float y) {
-        return org.lwjgl3.opengl.NVPathRendering.glIsPointInStrokePathNV(path, x, y);
+        return org.lwjgl.opengl.NVPathRendering.glIsPointInStrokePathNV(path, x, y);
     }
 
     public static void glPathColorGenNV(int color, int genMode, int colorFormat, java.nio.FloatBuffer coeffs) {
-        org.lwjgl3.opengl.NVPathRendering.glPathColorGenNV(color, genMode, colorFormat, coeffs);
+        org.lwjgl.opengl.NVPathRendering.glPathColorGenNV(color, genMode, colorFormat, coeffs);
     }
 
     public static void glPathCommandsNV(int path, java.nio.ByteBuffer commands, int coordType,
             java.nio.ByteBuffer coords) {
-        org.lwjgl3.opengl.NVPathRendering.glPathCommandsNV(path, commands, coordType, coords);
+        org.lwjgl.opengl.NVPathRendering.glPathCommandsNV(path, commands, coordType, coords);
     }
 
     public static void glPathCoordsNV(int path, int coordType, java.nio.ByteBuffer coords) {
-        org.lwjgl3.opengl.NVPathRendering.glPathCoordsNV(path, coordType, coords);
+        org.lwjgl.opengl.NVPathRendering.glPathCoordsNV(path, coordType, coords);
     }
 
     public static void glPathCoverDepthFuncNV(int zfunc) {
-        org.lwjgl3.opengl.NVPathRendering.glPathCoverDepthFuncNV(zfunc);
+        org.lwjgl.opengl.NVPathRendering.glPathCoverDepthFuncNV(zfunc);
     }
 
     public static void glPathDashArrayNV(int path, java.nio.FloatBuffer dashArray) {
-        org.lwjgl3.opengl.NVPathRendering.glPathDashArrayNV(path, dashArray);
+        org.lwjgl.opengl.NVPathRendering.glPathDashArrayNV(path, dashArray);
     }
 
     public static void glPathFogGenNV(int genMode) {
-        org.lwjgl3.opengl.NVPathRendering.glPathFogGenNV(genMode);
+        org.lwjgl.opengl.NVPathRendering.glPathFogGenNV(genMode);
     }
 
     public static void glPathGlyphRangeNV(int firstPathName, int fontTarget, java.nio.ByteBuffer fontName,
             int fontStyle, int firstGlyph, int numGlyphs, int handleMissingGlyphs, int pathParameterTemplate,
             float emScale) {
-        org.lwjgl3.opengl.NVPathRendering.glPathGlyphRangeNV(
+        org.lwjgl.opengl.NVPathRendering.glPathGlyphRangeNV(
                 firstPathName,
                 fontTarget,
                 fontName,
@@ -309,7 +309,7 @@ public static void glPathGlyphRangeNV(int firstPathName, int fontTarget, java.ni
     public static void glPathGlyphsNV(int firstPathName, int fontTarget, java.nio.ByteBuffer fontName, int fontStyle,
             int type, java.nio.ByteBuffer charcodes, int handleMissingGlyphs, int pathParameterTemplate,
             float emScale) {
-        org.lwjgl3.opengl.NVPathRendering.glPathGlyphsNV(
+        org.lwjgl.opengl.NVPathRendering.glPathGlyphsNV(
                 firstPathName,
                 fontTarget,
                 fontName,
@@ -322,49 +322,49 @@ public static void glPathGlyphsNV(int firstPathName, int fontTarget, java.nio.By
     }
 
     public static void glPathParameterNV(int path, int pname, java.nio.FloatBuffer value) {
-        org.lwjgl3.opengl.NVPathRendering.glPathParameterfvNV(path, pname, value);
+        org.lwjgl.opengl.NVPathRendering.glPathParameterfvNV(path, pname, value);
     }
 
     public static void glPathParameterNV(int path, int pname, java.nio.IntBuffer value) {
-        org.lwjgl3.opengl.NVPathRendering.glPathParameterivNV(path, pname, value);
+        org.lwjgl.opengl.NVPathRendering.glPathParameterivNV(path, pname, value);
     }
 
     public static void glPathParameterfNV(int path, int pname, float value) {
-        org.lwjgl3.opengl.NVPathRendering.glPathParameterfNV(path, pname, value);
+        org.lwjgl.opengl.NVPathRendering.glPathParameterfNV(path, pname, value);
     }
 
     public static void glPathParameteriNV(int path, int pname, int value) {
-        org.lwjgl3.opengl.NVPathRendering.glPathParameteriNV(path, pname, value);
+        org.lwjgl.opengl.NVPathRendering.glPathParameteriNV(path, pname, value);
     }
 
     public static void glPathStencilFuncNV(int func, int ref, int mask) {
-        org.lwjgl3.opengl.NVPathRendering.glPathStencilFuncNV(func, ref, mask);
+        org.lwjgl.opengl.NVPathRendering.glPathStencilFuncNV(func, ref, mask);
     }
 
     public static void glPathStringNV(int path, int format, java.nio.ByteBuffer pathString) {
-        org.lwjgl3.opengl.NVPathRendering.glPathStringNV(path, format, pathString);
+        org.lwjgl.opengl.NVPathRendering.glPathStringNV(path, format, pathString);
     }
 
     public static void glPathSubCommandsNV(int path, int commandStart, int commandsToDelete,
             java.nio.ByteBuffer commands, int coordType, java.nio.ByteBuffer coords) {
-        org.lwjgl3.opengl.NVPathRendering
+        org.lwjgl.opengl.NVPathRendering
                 .glPathSubCommandsNV(path, commandStart, commandsToDelete, commands, coordType, coords);
     }
 
     public static void glPathSubCoordsNV(int path, int coordStart, int coordType, java.nio.ByteBuffer coords) {
-        org.lwjgl3.opengl.NVPathRendering.glPathSubCoordsNV(path, coordStart, coordType, coords);
+        org.lwjgl.opengl.NVPathRendering.glPathSubCoordsNV(path, coordStart, coordType, coords);
     }
 
     public static boolean glPointAlongPathNV(int path, int startSegment, int numSegments, float distance,
             java.nio.FloatBuffer x, java.nio.FloatBuffer y, java.nio.FloatBuffer tangentX,
             java.nio.FloatBuffer tangentY) {
-        return org.lwjgl3.opengl.NVPathRendering
+        return org.lwjgl.opengl.NVPathRendering
                 .glPointAlongPathNV(path, startSegment, numSegments, distance, x, y, tangentX, tangentY);
     }
 
     public static void glStencilFillPathInstancedNV(int pathNameType, java.nio.ByteBuffer paths, int pathBase,
             int fillMode, int mask, int transformType, java.nio.FloatBuffer transformValues) {
-        org.lwjgl3.opengl.NVPathRendering.glStencilFillPathInstancedNV(
+        org.lwjgl.opengl.NVPathRendering.glStencilFillPathInstancedNV(
                 pathNameType,
                 paths,
                 pathBase,
@@ -375,12 +375,12 @@ public static void glStencilFillPathInstancedNV(int pathNameType, java.nio.ByteB
     }
 
     public static void glStencilFillPathNV(int path, int fillMode, int mask) {
-        org.lwjgl3.opengl.NVPathRendering.glStencilFillPathNV(path, fillMode, mask);
+        org.lwjgl.opengl.NVPathRendering.glStencilFillPathNV(path, fillMode, mask);
     }
 
     public static void glStencilStrokePathInstancedNV(int pathNameType, java.nio.ByteBuffer paths, int pathBase,
             int reference, int mask, int transformType, java.nio.FloatBuffer transformValues) {
-        org.lwjgl3.opengl.NVPathRendering.glStencilStrokePathInstancedNV(
+        org.lwjgl.opengl.NVPathRendering.glStencilStrokePathInstancedNV(
                 pathNameType,
                 paths,
                 pathBase,
@@ -391,15 +391,15 @@ public static void glStencilStrokePathInstancedNV(int pathNameType, java.nio.Byt
     }
 
     public static void glStencilStrokePathNV(int path, int reference, int mask) {
-        org.lwjgl3.opengl.NVPathRendering.glStencilStrokePathNV(path, reference, mask);
+        org.lwjgl.opengl.NVPathRendering.glStencilStrokePathNV(path, reference, mask);
     }
 
     public static void glTransformPathNV(int resultPath, int srcPath, int transformType,
             java.nio.FloatBuffer transformValues) {
-        org.lwjgl3.opengl.NVPathRendering.glTransformPathNV(resultPath, srcPath, transformType, transformValues);
+        org.lwjgl.opengl.NVPathRendering.glTransformPathNV(resultPath, srcPath, transformType, transformValues);
     }
 
     public static void glWeightPathsNV(int resultPath, java.nio.IntBuffer paths, java.nio.FloatBuffer weights) {
-        org.lwjgl3.opengl.NVPathRendering.glWeightPathsNV(resultPath, paths, weights);
+        org.lwjgl.opengl.NVPathRendering.glWeightPathsNV(resultPath, paths, weights);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/NVPixelDataRange.java b/src/main/java/org/lwjglx/opengl/NVPixelDataRange.java
similarity index 73%
rename from src/main/java/org/lwjgl/opengl/NVPixelDataRange.java
rename to src/main/java/org/lwjglx/opengl/NVPixelDataRange.java
index bdd7ec5f5..fbea5f75a 100644
--- a/src/main/java/org/lwjgl/opengl/NVPixelDataRange.java
+++ b/src/main/java/org/lwjglx/opengl/NVPixelDataRange.java
@@ -1,6 +1,6 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
-import org.lwjgl.lwjgl3ify.BufferCasts;
+import org.lwjglx.lwjgl3ify.BufferCasts;
 
 public class NVPixelDataRange {
 
@@ -12,38 +12,38 @@ public class NVPixelDataRange {
     public static final int GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV = (int) 34940;
 
     public static void glFlushPixelDataRangeNV(int target) {
-        org.lwjgl3.opengl.NVPixelDataRange.glFlushPixelDataRangeNV(target);
+        org.lwjgl.opengl.NVPixelDataRange.glFlushPixelDataRangeNV(target);
     }
 
     public static void glPixelDataRangeNV(int target, java.nio.ByteBuffer data) {
-        org.lwjgl3.opengl.NVPixelDataRange.glPixelDataRangeNV(target, data);
+        org.lwjgl.opengl.NVPixelDataRange.glPixelDataRangeNV(target, data);
     }
 
     public static void glPixelDataRangeNV(int target, java.nio.DoubleBuffer data) {
         final java.nio.ByteBuffer wrappedArg1 = BufferCasts.toByteBuffer(data);
 
-        org.lwjgl3.opengl.NVPixelDataRange.glPixelDataRangeNV(target, wrappedArg1);
+        org.lwjgl.opengl.NVPixelDataRange.glPixelDataRangeNV(target, wrappedArg1);
         BufferCasts.updateBuffer(data, wrappedArg1);
     }
 
     public static void glPixelDataRangeNV(int target, java.nio.FloatBuffer data) {
         final java.nio.ByteBuffer wrappedArg1 = BufferCasts.toByteBuffer(data);
 
-        org.lwjgl3.opengl.NVPixelDataRange.glPixelDataRangeNV(target, wrappedArg1);
+        org.lwjgl.opengl.NVPixelDataRange.glPixelDataRangeNV(target, wrappedArg1);
         BufferCasts.updateBuffer(data, wrappedArg1);
     }
 
     public static void glPixelDataRangeNV(int target, java.nio.IntBuffer data) {
         final java.nio.ByteBuffer wrappedArg1 = BufferCasts.toByteBuffer(data);
 
-        org.lwjgl3.opengl.NVPixelDataRange.glPixelDataRangeNV(target, wrappedArg1);
+        org.lwjgl.opengl.NVPixelDataRange.glPixelDataRangeNV(target, wrappedArg1);
         BufferCasts.updateBuffer(data, wrappedArg1);
     }
 
     public static void glPixelDataRangeNV(int target, java.nio.ShortBuffer data) {
         final java.nio.ByteBuffer wrappedArg1 = BufferCasts.toByteBuffer(data);
 
-        org.lwjgl3.opengl.NVPixelDataRange.glPixelDataRangeNV(target, wrappedArg1);
+        org.lwjgl.opengl.NVPixelDataRange.glPixelDataRangeNV(target, wrappedArg1);
         BufferCasts.updateBuffer(data, wrappedArg1);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/NVPointSprite.java b/src/main/java/org/lwjglx/opengl/NVPointSprite.java
similarity index 68%
rename from src/main/java/org/lwjgl/opengl/NVPointSprite.java
rename to src/main/java/org/lwjglx/opengl/NVPointSprite.java
index e92b551cd..09120bc85 100644
--- a/src/main/java/org/lwjgl/opengl/NVPointSprite.java
+++ b/src/main/java/org/lwjglx/opengl/NVPointSprite.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVPointSprite {
 
@@ -7,10 +7,10 @@ public class NVPointSprite {
     public static final int GL_POINT_SPRITE_R_MODE_NV = (int) 34915;
 
     public static void glPointParameterNV(int pname, java.nio.IntBuffer params) {
-        org.lwjgl3.opengl.NVPointSprite.glPointParameterivNV(pname, params);
+        org.lwjgl.opengl.NVPointSprite.glPointParameterivNV(pname, params);
     }
 
     public static void glPointParameteriNV(int pname, int param) {
-        org.lwjgl3.opengl.NVPointSprite.glPointParameteriNV(pname, param);
+        org.lwjgl.opengl.NVPointSprite.glPointParameteriNV(pname, param);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/NVPrimitiveRestart.java b/src/main/java/org/lwjglx/opengl/NVPrimitiveRestart.java
similarity index 63%
rename from src/main/java/org/lwjgl/opengl/NVPrimitiveRestart.java
rename to src/main/java/org/lwjglx/opengl/NVPrimitiveRestart.java
index b6901fe0d..aa6e1b382 100644
--- a/src/main/java/org/lwjgl/opengl/NVPrimitiveRestart.java
+++ b/src/main/java/org/lwjglx/opengl/NVPrimitiveRestart.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVPrimitiveRestart {
 
@@ -6,10 +6,10 @@ public class NVPrimitiveRestart {
     public static final int GL_PRIMITIVE_RESTART_NV = (int) 34136;
 
     public static void glPrimitiveRestartIndexNV(int index) {
-        org.lwjgl3.opengl.NVPrimitiveRestart.glPrimitiveRestartIndexNV(index);
+        org.lwjgl.opengl.NVPrimitiveRestart.glPrimitiveRestartIndexNV(index);
     }
 
     public static void glPrimitiveRestartNV() {
-        org.lwjgl3.opengl.NVPrimitiveRestart.glPrimitiveRestartNV();
+        org.lwjgl.opengl.NVPrimitiveRestart.glPrimitiveRestartNV();
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/NVShaderBufferLoad.java b/src/main/java/org/lwjglx/opengl/NVShaderBufferLoad.java
similarity index 52%
rename from src/main/java/org/lwjgl/opengl/NVShaderBufferLoad.java
rename to src/main/java/org/lwjglx/opengl/NVShaderBufferLoad.java
index eb0078aa2..1f1f73fd5 100644
--- a/src/main/java/org/lwjgl/opengl/NVShaderBufferLoad.java
+++ b/src/main/java/org/lwjglx/opengl/NVShaderBufferLoad.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVShaderBufferLoad {
 
@@ -7,66 +7,66 @@ public class NVShaderBufferLoad {
     public static final int GL_MAX_SHADER_BUFFER_ADDRESS_NV = (int) 36661;
 
     public static void glGetBufferParameteruNV(int target, int pname, java.nio.LongBuffer params) {
-        org.lwjgl3.opengl.NVShaderBufferLoad.glGetBufferParameterui64vNV(target, pname, params);
+        org.lwjgl.opengl.NVShaderBufferLoad.glGetBufferParameterui64vNV(target, pname, params);
     }
 
     public static long glGetBufferParameterui64NV(int target, int pname) {
-        return org.lwjgl3.opengl.NVShaderBufferLoad.glGetBufferParameterui64NV(target, pname);
+        return org.lwjgl.opengl.NVShaderBufferLoad.glGetBufferParameterui64NV(target, pname);
     }
 
     public static void glGetIntegeruNV(int value, java.nio.LongBuffer result) {
-        org.lwjgl3.opengl.NVShaderBufferLoad.glGetIntegerui64vNV(value, result);
+        org.lwjgl.opengl.NVShaderBufferLoad.glGetIntegerui64vNV(value, result);
     }
 
     public static long glGetIntegerui64NV(int value) {
-        return org.lwjgl3.opengl.NVShaderBufferLoad.glGetIntegerui64NV(value);
+        return org.lwjgl.opengl.NVShaderBufferLoad.glGetIntegerui64NV(value);
     }
 
     public static void glGetNamedBufferParameteruNV(int buffer, int pname, java.nio.LongBuffer params) {
-        org.lwjgl3.opengl.NVShaderBufferLoad.glGetNamedBufferParameterui64vNV(buffer, pname, params);
+        org.lwjgl.opengl.NVShaderBufferLoad.glGetNamedBufferParameterui64vNV(buffer, pname, params);
     }
 
     public static long glGetNamedBufferParameterui64NV(int buffer, int pname) {
-        return org.lwjgl3.opengl.NVShaderBufferLoad.glGetNamedBufferParameterui64NV(buffer, pname);
+        return org.lwjgl.opengl.NVShaderBufferLoad.glGetNamedBufferParameterui64NV(buffer, pname);
     }
 
     public static boolean glIsBufferResidentNV(int target) {
-        return org.lwjgl3.opengl.NVShaderBufferLoad.glIsBufferResidentNV(target);
+        return org.lwjgl.opengl.NVShaderBufferLoad.glIsBufferResidentNV(target);
     }
 
     public static boolean glIsNamedBufferResidentNV(int buffer) {
-        return org.lwjgl3.opengl.NVShaderBufferLoad.glIsNamedBufferResidentNV(buffer);
+        return org.lwjgl.opengl.NVShaderBufferLoad.glIsNamedBufferResidentNV(buffer);
     }
 
     public static void glMakeBufferNonResidentNV(int target) {
-        org.lwjgl3.opengl.NVShaderBufferLoad.glMakeBufferNonResidentNV(target);
+        org.lwjgl.opengl.NVShaderBufferLoad.glMakeBufferNonResidentNV(target);
     }
 
     public static void glMakeBufferResidentNV(int target, int access) {
-        org.lwjgl3.opengl.NVShaderBufferLoad.glMakeBufferResidentNV(target, access);
+        org.lwjgl.opengl.NVShaderBufferLoad.glMakeBufferResidentNV(target, access);
     }
 
     public static void glMakeNamedBufferNonResidentNV(int buffer) {
-        org.lwjgl3.opengl.NVShaderBufferLoad.glMakeNamedBufferNonResidentNV(buffer);
+        org.lwjgl.opengl.NVShaderBufferLoad.glMakeNamedBufferNonResidentNV(buffer);
     }
 
     public static void glMakeNamedBufferResidentNV(int buffer, int access) {
-        org.lwjgl3.opengl.NVShaderBufferLoad.glMakeNamedBufferResidentNV(buffer, access);
+        org.lwjgl.opengl.NVShaderBufferLoad.glMakeNamedBufferResidentNV(buffer, access);
     }
 
     public static void glProgramUniformuNV(int program, int location, java.nio.LongBuffer value) {
-        org.lwjgl3.opengl.NVShaderBufferLoad.glProgramUniformui64vNV(program, location, value);
+        org.lwjgl.opengl.NVShaderBufferLoad.glProgramUniformui64vNV(program, location, value);
     }
 
     public static void glProgramUniformui64NV(int program, int location, long value) {
-        org.lwjgl3.opengl.NVShaderBufferLoad.glProgramUniformui64NV(program, location, value);
+        org.lwjgl.opengl.NVShaderBufferLoad.glProgramUniformui64NV(program, location, value);
     }
 
     public static void glUniformuNV(int location, java.nio.LongBuffer value) {
-        org.lwjgl3.opengl.NVShaderBufferLoad.glUniformui64vNV(location, value);
+        org.lwjgl.opengl.NVShaderBufferLoad.glUniformui64vNV(location, value);
     }
 
     public static void glUniformui64NV(int location, long value) {
-        org.lwjgl3.opengl.NVShaderBufferLoad.glUniformui64NV(location, value);
+        org.lwjgl.opengl.NVShaderBufferLoad.glUniformui64NV(location, value);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/NVShaderBufferStore.java b/src/main/java/org/lwjglx/opengl/NVShaderBufferStore.java
similarity index 81%
rename from src/main/java/org/lwjgl/opengl/NVShaderBufferStore.java
rename to src/main/java/org/lwjglx/opengl/NVShaderBufferStore.java
index 6da426463..446f06325 100644
--- a/src/main/java/org/lwjgl/opengl/NVShaderBufferStore.java
+++ b/src/main/java/org/lwjglx/opengl/NVShaderBufferStore.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVShaderBufferStore {
 
diff --git a/src/main/java/org/lwjgl/opengl/NVTexgenReflection.java b/src/main/java/org/lwjglx/opengl/NVTexgenReflection.java
similarity index 85%
rename from src/main/java/org/lwjgl/opengl/NVTexgenReflection.java
rename to src/main/java/org/lwjglx/opengl/NVTexgenReflection.java
index d02400395..ff060ae63 100644
--- a/src/main/java/org/lwjgl/opengl/NVTexgenReflection.java
+++ b/src/main/java/org/lwjglx/opengl/NVTexgenReflection.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVTexgenReflection {
 
diff --git a/src/main/java/org/lwjglx/opengl/NVTextureBarrier.java b/src/main/java/org/lwjglx/opengl/NVTextureBarrier.java
new file mode 100644
index 000000000..ca593a80e
--- /dev/null
+++ b/src/main/java/org/lwjglx/opengl/NVTextureBarrier.java
@@ -0,0 +1,8 @@
+package org.lwjglx.opengl;
+
+public class NVTextureBarrier {
+
+    public static void glTextureBarrierNV() {
+        org.lwjgl.opengl.NVTextureBarrier.glTextureBarrierNV();
+    }
+}
diff --git a/src/main/java/org/lwjgl/opengl/NVTextureMultisample.java b/src/main/java/org/lwjglx/opengl/NVTextureMultisample.java
similarity index 84%
rename from src/main/java/org/lwjgl/opengl/NVTextureMultisample.java
rename to src/main/java/org/lwjglx/opengl/NVTextureMultisample.java
index 980c01658..dc295e3f1 100644
--- a/src/main/java/org/lwjgl/opengl/NVTextureMultisample.java
+++ b/src/main/java/org/lwjglx/opengl/NVTextureMultisample.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVTextureMultisample {
 
@@ -7,7 +7,7 @@ public class NVTextureMultisample {
 
     public static void glTexImage2DMultisampleCoverageNV(int target, int coverageSamples, int colorSamples,
             int internalFormat, int width, int height, boolean fixedSampleLocations) {
-        org.lwjgl3.opengl.NVTextureMultisample.glTexImage2DMultisampleCoverageNV(
+        org.lwjgl.opengl.NVTextureMultisample.glTexImage2DMultisampleCoverageNV(
                 target,
                 coverageSamples,
                 colorSamples,
@@ -19,7 +19,7 @@ public static void glTexImage2DMultisampleCoverageNV(int target, int coverageSam
 
     public static void glTexImage3DMultisampleCoverageNV(int target, int coverageSamples, int colorSamples,
             int internalFormat, int width, int height, int depth, boolean fixedSampleLocations) {
-        org.lwjgl3.opengl.NVTextureMultisample.glTexImage3DMultisampleCoverageNV(
+        org.lwjgl.opengl.NVTextureMultisample.glTexImage3DMultisampleCoverageNV(
                 target,
                 coverageSamples,
                 colorSamples,
@@ -32,7 +32,7 @@ public static void glTexImage3DMultisampleCoverageNV(int target, int coverageSam
 
     public static void glTextureImage2DMultisampleCoverageNV(int texture, int target, int coverageSamples,
             int colorSamples, int internalFormat, int width, int height, boolean fixedSampleLocations) {
-        org.lwjgl3.opengl.NVTextureMultisample.glTextureImage2DMultisampleCoverageNV(
+        org.lwjgl.opengl.NVTextureMultisample.glTextureImage2DMultisampleCoverageNV(
                 texture,
                 target,
                 coverageSamples,
@@ -45,7 +45,7 @@ public static void glTextureImage2DMultisampleCoverageNV(int texture, int target
 
     public static void glTextureImage2DMultisampleNV(int texture, int target, int samples, int internalFormat,
             int width, int height, boolean fixedSampleLocations) {
-        org.lwjgl3.opengl.NVTextureMultisample.glTextureImage2DMultisampleNV(
+        org.lwjgl.opengl.NVTextureMultisample.glTextureImage2DMultisampleNV(
                 texture,
                 target,
                 samples,
@@ -57,7 +57,7 @@ public static void glTextureImage2DMultisampleNV(int texture, int target, int sa
 
     public static void glTextureImage3DMultisampleCoverageNV(int texture, int target, int coverageSamples,
             int colorSamples, int internalFormat, int width, int height, int depth, boolean fixedSampleLocations) {
-        org.lwjgl3.opengl.NVTextureMultisample.glTextureImage3DMultisampleCoverageNV(
+        org.lwjgl.opengl.NVTextureMultisample.glTextureImage3DMultisampleCoverageNV(
                 texture,
                 target,
                 coverageSamples,
@@ -71,7 +71,7 @@ public static void glTextureImage3DMultisampleCoverageNV(int texture, int target
 
     public static void glTextureImage3DMultisampleNV(int texture, int target, int samples, int internalFormat,
             int width, int height, int depth, boolean fixedSampleLocations) {
-        org.lwjgl3.opengl.NVTextureMultisample.glTextureImage3DMultisampleNV(
+        org.lwjgl.opengl.NVTextureMultisample.glTextureImage3DMultisampleNV(
                 texture,
                 target,
                 samples,
diff --git a/src/main/java/org/lwjgl/opengl/NVTextureShader.java b/src/main/java/org/lwjglx/opengl/NVTextureShader.java
similarity index 99%
rename from src/main/java/org/lwjgl/opengl/NVTextureShader.java
rename to src/main/java/org/lwjglx/opengl/NVTextureShader.java
index be0772d73..7ed53146e 100644
--- a/src/main/java/org/lwjgl/opengl/NVTextureShader.java
+++ b/src/main/java/org/lwjglx/opengl/NVTextureShader.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVTextureShader {
 
diff --git a/src/main/java/org/lwjgl/opengl/NVTextureShader2.java b/src/main/java/org/lwjglx/opengl/NVTextureShader2.java
similarity index 98%
rename from src/main/java/org/lwjgl/opengl/NVTextureShader2.java
rename to src/main/java/org/lwjglx/opengl/NVTextureShader2.java
index ec3555fe6..a8c44e789 100644
--- a/src/main/java/org/lwjgl/opengl/NVTextureShader2.java
+++ b/src/main/java/org/lwjglx/opengl/NVTextureShader2.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVTextureShader2 {
 
diff --git a/src/main/java/org/lwjgl/opengl/NVTextureShader3.java b/src/main/java/org/lwjglx/opengl/NVTextureShader3.java
similarity index 98%
rename from src/main/java/org/lwjgl/opengl/NVTextureShader3.java
rename to src/main/java/org/lwjglx/opengl/NVTextureShader3.java
index 5a1312481..60c6796ce 100644
--- a/src/main/java/org/lwjgl/opengl/NVTextureShader3.java
+++ b/src/main/java/org/lwjglx/opengl/NVTextureShader3.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVTextureShader3 {
 
diff --git a/src/main/java/org/lwjgl/opengl/NVTransformFeedback.java b/src/main/java/org/lwjglx/opengl/NVTransformFeedback.java
similarity index 71%
rename from src/main/java/org/lwjgl/opengl/NVTransformFeedback.java
rename to src/main/java/org/lwjglx/opengl/NVTransformFeedback.java
index 57aa03bf2..cfc39b0f5 100644
--- a/src/main/java/org/lwjgl/opengl/NVTransformFeedback.java
+++ b/src/main/java/org/lwjglx/opengl/NVTransformFeedback.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVTransformFeedback {
 
@@ -30,59 +30,59 @@ public class NVTransformFeedback {
     public static final int GL_VERTEX_ID_NV = (int) 35963;
 
     public static void glActiveVaryingNV(int program, java.lang.CharSequence name) {
-        org.lwjgl3.opengl.NVTransformFeedback.glActiveVaryingNV(program, name);
+        org.lwjgl.opengl.NVTransformFeedback.glActiveVaryingNV(program, name);
     }
 
     public static void glActiveVaryingNV(int program, java.nio.ByteBuffer name) {
-        org.lwjgl3.opengl.NVTransformFeedback.glActiveVaryingNV(program, name);
+        org.lwjgl.opengl.NVTransformFeedback.glActiveVaryingNV(program, name);
     }
 
     public static void glBeginTransformFeedbackNV(int primitiveMode) {
-        org.lwjgl3.opengl.NVTransformFeedback.glBeginTransformFeedbackNV(primitiveMode);
+        org.lwjgl.opengl.NVTransformFeedback.glBeginTransformFeedbackNV(primitiveMode);
     }
 
     public static void glBindBufferBaseNV(int target, int index, int buffer) {
-        org.lwjgl3.opengl.NVTransformFeedback.glBindBufferBaseNV(target, index, buffer);
+        org.lwjgl.opengl.NVTransformFeedback.glBindBufferBaseNV(target, index, buffer);
     }
 
     public static void glBindBufferOffsetNV(int target, int index, int buffer, long offset) {
-        org.lwjgl3.opengl.NVTransformFeedback.glBindBufferOffsetNV(target, index, buffer, offset);
+        org.lwjgl.opengl.NVTransformFeedback.glBindBufferOffsetNV(target, index, buffer, offset);
     }
 
     public static void glBindBufferRangeNV(int target, int index, int buffer, long offset, long size) {
-        org.lwjgl3.opengl.NVTransformFeedback.glBindBufferRangeNV(target, index, buffer, offset, size);
+        org.lwjgl.opengl.NVTransformFeedback.glBindBufferRangeNV(target, index, buffer, offset, size);
     }
 
     public static void glEndTransformFeedbackNV() {
-        org.lwjgl3.opengl.NVTransformFeedback.glEndTransformFeedbackNV();
+        org.lwjgl.opengl.NVTransformFeedback.glEndTransformFeedbackNV();
     }
 
     public static void glGetActiveVaryingNV(int program, int index, java.nio.IntBuffer length, java.nio.IntBuffer size,
             java.nio.IntBuffer type, java.nio.ByteBuffer name) {
-        org.lwjgl3.opengl.NVTransformFeedback.glGetActiveVaryingNV(program, index, length, size, type, name);
+        org.lwjgl.opengl.NVTransformFeedback.glGetActiveVaryingNV(program, index, length, size, type, name);
     }
 
     public static int glGetTransformFeedbackVaryingNV(int program, int index) {
-        return org.lwjgl3.opengl.NVTransformFeedback.glGetTransformFeedbackVaryingNV(program, index);
+        return org.lwjgl.opengl.NVTransformFeedback.glGetTransformFeedbackVaryingNV(program, index);
     }
 
     public static void glGetTransformFeedbackVaryingNV(int program, int index, java.nio.IntBuffer location) {
-        org.lwjgl3.opengl.NVTransformFeedback.glGetTransformFeedbackVaryingNV(program, index, location);
+        org.lwjgl.opengl.NVTransformFeedback.glGetTransformFeedbackVaryingNV(program, index, location);
     }
 
     public static int glGetVaryingLocationNV(int program, java.lang.CharSequence name) {
-        return org.lwjgl3.opengl.NVTransformFeedback.glGetVaryingLocationNV(program, name);
+        return org.lwjgl.opengl.NVTransformFeedback.glGetVaryingLocationNV(program, name);
     }
 
     public static int glGetVaryingLocationNV(int program, java.nio.ByteBuffer name) {
-        return org.lwjgl3.opengl.NVTransformFeedback.glGetVaryingLocationNV(program, name);
+        return org.lwjgl.opengl.NVTransformFeedback.glGetVaryingLocationNV(program, name);
     }
 
     public static void glTransformFeedbackAttribsNV(java.nio.IntBuffer attribs, int bufferMode) {
-        org.lwjgl3.opengl.NVTransformFeedback.glTransformFeedbackAttribsNV(attribs, bufferMode);
+        org.lwjgl.opengl.NVTransformFeedback.glTransformFeedbackAttribsNV(attribs, bufferMode);
     }
 
     public static void glTransformFeedbackVaryingsNV(int program, java.nio.IntBuffer locations, int bufferMode) {
-        org.lwjgl3.opengl.NVTransformFeedback.glTransformFeedbackVaryingsNV(program, locations, bufferMode);
+        org.lwjgl.opengl.NVTransformFeedback.glTransformFeedbackVaryingsNV(program, locations, bufferMode);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/NVTransformFeedback2.java b/src/main/java/org/lwjglx/opengl/NVTransformFeedback2.java
similarity index 57%
rename from src/main/java/org/lwjgl/opengl/NVTransformFeedback2.java
rename to src/main/java/org/lwjglx/opengl/NVTransformFeedback2.java
index 894235f54..9e0946bd9 100644
--- a/src/main/java/org/lwjgl/opengl/NVTransformFeedback2.java
+++ b/src/main/java/org/lwjglx/opengl/NVTransformFeedback2.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVTransformFeedback2 {
 
@@ -8,38 +8,38 @@ public class NVTransformFeedback2 {
     public static final int GL_TRANSFORM_FEEDBACK_NV = (int) 36386;
 
     public static void glBindTransformFeedbackNV(int target, int id) {
-        org.lwjgl3.opengl.NVTransformFeedback2.glBindTransformFeedbackNV(target, id);
+        org.lwjgl.opengl.NVTransformFeedback2.glBindTransformFeedbackNV(target, id);
     }
 
     public static void glDeleteTransformFeedbacksNV(int id) {
-        org.lwjgl3.opengl.NVTransformFeedback2.glDeleteTransformFeedbacksNV(id);
+        org.lwjgl.opengl.NVTransformFeedback2.glDeleteTransformFeedbacksNV(id);
     }
 
     public static void glDeleteTransformFeedbacksNV(java.nio.IntBuffer ids) {
-        org.lwjgl3.opengl.NVTransformFeedback2.glDeleteTransformFeedbacksNV(ids);
+        org.lwjgl.opengl.NVTransformFeedback2.glDeleteTransformFeedbacksNV(ids);
     }
 
     public static void glDrawTransformFeedbackNV(int mode, int id) {
-        org.lwjgl3.opengl.NVTransformFeedback2.glDrawTransformFeedbackNV(mode, id);
+        org.lwjgl.opengl.NVTransformFeedback2.glDrawTransformFeedbackNV(mode, id);
     }
 
     public static int glGenTransformFeedbacksNV() {
-        return org.lwjgl3.opengl.NVTransformFeedback2.glGenTransformFeedbacksNV();
+        return org.lwjgl.opengl.NVTransformFeedback2.glGenTransformFeedbacksNV();
     }
 
     public static void glGenTransformFeedbacksNV(java.nio.IntBuffer ids) {
-        org.lwjgl3.opengl.NVTransformFeedback2.glGenTransformFeedbacksNV(ids);
+        org.lwjgl.opengl.NVTransformFeedback2.glGenTransformFeedbacksNV(ids);
     }
 
     public static boolean glIsTransformFeedbackNV(int id) {
-        return org.lwjgl3.opengl.NVTransformFeedback2.glIsTransformFeedbackNV(id);
+        return org.lwjgl.opengl.NVTransformFeedback2.glIsTransformFeedbackNV(id);
     }
 
     public static void glPauseTransformFeedbackNV() {
-        org.lwjgl3.opengl.NVTransformFeedback2.glPauseTransformFeedbackNV();
+        org.lwjgl.opengl.NVTransformFeedback2.glPauseTransformFeedbackNV();
     }
 
     public static void glResumeTransformFeedbackNV() {
-        org.lwjgl3.opengl.NVTransformFeedback2.glResumeTransformFeedbackNV();
+        org.lwjgl.opengl.NVTransformFeedback2.glResumeTransformFeedbackNV();
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/NVVertexArrayRange.java b/src/main/java/org/lwjglx/opengl/NVVertexArrayRange.java
similarity index 73%
rename from src/main/java/org/lwjgl/opengl/NVVertexArrayRange.java
rename to src/main/java/org/lwjglx/opengl/NVVertexArrayRange.java
index 4756bd16d..e275318ce 100644
--- a/src/main/java/org/lwjgl/opengl/NVVertexArrayRange.java
+++ b/src/main/java/org/lwjglx/opengl/NVVertexArrayRange.java
@@ -1,6 +1,6 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
-import org.lwjgl.lwjgl3ify.BufferCasts;
+import org.lwjglx.lwjgl3ify.BufferCasts;
 
 public class NVVertexArrayRange {
 
@@ -11,38 +11,38 @@ public class NVVertexArrayRange {
     public static final int GL_VERTEX_ARRAY_RANGE_VALID_NV = (int) 34079;
 
     public static void glFlushVertexArrayRangeNV() {
-        org.lwjgl3.opengl.NVVertexArrayRange.glFlushVertexArrayRangeNV();
+        org.lwjgl.opengl.NVVertexArrayRange.glFlushVertexArrayRangeNV();
     }
 
     public static void glVertexArrayRangeNV(java.nio.ByteBuffer pPointer) {
-        org.lwjgl3.opengl.NVVertexArrayRange.glVertexArrayRangeNV(pPointer);
+        org.lwjgl.opengl.NVVertexArrayRange.glVertexArrayRangeNV(pPointer);
     }
 
     public static void glVertexArrayRangeNV(java.nio.DoubleBuffer pPointer) {
         final java.nio.ByteBuffer wrappedArg0 = BufferCasts.toByteBuffer(pPointer);
 
-        org.lwjgl3.opengl.NVVertexArrayRange.glVertexArrayRangeNV(wrappedArg0);
+        org.lwjgl.opengl.NVVertexArrayRange.glVertexArrayRangeNV(wrappedArg0);
         BufferCasts.updateBuffer(pPointer, wrappedArg0);
     }
 
     public static void glVertexArrayRangeNV(java.nio.FloatBuffer pPointer) {
         final java.nio.ByteBuffer wrappedArg0 = BufferCasts.toByteBuffer(pPointer);
 
-        org.lwjgl3.opengl.NVVertexArrayRange.glVertexArrayRangeNV(wrappedArg0);
+        org.lwjgl.opengl.NVVertexArrayRange.glVertexArrayRangeNV(wrappedArg0);
         BufferCasts.updateBuffer(pPointer, wrappedArg0);
     }
 
     public static void glVertexArrayRangeNV(java.nio.IntBuffer pPointer) {
         final java.nio.ByteBuffer wrappedArg0 = BufferCasts.toByteBuffer(pPointer);
 
-        org.lwjgl3.opengl.NVVertexArrayRange.glVertexArrayRangeNV(wrappedArg0);
+        org.lwjgl.opengl.NVVertexArrayRange.glVertexArrayRangeNV(wrappedArg0);
         BufferCasts.updateBuffer(pPointer, wrappedArg0);
     }
 
     public static void glVertexArrayRangeNV(java.nio.ShortBuffer pPointer) {
         final java.nio.ByteBuffer wrappedArg0 = BufferCasts.toByteBuffer(pPointer);
 
-        org.lwjgl3.opengl.NVVertexArrayRange.glVertexArrayRangeNV(wrappedArg0);
+        org.lwjgl.opengl.NVVertexArrayRange.glVertexArrayRangeNV(wrappedArg0);
         BufferCasts.updateBuffer(pPointer, wrappedArg0);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/NVVertexArrayRange2.java b/src/main/java/org/lwjglx/opengl/NVVertexArrayRange2.java
similarity index 81%
rename from src/main/java/org/lwjgl/opengl/NVVertexArrayRange2.java
rename to src/main/java/org/lwjglx/opengl/NVVertexArrayRange2.java
index 85f270fe9..c2f907d22 100644
--- a/src/main/java/org/lwjgl/opengl/NVVertexArrayRange2.java
+++ b/src/main/java/org/lwjglx/opengl/NVVertexArrayRange2.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVVertexArrayRange2 {
 
diff --git a/src/main/java/org/lwjgl/opengl/NVVertexAttribInteger64bit.java b/src/main/java/org/lwjglx/opengl/NVVertexAttribInteger64bit.java
similarity index 51%
rename from src/main/java/org/lwjgl/opengl/NVVertexAttribInteger64bit.java
rename to src/main/java/org/lwjglx/opengl/NVVertexAttribInteger64bit.java
index edce38cf4..4fa4318c9 100644
--- a/src/main/java/org/lwjgl/opengl/NVVertexAttribInteger64bit.java
+++ b/src/main/java/org/lwjglx/opengl/NVVertexAttribInteger64bit.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVVertexAttribInteger64bit {
 
@@ -6,78 +6,78 @@ public class NVVertexAttribInteger64bit {
     public static final int GL_UNSIGNED_INT64_NV = (int) 5135;
 
     public static void glGetVertexAttribLNV(int index, int pname, java.nio.LongBuffer params) {
-        org.lwjgl3.opengl.NVVertexAttribInteger64bit.glGetVertexAttribLi64vNV(index, pname, params);
+        org.lwjgl.opengl.NVVertexAttribInteger64bit.glGetVertexAttribLi64vNV(index, pname, params);
     }
 
     public static void glGetVertexAttribLuNV(int index, int pname, java.nio.LongBuffer params) {
-        org.lwjgl3.opengl.NVVertexAttribInteger64bit.glGetVertexAttribLui64vNV(index, pname, params);
+        org.lwjgl.opengl.NVVertexAttribInteger64bit.glGetVertexAttribLui64vNV(index, pname, params);
     }
 
     public static void glVertexAttribL1NV(int index, java.nio.LongBuffer v) {
-        org.lwjgl3.opengl.NVVertexAttribInteger64bit.glVertexAttribL1i64vNV(index, v);
+        org.lwjgl.opengl.NVVertexAttribInteger64bit.glVertexAttribL1i64vNV(index, v);
     }
 
     public static void glVertexAttribL1i64NV(int index, long x) {
-        org.lwjgl3.opengl.NVVertexAttribInteger64bit.glVertexAttribL1i64NV(index, x);
+        org.lwjgl.opengl.NVVertexAttribInteger64bit.glVertexAttribL1i64NV(index, x);
     }
 
     public static void glVertexAttribL1uNV(int index, java.nio.LongBuffer v) {
-        org.lwjgl3.opengl.NVVertexAttribInteger64bit.glVertexAttribL1ui64vNV(index, v);
+        org.lwjgl.opengl.NVVertexAttribInteger64bit.glVertexAttribL1ui64vNV(index, v);
     }
 
     public static void glVertexAttribL1ui64NV(int index, long x) {
-        org.lwjgl3.opengl.NVVertexAttribInteger64bit.glVertexAttribL1ui64NV(index, x);
+        org.lwjgl.opengl.NVVertexAttribInteger64bit.glVertexAttribL1ui64NV(index, x);
     }
 
     public static void glVertexAttribL2NV(int index, java.nio.LongBuffer v) {
-        org.lwjgl3.opengl.NVVertexAttribInteger64bit.glVertexAttribL2i64vNV(index, v);
+        org.lwjgl.opengl.NVVertexAttribInteger64bit.glVertexAttribL2i64vNV(index, v);
     }
 
     public static void glVertexAttribL2i64NV(int index, long x, long y) {
-        org.lwjgl3.opengl.NVVertexAttribInteger64bit.glVertexAttribL2i64NV(index, x, y);
+        org.lwjgl.opengl.NVVertexAttribInteger64bit.glVertexAttribL2i64NV(index, x, y);
     }
 
     public static void glVertexAttribL2uNV(int index, java.nio.LongBuffer v) {
-        org.lwjgl3.opengl.NVVertexAttribInteger64bit.glVertexAttribL2ui64vNV(index, v);
+        org.lwjgl.opengl.NVVertexAttribInteger64bit.glVertexAttribL2ui64vNV(index, v);
     }
 
     public static void glVertexAttribL2ui64NV(int index, long x, long y) {
-        org.lwjgl3.opengl.NVVertexAttribInteger64bit.glVertexAttribL2ui64NV(index, x, y);
+        org.lwjgl.opengl.NVVertexAttribInteger64bit.glVertexAttribL2ui64NV(index, x, y);
     }
 
     public static void glVertexAttribL3NV(int index, java.nio.LongBuffer v) {
-        org.lwjgl3.opengl.NVVertexAttribInteger64bit.glVertexAttribL3i64vNV(index, v);
+        org.lwjgl.opengl.NVVertexAttribInteger64bit.glVertexAttribL3i64vNV(index, v);
     }
 
     public static void glVertexAttribL3i64NV(int index, long x, long y, long z) {
-        org.lwjgl3.opengl.NVVertexAttribInteger64bit.glVertexAttribL3i64NV(index, x, y, z);
+        org.lwjgl.opengl.NVVertexAttribInteger64bit.glVertexAttribL3i64NV(index, x, y, z);
     }
 
     public static void glVertexAttribL3uNV(int index, java.nio.LongBuffer v) {
-        org.lwjgl3.opengl.NVVertexAttribInteger64bit.glVertexAttribL3ui64vNV(index, v);
+        org.lwjgl.opengl.NVVertexAttribInteger64bit.glVertexAttribL3ui64vNV(index, v);
     }
 
     public static void glVertexAttribL3ui64NV(int index, long x, long y, long z) {
-        org.lwjgl3.opengl.NVVertexAttribInteger64bit.glVertexAttribL3ui64NV(index, x, y, z);
+        org.lwjgl.opengl.NVVertexAttribInteger64bit.glVertexAttribL3ui64NV(index, x, y, z);
     }
 
     public static void glVertexAttribL4NV(int index, java.nio.LongBuffer v) {
-        org.lwjgl3.opengl.NVVertexAttribInteger64bit.glVertexAttribL4i64vNV(index, v);
+        org.lwjgl.opengl.NVVertexAttribInteger64bit.glVertexAttribL4i64vNV(index, v);
     }
 
     public static void glVertexAttribL4i64NV(int index, long x, long y, long z, long w) {
-        org.lwjgl3.opengl.NVVertexAttribInteger64bit.glVertexAttribL4i64NV(index, x, y, z, w);
+        org.lwjgl.opengl.NVVertexAttribInteger64bit.glVertexAttribL4i64NV(index, x, y, z, w);
     }
 
     public static void glVertexAttribL4uNV(int index, java.nio.LongBuffer v) {
-        org.lwjgl3.opengl.NVVertexAttribInteger64bit.glVertexAttribL4ui64vNV(index, v);
+        org.lwjgl.opengl.NVVertexAttribInteger64bit.glVertexAttribL4ui64vNV(index, v);
     }
 
     public static void glVertexAttribL4ui64NV(int index, long x, long y, long z, long w) {
-        org.lwjgl3.opengl.NVVertexAttribInteger64bit.glVertexAttribL4ui64NV(index, x, y, z, w);
+        org.lwjgl.opengl.NVVertexAttribInteger64bit.glVertexAttribL4ui64NV(index, x, y, z, w);
     }
 
     public static void glVertexAttribLFormatNV(int index, int size, int type, int stride) {
-        org.lwjgl3.opengl.NVVertexAttribInteger64bit.glVertexAttribLFormatNV(index, size, type, stride);
+        org.lwjgl.opengl.NVVertexAttribInteger64bit.glVertexAttribLFormatNV(index, size, type, stride);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/NVVertexBufferUnifiedMemory.java b/src/main/java/org/lwjglx/opengl/NVVertexBufferUnifiedMemory.java
similarity index 70%
rename from src/main/java/org/lwjgl/opengl/NVVertexBufferUnifiedMemory.java
rename to src/main/java/org/lwjglx/opengl/NVVertexBufferUnifiedMemory.java
index 3a3255b35..f14a02f3f 100644
--- a/src/main/java/org/lwjgl/opengl/NVVertexBufferUnifiedMemory.java
+++ b/src/main/java/org/lwjglx/opengl/NVVertexBufferUnifiedMemory.java
@@ -1,4 +1,4 @@
-package org.lwjgl.opengl;
+package org.lwjglx.opengl;
 
 public class NVVertexBufferUnifiedMemory {
 
@@ -26,50 +26,50 @@ public class NVVertexBufferUnifiedMemory {
     public static final int GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV = (int) 36638;
 
     public static void glBufferAddressRangeNV(int pname, int index, long address, long length) {
-        org.lwjgl3.opengl.NVVertexBufferUnifiedMemory.glBufferAddressRangeNV(pname, index, address, length);
+        org.lwjgl.opengl.NVVertexBufferUnifiedMemory.glBufferAddressRangeNV(pname, index, address, length);
     }
 
     public static void glColorFormatNV(int size, int type, int stride) {
-        org.lwjgl3.opengl.NVVertexBufferUnifiedMemory.glColorFormatNV(size, type, stride);
+        org.lwjgl.opengl.NVVertexBufferUnifiedMemory.glColorFormatNV(size, type, stride);
     }
 
     public static void glEdgeFlagFormatNV(int stride) {
-        org.lwjgl3.opengl.NVVertexBufferUnifiedMemory.glEdgeFlagFormatNV(stride);
+        org.lwjgl.opengl.NVVertexBufferUnifiedMemory.glEdgeFlagFormatNV(stride);
     }
 
     public static void glFogCoordFormatNV(int type, int stride) {
-        org.lwjgl3.opengl.NVVertexBufferUnifiedMemory.glFogCoordFormatNV(type, stride);
+        org.lwjgl.opengl.NVVertexBufferUnifiedMemory.glFogCoordFormatNV(type, stride);
     }
 
     public static void glGetIntegeruNV(int value, int index, java.nio.LongBuffer result) {
-        org.lwjgl3.opengl.NVVertexBufferUnifiedMemory.glGetIntegerui64i_vNV(value, index, result);
+        org.lwjgl.opengl.NVVertexBufferUnifiedMemory.glGetIntegerui64i_vNV(value, index, result);
     }
 
     public static void glIndexFormatNV(int type, int stride) {
-        org.lwjgl3.opengl.NVVertexBufferUnifiedMemory.glIndexFormatNV(type, stride);
+        org.lwjgl.opengl.NVVertexBufferUnifiedMemory.glIndexFormatNV(type, stride);
     }
 
     public static void glNormalFormatNV(int type, int stride) {
-        org.lwjgl3.opengl.NVVertexBufferUnifiedMemory.glNormalFormatNV(type, stride);
+        org.lwjgl.opengl.NVVertexBufferUnifiedMemory.glNormalFormatNV(type, stride);
     }
 
     public static void glSecondaryColorFormatNV(int size, int type, int stride) {
-        org.lwjgl3.opengl.NVVertexBufferUnifiedMemory.glSecondaryColorFormatNV(size, type, stride);
+        org.lwjgl.opengl.NVVertexBufferUnifiedMemory.glSecondaryColorFormatNV(size, type, stride);
     }
 
     public static void glTexCoordFormatNV(int size, int type, int stride) {
-        org.lwjgl3.opengl.NVVertexBufferUnifiedMemory.glTexCoordFormatNV(size, type, stride);
+        org.lwjgl.opengl.NVVertexBufferUnifiedMemory.glTexCoordFormatNV(size, type, stride);
     }
 
     public static void glVertexAttribFormatNV(int index, int size, int type, boolean normalized, int stride) {
-        org.lwjgl3.opengl.NVVertexBufferUnifiedMemory.glVertexAttribFormatNV(index, size, type, normalized, stride);
+        org.lwjgl.opengl.NVVertexBufferUnifiedMemory.glVertexAttribFormatNV(index, size, type, normalized, stride);
     }
 
     public static void glVertexAttribIFormatNV(int index, int size, int type, int stride) {
-        org.lwjgl3.opengl.NVVertexBufferUnifiedMemory.glVertexAttribIFormatNV(index, size, type, stride);
+        org.lwjgl.opengl.NVVertexBufferUnifiedMemory.glVertexAttribIFormatNV(index, size, type, stride);
     }
 
     public static void glVertexFormatNV(int size, int type, int stride) {
-        org.lwjgl3.opengl.NVVertexBufferUnifiedMemory.glVertexFormatNV(size, type, stride);
+        org.lwjgl.opengl.NVVertexBufferUnifiedMemory.glVertexFormatNV(size, type, stride);
     }
 }
diff --git a/src/main/java/org/lwjgl/opengl/OpenGLException.java b/src/main/java/org/lwjglx/opengl/OpenGLException.java
similarity index 99%
rename from src/main/java/org/lwjgl/opengl/OpenGLException.java
rename to src/main/java/org/lwjglx/opengl/OpenGLException.java
index 64f86b4e1..f93446dca 100644
--- a/src/main/java/org/lwjgl/opengl/OpenGLException.java
+++ b/src/main/java/org/lwjglx/opengl/OpenGLException.java
@@ -13,7 +13,7 @@
  * 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.opengl;
+package org.lwjglx.opengl;
 
 /**
  * <p/>
diff --git a/src/main/java/org/lwjgl/opengl/Pbuffer.java b/src/main/java/org/lwjglx/opengl/Pbuffer.java
similarity index 99%
rename from src/main/java/org/lwjgl/opengl/Pbuffer.java
rename to src/main/java/org/lwjglx/opengl/Pbuffer.java
index f816916ba..c26468e4e 100644
--- a/src/main/java/org/lwjgl/opengl/Pbuffer.java
+++ b/src/main/java/org/lwjglx/opengl/Pbuffer.java
@@ -13,13 +13,13 @@
  * 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.opengl;
+package org.lwjglx.opengl;
 
 import java.nio.IntBuffer;
 
-import org.lwjgl.BufferUtils;
-import org.lwjgl.LWJGLException;
-import org.lwjgl.Sys;
+import org.lwjglx.BufferUtils;
+import org.lwjglx.LWJGLException;
+import org.lwjglx.Sys;
 
 /**
  * <p/>
diff --git a/src/main/java/org/lwjgl/opengl/PeerInfo.java b/src/main/java/org/lwjglx/opengl/PeerInfo.java
similarity index 97%
rename from src/main/java/org/lwjgl/opengl/PeerInfo.java
rename to src/main/java/org/lwjglx/opengl/PeerInfo.java
index 4007ab4ca..cbdb8c3ae 100644
--- a/src/main/java/org/lwjgl/opengl/PeerInfo.java
+++ b/src/main/java/org/lwjglx/opengl/PeerInfo.java
@@ -13,12 +13,12 @@
  * 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.opengl;
+package org.lwjglx.opengl;
 
 import java.nio.ByteBuffer;
 
-import org.lwjgl.LWJGLException;
-import org.lwjgl.LWJGLUtil;
+import org.lwjglx.LWJGLException;
+import org.lwjglx.LWJGLUtil;
 
 /**
  *
diff --git a/src/main/java/org/lwjgl/opengl/PixelFormat.java b/src/main/java/org/lwjglx/opengl/PixelFormat.java
similarity index 99%
rename from src/main/java/org/lwjgl/opengl/PixelFormat.java
rename to src/main/java/org/lwjglx/opengl/PixelFormat.java
index 0af132acc..e638ffb3e 100644
--- a/src/main/java/org/lwjgl/opengl/PixelFormat.java
+++ b/src/main/java/org/lwjglx/opengl/PixelFormat.java
@@ -13,7 +13,7 @@
  * 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.opengl;
+package org.lwjglx.opengl;
 
 /**
  * This class describes pixel format properties for an OpenGL context. Instances of this class is used as arguments to
diff --git a/src/main/java/org/lwjgl/opengl/PixelFormatLWJGL.java b/src/main/java/org/lwjglx/opengl/PixelFormatLWJGL.java
similarity index 98%
rename from src/main/java/org/lwjgl/opengl/PixelFormatLWJGL.java
rename to src/main/java/org/lwjglx/opengl/PixelFormatLWJGL.java
index 9747eb3a4..afb1e90f4 100644
--- a/src/main/java/org/lwjgl/opengl/PixelFormatLWJGL.java
+++ b/src/main/java/org/lwjglx/opengl/PixelFormatLWJGL.java
@@ -13,7 +13,7 @@
  * 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.opengl;
+package org.lwjglx.opengl;
 
 /**
  * [INTERNAL USE ONLY]
diff --git a/src/main/java/org/lwjgl/opengl/RenderTexture.java b/src/main/java/org/lwjglx/opengl/RenderTexture.java
similarity index 99%
rename from src/main/java/org/lwjgl/opengl/RenderTexture.java
rename to src/main/java/org/lwjglx/opengl/RenderTexture.java
index 70f1b5ac1..363e311d7 100644
--- a/src/main/java/org/lwjgl/opengl/RenderTexture.java
+++ b/src/main/java/org/lwjglx/opengl/RenderTexture.java
@@ -13,13 +13,13 @@
  * 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.opengl;
+package org.lwjglx.opengl;
 
-import static org.lwjgl3.opengl.GL11.*;
+import static org.lwjgl.opengl.GL11.*;
 
 import java.nio.IntBuffer;
 
-import org.lwjgl.BufferUtils;
+import org.lwjglx.BufferUtils;
 
 /** This class represents the state necessary for render-to-texture. */
 public final class RenderTexture {
diff --git a/src/main/java/org/lwjgl/opengl/SharedDrawable.java b/src/main/java/org/lwjglx/opengl/SharedDrawable.java
similarity index 93%
rename from src/main/java/org/lwjgl/opengl/SharedDrawable.java
rename to src/main/java/org/lwjglx/opengl/SharedDrawable.java
index 159146327..0a4c61296 100644
--- a/src/main/java/org/lwjgl/opengl/SharedDrawable.java
+++ b/src/main/java/org/lwjglx/opengl/SharedDrawable.java
@@ -13,9 +13,9 @@
  * 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.opengl;
+package org.lwjglx.opengl;
 
-import org.lwjgl.LWJGLException;
+import org.lwjglx.LWJGLException;
 
 /**
  * @author Spasi
@@ -23,7 +23,7 @@
 
 /**
  * A Drawable implementation that shares its context with another Drawable. This is useful for background loading of
- * resources. See org.lwjgl3.test.opengl.multithread.BackgroundLoad for an example.
+ * resources. See org.lwjgl.test.opengl.multithread.BackgroundLoad for an example.
  *
  * @author Spasi
  */
diff --git a/src/main/java/org/lwjgl/opengl/Sync.java b/src/main/java/org/lwjglx/opengl/Sync.java
similarity index 99%
rename from src/main/java/org/lwjgl/opengl/Sync.java
rename to src/main/java/org/lwjglx/opengl/Sync.java
index ce0f89b34..ca08b5304 100644
--- a/src/main/java/org/lwjgl/opengl/Sync.java
+++ b/src/main/java/org/lwjglx/opengl/Sync.java
@@ -13,9 +13,9 @@
  * 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.opengl;
+package org.lwjglx.opengl;
 
-import org.lwjgl.Sys;
+import org.lwjglx.Sys;
 
 /**
  * A highly accurate sync method that continually adapts to the system it runs on to provide reliable results.
diff --git a/src/main/java/org/lwjgl/opengl/Util.java b/src/main/java/org/lwjglx/opengl/Util.java
similarity index 94%
rename from src/main/java/org/lwjgl/opengl/Util.java
rename to src/main/java/org/lwjglx/opengl/Util.java
index 2baeffdeb..c20695b72 100644
--- a/src/main/java/org/lwjgl/opengl/Util.java
+++ b/src/main/java/org/lwjglx/opengl/Util.java
@@ -13,11 +13,11 @@
  * 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.opengl;
+package org.lwjglx.opengl;
 
-import static org.lwjgl3.opengl.ARBImaging.*;
-import static org.lwjgl3.opengl.GL11.*;
-import static org.lwjgl3.opengl.GL30.*;
+import static org.lwjgl.opengl.ARBImaging.*;
+import static org.lwjgl.opengl.GL11.*;
+import static org.lwjgl.opengl.GL30.*;
 
 /**
  * Simple utility class.
diff --git a/src/main/java/org/lwjgl/util/Color.java b/src/main/java/org/lwjglx/util/Color.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/Color.java
rename to src/main/java/org/lwjglx/util/Color.java
index c9663468d..91641d4d3 100644
--- a/src/main/java/org/lwjgl/util/Color.java
+++ b/src/main/java/org/lwjglx/util/Color.java
@@ -13,7 +13,7 @@
  * 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.util;
+package org.lwjglx.util;
 
 import java.io.Serializable;
 import java.nio.ByteBuffer;
diff --git a/src/main/java/org/lwjgl/util/Dimension.java b/src/main/java/org/lwjglx/util/Dimension.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/Dimension.java
rename to src/main/java/org/lwjglx/util/Dimension.java
index d86eaa67e..54d879aee 100644
--- a/src/main/java/org/lwjgl/util/Dimension.java
+++ b/src/main/java/org/lwjglx/util/Dimension.java
@@ -13,7 +13,7 @@
  * 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.util;
+package org.lwjglx.util;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/lwjgl/util/Display.java b/src/main/java/org/lwjglx/util/Display.java
similarity index 96%
rename from src/main/java/org/lwjgl/util/Display.java
rename to src/main/java/org/lwjglx/util/Display.java
index 13514cccb..41e587684 100644
--- a/src/main/java/org/lwjgl/util/Display.java
+++ b/src/main/java/org/lwjglx/util/Display.java
@@ -13,15 +13,15 @@
  * 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.util;
+package org.lwjglx.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 
-import org.lwjgl.LWJGLException;
-import org.lwjgl.LWJGLUtil;
-import org.lwjgl.opengl.DisplayMode;
+import org.lwjglx.LWJGLException;
+import org.lwjglx.LWJGLUtil;
+import org.lwjglx.opengl.DisplayMode;
 
 /**
  * Display initialization utility, that can be used to find display modes and pick one for you based on your criteria.
@@ -50,7 +50,7 @@ public final class Display {
     public static DisplayMode[] getAvailableDisplayModes(int minWidth, int minHeight, int maxWidth, int maxHeight,
             int minBPP, int maxBPP, int minFreq, int maxFreq) throws LWJGLException {
         // First get the available display modes
-        DisplayMode[] modes = org.lwjgl.opengl.Display.getAvailableDisplayModes();
+        DisplayMode[] modes = org.lwjglx.opengl.Display.getAvailableDisplayModes();
 
         if (LWJGLUtil.DEBUG || DEBUG) {
             System.out.println("Available screen modes:");
@@ -102,7 +102,7 @@ public static DisplayMode[] getAvailableDisplayModes(int minWidth, int minHeight
      * @return the chosen display mode
      * @throws NoSuchFieldException if one of the params is not a field in DisplayMode
      * @throws Exception            if no display mode could be set
-     * @see org.lwjgl3.opengl.DisplayMode
+     * @see org.lwjgl.opengl.DisplayMode
      */
     public static DisplayMode setDisplayMode(DisplayMode[] dm, final String[] param) throws Exception {
 
@@ -200,7 +200,7 @@ public int compare(DisplayMode dm1, DisplayMode dm2) {
         for (DisplayMode aDm : dm) {
             try {
                 if (LWJGLUtil.DEBUG || DEBUG) System.out.println("Attempting to set displaymode: " + aDm);
-                org.lwjgl.opengl.Display.setDisplayMode(aDm);
+                org.lwjglx.opengl.Display.setDisplayMode(aDm);
                 return aDm;
             } catch (Exception e) {
                 if (LWJGLUtil.DEBUG || DEBUG) {
diff --git a/src/main/java/org/lwjgl/util/Point.java b/src/main/java/org/lwjglx/util/Point.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/Point.java
rename to src/main/java/org/lwjglx/util/Point.java
index d271ce298..76582b996 100644
--- a/src/main/java/org/lwjgl/util/Point.java
+++ b/src/main/java/org/lwjglx/util/Point.java
@@ -13,7 +13,7 @@
  * 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.util;
+package org.lwjglx.util;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/lwjgl/util/ReadableColor.java b/src/main/java/org/lwjglx/util/ReadableColor.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/ReadableColor.java
rename to src/main/java/org/lwjglx/util/ReadableColor.java
index 2a4634893..a5a20a55d 100644
--- a/src/main/java/org/lwjgl/util/ReadableColor.java
+++ b/src/main/java/org/lwjglx/util/ReadableColor.java
@@ -13,7 +13,7 @@
  * 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.util;
+package org.lwjglx.util;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/main/java/org/lwjgl/util/ReadableDimension.java b/src/main/java/org/lwjglx/util/ReadableDimension.java
similarity index 98%
rename from src/main/java/org/lwjgl/util/ReadableDimension.java
rename to src/main/java/org/lwjglx/util/ReadableDimension.java
index 36db70a3e..eaa5165ad 100644
--- a/src/main/java/org/lwjgl/util/ReadableDimension.java
+++ b/src/main/java/org/lwjglx/util/ReadableDimension.java
@@ -13,7 +13,7 @@
  * 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.util;
+package org.lwjglx.util;
 
 /**
  * Readonly interface for Dimensions
diff --git a/src/main/java/org/lwjgl/util/ReadablePoint.java b/src/main/java/org/lwjglx/util/ReadablePoint.java
similarity index 98%
rename from src/main/java/org/lwjgl/util/ReadablePoint.java
rename to src/main/java/org/lwjglx/util/ReadablePoint.java
index d171863e2..aedb59ef8 100644
--- a/src/main/java/org/lwjgl/util/ReadablePoint.java
+++ b/src/main/java/org/lwjglx/util/ReadablePoint.java
@@ -13,7 +13,7 @@
  * 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.util;
+package org.lwjglx.util;
 
 /**
  * Readonly interface for Points
diff --git a/src/main/java/org/lwjgl/util/ReadableRectangle.java b/src/main/java/org/lwjglx/util/ReadableRectangle.java
similarity index 98%
rename from src/main/java/org/lwjgl/util/ReadableRectangle.java
rename to src/main/java/org/lwjglx/util/ReadableRectangle.java
index df7e9721a..7337b7fed 100644
--- a/src/main/java/org/lwjgl/util/ReadableRectangle.java
+++ b/src/main/java/org/lwjglx/util/ReadableRectangle.java
@@ -13,7 +13,7 @@
  * 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.util;
+package org.lwjglx.util;
 
 /**
  * Readonly interface for Rectangles
diff --git a/src/main/java/org/lwjgl/util/Rectangle.java b/src/main/java/org/lwjglx/util/Rectangle.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/Rectangle.java
rename to src/main/java/org/lwjglx/util/Rectangle.java
index fd1d24f30..c5500c5f8 100644
--- a/src/main/java/org/lwjgl/util/Rectangle.java
+++ b/src/main/java/org/lwjglx/util/Rectangle.java
@@ -13,7 +13,7 @@
  * 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.util;
+package org.lwjglx.util;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/lwjgl/util/Renderable.java b/src/main/java/org/lwjglx/util/Renderable.java
similarity index 98%
rename from src/main/java/org/lwjgl/util/Renderable.java
rename to src/main/java/org/lwjglx/util/Renderable.java
index d237fc571..20cc8f8fe 100644
--- a/src/main/java/org/lwjgl/util/Renderable.java
+++ b/src/main/java/org/lwjglx/util/Renderable.java
@@ -13,7 +13,7 @@
  * 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.util;
+package org.lwjglx.util;
 
 /**
  *
diff --git a/src/main/java/org/lwjgl/util/Timer.java b/src/main/java/org/lwjglx/util/Timer.java
similarity index 98%
rename from src/main/java/org/lwjgl/util/Timer.java
rename to src/main/java/org/lwjglx/util/Timer.java
index 203654de5..62f04beec 100644
--- a/src/main/java/org/lwjgl/util/Timer.java
+++ b/src/main/java/org/lwjglx/util/Timer.java
@@ -13,9 +13,9 @@
  * 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.util;
+package org.lwjglx.util;
 
-import org.lwjgl.Sys;
+import org.lwjglx.Sys;
 
 /**
  *
diff --git a/src/main/java/org/lwjgl/util/WaveData.java b/src/main/java/org/lwjglx/util/WaveData.java
similarity index 95%
rename from src/main/java/org/lwjgl/util/WaveData.java
rename to src/main/java/org/lwjglx/util/WaveData.java
index 51483b88e..e91dadd2f 100644
--- a/src/main/java/org/lwjgl/util/WaveData.java
+++ b/src/main/java/org/lwjglx/util/WaveData.java
@@ -13,7 +13,7 @@
  * 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.util;
+package org.lwjglx.util;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
@@ -28,7 +28,8 @@
 import javax.sound.sampled.AudioInputStream;
 import javax.sound.sampled.AudioSystem;
 
-import org.lwjgl3.openal.AL11;
+import org.lwjgl.openal.AL11;
+import org.lwjglx.LWJGLUtil;
 
 // import com.sun.media.sound.WaveFileReader;
 
@@ -85,7 +86,7 @@ public static WaveData create(URL path) {
             // WaveFileReader wfr = new WaveFileReader();
             // return create(wfr.getAudioInputStream(new BufferedInputStream(path.openStream())));
         } catch (Exception e) {
-            org.lwjgl.LWJGLUtil.log("Unable to create from: " + path + ", " + e.getMessage());
+            LWJGLUtil.log("Unable to create from: " + path + ", " + e.getMessage());
             return null;
         }
     }
@@ -110,7 +111,7 @@ public static WaveData create(InputStream is) {
         try {
             return create(AudioSystem.getAudioInputStream(is));
         } catch (Exception e) {
-            org.lwjgl.LWJGLUtil.log("Unable to create from inputstream, " + e.getMessage());
+            LWJGLUtil.log("Unable to create from inputstream, " + e.getMessage());
             return null;
         }
     }
@@ -125,7 +126,7 @@ public static WaveData create(byte[] buffer) {
         try {
             return create(AudioSystem.getAudioInputStream(new BufferedInputStream(new ByteArrayInputStream(buffer))));
         } catch (Exception e) {
-            org.lwjgl.LWJGLUtil.log("Unable to create from byte array, " + e.getMessage());
+            LWJGLUtil.log("Unable to create from byte array, " + e.getMessage());
             return null;
         }
     }
@@ -149,7 +150,7 @@ public static WaveData create(ByteBuffer buffer) {
             }
             return create(bytes);
         } catch (Exception e) {
-            org.lwjgl.LWJGLUtil.log("Unable to create from ByteBuffer, " + e.getMessage());
+            LWJGLUtil.log("Unable to create from ByteBuffer, " + e.getMessage());
             return null;
         }
     }
diff --git a/src/main/java/org/lwjgl/util/WritableColor.java b/src/main/java/org/lwjglx/util/WritableColor.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/WritableColor.java
rename to src/main/java/org/lwjglx/util/WritableColor.java
index f38ac6ced..24f2fc13b 100644
--- a/src/main/java/org/lwjgl/util/WritableColor.java
+++ b/src/main/java/org/lwjglx/util/WritableColor.java
@@ -13,7 +13,7 @@
  * 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.util;
+package org.lwjglx.util;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/main/java/org/lwjgl/util/WritableDimension.java b/src/main/java/org/lwjglx/util/WritableDimension.java
similarity index 98%
rename from src/main/java/org/lwjgl/util/WritableDimension.java
rename to src/main/java/org/lwjglx/util/WritableDimension.java
index be69f091d..133ccfdf2 100644
--- a/src/main/java/org/lwjgl/util/WritableDimension.java
+++ b/src/main/java/org/lwjglx/util/WritableDimension.java
@@ -13,7 +13,7 @@
  * 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.util;
+package org.lwjglx.util;
 
 /**
  * Write interface for Dimensions
diff --git a/src/main/java/org/lwjgl/util/WritablePoint.java b/src/main/java/org/lwjglx/util/WritablePoint.java
similarity index 98%
rename from src/main/java/org/lwjgl/util/WritablePoint.java
rename to src/main/java/org/lwjglx/util/WritablePoint.java
index f5c170093..086d1b07c 100644
--- a/src/main/java/org/lwjgl/util/WritablePoint.java
+++ b/src/main/java/org/lwjglx/util/WritablePoint.java
@@ -13,7 +13,7 @@
  * 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.util;
+package org.lwjglx.util;
 
 /**
  * Write interface for Points
diff --git a/src/main/java/org/lwjgl/util/WritableRectangle.java b/src/main/java/org/lwjglx/util/WritableRectangle.java
similarity index 98%
rename from src/main/java/org/lwjgl/util/WritableRectangle.java
rename to src/main/java/org/lwjglx/util/WritableRectangle.java
index 91ee49e93..a2b225020 100644
--- a/src/main/java/org/lwjgl/util/WritableRectangle.java
+++ b/src/main/java/org/lwjglx/util/WritableRectangle.java
@@ -13,7 +13,7 @@
  * 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.util;
+package org.lwjglx.util;
 
 /**
  * Write interface for Rectangles
diff --git a/src/main/java/org/lwjgl/util/XPMFile.java b/src/main/java/org/lwjglx/util/XPMFile.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/XPMFile.java
rename to src/main/java/org/lwjglx/util/XPMFile.java
index 76a1d65cc..7a2af270c 100644
--- a/src/main/java/org/lwjgl/util/XPMFile.java
+++ b/src/main/java/org/lwjglx/util/XPMFile.java
@@ -13,7 +13,7 @@
  * 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.util;
+package org.lwjglx.util;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
diff --git a/src/main/java/org/lwjgl/util/glu/Cylinder.java b/src/main/java/org/lwjglx/util/glu/Cylinder.java
similarity index 98%
rename from src/main/java/org/lwjgl/util/glu/Cylinder.java
rename to src/main/java/org/lwjglx/util/glu/Cylinder.java
index 2dabc70d5..f5b6abb0a 100644
--- a/src/main/java/org/lwjgl/util/glu/Cylinder.java
+++ b/src/main/java/org/lwjglx/util/glu/Cylinder.java
@@ -13,10 +13,10 @@
  * 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.util.glu;
+package org.lwjglx.util.glu;
 
-import static org.lwjgl3.opengl.GL11.*;
-import static org.lwjgl.util.glu.GLU.*;
+import static org.lwjgl.opengl.GL11.*;
+import static org.lwjglx.util.glu.GLU.*;
 
 /**
  * Cylinder.java
diff --git a/src/main/java/org/lwjgl/util/glu/Disk.java b/src/main/java/org/lwjglx/util/glu/Disk.java
similarity index 98%
rename from src/main/java/org/lwjgl/util/glu/Disk.java
rename to src/main/java/org/lwjglx/util/glu/Disk.java
index e336965e0..3b106bcc2 100644
--- a/src/main/java/org/lwjgl/util/glu/Disk.java
+++ b/src/main/java/org/lwjglx/util/glu/Disk.java
@@ -13,10 +13,10 @@
  * 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.util.glu;
+package org.lwjglx.util.glu;
 
-import static org.lwjgl3.opengl.GL11.*;
-import static org.lwjgl.util.glu.GLU.*;
+import static org.lwjgl.opengl.GL11.*;
+import static org.lwjglx.util.glu.GLU.*;
 
 /**
  * Disk.java
diff --git a/src/main/java/org/lwjgl/util/glu/GLU.java b/src/main/java/org/lwjglx/util/glu/GLU.java
similarity index 98%
rename from src/main/java/org/lwjgl/util/glu/GLU.java
rename to src/main/java/org/lwjglx/util/glu/GLU.java
index 287c5aeec..17a778b70 100644
--- a/src/main/java/org/lwjgl/util/glu/GLU.java
+++ b/src/main/java/org/lwjglx/util/glu/GLU.java
@@ -13,16 +13,16 @@
  * 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.util.glu;
+package org.lwjglx.util.glu;
 
-import static org.lwjgl3.opengl.GL11.*;
+import static org.lwjgl.opengl.GL11.*;
 
 import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 
-import org.lwjgl.opengl.Util;
-import org.lwjgl.util.glu.tessellation.GLUtessellatorImpl;
+import org.lwjglx.opengl.Util;
+import org.lwjglx.util.glu.tessellation.GLUtessellatorImpl;
 
 /**
  * GLU.java
diff --git a/src/main/java/org/lwjgl/util/glu/GLUtessellator.java b/src/main/java/org/lwjglx/util/glu/GLUtessellator.java
similarity index 98%
rename from src/main/java/org/lwjgl/util/glu/GLUtessellator.java
rename to src/main/java/org/lwjglx/util/glu/GLUtessellator.java
index 2a5826cda..8be72ec7d 100644
--- a/src/main/java/org/lwjgl/util/glu/GLUtessellator.java
+++ b/src/main/java/org/lwjglx/util/glu/GLUtessellator.java
@@ -14,7 +14,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.lwjgl.util.glu;
+package org.lwjglx.util.glu;
 
 public interface GLUtessellator {
 
diff --git a/src/main/java/org/lwjgl/util/glu/GLUtessellatorCallback.java b/src/main/java/org/lwjglx/util/glu/GLUtessellatorCallback.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/glu/GLUtessellatorCallback.java
rename to src/main/java/org/lwjglx/util/glu/GLUtessellatorCallback.java
index fff371af7..b911e7e94 100644
--- a/src/main/java/org/lwjgl/util/glu/GLUtessellatorCallback.java
+++ b/src/main/java/org/lwjglx/util/glu/GLUtessellatorCallback.java
@@ -42,7 +42,7 @@
  * OpenGL(R) version 1.2.1 Specification. Author: Eric Veach, July 1994 Java Port: Pepijn Van Eeckhoudt, July 2003 Java
  * Port: Nathan Parker Burg, August 2003
  */
-package org.lwjgl.util.glu;
+package org.lwjglx.util.glu;
 
 /**
  * <b>GLUtessellatorCallback</b> interface provides methods that the user will override to define the callbacks for a
diff --git a/src/main/java/org/lwjgl/util/glu/GLUtessellatorCallbackAdapter.java b/src/main/java/org/lwjglx/util/glu/GLUtessellatorCallbackAdapter.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/glu/GLUtessellatorCallbackAdapter.java
rename to src/main/java/org/lwjglx/util/glu/GLUtessellatorCallbackAdapter.java
index 14d822788..ddc2ca8ec 100644
--- a/src/main/java/org/lwjgl/util/glu/GLUtessellatorCallbackAdapter.java
+++ b/src/main/java/org/lwjglx/util/glu/GLUtessellatorCallbackAdapter.java
@@ -42,7 +42,7 @@
  * OpenGL(R) version 1.2.1 Specification. Author: Eric Veach, July 1994 Java Port: Pepijn Van Eeckhoudt, July 2003 Java
  * Port: Nathan Parker Burg, August 2003
  */
-package org.lwjgl.util.glu;
+package org.lwjglx.util.glu;
 
 /**
  * The <b>GLUtessellatorCallbackAdapter</b> provides a default implementation of {@link GLUtessellatorCallback
diff --git a/src/main/java/org/lwjgl/util/glu/MipMap.java b/src/main/java/org/lwjglx/util/glu/MipMap.java
similarity index 97%
rename from src/main/java/org/lwjgl/util/glu/MipMap.java
rename to src/main/java/org/lwjglx/util/glu/MipMap.java
index 0bf612982..128387a3f 100644
--- a/src/main/java/org/lwjgl/util/glu/MipMap.java
+++ b/src/main/java/org/lwjglx/util/glu/MipMap.java
@@ -13,15 +13,15 @@
  * 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.util.glu;
+package org.lwjglx.util.glu;
 
-import static org.lwjgl3.opengl.GL11.*;
-import static org.lwjgl3.stb.STBImageResize.*;
-import static org.lwjgl.util.glu.GLU.*;
+import static org.lwjgl.opengl.GL11.*;
+import static org.lwjgl.stb.STBImageResize.*;
+import static org.lwjglx.util.glu.GLU.*;
 
 import java.nio.ByteBuffer;
 
-import org.lwjgl.BufferUtils;
+import org.lwjglx.BufferUtils;
 
 /**
  * MipMap.java
diff --git a/src/main/java/org/lwjgl/util/glu/PartialDisk.java b/src/main/java/org/lwjglx/util/glu/PartialDisk.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/glu/PartialDisk.java
rename to src/main/java/org/lwjglx/util/glu/PartialDisk.java
index 9f5ca3a34..272b1cf8c 100644
--- a/src/main/java/org/lwjgl/util/glu/PartialDisk.java
+++ b/src/main/java/org/lwjglx/util/glu/PartialDisk.java
@@ -13,10 +13,10 @@
  * 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.util.glu;
+package org.lwjglx.util.glu;
 
-import static org.lwjgl3.opengl.GL11.*;
-import static org.lwjgl.util.glu.GLU.*;
+import static org.lwjgl.opengl.GL11.*;
+import static org.lwjglx.util.glu.GLU.*;
 
 /**
  * PartialDisk.java
diff --git a/src/main/java/org/lwjgl/util/glu/PixelStoreState.java b/src/main/java/org/lwjglx/util/glu/PixelStoreState.java
similarity index 97%
rename from src/main/java/org/lwjgl/util/glu/PixelStoreState.java
rename to src/main/java/org/lwjglx/util/glu/PixelStoreState.java
index 0fdd7175e..c5818188f 100644
--- a/src/main/java/org/lwjgl/util/glu/PixelStoreState.java
+++ b/src/main/java/org/lwjglx/util/glu/PixelStoreState.java
@@ -13,9 +13,9 @@
  * 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.util.glu;
+package org.lwjglx.util.glu;
 
-import static org.lwjgl3.opengl.GL11.*;
+import static org.lwjgl.opengl.GL11.*;
 
 /**
  * PixelStoreState.java
diff --git a/src/main/java/org/lwjgl/util/glu/Project.java b/src/main/java/org/lwjglx/util/glu/Project.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/glu/Project.java
rename to src/main/java/org/lwjglx/util/glu/Project.java
index 85c33a6fa..62f722dd8 100644
--- a/src/main/java/org/lwjgl/util/glu/Project.java
+++ b/src/main/java/org/lwjglx/util/glu/Project.java
@@ -13,14 +13,14 @@
  * 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.util.glu;
+package org.lwjglx.util.glu;
 
-import static org.lwjgl3.opengl.GL11.*;
+import static org.lwjgl.opengl.GL11.*;
 
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 
-import org.lwjgl.BufferUtils;
+import org.lwjglx.BufferUtils;
 
 /**
  * Project.java
diff --git a/src/main/java/org/lwjgl/util/glu/Quadric.java b/src/main/java/org/lwjglx/util/glu/Quadric.java
similarity index 98%
rename from src/main/java/org/lwjgl/util/glu/Quadric.java
rename to src/main/java/org/lwjglx/util/glu/Quadric.java
index f05457d69..fd82c3630 100644
--- a/src/main/java/org/lwjgl/util/glu/Quadric.java
+++ b/src/main/java/org/lwjglx/util/glu/Quadric.java
@@ -13,10 +13,10 @@
  * 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.util.glu;
+package org.lwjglx.util.glu;
 
-import static org.lwjgl3.opengl.GL11.*;
-import static org.lwjgl.util.glu.GLU.*;
+import static org.lwjgl.opengl.GL11.*;
+import static org.lwjglx.util.glu.GLU.*;
 
 /**
  * Quadric.java
diff --git a/src/main/java/org/lwjgl/util/glu/Registry.java b/src/main/java/org/lwjglx/util/glu/Registry.java
similarity index 97%
rename from src/main/java/org/lwjgl/util/glu/Registry.java
rename to src/main/java/org/lwjglx/util/glu/Registry.java
index 5bc37628d..fa7f4394e 100644
--- a/src/main/java/org/lwjgl/util/glu/Registry.java
+++ b/src/main/java/org/lwjglx/util/glu/Registry.java
@@ -13,9 +13,9 @@
  * 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.util.glu;
+package org.lwjglx.util.glu;
 
-import static org.lwjgl.util.glu.GLU.*;
+import static org.lwjglx.util.glu.GLU.*;
 
 /**
  * Registry.java
diff --git a/src/main/java/org/lwjgl/util/glu/Sphere.java b/src/main/java/org/lwjglx/util/glu/Sphere.java
similarity index 98%
rename from src/main/java/org/lwjgl/util/glu/Sphere.java
rename to src/main/java/org/lwjglx/util/glu/Sphere.java
index 67e0435ea..31ab5afcc 100644
--- a/src/main/java/org/lwjgl/util/glu/Sphere.java
+++ b/src/main/java/org/lwjglx/util/glu/Sphere.java
@@ -13,10 +13,10 @@
  * 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.util.glu;
+package org.lwjglx.util.glu;
 
-import static org.lwjgl3.opengl.GL11.*;
-import static org.lwjgl.util.glu.GLU.*;
+import static org.lwjgl.opengl.GL11.*;
+import static org.lwjglx.util.glu.GLU.*;
 
 /**
  * Sphere.java
diff --git a/src/main/java/org/lwjgl/util/glu/Util.java b/src/main/java/org/lwjglx/util/glu/Util.java
similarity index 96%
rename from src/main/java/org/lwjgl/util/glu/Util.java
rename to src/main/java/org/lwjglx/util/glu/Util.java
index 04c1048ca..fbd78368d 100644
--- a/src/main/java/org/lwjgl/util/glu/Util.java
+++ b/src/main/java/org/lwjglx/util/glu/Util.java
@@ -13,14 +13,14 @@
  * 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.util.glu;
+package org.lwjglx.util.glu;
 
-import static org.lwjgl3.opengl.GL11.*;
-import static org.lwjgl3.opengl.GL12.*;
+import static org.lwjgl.opengl.GL11.*;
+import static org.lwjgl.opengl.GL12.*;
 
 import java.nio.IntBuffer;
 
-import org.lwjgl.BufferUtils;
+import org.lwjglx.BufferUtils;
 
 /**
  * Util.java
@@ -186,7 +186,7 @@ protected static int bytesPerPixel(int format, int type) {
      */
     protected static int glGetIntegerv(int what) {
         scratch.rewind();
-        org.lwjgl3.opengl.GL11.glGetIntegerv(what, scratch);
+        org.lwjgl.opengl.GL11.glGetIntegerv(what, scratch);
         return scratch.get();
     }
 }
diff --git a/src/main/java/org/lwjgl/util/glu/tessellation/ActiveRegion.java b/src/main/java/org/lwjglx/util/glu/tessellation/ActiveRegion.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/glu/tessellation/ActiveRegion.java
rename to src/main/java/org/lwjglx/util/glu/tessellation/ActiveRegion.java
index 56d8091ed..691d760ea 100644
--- a/src/main/java/org/lwjgl/util/glu/tessellation/ActiveRegion.java
+++ b/src/main/java/org/lwjglx/util/glu/tessellation/ActiveRegion.java
@@ -42,7 +42,7 @@
  * OpenGL(R) version 1.2.1 Specification. Author: Eric Veach, July 1994 Java Port: Pepijn Van Eeckhoudt, July 2003 Java
  * Port: Nathan Parker Burg, August 2003
  */
-package org.lwjgl.util.glu.tessellation;
+package org.lwjglx.util.glu.tessellation;
 
 class ActiveRegion {
 
diff --git a/src/main/java/org/lwjgl/util/glu/tessellation/CachedVertex.java b/src/main/java/org/lwjglx/util/glu/tessellation/CachedVertex.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/glu/tessellation/CachedVertex.java
rename to src/main/java/org/lwjglx/util/glu/tessellation/CachedVertex.java
index 4333a8a00..ded8ad9b5 100644
--- a/src/main/java/org/lwjgl/util/glu/tessellation/CachedVertex.java
+++ b/src/main/java/org/lwjglx/util/glu/tessellation/CachedVertex.java
@@ -42,7 +42,7 @@
  * OpenGL(R) version 1.2.1 Specification. Author: Eric Veach, July 1994 Java Port: Pepijn Van Eeckhoudt, July 2003 Java
  * Port: Nathan Parker Burg, August 2003
  */
-package org.lwjgl.util.glu.tessellation;
+package org.lwjglx.util.glu.tessellation;
 
 class CachedVertex {
 
diff --git a/src/main/java/org/lwjgl/util/glu/tessellation/Dict.java b/src/main/java/org/lwjglx/util/glu/tessellation/Dict.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/glu/tessellation/Dict.java
rename to src/main/java/org/lwjglx/util/glu/tessellation/Dict.java
index f51b2fce4..f975ca179 100644
--- a/src/main/java/org/lwjgl/util/glu/tessellation/Dict.java
+++ b/src/main/java/org/lwjglx/util/glu/tessellation/Dict.java
@@ -42,7 +42,7 @@
  * OpenGL(R) version 1.2.1 Specification. Author: Eric Veach, July 1994 Java Port: Pepijn Van Eeckhoudt, July 2003 Java
  * Port: Nathan Parker Burg, August 2003
  */
-package org.lwjgl.util.glu.tessellation;
+package org.lwjglx.util.glu.tessellation;
 
 class Dict {
 
diff --git a/src/main/java/org/lwjgl/util/glu/tessellation/DictNode.java b/src/main/java/org/lwjglx/util/glu/tessellation/DictNode.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/glu/tessellation/DictNode.java
rename to src/main/java/org/lwjglx/util/glu/tessellation/DictNode.java
index d1c3a1fdb..045d5d231 100644
--- a/src/main/java/org/lwjgl/util/glu/tessellation/DictNode.java
+++ b/src/main/java/org/lwjglx/util/glu/tessellation/DictNode.java
@@ -42,7 +42,7 @@
  * OpenGL(R) version 1.2.1 Specification. Author: Eric Veach, July 1994 Java Port: Pepijn Van Eeckhoudt, July 2003 Java
  * Port: Nathan Parker Burg, August 2003
  */
-package org.lwjgl.util.glu.tessellation;
+package org.lwjglx.util.glu.tessellation;
 
 class DictNode {
 
diff --git a/src/main/java/org/lwjgl/util/glu/tessellation/GLUface.java b/src/main/java/org/lwjglx/util/glu/tessellation/GLUface.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/glu/tessellation/GLUface.java
rename to src/main/java/org/lwjglx/util/glu/tessellation/GLUface.java
index a3bdbb198..25ccf09e6 100644
--- a/src/main/java/org/lwjgl/util/glu/tessellation/GLUface.java
+++ b/src/main/java/org/lwjglx/util/glu/tessellation/GLUface.java
@@ -42,7 +42,7 @@
  * OpenGL(R) version 1.2.1 Specification. Author: Eric Veach, July 1994 Java Port: Pepijn Van Eeckhoudt, July 2003 Java
  * Port: Nathan Parker Burg, August 2003
  */
-package org.lwjgl.util.glu.tessellation;
+package org.lwjglx.util.glu.tessellation;
 
 class GLUface {
 
diff --git a/src/main/java/org/lwjgl/util/glu/tessellation/GLUhalfEdge.java b/src/main/java/org/lwjglx/util/glu/tessellation/GLUhalfEdge.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/glu/tessellation/GLUhalfEdge.java
rename to src/main/java/org/lwjglx/util/glu/tessellation/GLUhalfEdge.java
index c5c0b1829..f111ee9bf 100644
--- a/src/main/java/org/lwjgl/util/glu/tessellation/GLUhalfEdge.java
+++ b/src/main/java/org/lwjglx/util/glu/tessellation/GLUhalfEdge.java
@@ -42,7 +42,7 @@
  * OpenGL(R) version 1.2.1 Specification. Author: Eric Veach, July 1994 Java Port: Pepijn Van Eeckhoudt, July 2003 Java
  * Port: Nathan Parker Burg, August 2003
  */
-package org.lwjgl.util.glu.tessellation;
+package org.lwjglx.util.glu.tessellation;
 
 class GLUhalfEdge {
 
diff --git a/src/main/java/org/lwjgl/util/glu/tessellation/GLUmesh.java b/src/main/java/org/lwjglx/util/glu/tessellation/GLUmesh.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/glu/tessellation/GLUmesh.java
rename to src/main/java/org/lwjglx/util/glu/tessellation/GLUmesh.java
index bbb6018cd..108513ebc 100644
--- a/src/main/java/org/lwjgl/util/glu/tessellation/GLUmesh.java
+++ b/src/main/java/org/lwjglx/util/glu/tessellation/GLUmesh.java
@@ -42,7 +42,7 @@
  * OpenGL(R) version 1.2.1 Specification. Author: Eric Veach, July 1994 Java Port: Pepijn Van Eeckhoudt, July 2003 Java
  * Port: Nathan Parker Burg, August 2003
  */
-package org.lwjgl.util.glu.tessellation;
+package org.lwjglx.util.glu.tessellation;
 
 class GLUmesh {
 
diff --git a/src/main/java/org/lwjgl/util/glu/tessellation/GLUtessellatorImpl.java b/src/main/java/org/lwjglx/util/glu/tessellation/GLUtessellatorImpl.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/glu/tessellation/GLUtessellatorImpl.java
rename to src/main/java/org/lwjglx/util/glu/tessellation/GLUtessellatorImpl.java
index c5b3c5c6f..902bee753 100644
--- a/src/main/java/org/lwjgl/util/glu/tessellation/GLUtessellatorImpl.java
+++ b/src/main/java/org/lwjglx/util/glu/tessellation/GLUtessellatorImpl.java
@@ -42,13 +42,13 @@
  * OpenGL(R) version 1.2.1 Specification. Author: Eric Veach, July 1994 Java Port: Pepijn Van Eeckhoudt, July 2003 Java
  * Port: Nathan Parker Burg, August 2003
  */
-package org.lwjgl.util.glu.tessellation;
+package org.lwjglx.util.glu.tessellation;
 
-import static org.lwjgl.util.glu.GLU.*;
+import static org.lwjglx.util.glu.GLU.*;
 
-import org.lwjgl.util.glu.GLUtessellator;
-import org.lwjgl.util.glu.GLUtessellatorCallback;
-import org.lwjgl.util.glu.GLUtessellatorCallbackAdapter;
+import org.lwjglx.util.glu.GLUtessellator;
+import org.lwjglx.util.glu.GLUtessellatorCallback;
+import org.lwjglx.util.glu.GLUtessellatorCallbackAdapter;
 
 public class GLUtessellatorImpl implements GLUtessellator {
 
diff --git a/src/main/java/org/lwjgl/util/glu/tessellation/GLUvertex.java b/src/main/java/org/lwjglx/util/glu/tessellation/GLUvertex.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/glu/tessellation/GLUvertex.java
rename to src/main/java/org/lwjglx/util/glu/tessellation/GLUvertex.java
index cc8fd1c4a..15df9d6e1 100644
--- a/src/main/java/org/lwjgl/util/glu/tessellation/GLUvertex.java
+++ b/src/main/java/org/lwjglx/util/glu/tessellation/GLUvertex.java
@@ -42,7 +42,7 @@
  * OpenGL(R) version 1.2.1 Specification. Author: Eric Veach, July 1994 Java Port: Pepijn Van Eeckhoudt, July 2003 Java
  * Port: Nathan Parker Burg, August 2003
  */
-package org.lwjgl.util.glu.tessellation;
+package org.lwjglx.util.glu.tessellation;
 
 class GLUvertex {
 
diff --git a/src/main/java/org/lwjgl/util/glu/tessellation/Geom.java b/src/main/java/org/lwjglx/util/glu/tessellation/Geom.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/glu/tessellation/Geom.java
rename to src/main/java/org/lwjglx/util/glu/tessellation/Geom.java
index e9aac580b..4ed7e0dfc 100644
--- a/src/main/java/org/lwjgl/util/glu/tessellation/Geom.java
+++ b/src/main/java/org/lwjglx/util/glu/tessellation/Geom.java
@@ -42,7 +42,7 @@
  * OpenGL(R) version 1.2.1 Specification. Author: Eric Veach, July 1994 Java Port: Pepijn Van Eeckhoudt, July 2003 Java
  * Port: Nathan Parker Burg, August 2003
  */
-package org.lwjgl.util.glu.tessellation;
+package org.lwjglx.util.glu.tessellation;
 
 class Geom {
 
diff --git a/src/main/java/org/lwjgl/util/glu/tessellation/Mesh.java b/src/main/java/org/lwjglx/util/glu/tessellation/Mesh.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/glu/tessellation/Mesh.java
rename to src/main/java/org/lwjglx/util/glu/tessellation/Mesh.java
index 21261b01c..8b2643aca 100644
--- a/src/main/java/org/lwjgl/util/glu/tessellation/Mesh.java
+++ b/src/main/java/org/lwjglx/util/glu/tessellation/Mesh.java
@@ -42,7 +42,7 @@
  * OpenGL(R) version 1.2.1 Specification. Author: Eric Veach, July 1994 Java Port: Pepijn Van Eeckhoudt, July 2003 Java
  * Port: Nathan Parker Burg, August 2003
  */
-package org.lwjgl.util.glu.tessellation;
+package org.lwjglx.util.glu.tessellation;
 
 class Mesh {
 
diff --git a/src/main/java/org/lwjgl/util/glu/tessellation/Normal.java b/src/main/java/org/lwjglx/util/glu/tessellation/Normal.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/glu/tessellation/Normal.java
rename to src/main/java/org/lwjglx/util/glu/tessellation/Normal.java
index 51d515f9e..083b7883c 100644
--- a/src/main/java/org/lwjgl/util/glu/tessellation/Normal.java
+++ b/src/main/java/org/lwjglx/util/glu/tessellation/Normal.java
@@ -42,9 +42,9 @@
  * OpenGL(R) version 1.2.1 Specification. Author: Eric Veach, July 1994 Java Port: Pepijn Van Eeckhoudt, July 2003 Java
  * Port: Nathan Parker Burg, August 2003
  */
-package org.lwjgl.util.glu.tessellation;
+package org.lwjglx.util.glu.tessellation;
 
-import org.lwjgl.util.glu.GLU;
+import org.lwjglx.util.glu.GLU;
 
 class Normal {
 
diff --git a/src/main/java/org/lwjgl/util/glu/tessellation/PriorityQ.java b/src/main/java/org/lwjglx/util/glu/tessellation/PriorityQ.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/glu/tessellation/PriorityQ.java
rename to src/main/java/org/lwjglx/util/glu/tessellation/PriorityQ.java
index 06cc877f3..68f534a1d 100644
--- a/src/main/java/org/lwjgl/util/glu/tessellation/PriorityQ.java
+++ b/src/main/java/org/lwjglx/util/glu/tessellation/PriorityQ.java
@@ -42,7 +42,7 @@
  * OpenGL(R) version 1.2.1 Specification. Author: Eric Veach, July 1994 Java Port: Pepijn Van Eeckhoudt, July 2003 Java
  * Port: Nathan Parker Burg, August 2003
  */
-package org.lwjgl.util.glu.tessellation;
+package org.lwjglx.util.glu.tessellation;
 
 abstract class PriorityQ {
 
diff --git a/src/main/java/org/lwjgl/util/glu/tessellation/PriorityQHeap.java b/src/main/java/org/lwjglx/util/glu/tessellation/PriorityQHeap.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/glu/tessellation/PriorityQHeap.java
rename to src/main/java/org/lwjglx/util/glu/tessellation/PriorityQHeap.java
index 5cd90e02b..18488c368 100644
--- a/src/main/java/org/lwjgl/util/glu/tessellation/PriorityQHeap.java
+++ b/src/main/java/org/lwjglx/util/glu/tessellation/PriorityQHeap.java
@@ -42,7 +42,7 @@
  * OpenGL(R) version 1.2.1 Specification. Author: Eric Veach, July 1994 Java Port: Pepijn Van Eeckhoudt, July 2003 Java
  * Port: Nathan Parker Burg, August 2003
  */
-package org.lwjgl.util.glu.tessellation;
+package org.lwjglx.util.glu.tessellation;
 
 class PriorityQHeap extends PriorityQ {
 
diff --git a/src/main/java/org/lwjgl/util/glu/tessellation/PriorityQSort.java b/src/main/java/org/lwjglx/util/glu/tessellation/PriorityQSort.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/glu/tessellation/PriorityQSort.java
rename to src/main/java/org/lwjglx/util/glu/tessellation/PriorityQSort.java
index 97051f59d..cfd3fa17a 100644
--- a/src/main/java/org/lwjgl/util/glu/tessellation/PriorityQSort.java
+++ b/src/main/java/org/lwjglx/util/glu/tessellation/PriorityQSort.java
@@ -38,7 +38,7 @@
  * OpenGL(R) version 1.2.1 Specification. Author: Eric Veach, July 1994 Java Port: Pepijn Van Eeckhoudt, July 2003 Java
  * Port: Nathan Parker Burg, August 2003
  */
-package org.lwjgl.util.glu.tessellation;
+package org.lwjglx.util.glu.tessellation;
 
 class PriorityQSort extends PriorityQ {
 
diff --git a/src/main/java/org/lwjgl/util/glu/tessellation/Render.java b/src/main/java/org/lwjglx/util/glu/tessellation/Render.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/glu/tessellation/Render.java
rename to src/main/java/org/lwjglx/util/glu/tessellation/Render.java
index 7a77afd5f..367b34249 100644
--- a/src/main/java/org/lwjgl/util/glu/tessellation/Render.java
+++ b/src/main/java/org/lwjglx/util/glu/tessellation/Render.java
@@ -42,10 +42,10 @@
  * OpenGL(R) version 1.2.1 Specification. Author: Eric Veach, July 1994 Java Port: Pepijn Van Eeckhoudt, July 2003 Java
  * Port: Nathan Parker Burg, August 2003
  */
-package org.lwjgl.util.glu.tessellation;
+package org.lwjglx.util.glu.tessellation;
 
-import static org.lwjgl3.opengl.GL11.*;
-import static org.lwjgl.util.glu.GLU.*;
+import static org.lwjgl.opengl.GL11.*;
+import static org.lwjglx.util.glu.GLU.*;
 
 class Render {
 
diff --git a/src/main/java/org/lwjgl/util/glu/tessellation/Sweep.java b/src/main/java/org/lwjglx/util/glu/tessellation/Sweep.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/glu/tessellation/Sweep.java
rename to src/main/java/org/lwjglx/util/glu/tessellation/Sweep.java
index 267cd4dd5..210b39571 100644
--- a/src/main/java/org/lwjgl/util/glu/tessellation/Sweep.java
+++ b/src/main/java/org/lwjglx/util/glu/tessellation/Sweep.java
@@ -42,9 +42,9 @@
  * OpenGL(R) version 1.2.1 Specification. Author: Eric Veach, July 1994 Java Port: Pepijn Van Eeckhoudt, July 2003 Java
  * Port: Nathan Parker Burg, August 2003
  */
-package org.lwjgl.util.glu.tessellation;
+package org.lwjglx.util.glu.tessellation;
 
-import static org.lwjgl.util.glu.GLU.*;
+import static org.lwjglx.util.glu.GLU.*;
 
 class Sweep {
 
diff --git a/src/main/java/org/lwjgl/util/glu/tessellation/TessMono.java b/src/main/java/org/lwjglx/util/glu/tessellation/TessMono.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/glu/tessellation/TessMono.java
rename to src/main/java/org/lwjglx/util/glu/tessellation/TessMono.java
index 3560b50a2..d76c0fcb6 100644
--- a/src/main/java/org/lwjgl/util/glu/tessellation/TessMono.java
+++ b/src/main/java/org/lwjglx/util/glu/tessellation/TessMono.java
@@ -42,7 +42,7 @@
  * OpenGL(R) version 1.2.1 Specification. Author: Eric Veach, July 1994 Java Port: Pepijn Van Eeckhoudt, July 2003 Java
  * Port: Nathan Parker Burg, August 2003
  */
-package org.lwjgl.util.glu.tessellation;
+package org.lwjglx.util.glu.tessellation;
 
 class TessMono {
 
diff --git a/src/main/java/org/lwjgl/util/glu/tessellation/TessState.java b/src/main/java/org/lwjglx/util/glu/tessellation/TessState.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/glu/tessellation/TessState.java
rename to src/main/java/org/lwjglx/util/glu/tessellation/TessState.java
index 4b66084b8..c35da601d 100644
--- a/src/main/java/org/lwjgl/util/glu/tessellation/TessState.java
+++ b/src/main/java/org/lwjglx/util/glu/tessellation/TessState.java
@@ -42,7 +42,7 @@
  * OpenGL(R) version 1.2.1 Specification. Author: Eric Veach, July 1994 Java Port: Pepijn Van Eeckhoudt, July 2003 Java
  * Port: Nathan Parker Burg, August 2003
  */
-package org.lwjgl.util.glu.tessellation;
+package org.lwjglx.util.glu.tessellation;
 
 class TessState {
 
diff --git a/src/main/java/org/lwjgl/util/vector/Matrix.java b/src/main/java/org/lwjglx/util/vector/Matrix.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/vector/Matrix.java
rename to src/main/java/org/lwjglx/util/vector/Matrix.java
index 50e9867eb..8e7d0a29b 100644
--- a/src/main/java/org/lwjgl/util/vector/Matrix.java
+++ b/src/main/java/org/lwjglx/util/vector/Matrix.java
@@ -13,7 +13,7 @@
  * 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.util.vector;
+package org.lwjglx.util.vector;
 
 import java.io.Serializable;
 import java.nio.FloatBuffer;
diff --git a/src/main/java/org/lwjgl/util/vector/Matrix2f.java b/src/main/java/org/lwjglx/util/vector/Matrix2f.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/vector/Matrix2f.java
rename to src/main/java/org/lwjglx/util/vector/Matrix2f.java
index 79065f4ff..ca2d40335 100644
--- a/src/main/java/org/lwjgl/util/vector/Matrix2f.java
+++ b/src/main/java/org/lwjglx/util/vector/Matrix2f.java
@@ -13,7 +13,7 @@
  * 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.util.vector;
+package org.lwjglx.util.vector;
 
 import java.io.Serializable;
 import java.nio.FloatBuffer;
@@ -378,7 +378,7 @@ public static Matrix2f setZero(Matrix2f src) {
 
     /*
      * (non-Javadoc)
-     * @see org.lwjgl3.vector.Matrix#determinant()
+     * @see org.lwjgl.vector.Matrix#determinant()
      */
     public float determinant() {
         return m00 * m11 - m01 * m10;
diff --git a/src/main/java/org/lwjgl/util/vector/Matrix3f.java b/src/main/java/org/lwjglx/util/vector/Matrix3f.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/vector/Matrix3f.java
rename to src/main/java/org/lwjglx/util/vector/Matrix3f.java
index 0e3ab4c83..12355a0bb 100644
--- a/src/main/java/org/lwjgl/util/vector/Matrix3f.java
+++ b/src/main/java/org/lwjglx/util/vector/Matrix3f.java
@@ -13,7 +13,7 @@
  * 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.util.vector;
+package org.lwjglx.util.vector;
 
 import java.io.Serializable;
 import java.nio.FloatBuffer;
diff --git a/src/main/java/org/lwjgl/util/vector/Matrix4f.java b/src/main/java/org/lwjglx/util/vector/Matrix4f.java
similarity index 99%
rename from src/main/java/org/lwjgl/util/vector/Matrix4f.java
rename to src/main/java/org/lwjglx/util/vector/Matrix4f.java
index 0bfddb108..71acd8948 100644
--- a/src/main/java/org/lwjgl/util/vector/Matrix4f.java
+++ b/src/main/java/org/lwjglx/util/vector/Matrix4f.java
@@ -13,7 +13,7 @@
  * 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.util.vector;
+package org.lwjglx.util.vector;
 
 import java.io.Serializable;
 import java.nio.FloatBuffer;
diff --git a/src/main/java/org/lwjgl/util/vector/Quaternion.java b/src/main/java/org/lwjglx/util/vector/Quaternion.java
similarity index 95%
rename from src/main/java/org/lwjgl/util/vector/Quaternion.java
rename to src/main/java/org/lwjglx/util/vector/Quaternion.java
index 61808d57c..18073e49b 100644
--- a/src/main/java/org/lwjgl/util/vector/Quaternion.java
+++ b/src/main/java/org/lwjglx/util/vector/Quaternion.java
@@ -13,7 +13,7 @@
  * 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.util.vector;
+package org.lwjglx.util.vector;
 
 /**
  *
@@ -57,7 +57,7 @@ public Quaternion(float x, float y, float z, float w) {
 
     /*
      * (non-Javadoc)
-     * @see org.lwjgl3.util.vector.WritableVector2f#set(float, float)
+     * @see org.lwjgl.util.vector.WritableVector2f#set(float, float)
      */
     public void set(float x, float y) {
         this.x = x;
@@ -66,7 +66,7 @@ public void set(float x, float y) {
 
     /*
      * (non-Javadoc)
-     * @see org.lwjgl3.util.vector.WritableVector3f#set(float, float, float)
+     * @see org.lwjgl.util.vector.WritableVector3f#set(float, float, float)
      */
     public void set(float x, float y, float z) {
         this.x = x;
@@ -76,7 +76,7 @@ public void set(float x, float y, float z) {
 
     /*
      * (non-Javadoc)
-     * @see org.lwjgl3.util.vector.WritableVector4f#set(float, float, float, float)
+     * @see org.lwjgl.util.vector.WritableVector4f#set(float, float, float, float)
      */
     public void set(float x, float y, float z, float w) {
         this.x = x;
@@ -202,7 +202,7 @@ public Vector negate() {
 
     /*
      * (non-Javadoc)
-     * @see org.lwjgl3.util.vector.Vector#load(java.nio.FloatBuffer)
+     * @see org.lwjgl.util.vector.Vector#load(java.nio.FloatBuffer)
      */
     public Vector load(FloatBuffer buf) {
         x = buf.get();
@@ -214,7 +214,7 @@ public Vector load(FloatBuffer buf) {
 
     /*
      * (non-Javadoc)
-     * @see org.lwjgl3.vector.Vector#scale(float)
+     * @see org.lwjgl.vector.Vector#scale(float)
      */
     public Vector scale(float scale) {
         return scale(scale, this, this);
@@ -239,7 +239,7 @@ public static Quaternion scale(float scale, Quaternion src, Quaternion dest) {
 
     /*
      * (non-Javadoc)
-     * @see org.lwjgl3.util.vector.ReadableVector#store(java.nio.FloatBuffer)
+     * @see org.lwjgl.util.vector.ReadableVector#store(java.nio.FloatBuffer)
      */
     public Vector store(FloatBuffer buf) {
         buf.put(x);
@@ -293,7 +293,7 @@ public void setZ(float z) {
 
     /*
      * (Overrides)
-     * @see org.lwjgl3.vector.ReadableVector3f#getZ()
+     * @see org.lwjgl.vector.ReadableVector3f#getZ()
      */
     public float getZ() {
         return z;
@@ -310,7 +310,7 @@ public void setW(float w) {
 
     /*
      * (Overrides)
-     * @see org.lwjgl3.vector.ReadableVector3f#getW()
+     * @see org.lwjgl.vector.ReadableVector3f#getW()
      */
     public float getW() {
         return w;
diff --git a/src/main/java/org/lwjgl/util/vector/ReadableVector.java b/src/main/java/org/lwjglx/util/vector/ReadableVector.java
similarity index 98%
rename from src/main/java/org/lwjgl/util/vector/ReadableVector.java
rename to src/main/java/org/lwjglx/util/vector/ReadableVector.java
index 7c07051c6..ff7d7d78d 100644
--- a/src/main/java/org/lwjgl/util/vector/ReadableVector.java
+++ b/src/main/java/org/lwjglx/util/vector/ReadableVector.java
@@ -13,7 +13,7 @@
  * 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.util.vector;
+package org.lwjglx.util.vector;
 
 import java.nio.FloatBuffer;
 
diff --git a/src/main/java/org/lwjgl/util/vector/ReadableVector2f.java b/src/main/java/org/lwjglx/util/vector/ReadableVector2f.java
similarity index 98%
rename from src/main/java/org/lwjgl/util/vector/ReadableVector2f.java
rename to src/main/java/org/lwjglx/util/vector/ReadableVector2f.java
index 744fa0220..f64f37cb3 100644
--- a/src/main/java/org/lwjgl/util/vector/ReadableVector2f.java
+++ b/src/main/java/org/lwjglx/util/vector/ReadableVector2f.java
@@ -13,7 +13,7 @@
  * 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.util.vector;
+package org.lwjglx.util.vector;
 
 /**
  * @author foo
diff --git a/src/main/java/org/lwjgl/util/vector/ReadableVector3f.java b/src/main/java/org/lwjglx/util/vector/ReadableVector3f.java
similarity index 98%
rename from src/main/java/org/lwjgl/util/vector/ReadableVector3f.java
rename to src/main/java/org/lwjglx/util/vector/ReadableVector3f.java
index 4a7599c30..ca4db215f 100644
--- a/src/main/java/org/lwjgl/util/vector/ReadableVector3f.java
+++ b/src/main/java/org/lwjglx/util/vector/ReadableVector3f.java
@@ -13,7 +13,7 @@
  * 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.util.vector;
+package org.lwjglx.util.vector;
 
 /**
  * @author foo
diff --git a/src/main/java/org/lwjgl/util/vector/ReadableVector4f.java b/src/main/java/org/lwjglx/util/vector/ReadableVector4f.java
similarity index 98%
rename from src/main/java/org/lwjgl/util/vector/ReadableVector4f.java
rename to src/main/java/org/lwjglx/util/vector/ReadableVector4f.java
index 9f30643e6..888013ff4 100644
--- a/src/main/java/org/lwjgl/util/vector/ReadableVector4f.java
+++ b/src/main/java/org/lwjglx/util/vector/ReadableVector4f.java
@@ -13,7 +13,7 @@
  * 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.util.vector;
+package org.lwjglx.util.vector;
 
 /**
  * @author foo
diff --git a/src/main/java/org/lwjgl/util/vector/Vector.java b/src/main/java/org/lwjglx/util/vector/Vector.java
similarity index 98%
rename from src/main/java/org/lwjgl/util/vector/Vector.java
rename to src/main/java/org/lwjglx/util/vector/Vector.java
index e04ecd258..318959d36 100644
--- a/src/main/java/org/lwjgl/util/vector/Vector.java
+++ b/src/main/java/org/lwjglx/util/vector/Vector.java
@@ -13,7 +13,7 @@
  * 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.util.vector;
+package org.lwjglx.util.vector;
 
 import java.io.Serializable;
 import java.nio.FloatBuffer;
diff --git a/src/main/java/org/lwjgl/util/vector/Vector2f.java b/src/main/java/org/lwjglx/util/vector/Vector2f.java
similarity index 97%
rename from src/main/java/org/lwjgl/util/vector/Vector2f.java
rename to src/main/java/org/lwjglx/util/vector/Vector2f.java
index 5880a5a4a..885057200 100644
--- a/src/main/java/org/lwjgl/util/vector/Vector2f.java
+++ b/src/main/java/org/lwjglx/util/vector/Vector2f.java
@@ -13,7 +13,7 @@
  * 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.util.vector;
+package org.lwjglx.util.vector;
 
 import java.io.Serializable;
 import java.nio.FloatBuffer;
@@ -54,7 +54,7 @@ public Vector2f(float x, float y) {
 
     /*
      * (non-Javadoc)
-     * @see org.lwjgl3.util.vector.WritableVector2f#set(float, float)
+     * @see org.lwjgl.util.vector.WritableVector2f#set(float, float)
      */
     public void set(float x, float y) {
         this.x = x;
@@ -215,7 +215,7 @@ public Vector load(FloatBuffer buf) {
 
     /*
      * (non-Javadoc)
-     * @see org.lwjgl3.vector.Vector#scale(float)
+     * @see org.lwjgl.vector.Vector#scale(float)
      */
     public Vector scale(float scale) {
 
diff --git a/src/main/java/org/lwjgl/util/vector/Vector3f.java b/src/main/java/org/lwjglx/util/vector/Vector3f.java
similarity index 95%
rename from src/main/java/org/lwjgl/util/vector/Vector3f.java
rename to src/main/java/org/lwjglx/util/vector/Vector3f.java
index c10475536..f12e44bc2 100644
--- a/src/main/java/org/lwjgl/util/vector/Vector3f.java
+++ b/src/main/java/org/lwjglx/util/vector/Vector3f.java
@@ -13,7 +13,7 @@
  * 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.util.vector;
+package org.lwjglx.util.vector;
 
 import java.io.Serializable;
 import java.nio.FloatBuffer;
@@ -54,7 +54,7 @@ public Vector3f(float x, float y, float z) {
 
     /*
      * (non-Javadoc)
-     * @see org.lwjgl3.util.vector.WritableVector2f#set(float, float)
+     * @see org.lwjgl.util.vector.WritableVector2f#set(float, float)
      */
     public void set(float x, float y) {
         this.x = x;
@@ -63,7 +63,7 @@ public void set(float x, float y) {
 
     /*
      * (non-Javadoc)
-     * @see org.lwjgl3.util.vector.WritableVector3f#set(float, float, float)
+     * @see org.lwjgl.util.vector.WritableVector3f#set(float, float, float)
      */
     public void set(float x, float y, float z) {
         this.x = x;
@@ -225,7 +225,7 @@ public static float angle(Vector3f a, Vector3f b) {
 
     /*
      * (non-Javadoc)
-     * @see org.lwjgl3.vector.Vector#load(FloatBuffer)
+     * @see org.lwjgl.vector.Vector#load(FloatBuffer)
      */
     public Vector load(FloatBuffer buf) {
         x = buf.get();
@@ -236,7 +236,7 @@ public Vector load(FloatBuffer buf) {
 
     /*
      * (non-Javadoc)
-     * @see org.lwjgl3.vector.Vector#scale(float)
+     * @see org.lwjgl.vector.Vector#scale(float)
      */
     public Vector scale(float scale) {
 
@@ -249,7 +249,7 @@ public Vector scale(float scale) {
 
     /*
      * (non-Javadoc)
-     * @see org.lwjgl3.vector.Vector#store(FloatBuffer)
+     * @see org.lwjgl.vector.Vector#store(FloatBuffer)
      */
     public Vector store(FloatBuffer buf) {
 
@@ -320,7 +320,7 @@ public void setZ(float z) {
 
     /*
      * (Overrides)
-     * @see org.lwjgl3.vector.ReadableVector3f#getZ()
+     * @see org.lwjgl.vector.ReadableVector3f#getZ()
      */
     public float getZ() {
         return z;
diff --git a/src/main/java/org/lwjgl/util/vector/Vector4f.java b/src/main/java/org/lwjglx/util/vector/Vector4f.java
similarity index 93%
rename from src/main/java/org/lwjgl/util/vector/Vector4f.java
rename to src/main/java/org/lwjglx/util/vector/Vector4f.java
index aa30cb48e..e500d0c8c 100644
--- a/src/main/java/org/lwjgl/util/vector/Vector4f.java
+++ b/src/main/java/org/lwjglx/util/vector/Vector4f.java
@@ -13,7 +13,7 @@
  * 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.util.vector;
+package org.lwjglx.util.vector;
 
 import java.io.Serializable;
 import java.nio.FloatBuffer;
@@ -54,7 +54,7 @@ public Vector4f(float x, float y, float z, float w) {
 
     /*
      * (non-Javadoc)
-     * @see org.lwjgl3.util.vector.WritableVector2f#set(float, float)
+     * @see org.lwjgl.util.vector.WritableVector2f#set(float, float)
      */
     public void set(float x, float y) {
         this.x = x;
@@ -63,7 +63,7 @@ public void set(float x, float y) {
 
     /*
      * (non-Javadoc)
-     * @see org.lwjgl3.util.vector.WritableVector3f#set(float, float, float)
+     * @see org.lwjgl.util.vector.WritableVector3f#set(float, float, float)
      */
     public void set(float x, float y, float z) {
         this.x = x;
@@ -73,7 +73,7 @@ public void set(float x, float y, float z) {
 
     /*
      * (non-Javadoc)
-     * @see org.lwjgl3.util.vector.WritableVector4f#set(float, float, float, float)
+     * @see org.lwjgl.util.vector.WritableVector4f#set(float, float, float, float)
      */
     public void set(float x, float y, float z, float w) {
         this.x = x;
@@ -220,7 +220,7 @@ public static float angle(Vector4f a, Vector4f b) {
 
     /*
      * (non-Javadoc)
-     * @see org.lwjgl3.vector.Vector#load(FloatBuffer)
+     * @see org.lwjgl.vector.Vector#load(FloatBuffer)
      */
     public Vector load(FloatBuffer buf) {
         x = buf.get();
@@ -232,7 +232,7 @@ public Vector load(FloatBuffer buf) {
 
     /*
      * (non-Javadoc)
-     * @see org.lwjgl3.vector.Vector#scale(float)
+     * @see org.lwjgl.vector.Vector#scale(float)
      */
     public Vector scale(float scale) {
         x *= scale;
@@ -244,7 +244,7 @@ public Vector scale(float scale) {
 
     /*
      * (non-Javadoc)
-     * @see org.lwjgl3.vector.Vector#store(FloatBuffer)
+     * @see org.lwjgl.vector.Vector#store(FloatBuffer)
      */
     public Vector store(FloatBuffer buf) {
 
@@ -303,7 +303,7 @@ public void setZ(float z) {
 
     /*
      * (Overrides)
-     * @see org.lwjgl3.vector.ReadableVector3f#getZ()
+     * @see org.lwjgl.vector.ReadableVector3f#getZ()
      */
     public float getZ() {
         return z;
@@ -320,7 +320,7 @@ public void setW(float w) {
 
     /*
      * (Overrides)
-     * @see org.lwjgl3.vector.ReadableVector3f#getZ()
+     * @see org.lwjgl.vector.ReadableVector3f#getZ()
      */
     public float getW() {
         return w;
diff --git a/src/main/java/org/lwjgl/util/vector/WritableVector2f.java b/src/main/java/org/lwjglx/util/vector/WritableVector2f.java
similarity index 98%
rename from src/main/java/org/lwjgl/util/vector/WritableVector2f.java
rename to src/main/java/org/lwjglx/util/vector/WritableVector2f.java
index 9193bfdf2..4d5847c3a 100644
--- a/src/main/java/org/lwjgl/util/vector/WritableVector2f.java
+++ b/src/main/java/org/lwjglx/util/vector/WritableVector2f.java
@@ -13,7 +13,7 @@
  * 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.util.vector;
+package org.lwjglx.util.vector;
 
 /**
  * Writable interface to Vector2fs
diff --git a/src/main/java/org/lwjgl/util/vector/WritableVector3f.java b/src/main/java/org/lwjglx/util/vector/WritableVector3f.java
similarity index 98%
rename from src/main/java/org/lwjgl/util/vector/WritableVector3f.java
rename to src/main/java/org/lwjglx/util/vector/WritableVector3f.java
index bb94f7e39..51b5f42eb 100644
--- a/src/main/java/org/lwjgl/util/vector/WritableVector3f.java
+++ b/src/main/java/org/lwjglx/util/vector/WritableVector3f.java
@@ -13,7 +13,7 @@
  * 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.util.vector;
+package org.lwjglx.util.vector;
 
 /**
  * Writable interface to Vector3fs
diff --git a/src/main/java/org/lwjgl/util/vector/WritableVector4f.java b/src/main/java/org/lwjglx/util/vector/WritableVector4f.java
similarity index 98%
rename from src/main/java/org/lwjgl/util/vector/WritableVector4f.java
rename to src/main/java/org/lwjglx/util/vector/WritableVector4f.java
index d7289f18d..c8dd56c82 100644
--- a/src/main/java/org/lwjgl/util/vector/WritableVector4f.java
+++ b/src/main/java/org/lwjglx/util/vector/WritableVector4f.java
@@ -13,7 +13,7 @@
  * 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.util.vector;
+package org.lwjglx.util.vector;
 
 /**
  * Writable interface to Vector4fs
diff --git a/src/test/java/net/minecraftforge/debug/client/rendering/ItemTESRTest.java b/src/test/java/net/minecraftforge/debug/client/rendering/ItemTESRTest.java
index 5fcb17b63..261e41b6a 100644
--- a/src/test/java/net/minecraftforge/debug/client/rendering/ItemTESRTest.java
+++ b/src/test/java/net/minecraftforge/debug/client/rendering/ItemTESRTest.java
@@ -45,7 +45,7 @@
 import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
 import net.minecraftforge.fml.relauncher.Side;
 
-import static org.lwjgl.opengl.GL11.*;
+import static org.lwjglx.opengl.GL11.*;
 
 @Mod(modid = ItemTESRTest.MODID, name = "ForgeDebugItemTile", version = "1.0", acceptableRemoteVersions = "*")
 public class ItemTESRTest
diff --git a/src/test/java/net/minecraftforge/debug/gameplay/PotionRegistryTest.java b/src/test/java/net/minecraftforge/debug/gameplay/PotionRegistryTest.java
index edb39cfcf..ab9e11a17 100644
--- a/src/test/java/net/minecraftforge/debug/gameplay/PotionRegistryTest.java
+++ b/src/test/java/net/minecraftforge/debug/gameplay/PotionRegistryTest.java
@@ -34,7 +34,7 @@
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import org.lwjgl.opengl.GL11;
+import org.lwjglx.opengl.GL11;
 
 @Mod.EventBusSubscriber
 @Mod(modid = PotionRegistryTest.MOD_ID, name = "ForgePotionRegistry", version = "1.0", acceptableRemoteVersions = "*")
diff --git a/src/test/java/net/minecraftforge/debug/util/TextureDumper.java b/src/test/java/net/minecraftforge/debug/util/TextureDumper.java
index 04cd60470..33ac4200a 100644
--- a/src/test/java/net/minecraftforge/debug/util/TextureDumper.java
+++ b/src/test/java/net/minecraftforge/debug/util/TextureDumper.java
@@ -26,9 +26,9 @@
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.apache.logging.log4j.Logger;
-import org.lwjgl.BufferUtils;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
+import org.lwjglx.BufferUtils;
+import org.lwjglx.opengl.GL11;
+import org.lwjglx.opengl.GL12;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;