From b9ab39d77435b79895ffce901bc3d2bf64b1520a Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Thu, 18 Feb 2010 20:02:00 +0000
Subject: [PATCH] renaming package back to processing.core, so that more
 libraries work off-the-shelf

---
 .../core/src/processing/{android => }/core/GLConstants.java | 2 +-
 android/core/src/processing/{android => }/core/GLFont.java  | 2 +-
 android/core/src/processing/{android => }/core/GLModel.java | 2 +-
 .../core/src/processing/{android => }/core/GLTexture.java   | 2 +-
 android/core/src/processing/{android => }/core/PApplet.java | 2 +-
 .../core/src/processing/{android => }/core/PConstants.java  | 2 +-
 android/core/src/processing/{android => }/core/PFont.java   | 2 +-
 .../core/src/processing/{android => }/core/PGraphics.java   | 2 +-
 .../core/src/processing/{android => }/core/PGraphics3D.java | 2 +-
 .../processing/{android => }/core/PGraphicsAndroid2D.java   | 2 +-
 .../processing/{android => }/core/PGraphicsAndroid3D.java   | 2 +-
 android/core/src/processing/{android => }/core/PImage.java  | 6 +++---
 android/core/src/processing/{android => }/core/PLine.java   | 2 +-
 android/core/src/processing/{android => }/core/PMatrix.java | 2 +-
 .../core/src/processing/{android => }/core/PMatrix2D.java   | 2 +-
 .../core/src/processing/{android => }/core/PMatrix3D.java   | 2 +-
 .../core/src/processing/{android => }/core/PPolygon.java    | 2 +-
 android/core/src/processing/{android => }/core/PShape.java  | 2 +-
 .../core/src/processing/{android => }/core/PShapeSVG.java   | 4 ++--
 android/core/src/processing/{android => }/core/PStyle.java  | 2 +-
 .../core/src/processing/{android => }/core/PTriangle.java   | 2 +-
 android/core/src/processing/{android => }/core/PVector.java | 2 +-
 .../core/src/processing/{android => }/xml/CDATAReader.java  | 2 +-
 .../src/processing/{android => }/xml/ContentReader.java     | 2 +-
 android/core/src/processing/{android => }/xml/PIReader.java | 2 +-
 .../src/processing/{android => }/xml/StdXMLBuilder.java     | 4 ++--
 .../core/src/processing/{android => }/xml/StdXMLParser.java | 2 +-
 .../core/src/processing/{android => }/xml/StdXMLReader.java | 2 +-
 .../core/src/processing/{android => }/xml/XMLAttribute.java | 2 +-
 .../core/src/processing/{android => }/xml/XMLElement.java   | 4 ++--
 .../src/processing/{android => }/xml/XMLEntityResolver.java | 2 +-
 .../core/src/processing/{android => }/xml/XMLException.java | 2 +-
 .../src/processing/{android => }/xml/XMLParseException.java | 2 +-
 android/core/src/processing/{android => }/xml/XMLUtil.java  | 2 +-
 .../{android => }/xml/XMLValidationException.java           | 2 +-
 .../core/src/processing/{android => }/xml/XMLValidator.java | 2 +-
 .../core/src/processing/{android => }/xml/XMLWriter.java    | 2 +-
 37 files changed, 42 insertions(+), 42 deletions(-)
 rename android/core/src/processing/{android => }/core/GLConstants.java (97%)
 rename android/core/src/processing/{android => }/core/GLFont.java (99%)
 rename android/core/src/processing/{android => }/core/GLModel.java (96%)
 rename android/core/src/processing/{android => }/core/GLTexture.java (96%)
 rename android/core/src/processing/{android => }/core/PApplet.java (99%)
 rename android/core/src/processing/{android => }/core/PConstants.java (99%)
 rename android/core/src/processing/{android => }/core/PFont.java (99%)
 rename android/core/src/processing/{android => }/core/PGraphics.java (99%)
 rename android/core/src/processing/{android => }/core/PGraphics3D.java (99%)
 rename android/core/src/processing/{android => }/core/PGraphicsAndroid2D.java (99%)
 rename android/core/src/processing/{android => }/core/PGraphicsAndroid3D.java (99%)
 rename android/core/src/processing/{android => }/core/PImage.java (99%)
 rename android/core/src/processing/{android => }/core/PLine.java (99%)
 rename android/core/src/processing/{android => }/core/PMatrix.java (99%)
 rename android/core/src/processing/{android => }/core/PMatrix2D.java (99%)
 rename android/core/src/processing/{android => }/core/PMatrix3D.java (99%)
 rename android/core/src/processing/{android => }/core/PPolygon.java (99%)
 rename android/core/src/processing/{android => }/core/PShape.java (99%)
 rename android/core/src/processing/{android => }/core/PShapeSVG.java (99%)
 rename android/core/src/processing/{android => }/core/PStyle.java (98%)
 rename android/core/src/processing/{android => }/core/PTriangle.java (99%)
 rename android/core/src/processing/{android => }/core/PVector.java (99%)
 rename android/core/src/processing/{android => }/xml/CDATAReader.java (99%)
 rename android/core/src/processing/{android => }/xml/ContentReader.java (99%)
 rename android/core/src/processing/{android => }/xml/PIReader.java (99%)
 rename android/core/src/processing/{android => }/xml/StdXMLBuilder.java (99%)
 rename android/core/src/processing/{android => }/xml/StdXMLParser.java (99%)
 rename android/core/src/processing/{android => }/xml/StdXMLReader.java (99%)
 rename android/core/src/processing/{android => }/xml/XMLAttribute.java (99%)
 rename android/core/src/processing/{android => }/xml/XMLElement.java (99%)
 rename android/core/src/processing/{android => }/xml/XMLEntityResolver.java (99%)
 rename android/core/src/processing/{android => }/xml/XMLException.java (99%)
 rename android/core/src/processing/{android => }/xml/XMLParseException.java (98%)
 rename android/core/src/processing/{android => }/xml/XMLUtil.java (99%)
 rename android/core/src/processing/{android => }/xml/XMLValidationException.java (99%)
 rename android/core/src/processing/{android => }/xml/XMLValidator.java (99%)
 rename android/core/src/processing/{android => }/xml/XMLWriter.java (99%)

