diff --git a/android/core/src/processing/core/PApplet.java b/android/core/src/processing/core/PApplet.java
index 3026d6ae1..d3a778a08 100644
--- a/android/core/src/processing/core/PApplet.java
+++ b/android/core/src/processing/core/PApplet.java
@@ -64,6 +64,9 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpEntity;
+
+import processing.opengl.PGraphicsOpenGL;
+
 import java.net.URI;
 
 
@@ -71,8 +74,8 @@ public class PApplet extends Activity implements PConstants, Runnable {
   /** The PGraphics renderer associated with this PApplet */
   public PGraphics g;
 
-//  static final boolean DEBUG = true;
-  static final boolean DEBUG = false;
+//  static final public boolean DEBUG = true;
+  static final public boolean DEBUG = false;
 
   /** The frame containing this applet (if any) */
 //  public Frame frame;
@@ -957,6 +960,17 @@ public class PApplet extends Activity implements PConstants, Runnable {
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
+  /** Holy crap this was an ugly one. Need to fix. */
+  public void andresNeedsBetterAPI() {
+    if (looping) { // This "if" is needed to avoid flickering when looping is disabled.
+      ((GLSurfaceView) surfaceView).requestRender();
+    }
+  }
+
+
+  // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
+
+
   /**
    * Called by the sketch surface view, thought it could conceivably be called
    * by Android as well.
diff --git a/android/core/src/processing/core/PMatrix3D.java b/android/core/src/processing/core/PMatrix3D.java
index 670c43870..27e8a71d4 100644
--- a/android/core/src/processing/core/PMatrix3D.java
+++ b/android/core/src/processing/core/PMatrix3D.java
@@ -26,7 +26,7 @@ package processing.core;
 /**
  * 4x4 matrix implementation.
  */
-public final class PMatrix3D implements PMatrix /*, PConstants*/ {
+public class PMatrix3D implements PMatrix /*, PConstants*/ {
 
   public float m00, m01, m02, m03;
   public float m10, m11, m12, m13;
diff --git a/android/core/src/processing/core/FillShaderFragNoTex.glsl b/android/core/src/processing/opengl/FillShaderFragNoTex.glsl
similarity index 100%
rename from android/core/src/processing/core/FillShaderFragNoTex.glsl
rename to android/core/src/processing/opengl/FillShaderFragNoTex.glsl
diff --git a/android/core/src/processing/core/FillShaderFragTex.glsl b/android/core/src/processing/opengl/FillShaderFragTex.glsl
similarity index 100%
rename from android/core/src/processing/core/FillShaderFragTex.glsl
rename to android/core/src/processing/opengl/FillShaderFragTex.glsl
diff --git a/android/core/src/processing/core/FillShaderVertFull.glsl b/android/core/src/processing/opengl/FillShaderVertFull.glsl
similarity index 100%
rename from android/core/src/processing/core/FillShaderVertFull.glsl
rename to android/core/src/processing/opengl/FillShaderVertFull.glsl
diff --git a/android/core/src/processing/core/FillShaderVertLit.glsl b/android/core/src/processing/opengl/FillShaderVertLit.glsl
similarity index 100%
rename from android/core/src/processing/core/FillShaderVertLit.glsl
rename to android/core/src/processing/opengl/FillShaderVertLit.glsl
diff --git a/android/core/src/processing/core/FillShaderVertSimple.glsl b/android/core/src/processing/opengl/FillShaderVertSimple.glsl
similarity index 100%
rename from android/core/src/processing/core/FillShaderVertSimple.glsl
rename to android/core/src/processing/opengl/FillShaderVertSimple.glsl
diff --git a/android/core/src/processing/core/FillShaderVertTex.glsl b/android/core/src/processing/opengl/FillShaderVertTex.glsl
similarity index 100%
rename from android/core/src/processing/core/FillShaderVertTex.glsl
rename to android/core/src/processing/opengl/FillShaderVertTex.glsl
diff --git a/android/core/src/processing/core/LineShaderFrag.glsl b/android/core/src/processing/opengl/LineShaderFrag.glsl
similarity index 100%
rename from android/core/src/processing/core/LineShaderFrag.glsl
rename to android/core/src/processing/opengl/LineShaderFrag.glsl
diff --git a/android/core/src/processing/core/LineShaderVert.glsl b/android/core/src/processing/opengl/LineShaderVert.glsl
similarity index 100%
rename from android/core/src/processing/core/LineShaderVert.glsl
rename to android/core/src/processing/opengl/LineShaderVert.glsl
diff --git a/android/core/src/processing/core/PFontTexture.java b/android/core/src/processing/opengl/PFontTexture.java
similarity index 98%
rename from android/core/src/processing/core/PFontTexture.java
rename to android/core/src/processing/opengl/PFontTexture.java
index 8995421e2..8b3aa5a61 100644
--- a/android/core/src/processing/core/PFontTexture.java
+++ b/android/core/src/processing/opengl/PFontTexture.java
@@ -21,13 +21,12 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.core;
+package processing.opengl;
 
 import java.util.HashMap;
 
-import processing.core.PApplet;
-import processing.core.PConstants;
-import processing.core.PFont;
+import processing.core.*;
+
 
 /**
  * All the infrastructure needed for optimized font rendering 
diff --git a/android/core/src/processing/core/PFramebuffer.java b/android/core/src/processing/opengl/PFramebuffer.java
similarity index 99%
rename from android/core/src/processing/core/PFramebuffer.java
rename to android/core/src/processing/opengl/PFramebuffer.java
index d34c593e9..0d2d07d3f 100644
--- a/android/core/src/processing/core/PFramebuffer.java
+++ b/android/core/src/processing/opengl/PFramebuffer.java
@@ -20,9 +20,12 @@
  Boston, MA  02111-1307  USA
  */
 
-package processing.core;
+package processing.opengl;
 import java.nio.IntBuffer;
 
+import processing.core.PApplet;
+import processing.core.PConstants;
+
 /**
  * Encapsulates a Frame Buffer Object for offscreen rendering.
  * When created with onscreen == true, it represents the normal
diff --git a/android/core/src/processing/core/PGL.java b/android/core/src/processing/opengl/PGL.java
similarity index 99%
rename from android/core/src/processing/core/PGL.java
rename to android/core/src/processing/opengl/PGL.java
index 79364a76a..112fa7a74 100644
--- a/android/core/src/processing/core/PGL.java
+++ b/android/core/src/processing/opengl/PGL.java
@@ -21,7 +21,7 @@
   Boston, MA  02111-1307  USA
  */
 
-package processing.core;
+package processing.opengl;
 
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
@@ -30,9 +30,10 @@ import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 import java.util.Arrays;
 
-import processing.glu.PGLU;
-import processing.glu.PGLUtessellator;
-import processing.glu.PGLUtessellatorCallbackAdapter;
+import processing.core.PApplet;
+import processing.opengl.tess.PGLU;
+import processing.opengl.tess.PGLUtessellator;
+import processing.opengl.tess.PGLUtessellatorCallbackAdapter;
 
 import javax.microedition.khronos.egl.EGL10;
 import javax.microedition.khronos.egl.EGLConfig;
@@ -470,9 +471,7 @@ public class PGL {
   
   
   public void requestDraw() {
-    if (pg.parent.looping) { // This "if" is needed to avoid flickering when looping is disabled.
-      ((GLSurfaceView) pg.parent.surfaceView).requestRender();
-    }
+    pg.parent.andresNeedsBetterAPI();
   }  
   
   
diff --git a/android/core/src/processing/core/PGraphicsOpenGL.java b/android/core/src/processing/opengl/PGraphicsOpenGL.java
similarity index 99%
rename from android/core/src/processing/core/PGraphicsOpenGL.java
rename to android/core/src/processing/opengl/PGraphicsOpenGL.java
index f18ba9411..0337d1aba 100644
--- a/android/core/src/processing/core/PGraphicsOpenGL.java
+++ b/android/core/src/processing/opengl/PGraphicsOpenGL.java
@@ -19,18 +19,12 @@
  Boston, MA  02111-1307  USA
  */
 
-package processing.core;
+package processing.opengl;
 
 import java.net.URL;
-import java.nio.ByteOrder;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.nio.ShortBuffer;
-import java.util.EmptyStackException;
-import java.util.HashMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Stack;
+import java.nio.*;
+import java.util.*;
+import processing.core.*;
 
 
 // drawPixels is missing...calls to glDrawPixels are commented out
@@ -190,8 +184,16 @@ public class PGraphicsOpenGL extends PGraphics {
   public PMatrix3D cameraInv;  
   public PMatrix3D modelview;
   public PMatrix3D modelviewInv;
+//  public PromiscuousMatrix3D modelviewInv;  // temporary type until we sort things out
   public PMatrix3D projmodelview;  
   
+//  class PromiscuousMatrix3D extends PMatrix3D {
+//    public void invTranslate(float tx, float ty, float tz) {
+//      super.invTranslate(tx, ty, tz);
+//    }
+//  }
+
+  
   // To pass to shaders
   protected float[] glProjection;
   protected float[] glModelview;
@@ -3178,11 +3180,19 @@ public class PGraphicsOpenGL extends PGraphics {
     }
     
     modelview.translate(tx, ty, tz);    
-    modelviewInv.invTranslate(tx, ty, tz);    
+    invTranslate(modelviewInv, tx, ty, tz);    
     projmodelview.translate(tx, ty, tz);  
   }
 
-  
+
+  static protected void invTranslate(PMatrix3D matrix, float tx, float ty, float tz) {
+    matrix.preApply(1, 0, 0, -tx,
+                    0, 1, 0, -ty,
+                    0, 0, 1, -tz,
+                    0, 0, 0, 1);
+  }
+
+
   /**
    * Two dimensional rotation. Same as rotateZ (this is identical to a 3D
    * rotation along the z-axis) but included for clarity -- it'd be weird for
@@ -3219,9 +3229,24 @@ public class PGraphicsOpenGL extends PGraphics {
     }
 
     modelview.rotate(angle, v0, v1, v2);
-    modelviewInv.invRotate(angle, v0, v1, v2);
+//    modelviewInv.invRotate(angle, v0, v1, v2);
+    invRotate(modelviewInv, angle, v0, v1, v2);
     calcProjmodelview(); // Possibly cheaper than doing projmodelview.rotate()
   }
+  
+  
+  static private void invRotate(PMatrix3D matrix, float angle, float v0, float v1, float v2) {
+    //TODO should make sure this vector is normalized
+
+    float c = PApplet.cos(-angle);
+    float s = PApplet.sin(-angle);
+    float t = 1.0f - c;
+
+    matrix.preApply((t*v0*v0) + c, (t*v0*v1) - (s*v2), (t*v0*v2) + (s*v1), 0,
+                    (t*v0*v1) + (s*v2), (t*v1*v1) + c, (t*v1*v2) - (s*v0), 0,
+                    (t*v0*v2) - (s*v1), (t*v1*v2) + (s*v0), (t*v2*v2) + c, 0,
+                    0, 0, 0, 1);
+  }
 
   
   /**
@@ -3249,9 +3274,14 @@ public class PGraphicsOpenGL extends PGraphics {
     }
 
     modelview.scale(sx, sy, sz);
-    modelviewInv.invScale(sx, sy, sz);    
+    invScale(modelviewInv, sx, sy, sz);    
     projmodelview.scale(sx, sy, sz);    
   }
+  
+  
+  static protected void invScale(PMatrix3D matrix, float x, float y, float z) {
+    matrix.preApply(1/x, 0, 0, 0,  0, 1/y, 0, 0,  0, 0, 1/z, 0,  0, 0, 0, 1);
+  }
 
   
   public void shearX(float angle) {
diff --git a/android/core/src/processing/core/PShader.java b/android/core/src/processing/opengl/PShader.java
similarity index 99%
rename from android/core/src/processing/core/PShader.java
rename to android/core/src/processing/opengl/PShader.java
index f5c113a36..524aab7ec 100644
--- a/android/core/src/processing/core/PShader.java
+++ b/android/core/src/processing/opengl/PShader.java
@@ -21,11 +21,14 @@
   Boston, MA  02111-1307  USA
  */
 
-package processing.core;
+package processing.opengl;
 
 import java.io.IOException;
 import java.net.URL;
 
+import processing.core.PApplet;
+import processing.core.PGraphics;
+
 
 /**
  * This class encapsulates a GLSL shader program, including a vertex 
diff --git a/android/core/src/processing/core/PShape3D.java b/android/core/src/processing/opengl/PShape3D.java
similarity index 96%
rename from android/core/src/processing/core/PShape3D.java
rename to android/core/src/processing/opengl/PShape3D.java
index 776011894..21684dc19 100644
--- a/android/core/src/processing/core/PShape3D.java
+++ b/android/core/src/processing/opengl/PShape3D.java
@@ -20,14 +20,10 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.core;
+package processing.opengl;
 
-import processing.core.PGraphicsOpenGL.FillShader;
-import processing.core.PGraphicsOpenGL.InGeometry;
-import processing.core.PGraphicsOpenGL.LineShader;
-import processing.core.PGraphicsOpenGL.PointShader;
-import processing.core.PGraphicsOpenGL.TessGeometry;
-import processing.core.PGraphicsOpenGL.Tessellator;
+import processing.core.*;
+import processing.opengl.PGraphicsOpenGL.*;
 
 import java.nio.FloatBuffer;
 import java.nio.ByteBuffer;
@@ -4297,7 +4293,7 @@ public class PShape3D extends PShape {
             materials.add(currentMtl);
           } else if (elements[0].equals("map_Kd") && elements.length > 1) {
             // Loading texture map.
-            String texname = elements[1];
+//            String texname = elements[1];
             //currentMtl.kdMap = papplet.loadImage(texname);
             currentMtl.kdMap = null;
           } else if (elements[0].equals("Ka") && elements.length > 3) {
diff --git a/android/core/src/processing/core/PTexture.java b/android/core/src/processing/opengl/PTexture.java
similarity index 95%
rename from android/core/src/processing/core/PTexture.java
rename to android/core/src/processing/opengl/PTexture.java
index bdd25a90c..0212cadab 100644
--- a/android/core/src/processing/core/PTexture.java
+++ b/android/core/src/processing/opengl/PTexture.java
@@ -20,7 +20,7 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.core;
+package processing.opengl;
 
 import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
@@ -28,6 +28,11 @@ import java.nio.IntBuffer;
 import java.util.LinkedList;
 import java.util.NoSuchElementException;
 
+import processing.core.PApplet;
+import processing.core.PConstants;
+import processing.core.PGraphics;
+import processing.core.PImage;
+
 
 /**
  * This class wraps an OpenGL texture.
diff --git a/android/core/src/processing/core/PointShaderFrag.glsl b/android/core/src/processing/opengl/PointShaderFrag.glsl
similarity index 100%
rename from android/core/src/processing/core/PointShaderFrag.glsl
rename to android/core/src/processing/opengl/PointShaderFrag.glsl
diff --git a/android/core/src/processing/core/PointShaderVert.glsl b/android/core/src/processing/opengl/PointShaderVert.glsl
similarity index 100%
rename from android/core/src/processing/core/PointShaderVert.glsl
rename to android/core/src/processing/opengl/PointShaderVert.glsl
diff --git a/android/core/src/processing/glu/tessellator/ActiveRegion.java b/android/core/src/processing/opengl/tess/ActiveRegion.java
similarity index 98%
rename from android/core/src/processing/glu/tessellator/ActiveRegion.java
rename to android/core/src/processing/opengl/tess/ActiveRegion.java
index 5ff30c583..6699923fc 100644
--- a/android/core/src/processing/glu/tessellator/ActiveRegion.java
+++ b/android/core/src/processing/opengl/tess/ActiveRegion.java
@@ -52,7 +52,7 @@
 ** Processing integration: Andres Colubri, February 2012
 */
 
-package processing.glu.tessellator;
+package processing.opengl.tess;
 
 class ActiveRegion {
     GLUhalfEdge eUp;        /* upper edge, directed right to left */
diff --git a/android/core/src/processing/glu/tessellator/CachedVertex.java b/android/core/src/processing/opengl/tess/CachedVertex.java
similarity index 98%
rename from android/core/src/processing/glu/tessellator/CachedVertex.java
rename to android/core/src/processing/opengl/tess/CachedVertex.java
index b418f6df9..327960ca0 100644
--- a/android/core/src/processing/glu/tessellator/CachedVertex.java
+++ b/android/core/src/processing/opengl/tess/CachedVertex.java
@@ -52,7 +52,7 @@
 ** Processing integration: Andres Colubri, February 2012
 */
 
-package processing.glu.tessellator;
+package processing.opengl.tess;
 
 class CachedVertex {
     public double[] coords = new double[3];
diff --git a/android/core/src/processing/glu/tessellator/Dict.java b/android/core/src/processing/opengl/tess/Dict.java
similarity index 99%
rename from android/core/src/processing/glu/tessellator/Dict.java
rename to android/core/src/processing/opengl/tess/Dict.java
index a75e0fd11..a1c04ea9d 100644
--- a/android/core/src/processing/glu/tessellator/Dict.java
+++ b/android/core/src/processing/opengl/tess/Dict.java
@@ -52,7 +52,7 @@
 ** Processing integration: Andres Colubri, February 2012
 */
 
-package processing.glu.tessellator;
+package processing.opengl.tess;
 
 class Dict {
     DictNode head;
diff --git a/android/core/src/processing/glu/tessellator/DictNode.java b/android/core/src/processing/opengl/tess/DictNode.java
similarity index 98%
rename from android/core/src/processing/glu/tessellator/DictNode.java
rename to android/core/src/processing/opengl/tess/DictNode.java
index 224db9923..0e1451ef5 100644
--- a/android/core/src/processing/glu/tessellator/DictNode.java
+++ b/android/core/src/processing/opengl/tess/DictNode.java
@@ -52,7 +52,7 @@
 ** Processing integration: Andres Colubri, February 2012
 */
 
-package processing.glu.tessellator;
+package processing.opengl.tess;
 
 class DictNode {
     Object key;
diff --git a/android/core/src/processing/glu/tessellator/GLUface.java b/android/core/src/processing/opengl/tess/GLUface.java
similarity index 98%
rename from android/core/src/processing/glu/tessellator/GLUface.java
rename to android/core/src/processing/opengl/tess/GLUface.java
index a8a470b8c..99afc1c4e 100644
--- a/android/core/src/processing/glu/tessellator/GLUface.java
+++ b/android/core/src/processing/opengl/tess/GLUface.java
@@ -51,7 +51,7 @@
 ** Processing integration: Andres Colubri, February 2012
 */
 
-package processing.glu.tessellator;
+package processing.opengl.tess;
 
 class GLUface {
     public GLUface next;        /* next face (never NULL) */
diff --git a/android/core/src/processing/glu/tessellator/GLUhalfEdge.java b/android/core/src/processing/opengl/tess/GLUhalfEdge.java
similarity index 98%
rename from android/core/src/processing/glu/tessellator/GLUhalfEdge.java
rename to android/core/src/processing/opengl/tess/GLUhalfEdge.java
index 561d4af92..53d8bd51a 100644
--- a/android/core/src/processing/glu/tessellator/GLUhalfEdge.java
+++ b/android/core/src/processing/opengl/tess/GLUhalfEdge.java
@@ -51,7 +51,7 @@
 ** Processing integration: Andres Colubri, February 2012
 */
 
-package processing.glu.tessellator;
+package processing.opengl.tess;
 
 class GLUhalfEdge {
     public GLUhalfEdge next;        /* doubly-linked list (prev==Sym->next) */
diff --git a/android/core/src/processing/glu/tessellator/GLUmesh.java b/android/core/src/processing/opengl/tess/GLUmesh.java
similarity index 98%
rename from android/core/src/processing/glu/tessellator/GLUmesh.java
rename to android/core/src/processing/opengl/tess/GLUmesh.java
index 0f186fc97..fecee0a75 100644
--- a/android/core/src/processing/glu/tessellator/GLUmesh.java
+++ b/android/core/src/processing/opengl/tess/GLUmesh.java
@@ -53,7 +53,7 @@
 ** Processing integration: Andres Colubri, February 2012
 */
 
-package processing.glu.tessellator;
+package processing.opengl.tess;
 
 class GLUmesh {
     GLUvertex vHead = new GLUvertex();        /* dummy header for vertex list */
diff --git a/android/core/src/processing/glu/tessellator/GLUtessellatorImpl.java b/android/core/src/processing/opengl/tess/GLUtessellatorImpl.java
similarity index 99%
rename from android/core/src/processing/glu/tessellator/GLUtessellatorImpl.java
rename to android/core/src/processing/opengl/tess/GLUtessellatorImpl.java
index 27fef9ac0..072877f9c 100644
--- a/android/core/src/processing/glu/tessellator/GLUtessellatorImpl.java
+++ b/android/core/src/processing/opengl/tess/GLUtessellatorImpl.java
@@ -52,9 +52,8 @@
 ** Processing integration: Andres Colubri, February 2012
 */
 
-package processing.glu.tessellator;
+package processing.opengl.tess;
 
-import processing.glu.*;
 
 public class GLUtessellatorImpl implements PGLUtessellator {
     public static final int TESS_MAX_CACHE = 100;
diff --git a/android/core/src/processing/glu/tessellator/GLUvertex.java b/android/core/src/processing/opengl/tess/GLUvertex.java
similarity index 98%
rename from android/core/src/processing/glu/tessellator/GLUvertex.java
rename to android/core/src/processing/opengl/tess/GLUvertex.java
index 49e378ae7..8349878a1 100644
--- a/android/core/src/processing/glu/tessellator/GLUvertex.java
+++ b/android/core/src/processing/opengl/tess/GLUvertex.java
@@ -52,7 +52,7 @@
 ** Processing integration: Andres Colubri, February 2012
 */
 
-package processing.glu.tessellator;
+package processing.opengl.tess;
 
 class GLUvertex {
     public GLUvertex next;        /* next vertex (never NULL) */
diff --git a/android/core/src/processing/glu/tessellator/Geom.java b/android/core/src/processing/opengl/tess/Geom.java
similarity index 99%
rename from android/core/src/processing/glu/tessellator/Geom.java
rename to android/core/src/processing/opengl/tess/Geom.java
index 0d423647d..3aa5e175d 100644
--- a/android/core/src/processing/glu/tessellator/Geom.java
+++ b/android/core/src/processing/opengl/tess/Geom.java
@@ -52,7 +52,7 @@
 ** Processing integration: Andres Colubri, February 2012
 */
 
-package processing.glu.tessellator;
+package processing.opengl.tess;
 
 class Geom {
     private Geom() {
diff --git a/android/core/src/processing/glu/tessellator/Mesh.java b/android/core/src/processing/opengl/tess/Mesh.java
similarity index 99%
rename from android/core/src/processing/glu/tessellator/Mesh.java
rename to android/core/src/processing/opengl/tess/Mesh.java
index b864081bf..29764face 100644
--- a/android/core/src/processing/glu/tessellator/Mesh.java
+++ b/android/core/src/processing/opengl/tess/Mesh.java
@@ -52,7 +52,7 @@
 ** Processing integration: Andres Colubri, February 2012
 */
 
-package processing.glu.tessellator;
+package processing.opengl.tess;
 
 class Mesh {
     private Mesh() {
diff --git a/android/core/src/processing/glu/tessellator/Normal.java b/android/core/src/processing/opengl/tess/Normal.java
similarity index 99%
rename from android/core/src/processing/glu/tessellator/Normal.java
rename to android/core/src/processing/opengl/tess/Normal.java
index 147660837..dbee9966d 100644
--- a/android/core/src/processing/glu/tessellator/Normal.java
+++ b/android/core/src/processing/opengl/tess/Normal.java
@@ -52,9 +52,8 @@
 ** Processing integration: Andres Colubri, February 2012
 */
 
-package processing.glu.tessellator;
+package processing.opengl.tess;
 
-import processing.glu.PGLU;
 
 class Normal {
     private Normal() {
diff --git a/android/core/src/processing/glu/PGLU.java b/android/core/src/processing/opengl/tess/PGLU.java
similarity index 98%
rename from android/core/src/processing/glu/PGLU.java
rename to android/core/src/processing/opengl/tess/PGLU.java
index 3716e9e9e..a4d6eaf76 100644
--- a/android/core/src/processing/glu/PGLU.java
+++ b/android/core/src/processing/opengl/tess/PGLU.java
@@ -1,7 +1,6 @@
-package processing.glu;
+package processing.opengl.tess;
 
 import android.opengl.GLES20;
-import processing.glu.tessellator.GLUtessellatorImpl;
 
 public class PGLU {
   public static final int GLU_FALSE = 0;  
diff --git a/android/core/src/processing/glu/PGLUtessellator.java b/android/core/src/processing/opengl/tess/PGLUtessellator.java
similarity index 99%
rename from android/core/src/processing/glu/PGLUtessellator.java
rename to android/core/src/processing/opengl/tess/PGLUtessellator.java
index 659fda72b..c54dc8f92 100644
--- a/android/core/src/processing/glu/PGLUtessellator.java
+++ b/android/core/src/processing/opengl/tess/PGLUtessellator.java
@@ -53,7 +53,7 @@
 ** Processing integration: Andres Colubri, February 2012
 */
 
-package processing.glu;
+package processing.opengl.tess;
 
 /**
  * The <b>GLUtessellator</b> object is used to hold the data, such as the
diff --git a/android/core/src/processing/glu/PGLUtessellatorCallback.java b/android/core/src/processing/opengl/tess/PGLUtessellatorCallback.java
similarity index 99%
rename from android/core/src/processing/glu/PGLUtessellatorCallback.java
rename to android/core/src/processing/opengl/tess/PGLUtessellatorCallback.java
index 3c3c867ca..f047b0764 100644
--- a/android/core/src/processing/glu/PGLUtessellatorCallback.java
+++ b/android/core/src/processing/opengl/tess/PGLUtessellatorCallback.java
@@ -51,7 +51,7 @@
 ** Java Port: Nathan Parker Burg, August 2003
 ** Processing integration: Andres Colubri, February 2012
 */
-package processing.glu;
+package processing.opengl.tess;
 
 /**
  * <b>GLUtessellatorCallback</b> interface provides methods that the user will
diff --git a/android/core/src/processing/glu/PGLUtessellatorCallbackAdapter.java b/android/core/src/processing/opengl/tess/PGLUtessellatorCallbackAdapter.java
similarity index 99%
rename from android/core/src/processing/glu/PGLUtessellatorCallbackAdapter.java
rename to android/core/src/processing/opengl/tess/PGLUtessellatorCallbackAdapter.java
index 2964893d1..9ea9a8c74 100644
--- a/android/core/src/processing/glu/PGLUtessellatorCallbackAdapter.java
+++ b/android/core/src/processing/opengl/tess/PGLUtessellatorCallbackAdapter.java
@@ -52,7 +52,7 @@
 ** Processing integration: Andres Colubri, February 2012
 */
 
-package processing.glu;
+package processing.opengl.tess;
 
 /**
  * The <b>GLUtessellatorCallbackAdapter</b> provides a default implementation of
diff --git a/android/core/src/processing/glu/tessellator/PriorityQ.java b/android/core/src/processing/opengl/tess/PriorityQ.java
similarity index 99%
rename from android/core/src/processing/glu/tessellator/PriorityQ.java
rename to android/core/src/processing/opengl/tess/PriorityQ.java
index 091e961b3..99c772869 100644
--- a/android/core/src/processing/glu/tessellator/PriorityQ.java
+++ b/android/core/src/processing/opengl/tess/PriorityQ.java
@@ -52,7 +52,7 @@
 ** Processing integration: Andres Colubri, February 2012
 */
 
-package processing.glu.tessellator;
+package processing.opengl.tess;
 
 abstract class PriorityQ {
     public static final int INIT_SIZE = 32;
diff --git a/android/core/src/processing/glu/tessellator/PriorityQHeap.java b/android/core/src/processing/opengl/tess/PriorityQHeap.java
similarity index 99%
rename from android/core/src/processing/glu/tessellator/PriorityQHeap.java
rename to android/core/src/processing/opengl/tess/PriorityQHeap.java
index e02f0305a..cf96d4fe9 100644
--- a/android/core/src/processing/glu/tessellator/PriorityQHeap.java
+++ b/android/core/src/processing/opengl/tess/PriorityQHeap.java
@@ -52,7 +52,7 @@
 ** Processing integration: Andres Colubri, February 2012
 */
 
-package processing.glu.tessellator;
+package processing.opengl.tess;
 
 class PriorityQHeap extends PriorityQ {
     PriorityQ.PQnode[] nodes;
diff --git a/android/core/src/processing/glu/tessellator/PriorityQSort.java b/android/core/src/processing/opengl/tess/PriorityQSort.java
similarity index 99%
rename from android/core/src/processing/glu/tessellator/PriorityQSort.java
rename to android/core/src/processing/opengl/tess/PriorityQSort.java
index 8ad52d077..d6a14d632 100644
--- a/android/core/src/processing/glu/tessellator/PriorityQSort.java
+++ b/android/core/src/processing/opengl/tess/PriorityQSort.java
@@ -48,7 +48,7 @@
 ** Processing integration: Andres Colubri, February 2012
 */
 
-package processing.glu.tessellator;
+package processing.opengl.tess;
 
 class PriorityQSort extends PriorityQ {
     PriorityQHeap heap;
diff --git a/android/core/src/processing/glu/tessellator/Render.java b/android/core/src/processing/opengl/tess/Render.java
similarity index 99%
rename from android/core/src/processing/glu/tessellator/Render.java
rename to android/core/src/processing/opengl/tess/Render.java
index 379f30aa4..17156deda 100644
--- a/android/core/src/processing/glu/tessellator/Render.java
+++ b/android/core/src/processing/opengl/tess/Render.java
@@ -52,10 +52,9 @@
 ** Processing integration: Andres Colubri, February 2012
 */
 
-package processing.glu.tessellator;
+package processing.opengl.tess;
 
 import android.opengl.GLES20;
-import processing.glu.PGLU;
 
 class Render {
     private static final boolean USE_OPTIMIZED_CODE_PATH = false;
diff --git a/android/core/src/processing/glu/tessellator/Sweep.java b/android/core/src/processing/opengl/tess/Sweep.java
similarity index 99%
rename from android/core/src/processing/glu/tessellator/Sweep.java
rename to android/core/src/processing/opengl/tess/Sweep.java
index cfcfcc730..9117de0d6 100644
--- a/android/core/src/processing/glu/tessellator/Sweep.java
+++ b/android/core/src/processing/opengl/tess/Sweep.java
@@ -53,9 +53,8 @@
 ** Processing integration: Andres Colubri, February 2012
 */
 
-package processing.glu.tessellator;
+package processing.opengl.tess;
 
-import processing.glu.PGLU;
 
 class Sweep {
     private Sweep() {
diff --git a/android/core/src/processing/glu/tessellator/TessMono.java b/android/core/src/processing/opengl/tess/TessMono.java
similarity index 99%
rename from android/core/src/processing/glu/tessellator/TessMono.java
rename to android/core/src/processing/opengl/tess/TessMono.java
index f675ac31d..683197f6c 100644
--- a/android/core/src/processing/glu/tessellator/TessMono.java
+++ b/android/core/src/processing/opengl/tess/TessMono.java
@@ -52,7 +52,7 @@
 ** Processing integration: Andres Colubri, February 2012
 */
 
-package processing.glu.tessellator;
+package processing.opengl.tess;
 
 class TessMono {
 /* __gl_meshTessellateMonoRegion( face ) tessellates a monotone region
@@ -208,7 +208,7 @@ class TessMono {
         }
     }
 
-    private static final int MARKED_FOR_DELETION = 0x7fffffff;
+//    private static final int MARKED_FOR_DELETION = 0x7fffffff;
 
 /* __gl_meshSetWindingNumber( mesh, value, keepOnlyBoundary ) resets the
  * winding numbers on all edges so that regions marked "inside" the
diff --git a/android/core/src/processing/glu/tessellator/TessState.java b/android/core/src/processing/opengl/tess/TessState.java
similarity index 98%
rename from android/core/src/processing/glu/tessellator/TessState.java
rename to android/core/src/processing/opengl/tess/TessState.java
index 947e89529..123d3bf71 100644
--- a/android/core/src/processing/glu/tessellator/TessState.java
+++ b/android/core/src/processing/opengl/tess/TessState.java
@@ -52,7 +52,7 @@
 ** Processing integration: Andres Colubri, February 2012
 */
 
-package processing.glu.tessellator;
+package processing.opengl.tess;
 
 class TessState {
     public static final int T_DORMANT = 0;