diff --git a/java/libraries/opengl/src/processing/opengl/FrameBuffer.java b/core/src/processing/opengl/FrameBuffer.java
similarity index 100%
rename from java/libraries/opengl/src/processing/opengl/FrameBuffer.java
rename to core/src/processing/opengl/FrameBuffer.java
diff --git a/java/libraries/opengl/src/processing/opengl/LinePath.java b/core/src/processing/opengl/LinePath.java
similarity index 100%
rename from java/libraries/opengl/src/processing/opengl/LinePath.java
rename to core/src/processing/opengl/LinePath.java
diff --git a/java/libraries/opengl/src/processing/opengl/LineShaderFrag.glsl b/core/src/processing/opengl/LineShaderFrag.glsl
similarity index 100%
rename from java/libraries/opengl/src/processing/opengl/LineShaderFrag.glsl
rename to core/src/processing/opengl/LineShaderFrag.glsl
diff --git a/java/libraries/opengl/src/processing/opengl/LineShaderVert.glsl b/core/src/processing/opengl/LineShaderVert.glsl
similarity index 100%
rename from java/libraries/opengl/src/processing/opengl/LineShaderVert.glsl
rename to core/src/processing/opengl/LineShaderVert.glsl
diff --git a/java/libraries/opengl/src/processing/opengl/LineStroker.java b/core/src/processing/opengl/LineStroker.java
similarity index 100%
rename from java/libraries/opengl/src/processing/opengl/LineStroker.java
rename to core/src/processing/opengl/LineStroker.java
diff --git a/java/libraries/opengl/src/processing/opengl/PFontTexture.java b/core/src/processing/opengl/PFontTexture.java
similarity index 100%
rename from java/libraries/opengl/src/processing/opengl/PFontTexture.java
rename to core/src/processing/opengl/PFontTexture.java
diff --git a/java/libraries/opengl/src/processing/opengl/PGL.java b/core/src/processing/opengl/PGL.java
similarity index 100%
rename from java/libraries/opengl/src/processing/opengl/PGL.java
rename to core/src/processing/opengl/PGL.java
diff --git a/java/libraries/opengl/src/processing/opengl/PGraphics2D.java b/core/src/processing/opengl/PGraphics2D.java
similarity index 100%
rename from java/libraries/opengl/src/processing/opengl/PGraphics2D.java
rename to core/src/processing/opengl/PGraphics2D.java
diff --git a/java/libraries/opengl/src/processing/opengl/PGraphics3D.java b/core/src/processing/opengl/PGraphics3D.java
similarity index 100%
rename from java/libraries/opengl/src/processing/opengl/PGraphics3D.java
rename to core/src/processing/opengl/PGraphics3D.java
diff --git a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java b/core/src/processing/opengl/PGraphicsOpenGL.java
similarity index 100%
rename from java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
rename to core/src/processing/opengl/PGraphicsOpenGL.java
diff --git a/java/libraries/opengl/src/processing/opengl/PShader.java b/core/src/processing/opengl/PShader.java
similarity index 100%
rename from java/libraries/opengl/src/processing/opengl/PShader.java
rename to core/src/processing/opengl/PShader.java
diff --git a/java/libraries/opengl/src/processing/opengl/PShape2D.java b/core/src/processing/opengl/PShape2D.java
similarity index 100%
rename from java/libraries/opengl/src/processing/opengl/PShape2D.java
rename to core/src/processing/opengl/PShape2D.java
diff --git a/java/libraries/opengl/src/processing/opengl/PShape3D.java b/core/src/processing/opengl/PShape3D.java
similarity index 100%
rename from java/libraries/opengl/src/processing/opengl/PShape3D.java
rename to core/src/processing/opengl/PShape3D.java
diff --git a/java/libraries/opengl/src/processing/opengl/PShapeOpenGL.java b/core/src/processing/opengl/PShapeOpenGL.java
similarity index 100%
rename from java/libraries/opengl/src/processing/opengl/PShapeOpenGL.java
rename to core/src/processing/opengl/PShapeOpenGL.java
diff --git a/java/libraries/opengl/src/processing/opengl/PointShaderFrag.glsl b/core/src/processing/opengl/PointShaderFrag.glsl
similarity index 100%
rename from java/libraries/opengl/src/processing/opengl/PointShaderFrag.glsl
rename to core/src/processing/opengl/PointShaderFrag.glsl
diff --git a/java/libraries/opengl/src/processing/opengl/PointShaderVert.glsl b/core/src/processing/opengl/PointShaderVert.glsl
similarity index 100%
rename from java/libraries/opengl/src/processing/opengl/PointShaderVert.glsl
rename to core/src/processing/opengl/PointShaderVert.glsl
diff --git a/java/libraries/opengl/src/processing/opengl/PolyFlatShaderVert.glsl b/core/src/processing/opengl/PolyFlatShaderVert.glsl
similarity index 100%
rename from java/libraries/opengl/src/processing/opengl/PolyFlatShaderVert.glsl
rename to core/src/processing/opengl/PolyFlatShaderVert.glsl
diff --git a/java/libraries/opengl/src/processing/opengl/PolyFullShaderVert.glsl b/core/src/processing/opengl/PolyFullShaderVert.glsl
similarity index 100%
rename from java/libraries/opengl/src/processing/opengl/PolyFullShaderVert.glsl
rename to core/src/processing/opengl/PolyFullShaderVert.glsl
diff --git a/java/libraries/opengl/src/processing/opengl/PolyLightShaderVert.glsl b/core/src/processing/opengl/PolyLightShaderVert.glsl
similarity index 100%
rename from java/libraries/opengl/src/processing/opengl/PolyLightShaderVert.glsl
rename to core/src/processing/opengl/PolyLightShaderVert.glsl
diff --git a/java/libraries/opengl/src/processing/opengl/PolyNoTexShaderFrag.glsl b/core/src/processing/opengl/PolyNoTexShaderFrag.glsl
similarity index 100%
rename from java/libraries/opengl/src/processing/opengl/PolyNoTexShaderFrag.glsl
rename to core/src/processing/opengl/PolyNoTexShaderFrag.glsl
diff --git a/java/libraries/opengl/src/processing/opengl/PolyTexShaderFrag.glsl b/core/src/processing/opengl/PolyTexShaderFrag.glsl
similarity index 100%
rename from java/libraries/opengl/src/processing/opengl/PolyTexShaderFrag.glsl
rename to core/src/processing/opengl/PolyTexShaderFrag.glsl
diff --git a/java/libraries/opengl/src/processing/opengl/PolyTexShaderVert.glsl b/core/src/processing/opengl/PolyTexShaderVert.glsl
similarity index 100%
rename from java/libraries/opengl/src/processing/opengl/PolyTexShaderVert.glsl
rename to core/src/processing/opengl/PolyTexShaderVert.glsl
diff --git a/java/libraries/opengl/src/processing/opengl/Texture.java b/core/src/processing/opengl/Texture.java
similarity index 100%
rename from java/libraries/opengl/src/processing/opengl/Texture.java
rename to core/src/processing/opengl/Texture.java