diff --git a/android/core/src/processing/android/core/GLConstants.java b/android/core/src/processing/core/GLConstants.java
similarity index 97%
rename from android/core/src/processing/android/core/GLConstants.java
rename to android/core/src/processing/core/GLConstants.java
index b612f4c34..3db1f3278 100644
--- a/android/core/src/processing/android/core/GLConstants.java
+++ b/android/core/src/processing/core/GLConstants.java
@@ -1,4 +1,4 @@
-package processing.android.core;
+package processing.core;
 
 public interface GLConstants {
 /**
diff --git a/android/core/src/processing/android/core/GLFont.java b/android/core/src/processing/core/GLFont.java
similarity index 99%
rename from android/core/src/processing/android/core/GLFont.java
rename to android/core/src/processing/core/GLFont.java
index 406a74f15..788e8e4a1 100644
--- a/android/core/src/processing/android/core/GLFont.java
+++ b/android/core/src/processing/core/GLFont.java
@@ -22,7 +22,7 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.android.core;
+package processing.core;
 
 import java.io.*;
 import java.util.Arrays;
diff --git a/android/core/src/processing/android/core/GLModel.java b/android/core/src/processing/core/GLModel.java
similarity index 96%
rename from android/core/src/processing/android/core/GLModel.java
rename to android/core/src/processing/core/GLModel.java
index 5f7a65a26..ba7a69286 100644
--- a/android/core/src/processing/android/core/GLModel.java
+++ b/android/core/src/processing/core/GLModel.java
@@ -1,4 +1,4 @@
-package processing.android.core;
+package processing.core;
 
 import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
diff --git a/android/core/src/processing/android/core/GLTexture.java b/android/core/src/processing/core/GLTexture.java
similarity index 96%
rename from android/core/src/processing/android/core/GLTexture.java
rename to android/core/src/processing/core/GLTexture.java
index 7473daf99..dd4b8e9c8 100644
--- a/android/core/src/processing/android/core/GLTexture.java
+++ b/android/core/src/processing/core/GLTexture.java
@@ -1,4 +1,4 @@
-package processing.android.core;
+package processing.core;
 
 import java.lang.reflect.Method;
 import java.nio.IntBuffer;
diff --git a/android/core/src/processing/android/core/PApplet.java b/android/core/src/processing/core/PApplet.java
similarity index 99%
rename from android/core/src/processing/android/core/PApplet.java
rename to android/core/src/processing/core/PApplet.java
index f342cf17b..3e6ba58a6 100644
--- a/android/core/src/processing/android/core/PApplet.java
+++ b/android/core/src/processing/core/PApplet.java
@@ -22,7 +22,7 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.android.core;
+package processing.core;
 
 import android.content.*;
 import android.content.res.AssetManager;
diff --git a/android/core/src/processing/android/core/PConstants.java b/android/core/src/processing/core/PConstants.java
similarity index 99%
rename from android/core/src/processing/android/core/PConstants.java
rename to android/core/src/processing/core/PConstants.java
index a6b4f5438..d51e69bba 100644
--- a/android/core/src/processing/android/core/PConstants.java
+++ b/android/core/src/processing/core/PConstants.java
@@ -22,7 +22,7 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.android.core;
+package processing.core;
 
 import android.view.KeyEvent;
 //import java.awt.Cursor;
diff --git a/android/core/src/processing/android/core/PFont.java b/android/core/src/processing/core/PFont.java
similarity index 99%
rename from android/core/src/processing/android/core/PFont.java
rename to android/core/src/processing/core/PFont.java
index bd794b6a4..ba46335cc 100644
--- a/android/core/src/processing/android/core/PFont.java
+++ b/android/core/src/processing/core/PFont.java
@@ -22,7 +22,7 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.android.core;
+package processing.core;
 
 //import java.awt.*;
 //import java.awt.image.BufferedImage;
diff --git a/android/core/src/processing/android/core/PGraphics.java b/android/core/src/processing/core/PGraphics.java
similarity index 99%
rename from android/core/src/processing/android/core/PGraphics.java
rename to android/core/src/processing/core/PGraphics.java
index 15f2ee8bf..146483dd3 100644
--- a/android/core/src/processing/android/core/PGraphics.java
+++ b/android/core/src/processing/core/PGraphics.java
@@ -22,7 +22,7 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.android.core;
+package processing.core;
 
 import java.util.HashMap;
 
diff --git a/android/core/src/processing/android/core/PGraphics3D.java b/android/core/src/processing/core/PGraphics3D.java
similarity index 99%
rename from android/core/src/processing/android/core/PGraphics3D.java
rename to android/core/src/processing/core/PGraphics3D.java
index a688e6003..7bd438125 100644
--- a/android/core/src/processing/android/core/PGraphics3D.java
+++ b/android/core/src/processing/core/PGraphics3D.java
@@ -22,7 +22,7 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.android.core;
+package processing.core;
 
 //import java.awt.Toolkit;
 //import java.awt.image.*;
diff --git a/android/core/src/processing/android/core/PGraphicsAndroid2D.java b/android/core/src/processing/core/PGraphicsAndroid2D.java
similarity index 99%
rename from android/core/src/processing/android/core/PGraphicsAndroid2D.java
rename to android/core/src/processing/core/PGraphicsAndroid2D.java
index 72da08cf7..ada809c82 100644
--- a/android/core/src/processing/android/core/PGraphicsAndroid2D.java
+++ b/android/core/src/processing/core/PGraphicsAndroid2D.java
@@ -21,7 +21,7 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.android.core;
+package processing.core;
 
 import android.graphics.*;
 import android.graphics.Bitmap.Config;
diff --git a/android/core/src/processing/android/core/PGraphicsAndroid3D.java b/android/core/src/processing/core/PGraphicsAndroid3D.java
similarity index 99%
rename from android/core/src/processing/android/core/PGraphicsAndroid3D.java
rename to android/core/src/processing/core/PGraphicsAndroid3D.java
index 19d720ccf..423e3cefc 100644
--- a/android/core/src/processing/android/core/PGraphicsAndroid3D.java
+++ b/android/core/src/processing/core/PGraphicsAndroid3D.java
@@ -1,4 +1,4 @@
-package processing.android.core;
+package processing.core;
 
 import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
diff --git a/android/core/src/processing/android/core/PImage.java b/android/core/src/processing/core/PImage.java
similarity index 99%
rename from android/core/src/processing/android/core/PImage.java
rename to android/core/src/processing/core/PImage.java
index e8bb57eb4..cb592ff2e 100644
--- a/android/core/src/processing/android/core/PImage.java
+++ b/android/core/src/processing/core/PImage.java
@@ -22,7 +22,7 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.android.core;
+package processing.core;
 
 //import java.awt.image.*;
 import java.io.*;
@@ -1340,7 +1340,7 @@ public class PImage implements PConstants, Cloneable {
 
   /**
    * Blends one area of this image to another area.
-   * @see processing.android.core.PImage#blendColor(int,int,int)
+   * @see processing.core.PImage#blendColor(int,int,int)
    */
   public void blend(int sx, int sy, int sw, int sh,
                     int dx, int dy, int dw, int dh, int mode) {
@@ -1350,7 +1350,7 @@ public class PImage implements PConstants, Cloneable {
 
   /**
    * Copies area of one image into another PImage object.
-   * @see processing.android.core.PImage#blendColor(int,int,int)
+   * @see processing.core.PImage#blendColor(int,int,int)
    */
   public void blend(PImage src,
                     int sx, int sy, int sw, int sh,
diff --git a/android/core/src/processing/android/core/PLine.java b/android/core/src/processing/core/PLine.java
similarity index 99%
rename from android/core/src/processing/android/core/PLine.java
rename to android/core/src/processing/core/PLine.java
index ff7e28c78..a18afda9c 100644
--- a/android/core/src/processing/android/core/PLine.java
+++ b/android/core/src/processing/core/PLine.java
@@ -22,7 +22,7 @@
   Boston, MA  02111-1307  USA
  */
 
-package processing.android.core;
+package processing.core;
 
 
 /**
diff --git a/android/core/src/processing/android/core/PMatrix.java b/android/core/src/processing/core/PMatrix.java
similarity index 99%
rename from android/core/src/processing/android/core/PMatrix.java
rename to android/core/src/processing/core/PMatrix.java
index afd7df295..aac9c0625 100644
--- a/android/core/src/processing/android/core/PMatrix.java
+++ b/android/core/src/processing/core/PMatrix.java
@@ -21,7 +21,7 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.android.core;
+package processing.core;
 
 
 public interface PMatrix {
diff --git a/android/core/src/processing/android/core/PMatrix2D.java b/android/core/src/processing/core/PMatrix2D.java
similarity index 99%
rename from android/core/src/processing/android/core/PMatrix2D.java
rename to android/core/src/processing/core/PMatrix2D.java
index 103471f49..fad4d0fa8 100644
--- a/android/core/src/processing/android/core/PMatrix2D.java
+++ b/android/core/src/processing/core/PMatrix2D.java
@@ -21,7 +21,7 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.android.core;
+package processing.core;
 
 
 /**
diff --git a/android/core/src/processing/android/core/PMatrix3D.java b/android/core/src/processing/core/PMatrix3D.java
similarity index 99%
rename from android/core/src/processing/android/core/PMatrix3D.java
rename to android/core/src/processing/core/PMatrix3D.java
index b92d8db5c..25d9fd11d 100644
--- a/android/core/src/processing/android/core/PMatrix3D.java
+++ b/android/core/src/processing/core/PMatrix3D.java
@@ -21,7 +21,7 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.android.core;
+package processing.core;
 
 
 /**
diff --git a/android/core/src/processing/android/core/PPolygon.java b/android/core/src/processing/core/PPolygon.java
similarity index 99%
rename from android/core/src/processing/android/core/PPolygon.java
rename to android/core/src/processing/core/PPolygon.java
index 8935793f5..09bf390b5 100644
--- a/android/core/src/processing/android/core/PPolygon.java
+++ b/android/core/src/processing/core/PPolygon.java
@@ -22,7 +22,7 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.android.core;
+package processing.core;
 
 
 /**
diff --git a/android/core/src/processing/android/core/PShape.java b/android/core/src/processing/core/PShape.java
similarity index 99%
rename from android/core/src/processing/android/core/PShape.java
rename to android/core/src/processing/core/PShape.java
index b019436c0..cf2274480 100644
--- a/android/core/src/processing/android/core/PShape.java
+++ b/android/core/src/processing/core/PShape.java
@@ -21,7 +21,7 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.android.core;
+package processing.core;
 
 import java.util.HashMap;
 
diff --git a/android/core/src/processing/android/core/PShapeSVG.java b/android/core/src/processing/core/PShapeSVG.java
similarity index 99%
rename from android/core/src/processing/android/core/PShapeSVG.java
rename to android/core/src/processing/core/PShapeSVG.java
index 7fd63bca3..384d0ec62 100644
--- a/android/core/src/processing/android/core/PShapeSVG.java
+++ b/android/core/src/processing/core/PShapeSVG.java
@@ -1,10 +1,10 @@
-package processing.android.core;
+package processing.core;
 
 import java.util.HashMap;
 
 import android.graphics.*;
 
-import processing.android.xml.XMLElement;
+import processing.xml.XMLElement;
 
 
 /**
diff --git a/android/core/src/processing/android/core/PStyle.java b/android/core/src/processing/core/PStyle.java
similarity index 98%
rename from android/core/src/processing/android/core/PStyle.java
rename to android/core/src/processing/core/PStyle.java
index c64ef4e05..ccea03a42 100644
--- a/android/core/src/processing/android/core/PStyle.java
+++ b/android/core/src/processing/core/PStyle.java
@@ -21,7 +21,7 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.android.core;
+package processing.core;
 
 
 public class PStyle implements PConstants {
diff --git a/android/core/src/processing/android/core/PTriangle.java b/android/core/src/processing/core/PTriangle.java
similarity index 99%
rename from android/core/src/processing/android/core/PTriangle.java
rename to android/core/src/processing/core/PTriangle.java
index 47cdf0165..97c4fed2e 100644
--- a/android/core/src/processing/android/core/PTriangle.java
+++ b/android/core/src/processing/core/PTriangle.java
@@ -22,7 +22,7 @@
   Boston, MA  02111-1307  USA
  */
 
-package processing.android.core;
+package processing.core;
 
 /**
  * Handles rendering of single (tesselated) triangles in 3D.
diff --git a/android/core/src/processing/android/core/PVector.java b/android/core/src/processing/core/PVector.java
similarity index 99%
rename from android/core/src/processing/android/core/PVector.java
rename to android/core/src/processing/core/PVector.java
index 3c4511bec..5f9be436e 100644
--- a/android/core/src/processing/android/core/PVector.java
+++ b/android/core/src/processing/core/PVector.java
@@ -22,7 +22,7 @@
   Boston, MA  02111-1307  USA
  */
 
-package processing.android.core;
+package processing.core;
 
 /**
  * A class to describe a two or three dimensional vector.
diff --git a/android/core/src/processing/android/xml/CDATAReader.java b/android/core/src/processing/xml/CDATAReader.java
similarity index 99%
rename from android/core/src/processing/android/xml/CDATAReader.java
rename to android/core/src/processing/xml/CDATAReader.java
index f8920abd1..11b6849a7 100644
--- a/android/core/src/processing/android/xml/CDATAReader.java
+++ b/android/core/src/processing/xml/CDATAReader.java
@@ -26,7 +26,7 @@
  *  3. This notice may not be removed or altered from any source distribution.
  */
 
-package processing.android.xml;
+package processing.xml;
 
 
 import java.io.Reader;
diff --git a/android/core/src/processing/android/xml/ContentReader.java b/android/core/src/processing/xml/ContentReader.java
similarity index 99%
rename from android/core/src/processing/android/xml/ContentReader.java
rename to android/core/src/processing/xml/ContentReader.java
index 47bf05e0d..66430c06b 100644
--- a/android/core/src/processing/android/xml/ContentReader.java
+++ b/android/core/src/processing/xml/ContentReader.java
@@ -26,7 +26,7 @@
  *  3. This notice may not be removed or altered from any source distribution.
  */
 
-package processing.android.xml;
+package processing.xml;
 
 
 import java.io.Reader;
diff --git a/android/core/src/processing/android/xml/PIReader.java b/android/core/src/processing/xml/PIReader.java
similarity index 99%
rename from android/core/src/processing/android/xml/PIReader.java
rename to android/core/src/processing/xml/PIReader.java
index 312dd065d..d6a2bf298 100644
--- a/android/core/src/processing/android/xml/PIReader.java
+++ b/android/core/src/processing/xml/PIReader.java
@@ -26,7 +26,7 @@
  *  3. This notice may not be removed or altered from any source distribution.
  */
 
-package processing.android.xml;
+package processing.xml;
 
 
 import java.io.Reader;
diff --git a/android/core/src/processing/android/xml/StdXMLBuilder.java b/android/core/src/processing/xml/StdXMLBuilder.java
similarity index 99%
rename from android/core/src/processing/android/xml/StdXMLBuilder.java
rename to android/core/src/processing/xml/StdXMLBuilder.java
index 675999a42..54a223546 100644
--- a/android/core/src/processing/android/xml/StdXMLBuilder.java
+++ b/android/core/src/processing/xml/StdXMLBuilder.java
@@ -26,7 +26,7 @@
  *  3. This notice may not be removed or altered from any source distribution.
  */
 
-package processing.android.xml;
+package processing.xml;
 
 
 import java.io.IOException;
@@ -38,7 +38,7 @@ import java.util.Stack;
  * StdXMLBuilder is a concrete implementation of IXMLBuilder which creates a
  * tree of IXMLElement from an XML data source.
  *
- * @see processing.android.xml.XMLElement
+ * @see processing.xml.XMLElement
  *
  * @author Marc De Scheemaecker
  * @version $Name: RELEASE_2_2_1 $, $Revision: 1.3 $
diff --git a/android/core/src/processing/android/xml/StdXMLParser.java b/android/core/src/processing/xml/StdXMLParser.java
similarity index 99%
rename from android/core/src/processing/android/xml/StdXMLParser.java
rename to android/core/src/processing/xml/StdXMLParser.java
index 59710efcd..da60bbb5d 100644
--- a/android/core/src/processing/android/xml/StdXMLParser.java
+++ b/android/core/src/processing/xml/StdXMLParser.java
@@ -26,7 +26,7 @@
  *  3. This notice may not be removed or altered from any source distribution.
  */
 
-package processing.android.xml;
+package processing.xml;
 
 
 import java.io.Reader;
diff --git a/android/core/src/processing/android/xml/StdXMLReader.java b/android/core/src/processing/xml/StdXMLReader.java
similarity index 99%
rename from android/core/src/processing/android/xml/StdXMLReader.java
rename to android/core/src/processing/xml/StdXMLReader.java
index ac1e45198..e2d97a580 100644
--- a/android/core/src/processing/android/xml/StdXMLReader.java
+++ b/android/core/src/processing/xml/StdXMLReader.java
@@ -26,7 +26,7 @@
  *  3. This notice may not be removed or altered from any source distribution.
  */
 
-package processing.android.xml;
+package processing.xml;
 
 
 import java.io.InputStream;
diff --git a/android/core/src/processing/android/xml/XMLAttribute.java b/android/core/src/processing/xml/XMLAttribute.java
similarity index 99%
rename from android/core/src/processing/android/xml/XMLAttribute.java
rename to android/core/src/processing/xml/XMLAttribute.java
index 0cbfbe2ca..759dd47fc 100644
--- a/android/core/src/processing/android/xml/XMLAttribute.java
+++ b/android/core/src/processing/xml/XMLAttribute.java
@@ -26,7 +26,7 @@
  *  3. This notice may not be removed or altered from any source distribution.
  */
 
-package processing.android.xml;
+package processing.xml;
 
 
 /**
diff --git a/android/core/src/processing/android/xml/XMLElement.java b/android/core/src/processing/xml/XMLElement.java
similarity index 99%
rename from android/core/src/processing/android/xml/XMLElement.java
rename to android/core/src/processing/xml/XMLElement.java
index 4d11eb834..944df0cd8 100644
--- a/android/core/src/processing/android/xml/XMLElement.java
+++ b/android/core/src/processing/xml/XMLElement.java
@@ -22,12 +22,12 @@
  *  3. This notice may not be removed or altered from any source distribution.
  */
 
-package processing.android.xml;
+package processing.xml;
 
 import java.io.*;
 import java.util.*;
 
-import processing.android.core.PApplet;
+import processing.core.PApplet;
 
 
 /**
diff --git a/android/core/src/processing/android/xml/XMLEntityResolver.java b/android/core/src/processing/xml/XMLEntityResolver.java
similarity index 99%
rename from android/core/src/processing/android/xml/XMLEntityResolver.java
rename to android/core/src/processing/xml/XMLEntityResolver.java
index a41edbe01..f12c4c0d4 100644
--- a/android/core/src/processing/android/xml/XMLEntityResolver.java
+++ b/android/core/src/processing/xml/XMLEntityResolver.java
@@ -26,7 +26,7 @@
  *  3. This notice may not be removed or altered from any source distribution.
  */
 
-package processing.android.xml;
+package processing.xml;
 
 
 import java.util.Hashtable;
diff --git a/android/core/src/processing/android/xml/XMLException.java b/android/core/src/processing/xml/XMLException.java
similarity index 99%
rename from android/core/src/processing/android/xml/XMLException.java
rename to android/core/src/processing/xml/XMLException.java
index 59811cf6d..8515d481a 100644
--- a/android/core/src/processing/android/xml/XMLException.java
+++ b/android/core/src/processing/xml/XMLException.java
@@ -26,7 +26,7 @@
  *  3. This notice may not be removed or altered from any source distribution.
  */
 
-package processing.android.xml;
+package processing.xml;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;
diff --git a/android/core/src/processing/android/xml/XMLParseException.java b/android/core/src/processing/xml/XMLParseException.java
similarity index 98%
rename from android/core/src/processing/android/xml/XMLParseException.java
rename to android/core/src/processing/xml/XMLParseException.java
index f761af888..aa7915d94 100644
--- a/android/core/src/processing/android/xml/XMLParseException.java
+++ b/android/core/src/processing/xml/XMLParseException.java
@@ -26,7 +26,7 @@
  *  3. This notice may not be removed or altered from any source distribution.
  */
 
-package processing.android.xml;
+package processing.xml;
 
 
 /**
diff --git a/android/core/src/processing/android/xml/XMLUtil.java b/android/core/src/processing/xml/XMLUtil.java
similarity index 99%
rename from android/core/src/processing/android/xml/XMLUtil.java
rename to android/core/src/processing/xml/XMLUtil.java
index 4bb181689..6adad79be 100644
--- a/android/core/src/processing/android/xml/XMLUtil.java
+++ b/android/core/src/processing/xml/XMLUtil.java
@@ -26,7 +26,7 @@
  *  3. This notice may not be removed or altered from any source distribution.
  */
 
-package processing.android.xml;
+package processing.xml;
 
 
 import java.io.IOException;
diff --git a/android/core/src/processing/android/xml/XMLValidationException.java b/android/core/src/processing/xml/XMLValidationException.java
similarity index 99%
rename from android/core/src/processing/android/xml/XMLValidationException.java
rename to android/core/src/processing/xml/XMLValidationException.java
index eedf75ca3..2e3bd1728 100644
--- a/android/core/src/processing/android/xml/XMLValidationException.java
+++ b/android/core/src/processing/xml/XMLValidationException.java
@@ -26,7 +26,7 @@
  *  3. This notice may not be removed or altered from any source distribution.
  */
 
-package processing.android.xml;
+package processing.xml;
 
 
 /**
diff --git a/android/core/src/processing/android/xml/XMLValidator.java b/android/core/src/processing/xml/XMLValidator.java
similarity index 99%
rename from android/core/src/processing/android/xml/XMLValidator.java
rename to android/core/src/processing/xml/XMLValidator.java
index 0395e8aca..876046d85 100644
--- a/android/core/src/processing/android/xml/XMLValidator.java
+++ b/android/core/src/processing/xml/XMLValidator.java
@@ -26,7 +26,7 @@
  *  3. This notice may not be removed or altered from any source distribution.
  */
 
-package processing.android.xml;
+package processing.xml;
 
 
 import java.io.Reader;
diff --git a/android/core/src/processing/android/xml/XMLWriter.java b/android/core/src/processing/xml/XMLWriter.java
similarity index 99%
rename from android/core/src/processing/android/xml/XMLWriter.java
rename to android/core/src/processing/xml/XMLWriter.java
index 819157f0b..7925cf8e3 100644
--- a/android/core/src/processing/android/xml/XMLWriter.java
+++ b/android/core/src/processing/xml/XMLWriter.java
@@ -26,7 +26,7 @@
  *  3. This notice may not be removed or altered from any source distribution.
  */
 
-package processing.android.xml;
+package processing.xml;
 
 
 import java.io.IOException;