diff --git a/java/libraries/opengl2/.classpath b/java/libraries/opengl/.classpath
similarity index 100%
rename from java/libraries/opengl2/.classpath
rename to java/libraries/opengl/.classpath
diff --git a/java/libraries/opengl2/.project b/java/libraries/opengl/.project
similarity index 100%
rename from java/libraries/opengl2/.project
rename to java/libraries/opengl/.project
diff --git a/java/libraries/opengl2/.settings/org.eclipse.jdt.core.prefs b/java/libraries/opengl/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from java/libraries/opengl2/.settings/org.eclipse.jdt.core.prefs
rename to java/libraries/opengl/.settings/org.eclipse.jdt.core.prefs
diff --git a/java/libraries/opengl2/.settings/org.eclipse.jdt.ui.prefs b/java/libraries/opengl/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from java/libraries/opengl2/.settings/org.eclipse.jdt.ui.prefs
rename to java/libraries/opengl/.settings/org.eclipse.jdt.ui.prefs
diff --git a/java/libraries/opengl2/build.xml b/java/libraries/opengl/build.xml
similarity index 100%
rename from java/libraries/opengl2/build.xml
rename to java/libraries/opengl/build.xml
diff --git a/java/libraries/opengl2/examples/Blending/Blending.pde b/java/libraries/opengl/examples/Blending/Blending.pde
similarity index 100%
rename from java/libraries/opengl2/examples/Blending/Blending.pde
rename to java/libraries/opengl/examples/Blending/Blending.pde
diff --git a/java/libraries/opengl2/examples/CameraLight/CameraLight.pde b/java/libraries/opengl/examples/CameraLight/CameraLight.pde
similarity index 100%
rename from java/libraries/opengl2/examples/CameraLight/CameraLight.pde
rename to java/libraries/opengl/examples/CameraLight/CameraLight.pde
diff --git a/java/libraries/opengl2/examples/Concentric/Concentric.pde b/java/libraries/opengl/examples/Concentric/Concentric.pde
similarity index 100%
rename from java/libraries/opengl2/examples/Concentric/Concentric.pde
rename to java/libraries/opengl/examples/Concentric/Concentric.pde
diff --git a/java/libraries/opengl2/examples/Concentric/Torus.pde b/java/libraries/opengl/examples/Concentric/Torus.pde
similarity index 100%
rename from java/libraries/opengl2/examples/Concentric/Torus.pde
rename to java/libraries/opengl/examples/Concentric/Torus.pde
diff --git a/java/libraries/opengl2/examples/Earth/Earth.pde b/java/libraries/opengl/examples/Earth/Earth.pde
similarity index 100%
rename from java/libraries/opengl2/examples/Earth/Earth.pde
rename to java/libraries/opengl/examples/Earth/Earth.pde
diff --git a/java/libraries/opengl2/examples/KineticType/KineticType.pde b/java/libraries/opengl/examples/KineticType/KineticType.pde
similarity index 100%
rename from java/libraries/opengl2/examples/KineticType/KineticType.pde
rename to java/libraries/opengl/examples/KineticType/KineticType.pde
diff --git a/java/libraries/opengl2/examples/KineticType/Letter.pde b/java/libraries/opengl/examples/KineticType/Letter.pde
similarity index 100%
rename from java/libraries/opengl2/examples/KineticType/Letter.pde
rename to java/libraries/opengl/examples/KineticType/Letter.pde
diff --git a/java/libraries/opengl2/examples/KineticType/Line.pde b/java/libraries/opengl/examples/KineticType/Line.pde
similarity index 100%
rename from java/libraries/opengl2/examples/KineticType/Line.pde
rename to java/libraries/opengl/examples/KineticType/Line.pde
diff --git a/java/libraries/opengl2/examples/KineticType/Word.pde b/java/libraries/opengl/examples/KineticType/Word.pde
similarity index 100%
rename from java/libraries/opengl2/examples/KineticType/Word.pde
rename to java/libraries/opengl/examples/KineticType/Word.pde
diff --git a/java/libraries/opengl2/examples/KineticType/data/Univers-66.vlw b/java/libraries/opengl/examples/KineticType/data/Univers-66.vlw
similarity index 100%
rename from java/libraries/opengl2/examples/KineticType/data/Univers-66.vlw
rename to java/libraries/opengl/examples/KineticType/data/Univers-66.vlw
diff --git a/java/libraries/opengl2/examples/Nehe/Bitmap.pde b/java/libraries/opengl/examples/Nehe/Bitmap.pde
similarity index 100%
rename from java/libraries/opengl2/examples/Nehe/Bitmap.pde
rename to java/libraries/opengl/examples/Nehe/Bitmap.pde
diff --git a/java/libraries/opengl2/examples/Nehe/Nehe.pde b/java/libraries/opengl/examples/Nehe/Nehe.pde
similarity index 100%
rename from java/libraries/opengl2/examples/Nehe/Nehe.pde
rename to java/libraries/opengl/examples/Nehe/Nehe.pde
diff --git a/java/libraries/opengl2/examples/Nehe/Texture.pde b/java/libraries/opengl/examples/Nehe/Texture.pde
similarity index 100%
rename from java/libraries/opengl2/examples/Nehe/Texture.pde
rename to java/libraries/opengl/examples/Nehe/Texture.pde
diff --git a/java/libraries/opengl2/examples/Nehe/VertData.pde b/java/libraries/opengl/examples/Nehe/VertData.pde
similarity index 100%
rename from java/libraries/opengl2/examples/Nehe/VertData.pde
rename to java/libraries/opengl/examples/Nehe/VertData.pde
diff --git a/java/libraries/opengl2/examples/Nehe/data/glass.bmp b/java/libraries/opengl/examples/Nehe/data/glass.bmp
similarity index 100%
rename from java/libraries/opengl2/examples/Nehe/data/glass.bmp
rename to java/libraries/opengl/examples/Nehe/data/glass.bmp
diff --git a/java/libraries/opengl2/examples/Planets/Perlin.pde b/java/libraries/opengl/examples/Planets/Perlin.pde
similarity index 100%
rename from java/libraries/opengl2/examples/Planets/Perlin.pde
rename to java/libraries/opengl/examples/Planets/Perlin.pde
diff --git a/java/libraries/opengl2/examples/Planets/Planets.pde b/java/libraries/opengl/examples/Planets/Planets.pde
similarity index 100%
rename from java/libraries/opengl2/examples/Planets/Planets.pde
rename to java/libraries/opengl/examples/Planets/Planets.pde
diff --git a/java/libraries/opengl2/examples/Planets/Sphere.pde b/java/libraries/opengl/examples/Planets/Sphere.pde
similarity index 100%
rename from java/libraries/opengl2/examples/Planets/Sphere.pde
rename to java/libraries/opengl/examples/Planets/Sphere.pde
diff --git a/java/libraries/opengl2/examples/Ribbons/ArcBall.pde b/java/libraries/opengl/examples/Ribbons/ArcBall.pde
similarity index 100%
rename from java/libraries/opengl2/examples/Ribbons/ArcBall.pde
rename to java/libraries/opengl/examples/Ribbons/ArcBall.pde
diff --git a/java/libraries/opengl2/examples/Ribbons/BSpline.pde b/java/libraries/opengl/examples/Ribbons/BSpline.pde
similarity index 100%
rename from java/libraries/opengl2/examples/Ribbons/BSpline.pde
rename to java/libraries/opengl/examples/Ribbons/BSpline.pde
diff --git a/java/libraries/opengl2/examples/Ribbons/Geometry.pde b/java/libraries/opengl/examples/Ribbons/Geometry.pde
similarity index 100%
rename from java/libraries/opengl2/examples/Ribbons/Geometry.pde
rename to java/libraries/opengl/examples/Ribbons/Geometry.pde
diff --git a/java/libraries/opengl2/examples/Ribbons/PDB.pde b/java/libraries/opengl/examples/Ribbons/PDB.pde
similarity index 100%
rename from java/libraries/opengl2/examples/Ribbons/PDB.pde
rename to java/libraries/opengl/examples/Ribbons/PDB.pde
diff --git a/java/libraries/opengl2/examples/Ribbons/Ribbons.pde b/java/libraries/opengl/examples/Ribbons/Ribbons.pde
similarity index 100%
rename from java/libraries/opengl2/examples/Ribbons/Ribbons.pde
rename to java/libraries/opengl/examples/Ribbons/Ribbons.pde
diff --git a/java/libraries/opengl2/examples/Ribbons/data/1CBS.pdb b/java/libraries/opengl/examples/Ribbons/data/1CBS.pdb
similarity index 100%
rename from java/libraries/opengl2/examples/Ribbons/data/1CBS.pdb
rename to java/libraries/opengl/examples/Ribbons/data/1CBS.pdb
diff --git a/java/libraries/opengl2/examples/Ribbons/data/2POR.pdb b/java/libraries/opengl/examples/Ribbons/data/2POR.pdb
similarity index 100%
rename from java/libraries/opengl2/examples/Ribbons/data/2POR.pdb
rename to java/libraries/opengl/examples/Ribbons/data/2POR.pdb
diff --git a/java/libraries/opengl2/examples/Ribbons/data/4HHB.pdb b/java/libraries/opengl/examples/Ribbons/data/4HHB.pdb
similarity index 100%
rename from java/libraries/opengl2/examples/Ribbons/data/4HHB.pdb
rename to java/libraries/opengl/examples/Ribbons/data/4HHB.pdb
diff --git a/java/libraries/opengl2/examples/Rocket/Rocket.pde b/java/libraries/opengl/examples/Rocket/Rocket.pde
similarity index 100%
rename from java/libraries/opengl2/examples/Rocket/Rocket.pde
rename to java/libraries/opengl/examples/Rocket/Rocket.pde
diff --git a/java/libraries/opengl2/examples/Rocket/data/rocket.mtl b/java/libraries/opengl/examples/Rocket/data/rocket.mtl
similarity index 100%
rename from java/libraries/opengl2/examples/Rocket/data/rocket.mtl
rename to java/libraries/opengl/examples/Rocket/data/rocket.mtl
diff --git a/java/libraries/opengl2/examples/Rocket/data/rocket.obj b/java/libraries/opengl/examples/Rocket/data/rocket.obj
similarity index 100%
rename from java/libraries/opengl2/examples/Rocket/data/rocket.obj
rename to java/libraries/opengl/examples/Rocket/data/rocket.obj
diff --git a/java/libraries/opengl2/examples/Trefoil/Surface.pde b/java/libraries/opengl/examples/Trefoil/Surface.pde
similarity index 100%
rename from java/libraries/opengl2/examples/Trefoil/Surface.pde
rename to java/libraries/opengl/examples/Trefoil/Surface.pde
diff --git a/java/libraries/opengl2/examples/Trefoil/Trefoil.pde b/java/libraries/opengl/examples/Trefoil/Trefoil.pde
similarity index 100%
rename from java/libraries/opengl2/examples/Trefoil/Trefoil.pde
rename to java/libraries/opengl/examples/Trefoil/Trefoil.pde
diff --git a/java/libraries/opengl2/library/export.txt b/java/libraries/opengl/library/export.txt
similarity index 100%
rename from java/libraries/opengl2/library/export.txt
rename to java/libraries/opengl/library/export.txt
diff --git a/java/libraries/opengl2/src/processing/opengl2/PFontTexture.java b/java/libraries/opengl/src/processing/opengl2/PFontTexture.java
similarity index 100%
rename from java/libraries/opengl2/src/processing/opengl2/PFontTexture.java
rename to java/libraries/opengl/src/processing/opengl2/PFontTexture.java
diff --git a/java/libraries/opengl2/src/processing/opengl2/PFramebuffer.java b/java/libraries/opengl/src/processing/opengl2/PFramebuffer.java
similarity index 100%
rename from java/libraries/opengl2/src/processing/opengl2/PFramebuffer.java
rename to java/libraries/opengl/src/processing/opengl2/PFramebuffer.java
diff --git a/java/libraries/opengl2/src/processing/opengl2/PGraphicsOpenGL2.java b/java/libraries/opengl/src/processing/opengl2/PGraphicsOpenGL2.java
similarity index 100%
rename from java/libraries/opengl2/src/processing/opengl2/PGraphicsOpenGL2.java
rename to java/libraries/opengl/src/processing/opengl2/PGraphicsOpenGL2.java
diff --git a/java/libraries/opengl2/src/processing/opengl2/PShape3D.java b/java/libraries/opengl/src/processing/opengl2/PShape3D.java
similarity index 100%
rename from java/libraries/opengl2/src/processing/opengl2/PShape3D.java
rename to java/libraries/opengl/src/processing/opengl2/PShape3D.java
diff --git a/java/libraries/opengl2/src/processing/opengl2/PTexture.java b/java/libraries/opengl/src/processing/opengl2/PTexture.java
similarity index 100%
rename from java/libraries/opengl2/src/processing/opengl2/PTexture.java
rename to java/libraries/opengl/src/processing/opengl2/PTexture.java