diff --git a/src/net/sourceforge/plantuml/acearth/PSystemXearth.java b/src/net/sourceforge/plantuml/acearth/PSystemXearth.java
index a809b3719..15df082ce 100644
--- a/src/net/sourceforge/plantuml/acearth/PSystemXearth.java
+++ b/src/net/sourceforge/plantuml/acearth/PSystemXearth.java
@@ -47,9 +47,9 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
 
-import ext.plantuml.com.ctreber.acearth.ACearth;
-import ext.plantuml.com.ctreber.acearth.ConfigurationACearth;
-import ext.plantuml.com.ctreber.acearth.plugins.markers.Marker;
+import zext.plantuml.com.ctreber.acearth.ACearth;
+import zext.plantuml.com.ctreber.acearth.ConfigurationACearth;
+import zext.plantuml.com.ctreber.acearth.plugins.markers.Marker;
 import net.sourceforge.plantuml.AbstractPSystem;
 import net.sourceforge.plantuml.FileFormatOption;
 import net.sourceforge.plantuml.api.ImageDataSimple;
diff --git a/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java b/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java
index aa19bba56..d7a8e9ad9 100644
--- a/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java
+++ b/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java
@@ -40,7 +40,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import ext.plantuml.com.ctreber.acearth.plugins.markers.Marker;
+import zext.plantuml.com.ctreber.acearth.plugins.markers.Marker;
 import net.sourceforge.plantuml.command.PSystemBasicFactory;
 import net.sourceforge.plantuml.core.UmlSource;
 import net.sourceforge.plantuml.log.Logme;
diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java
index 183d130ed..a78abd2eb 100644
--- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java
+++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java
@@ -61,7 +61,7 @@ public class CommandActivity3 extends SingleLineCommand2<ActivityDiagram3> {
 
 	public static final String endingGroup() {
 		return "(" //
-				+ ";(?:[%s]*(\\<\\<\\w+\\>\\>))?" //
+				+ ";[%s]*(\\<\\<\\w+\\>\\>(?:[%s]*\\<\\<\\w+\\>\\>)*)?" //
 				+ "|" //
 				+ Matcher.quoteReplacement("\\\\") // that is simply \ character
 				+ "|" //
@@ -77,7 +77,7 @@ public class CommandActivity3 extends SingleLineCommand2<ActivityDiagram3> {
 
 	private static final String endingGroupShort() {
 		return "(" //
-				+ ";(?:[%s]*(\\<\\<\\w+\\>\\>))?" //
+				+ ";[%s]*(\\<\\<\\w+\\>\\>(?:[%s]*\\<\\<\\w+\\>\\>)*)?" //
 				+ "|" //
 				+ Matcher.quoteReplacement("\\\\") // that is simply \ character
 				+ "|" //
diff --git a/src/net/sourceforge/plantuml/flashcode/FlashCodeUtilsZxing.java b/src/net/sourceforge/plantuml/flashcode/FlashCodeUtilsZxing.java
index f2058b5d2..902e27b8a 100644
--- a/src/net/sourceforge/plantuml/flashcode/FlashCodeUtilsZxing.java
+++ b/src/net/sourceforge/plantuml/flashcode/FlashCodeUtilsZxing.java
@@ -41,12 +41,12 @@ import java.util.Hashtable;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import ext.plantuml.com.google.zxing.BarcodeFormat;
-import ext.plantuml.com.google.zxing.EncodeHintType;
-import ext.plantuml.com.google.zxing.client.j2se.MatrixToImageWriter;
-import ext.plantuml.com.google.zxing.common.BitMatrix;
-import ext.plantuml.com.google.zxing.qrcode.QRCodeWriter;
-import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import zext.plantuml.com.google.zxing.BarcodeFormat;
+import zext.plantuml.com.google.zxing.EncodeHintType;
+import zext.plantuml.com.google.zxing.client.j2se.MatrixToImageWriter;
+import zext.plantuml.com.google.zxing.common.BitMatrix;
+import zext.plantuml.com.google.zxing.qrcode.QRCodeWriter;
+import zext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 import net.sourceforge.plantuml.utils.Log;
 
 public class FlashCodeUtilsZxing implements FlashCodeUtils {
diff --git a/src/net/sourceforge/plantuml/skin/ActorAwesome.java b/src/net/sourceforge/plantuml/skin/ActorAwesome.java
index 50869e283..d2926998c 100644
--- a/src/net/sourceforge/plantuml/skin/ActorAwesome.java
+++ b/src/net/sourceforge/plantuml/skin/ActorAwesome.java
@@ -55,10 +55,10 @@ public class ActorAwesome extends AbstractTextBlock implements TextBlock {
 	private final double radius = 8;
 	private final double bodyHeight = 28;
 
-	private final Fashion symbolContext;
+	private final Fashion fashion;
 
-	public ActorAwesome(Fashion symbolContext) {
-		this.symbolContext = symbolContext.withStroke(UStroke.withThickness(1.5));
+	public ActorAwesome(Fashion fashion) {
+		this.fashion = fashion;
 	}
 
 	public void drawU(UGraphic ug) {
@@ -81,18 +81,18 @@ public class ActorAwesome extends AbstractTextBlock implements TextBlock {
 		path.cubicTo(-bodyWidth / 2 + shoulder + collar, collar, -collar, collar, 0, collar);
 		path.closePath();
 
-		if (symbolContext.getDeltaShadow() != 0) {
-			head.setDeltaShadow(symbolContext.getDeltaShadow());
-			path.setDeltaShadow(symbolContext.getDeltaShadow());
+		if (fashion.getDeltaShadow() != 0) {
+			head.setDeltaShadow(fashion.getDeltaShadow());
+			path.setDeltaShadow(fashion.getDeltaShadow());
 		}
-		ug = symbolContext.apply(ug);
+		ug = fashion.apply(ug);
 		ug.apply(new UTranslate(centerX - head.getWidth() / 2, thickness())).draw(head);
 		ug.apply(new UTranslate(centerX, head.getHeight() + thickness())).draw(path);
 
 	}
 
 	private double thickness() {
-		return symbolContext.getStroke().getThickness();
+		return fashion.getStroke().getThickness();
 	}
 
 	public double getPreferredWidth() {
diff --git a/src/net/sourceforge/plantuml/skin/ActorHollow.java b/src/net/sourceforge/plantuml/skin/ActorHollow.java
index 91fc51ffc..0e8e79293 100644
--- a/src/net/sourceforge/plantuml/skin/ActorHollow.java
+++ b/src/net/sourceforge/plantuml/skin/ActorHollow.java
@@ -57,10 +57,10 @@ public class ActorHollow extends AbstractTextBlock implements TextBlock {
 	private final double bodyThickness = 6;
 	private final double legThickness = 6;
 
-	private final Fashion symbolContext;
+	private final Fashion fashion;
 
-	public ActorHollow(Fashion symbolContext) {
-		this.symbolContext = symbolContext;
+	public ActorHollow(Fashion fashion) {
+		this.fashion = fashion;
 	}
 
 	public void drawU(UGraphic ug) {
@@ -87,17 +87,17 @@ public class ActorHollow extends AbstractTextBlock implements TextBlock {
 		path.lineTo(-bodyWidth / 2, 0);
 		path.closePath();
 
-		if (symbolContext.getDeltaShadow() != 0) {
-			head.setDeltaShadow(symbolContext.getDeltaShadow());
-			path.setDeltaShadow(symbolContext.getDeltaShadow());
+		if (fashion.getDeltaShadow() != 0) {
+			head.setDeltaShadow(fashion.getDeltaShadow());
+			path.setDeltaShadow(fashion.getDeltaShadow());
 		}
-		ug = symbolContext.apply(ug);
+		ug = fashion.apply(ug);
 		ug.apply(new UTranslate(centerX - head.getWidth() / 2, thickness())).draw(head);
 		ug.apply(new UTranslate(centerX, head.getHeight() + thickness() + neckHeight)).draw(path);
 	}
 
 	private double thickness() {
-		return symbolContext.getStroke().getThickness();
+		return fashion.getStroke().getThickness();
 	}
 
 	public double getPreferredWidth() {
@@ -105,7 +105,7 @@ public class ActorHollow extends AbstractTextBlock implements TextBlock {
 	}
 
 	public double getPreferredHeight() {
-		return headDiam + neckHeight + bodyHeight + thickness() * 2 + symbolContext.getDeltaShadow();
+		return headDiam + neckHeight + bodyHeight + thickness() * 2 + fashion.getDeltaShadow();
 	}
 
 	public XDimension2D calculateDimension(StringBounder stringBounder) {
diff --git a/src/net/sourceforge/plantuml/skin/ActorStickMan.java b/src/net/sourceforge/plantuml/skin/ActorStickMan.java
index b92cb27eb..03e24ffdd 100644
--- a/src/net/sourceforge/plantuml/skin/ActorStickMan.java
+++ b/src/net/sourceforge/plantuml/skin/ActorStickMan.java
@@ -57,11 +57,11 @@ public class ActorStickMan extends AbstractTextBlock implements TextBlock {
 	private final double legsY = 15;
 	private final double headDiam = 16;
 
-	private final Fashion symbolContext;
+	private final Fashion fashion;
 	private final boolean actorBusiness;
 
-	ActorStickMan(Fashion symbolContext, boolean actorBusiness) {
-		this.symbolContext = symbolContext;
+	ActorStickMan(Fashion fashion, boolean actorBusiness) {
+		this.fashion = fashion;
 		this.actorBusiness = actorBusiness;
 	}
 
@@ -81,12 +81,12 @@ public class ActorStickMan extends AbstractTextBlock implements TextBlock {
 		path.lineTo(-legsX, bodyLenght + legsY);
 		path.moveTo(0, bodyLenght);
 		path.lineTo(legsX, bodyLenght + legsY);
-		if (symbolContext.getDeltaShadow() != 0) {
-			head.setDeltaShadow(symbolContext.getDeltaShadow());
-			path.setDeltaShadow(symbolContext.getDeltaShadow());
+		if (fashion.getDeltaShadow() != 0) {
+			head.setDeltaShadow(fashion.getDeltaShadow());
+			path.setDeltaShadow(fashion.getDeltaShadow());
 		}
 
-		ug = symbolContext.apply(ug);
+		ug = fashion.apply(ug);
 		ug.apply(new UTranslate(startX, thickness())).draw(head);
 		if (actorBusiness) {
 			specialBusiness(ug.apply(new UTranslate(startX + headDiam / 2, thickness() + headDiam / 2)));
@@ -109,7 +109,7 @@ public class ActorStickMan extends AbstractTextBlock implements TextBlock {
 	}
 
 	private double thickness() {
-		return symbolContext.getStroke().getThickness();
+		return fashion.getStroke().getThickness();
 	}
 
 	public double getPreferredWidth() {
@@ -117,7 +117,7 @@ public class ActorStickMan extends AbstractTextBlock implements TextBlock {
 	}
 
 	public double getPreferredHeight() {
-		return headDiam + bodyLenght + legsY + 2 * thickness() + symbolContext.getDeltaShadow() + 1;
+		return headDiam + bodyLenght + legsY + 2 * thickness() + fashion.getDeltaShadow() + 1;
 	}
 
 	public XDimension2D calculateDimension(StringBounder stringBounder) {
diff --git a/src/ext/plantuml/com/ctreber/acearth/ACearth.java b/src/zext/plantuml/com/ctreber/acearth/ACearth.java
similarity index 85%
rename from src/ext/plantuml/com/ctreber/acearth/ACearth.java
rename to src/zext/plantuml/com/ctreber/acearth/ACearth.java
index 7f04fc86d..532fb3fec 100644
--- a/src/ext/plantuml/com/ctreber/acearth/ACearth.java
+++ b/src/zext/plantuml/com/ctreber/acearth/ACearth.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth;
+package zext.plantuml.com.ctreber.acearth;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -7,33 +7,33 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
 
-import ext.plantuml.com.ctreber.acearth.gui.CanvasACearth;
-import ext.plantuml.com.ctreber.acearth.plugins.Plugin;
-import ext.plantuml.com.ctreber.acearth.plugins.markers.Marker;
-import ext.plantuml.com.ctreber.acearth.plugins.markers.PluginMarkers;
-import ext.plantuml.com.ctreber.acearth.projection.Projection;
-import ext.plantuml.com.ctreber.acearth.projection.ProjectionCyl;
-import ext.plantuml.com.ctreber.acearth.projection.ProjectionMerc;
-import ext.plantuml.com.ctreber.acearth.projection.ProjectionOrtho;
-import ext.plantuml.com.ctreber.acearth.renderer.Renderer;
-import ext.plantuml.com.ctreber.acearth.renderer.RowTypeRendererScanBit;
-import ext.plantuml.com.ctreber.acearth.renderer.RowTypeRendererScanDot;
-import ext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMap;
-import ext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMapDefault;
-import ext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMapOrtho;
-import ext.plantuml.com.ctreber.acearth.scandot.DotGeneratorLines;
-import ext.plantuml.com.ctreber.acearth.scandot.DotGeneratorStars;
-import ext.plantuml.com.ctreber.acearth.scandot.ScanDot;
-import ext.plantuml.com.ctreber.acearth.scandot.ScanDotGenerator;
-import ext.plantuml.com.ctreber.acearth.shader.Shader;
-import ext.plantuml.com.ctreber.acearth.shader.ShaderDefault;
-import ext.plantuml.com.ctreber.acearth.shader.ShaderFlat;
-import ext.plantuml.com.ctreber.acearth.shader.ShaderOrtho;
-import ext.plantuml.com.ctreber.acearth.util.Coordinate;
-import ext.plantuml.com.ctreber.acearth.util.SunPositionCalculator;
-import ext.plantuml.com.ctreber.acearth.util.Toolkit;
-import ext.plantuml.com.ctreber.aclib.sort.CTSort;
-import ext.plantuml.com.ctreber.aclib.sort.QuickSort;
+import zext.plantuml.com.ctreber.acearth.gui.CanvasACearth;
+import zext.plantuml.com.ctreber.acearth.plugins.Plugin;
+import zext.plantuml.com.ctreber.acearth.plugins.markers.Marker;
+import zext.plantuml.com.ctreber.acearth.plugins.markers.PluginMarkers;
+import zext.plantuml.com.ctreber.acearth.projection.Projection;
+import zext.plantuml.com.ctreber.acearth.projection.ProjectionCyl;
+import zext.plantuml.com.ctreber.acearth.projection.ProjectionMerc;
+import zext.plantuml.com.ctreber.acearth.projection.ProjectionOrtho;
+import zext.plantuml.com.ctreber.acearth.renderer.Renderer;
+import zext.plantuml.com.ctreber.acearth.renderer.RowTypeRendererScanBit;
+import zext.plantuml.com.ctreber.acearth.renderer.RowTypeRendererScanDot;
+import zext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMap;
+import zext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMapDefault;
+import zext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMapOrtho;
+import zext.plantuml.com.ctreber.acearth.scandot.DotGeneratorLines;
+import zext.plantuml.com.ctreber.acearth.scandot.DotGeneratorStars;
+import zext.plantuml.com.ctreber.acearth.scandot.ScanDot;
+import zext.plantuml.com.ctreber.acearth.scandot.ScanDotGenerator;
+import zext.plantuml.com.ctreber.acearth.shader.Shader;
+import zext.plantuml.com.ctreber.acearth.shader.ShaderDefault;
+import zext.plantuml.com.ctreber.acearth.shader.ShaderFlat;
+import zext.plantuml.com.ctreber.acearth.shader.ShaderOrtho;
+import zext.plantuml.com.ctreber.acearth.util.Coordinate;
+import zext.plantuml.com.ctreber.acearth.util.SunPositionCalculator;
+import zext.plantuml.com.ctreber.acearth.util.Toolkit;
+import zext.plantuml.com.ctreber.aclib.sort.CTSort;
+import zext.plantuml.com.ctreber.aclib.sort.QuickSort;
 
 /**
  * <h1>AC.earth - XEarth for Java</h1>
diff --git a/src/ext/plantuml/com/ctreber/acearth/Configuration.java b/src/zext/plantuml/com/ctreber/acearth/Configuration.java
similarity index 85%
rename from src/ext/plantuml/com/ctreber/acearth/Configuration.java
rename to src/zext/plantuml/com/ctreber/acearth/Configuration.java
index 7c84ea5ef..01bc6b508 100644
--- a/src/ext/plantuml/com/ctreber/acearth/Configuration.java
+++ b/src/zext/plantuml/com/ctreber/acearth/Configuration.java
@@ -1,14 +1,14 @@
-package ext.plantuml.com.ctreber.acearth;
+package zext.plantuml.com.ctreber.acearth;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import ext.plantuml.com.ctreber.aclib.gui.MOBoolean;
-import ext.plantuml.com.ctreber.aclib.gui.MODouble;
-import ext.plantuml.com.ctreber.aclib.gui.MOEnum;
-import ext.plantuml.com.ctreber.aclib.gui.MOInteger;
-import ext.plantuml.com.ctreber.aclib.gui.MOString;
-import ext.plantuml.com.ctreber.aclib.gui.MonitoredObject;
+import zext.plantuml.com.ctreber.aclib.gui.MOBoolean;
+import zext.plantuml.com.ctreber.aclib.gui.MODouble;
+import zext.plantuml.com.ctreber.aclib.gui.MOEnum;
+import zext.plantuml.com.ctreber.aclib.gui.MOInteger;
+import zext.plantuml.com.ctreber.aclib.gui.MOString;
+import zext.plantuml.com.ctreber.aclib.gui.MonitoredObject;
 
 /**
  * <p>
diff --git a/src/ext/plantuml/com/ctreber/acearth/ConfigurationACearth.java b/src/zext/plantuml/com/ctreber/acearth/ConfigurationACearth.java
similarity index 92%
rename from src/ext/plantuml/com/ctreber/acearth/ConfigurationACearth.java
rename to src/zext/plantuml/com/ctreber/acearth/ConfigurationACearth.java
index ae6529c4b..8bc3170f8 100644
--- a/src/ext/plantuml/com/ctreber/acearth/ConfigurationACearth.java
+++ b/src/zext/plantuml/com/ctreber/acearth/ConfigurationACearth.java
@@ -1,12 +1,12 @@
-package ext.plantuml.com.ctreber.acearth;
+package zext.plantuml.com.ctreber.acearth;
 
-import ext.plantuml.com.ctreber.acearth.util.Coordinate;
-import ext.plantuml.com.ctreber.aclib.gui.MOBoolean;
-import ext.plantuml.com.ctreber.aclib.gui.MODouble;
-import ext.plantuml.com.ctreber.aclib.gui.MOEnum;
-import ext.plantuml.com.ctreber.aclib.gui.MOInteger;
-import ext.plantuml.com.ctreber.aclib.gui.MOString;
-import ext.plantuml.com.ctreber.aclib.gui.MonitoredObject;
+import zext.plantuml.com.ctreber.acearth.util.Coordinate;
+import zext.plantuml.com.ctreber.aclib.gui.MOBoolean;
+import zext.plantuml.com.ctreber.aclib.gui.MODouble;
+import zext.plantuml.com.ctreber.aclib.gui.MOEnum;
+import zext.plantuml.com.ctreber.aclib.gui.MOInteger;
+import zext.plantuml.com.ctreber.aclib.gui.MOString;
+import zext.plantuml.com.ctreber.aclib.gui.MonitoredObject;
 
 /**
  * <p>
diff --git a/src/ext/plantuml/com/ctreber/acearth/MapData.java b/src/zext/plantuml/com/ctreber/acearth/MapData.java
similarity index 99%
rename from src/ext/plantuml/com/ctreber/acearth/MapData.java
rename to src/zext/plantuml/com/ctreber/acearth/MapData.java
index d73641c1f..f20437f9e 100644
--- a/src/ext/plantuml/com/ctreber/acearth/MapData.java
+++ b/src/zext/plantuml/com/ctreber/acearth/MapData.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth;
+package zext.plantuml.com.ctreber.acearth;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/ext/plantuml/com/ctreber/acearth/MapDataReader.java b/src/zext/plantuml/com/ctreber/acearth/MapDataReader.java
similarity index 95%
rename from src/ext/plantuml/com/ctreber/acearth/MapDataReader.java
rename to src/zext/plantuml/com/ctreber/acearth/MapDataReader.java
index 3f70e6afe..f17780e5d 100644
--- a/src/ext/plantuml/com/ctreber/acearth/MapDataReader.java
+++ b/src/zext/plantuml/com/ctreber/acearth/MapDataReader.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth;
+package zext.plantuml.com.ctreber.acearth;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -6,8 +6,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
 
-import ext.plantuml.com.ctreber.acearth.util.Point3D;
-import ext.plantuml.com.ctreber.acearth.util.Polygon;
+import zext.plantuml.com.ctreber.acearth.util.Point3D;
+import zext.plantuml.com.ctreber.acearth.util.Polygon;
 
 /**
  * The map data file is a big array of short (16-bit) ints, as follows: - it is
diff --git a/src/ext/plantuml/com/ctreber/acearth/gui/CanvasACearth.java b/src/zext/plantuml/com/ctreber/acearth/gui/CanvasACearth.java
similarity index 80%
rename from src/ext/plantuml/com/ctreber/acearth/gui/CanvasACearth.java
rename to src/zext/plantuml/com/ctreber/acearth/gui/CanvasACearth.java
index f751a7030..37db1cdc3 100644
--- a/src/ext/plantuml/com/ctreber/acearth/gui/CanvasACearth.java
+++ b/src/zext/plantuml/com/ctreber/acearth/gui/CanvasACearth.java
@@ -1,6 +1,6 @@
-package ext.plantuml.com.ctreber.acearth.gui;
+package zext.plantuml.com.ctreber.acearth.gui;
 
-import ext.plantuml.com.ctreber.acearth.ACearth;
+import zext.plantuml.com.ctreber.acearth.ACearth;
 
 /**
  * <p>
diff --git a/src/ext/plantuml/com/ctreber/acearth/gui/PixelCanvas.java b/src/zext/plantuml/com/ctreber/acearth/gui/PixelCanvas.java
similarity index 92%
rename from src/ext/plantuml/com/ctreber/acearth/gui/PixelCanvas.java
rename to src/zext/plantuml/com/ctreber/acearth/gui/PixelCanvas.java
index ab4b3deaa..4b7f68969 100644
--- a/src/ext/plantuml/com/ctreber/acearth/gui/PixelCanvas.java
+++ b/src/zext/plantuml/com/ctreber/acearth/gui/PixelCanvas.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth.gui;
+package zext.plantuml.com.ctreber.acearth.gui;
 
 import java.awt.Color;
 import java.awt.Graphics2D;
@@ -6,7 +6,7 @@ import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import ext.plantuml.com.ctreber.acearth.renderer.RenderTarget;
+import zext.plantuml.com.ctreber.acearth.renderer.RenderTarget;
 import net.sourceforge.plantuml.security.SImageIO;
 
 /**
diff --git a/src/ext/plantuml/com/ctreber/acearth/package-info.java b/src/zext/plantuml/com/ctreber/acearth/package-info.java
similarity index 90%
rename from src/ext/plantuml/com/ctreber/acearth/package-info.java
rename to src/zext/plantuml/com/ctreber/acearth/package-info.java
index 8e69ae42d..b0da411ce 100644
--- a/src/ext/plantuml/com/ctreber/acearth/package-info.java
+++ b/src/zext/plantuml/com/ctreber/acearth/package-info.java
@@ -13,4 +13,4 @@
  * @see net.sourceforge.plantuml.acearth
  * 
  */
-package ext.plantuml.com.ctreber.acearth;
+package zext.plantuml.com.ctreber.acearth;
diff --git a/src/ext/plantuml/com/ctreber/acearth/plugins/Plugin.java b/src/zext/plantuml/com/ctreber/acearth/plugins/Plugin.java
similarity index 78%
rename from src/ext/plantuml/com/ctreber/acearth/plugins/Plugin.java
rename to src/zext/plantuml/com/ctreber/acearth/plugins/Plugin.java
index 85de4bb01..f15f31bb1 100644
--- a/src/ext/plantuml/com/ctreber/acearth/plugins/Plugin.java
+++ b/src/zext/plantuml/com/ctreber/acearth/plugins/Plugin.java
@@ -1,11 +1,11 @@
-package ext.plantuml.com.ctreber.acearth.plugins;
+package zext.plantuml.com.ctreber.acearth.plugins;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-import ext.plantuml.com.ctreber.acearth.ACearth;
-import ext.plantuml.com.ctreber.acearth.gui.PixelCanvas;
-import ext.plantuml.com.ctreber.acearth.projection.Projection;
+import zext.plantuml.com.ctreber.acearth.ACearth;
+import zext.plantuml.com.ctreber.acearth.gui.PixelCanvas;
+import zext.plantuml.com.ctreber.acearth.projection.Projection;
 
 /**
  * <p></p>
diff --git a/src/ext/plantuml/com/ctreber/acearth/plugins/markers/Marker.java b/src/zext/plantuml/com/ctreber/acearth/plugins/markers/Marker.java
similarity index 90%
rename from src/ext/plantuml/com/ctreber/acearth/plugins/markers/Marker.java
rename to src/zext/plantuml/com/ctreber/acearth/plugins/markers/Marker.java
index ccd8b1589..bae5c8a14 100644
--- a/src/ext/plantuml/com/ctreber/acearth/plugins/markers/Marker.java
+++ b/src/zext/plantuml/com/ctreber/acearth/plugins/markers/Marker.java
@@ -1,17 +1,17 @@
-package ext.plantuml.com.ctreber.acearth.plugins.markers;
+package zext.plantuml.com.ctreber.acearth.plugins.markers;
 
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Graphics2D;
 import java.util.List;
 
-import ext.plantuml.com.ctreber.acearth.gui.PixelCanvas;
-import ext.plantuml.com.ctreber.acearth.projection.Projection;
-import ext.plantuml.com.ctreber.acearth.projection.ProjectionOrtho;
-import ext.plantuml.com.ctreber.acearth.util.Coordinate;
-import ext.plantuml.com.ctreber.acearth.util.Point2D;
-import ext.plantuml.com.ctreber.acearth.util.Point3D;
-import ext.plantuml.com.ctreber.acearth.util.StringParser;
+import zext.plantuml.com.ctreber.acearth.gui.PixelCanvas;
+import zext.plantuml.com.ctreber.acearth.projection.Projection;
+import zext.plantuml.com.ctreber.acearth.projection.ProjectionOrtho;
+import zext.plantuml.com.ctreber.acearth.util.Coordinate;
+import zext.plantuml.com.ctreber.acearth.util.Point2D;
+import zext.plantuml.com.ctreber.acearth.util.Point3D;
+import zext.plantuml.com.ctreber.acearth.util.StringParser;
 
 /**
  * <p>
diff --git a/src/ext/plantuml/com/ctreber/acearth/plugins/markers/PluginMarkers.java b/src/zext/plantuml/com/ctreber/acearth/plugins/markers/PluginMarkers.java
similarity index 92%
rename from src/ext/plantuml/com/ctreber/acearth/plugins/markers/PluginMarkers.java
rename to src/zext/plantuml/com/ctreber/acearth/plugins/markers/PluginMarkers.java
index b5e08db2a..c4f3c5cbb 100644
--- a/src/ext/plantuml/com/ctreber/acearth/plugins/markers/PluginMarkers.java
+++ b/src/zext/plantuml/com/ctreber/acearth/plugins/markers/PluginMarkers.java
@@ -1,9 +1,9 @@
-package ext.plantuml.com.ctreber.acearth.plugins.markers;
+package zext.plantuml.com.ctreber.acearth.plugins.markers;
 
 import java.util.Iterator;
 import java.util.List;
 
-import ext.plantuml.com.ctreber.acearth.plugins.Plugin;
+import zext.plantuml.com.ctreber.acearth.plugins.Plugin;
 
 /**
  * <p>
diff --git a/src/ext/plantuml/com/ctreber/acearth/projection/Projection.java b/src/zext/plantuml/com/ctreber/acearth/projection/Projection.java
similarity index 96%
rename from src/ext/plantuml/com/ctreber/acearth/projection/Projection.java
rename to src/zext/plantuml/com/ctreber/acearth/projection/Projection.java
index cdb6a2316..2da4743ff 100644
--- a/src/ext/plantuml/com/ctreber/acearth/projection/Projection.java
+++ b/src/zext/plantuml/com/ctreber/acearth/projection/Projection.java
@@ -1,9 +1,9 @@
-package ext.plantuml.com.ctreber.acearth.projection;
+package zext.plantuml.com.ctreber.acearth.projection;
 
-import ext.plantuml.com.ctreber.acearth.util.Coordinate;
-import ext.plantuml.com.ctreber.acearth.util.Point2D;
-import ext.plantuml.com.ctreber.acearth.util.Point3D;
-import ext.plantuml.com.ctreber.acearth.util.Toolkit;
+import zext.plantuml.com.ctreber.acearth.util.Coordinate;
+import zext.plantuml.com.ctreber.acearth.util.Point2D;
+import zext.plantuml.com.ctreber.acearth.util.Point3D;
+import zext.plantuml.com.ctreber.acearth.util.Toolkit;
 
 /**
  * <p>A projection for a globe on a flat surface (must be subclassed).
diff --git a/src/ext/plantuml/com/ctreber/acearth/projection/ProjectionCyl.java b/src/zext/plantuml/com/ctreber/acearth/projection/ProjectionCyl.java
similarity index 90%
rename from src/ext/plantuml/com/ctreber/acearth/projection/ProjectionCyl.java
rename to src/zext/plantuml/com/ctreber/acearth/projection/ProjectionCyl.java
index e25071c9f..5822b52a1 100644
--- a/src/ext/plantuml/com/ctreber/acearth/projection/ProjectionCyl.java
+++ b/src/zext/plantuml/com/ctreber/acearth/projection/ProjectionCyl.java
@@ -1,7 +1,7 @@
-package ext.plantuml.com.ctreber.acearth.projection;
+package zext.plantuml.com.ctreber.acearth.projection;
 
-import ext.plantuml.com.ctreber.acearth.util.Coordinate;
-import ext.plantuml.com.ctreber.acearth.util.Point3D;
+import zext.plantuml.com.ctreber.acearth.util.Coordinate;
+import zext.plantuml.com.ctreber.acearth.util.Point3D;
 
 /**
  * <p>Cylindrical projection. Show Earth flatly spread out on rectangle.
diff --git a/src/ext/plantuml/com/ctreber/acearth/projection/ProjectionMerc.java b/src/zext/plantuml/com/ctreber/acearth/projection/ProjectionMerc.java
similarity index 90%
rename from src/ext/plantuml/com/ctreber/acearth/projection/ProjectionMerc.java
rename to src/zext/plantuml/com/ctreber/acearth/projection/ProjectionMerc.java
index 775e35ace..f28bd43e8 100644
--- a/src/ext/plantuml/com/ctreber/acearth/projection/ProjectionMerc.java
+++ b/src/zext/plantuml/com/ctreber/acearth/projection/ProjectionMerc.java
@@ -1,7 +1,7 @@
-package ext.plantuml.com.ctreber.acearth.projection;
+package zext.plantuml.com.ctreber.acearth.projection;
 
-import ext.plantuml.com.ctreber.acearth.util.Coordinate;
-import ext.plantuml.com.ctreber.acearth.util.Point3D;
+import zext.plantuml.com.ctreber.acearth.util.Coordinate;
+import zext.plantuml.com.ctreber.acearth.util.Point3D;
 
 
 /**
diff --git a/src/ext/plantuml/com/ctreber/acearth/projection/ProjectionOrtho.java b/src/zext/plantuml/com/ctreber/acearth/projection/ProjectionOrtho.java
similarity index 88%
rename from src/ext/plantuml/com/ctreber/acearth/projection/ProjectionOrtho.java
rename to src/zext/plantuml/com/ctreber/acearth/projection/ProjectionOrtho.java
index 6ff24a612..2b5013436 100644
--- a/src/ext/plantuml/com/ctreber/acearth/projection/ProjectionOrtho.java
+++ b/src/zext/plantuml/com/ctreber/acearth/projection/ProjectionOrtho.java
@@ -1,7 +1,7 @@
-package ext.plantuml.com.ctreber.acearth.projection;
+package zext.plantuml.com.ctreber.acearth.projection;
 
-import ext.plantuml.com.ctreber.acearth.util.Coordinate;
-import ext.plantuml.com.ctreber.acearth.util.Point3D;
+import zext.plantuml.com.ctreber.acearth.util.Coordinate;
+import zext.plantuml.com.ctreber.acearth.util.Point3D;
 
 
 /**
diff --git a/src/ext/plantuml/com/ctreber/acearth/renderer/RenderTarget.java b/src/zext/plantuml/com/ctreber/acearth/renderer/RenderTarget.java
similarity index 88%
rename from src/ext/plantuml/com/ctreber/acearth/renderer/RenderTarget.java
rename to src/zext/plantuml/com/ctreber/acearth/renderer/RenderTarget.java
index e155cf32e..57c6fd5b1 100644
--- a/src/ext/plantuml/com/ctreber/acearth/renderer/RenderTarget.java
+++ b/src/zext/plantuml/com/ctreber/acearth/renderer/RenderTarget.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth.renderer;
+package zext.plantuml.com.ctreber.acearth.renderer;
 
 import java.awt.Color;
 
diff --git a/src/ext/plantuml/com/ctreber/acearth/renderer/Renderer.java b/src/zext/plantuml/com/ctreber/acearth/renderer/Renderer.java
similarity index 95%
rename from src/ext/plantuml/com/ctreber/acearth/renderer/Renderer.java
rename to src/zext/plantuml/com/ctreber/acearth/renderer/Renderer.java
index ae9f389c4..a7d9e62fb 100644
--- a/src/ext/plantuml/com/ctreber/acearth/renderer/Renderer.java
+++ b/src/zext/plantuml/com/ctreber/acearth/renderer/Renderer.java
@@ -1,11 +1,11 @@
-package ext.plantuml.com.ctreber.acearth.renderer;
+package zext.plantuml.com.ctreber.acearth.renderer;
 
 import java.awt.Color;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import ext.plantuml.com.ctreber.acearth.shader.Shader;
+import zext.plantuml.com.ctreber.acearth.shader.Shader;
 
 /**
  * <p>
diff --git a/src/ext/plantuml/com/ctreber/acearth/renderer/RowTypeRenderer.java b/src/zext/plantuml/com/ctreber/acearth/renderer/RowTypeRenderer.java
similarity index 92%
rename from src/ext/plantuml/com/ctreber/acearth/renderer/RowTypeRenderer.java
rename to src/zext/plantuml/com/ctreber/acearth/renderer/RowTypeRenderer.java
index 7ec815894..d290d37c4 100644
--- a/src/ext/plantuml/com/ctreber/acearth/renderer/RowTypeRenderer.java
+++ b/src/zext/plantuml/com/ctreber/acearth/renderer/RowTypeRenderer.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth.renderer;
+package zext.plantuml.com.ctreber.acearth.renderer;
 
 /**
  * <p>Renders a row of pixel types.</p>
diff --git a/src/ext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanBit.java b/src/zext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanBit.java
similarity index 92%
rename from src/ext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanBit.java
rename to src/zext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanBit.java
index 312ce543e..15ec2af81 100644
--- a/src/ext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanBit.java
+++ b/src/zext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanBit.java
@@ -1,7 +1,7 @@
-package ext.plantuml.com.ctreber.acearth.renderer;
+package zext.plantuml.com.ctreber.acearth.renderer;
 
-import ext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMap;
-import ext.plantuml.com.ctreber.acearth.scanbit.ScanBit;
+import zext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMap;
+import zext.plantuml.com.ctreber.acearth.scanbit.ScanBit;
 
 /**
  * <p>Renders a row of ScanBits to pixel types.</p>
diff --git a/src/ext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanDot.java b/src/zext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanDot.java
similarity index 89%
rename from src/ext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanDot.java
rename to src/zext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanDot.java
index 3223094df..ee8faf78d 100644
--- a/src/ext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanDot.java
+++ b/src/zext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanDot.java
@@ -1,7 +1,7 @@
-package ext.plantuml.com.ctreber.acearth.renderer;
+package zext.plantuml.com.ctreber.acearth.renderer;
 
-import ext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMap;
-import ext.plantuml.com.ctreber.acearth.scandot.ScanDot;
+import zext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMap;
+import zext.plantuml.com.ctreber.acearth.scandot.ScanDot;
 
 /**
  * <p>Renders a row of ScanDots to pixel types.</p>
diff --git a/src/ext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMap.java b/src/zext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMap.java
similarity index 88%
rename from src/ext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMap.java
rename to src/zext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMap.java
index f907a70b4..c2e36b152 100644
--- a/src/ext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMap.java
+++ b/src/zext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMap.java
@@ -1,16 +1,16 @@
-package ext.plantuml.com.ctreber.acearth.scanbit;
+package zext.plantuml.com.ctreber.acearth.scanbit;
 
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 
-import ext.plantuml.com.ctreber.acearth.projection.Projection;
-import ext.plantuml.com.ctreber.acearth.util.EdgeCrossing;
-import ext.plantuml.com.ctreber.acearth.util.Point2D;
-import ext.plantuml.com.ctreber.acearth.util.Point3D;
-import ext.plantuml.com.ctreber.acearth.util.Polygon;
-import ext.plantuml.com.ctreber.aclib.sort.CTSort;
-import ext.plantuml.com.ctreber.aclib.sort.QuickSort;
+import zext.plantuml.com.ctreber.acearth.projection.Projection;
+import zext.plantuml.com.ctreber.acearth.util.EdgeCrossing;
+import zext.plantuml.com.ctreber.acearth.util.Point2D;
+import zext.plantuml.com.ctreber.acearth.util.Point3D;
+import zext.plantuml.com.ctreber.acearth.util.Polygon;
+import zext.plantuml.com.ctreber.aclib.sort.CTSort;
+import zext.plantuml.com.ctreber.aclib.sort.QuickSort;
 
 /**
  * <p>
diff --git a/src/ext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapDefault.java b/src/zext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapDefault.java
similarity index 95%
rename from src/ext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapDefault.java
rename to src/zext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapDefault.java
index 7a3e8619b..780644110 100644
--- a/src/ext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapDefault.java
+++ b/src/zext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapDefault.java
@@ -1,11 +1,11 @@
-package ext.plantuml.com.ctreber.acearth.scanbit;
+package zext.plantuml.com.ctreber.acearth.scanbit;
 
 import java.util.Comparator;
 
-import ext.plantuml.com.ctreber.acearth.projection.Projection;
-import ext.plantuml.com.ctreber.acearth.util.EdgeCrossing;
-import ext.plantuml.com.ctreber.acearth.util.Point2D;
-import ext.plantuml.com.ctreber.acearth.util.Point3D;
+import zext.plantuml.com.ctreber.acearth.projection.Projection;
+import zext.plantuml.com.ctreber.acearth.util.EdgeCrossing;
+import zext.plantuml.com.ctreber.acearth.util.Point2D;
+import zext.plantuml.com.ctreber.acearth.util.Point3D;
 
 /**
  * <p>Map scanner for mercator and cylindrical projections.
diff --git a/src/ext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapOrtho.java b/src/zext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapOrtho.java
similarity index 94%
rename from src/ext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapOrtho.java
rename to src/zext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapOrtho.java
index 980b4e5b6..59cc35c33 100644
--- a/src/ext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapOrtho.java
+++ b/src/zext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapOrtho.java
@@ -1,11 +1,11 @@
-package ext.plantuml.com.ctreber.acearth.scanbit;
+package zext.plantuml.com.ctreber.acearth.scanbit;
 
 import java.util.Comparator;
 
-import ext.plantuml.com.ctreber.acearth.projection.Projection;
-import ext.plantuml.com.ctreber.acearth.util.EdgeCrossing;
-import ext.plantuml.com.ctreber.acearth.util.Point2D;
-import ext.plantuml.com.ctreber.acearth.util.Point3D;
+import zext.plantuml.com.ctreber.acearth.projection.Projection;
+import zext.plantuml.com.ctreber.acearth.util.EdgeCrossing;
+import zext.plantuml.com.ctreber.acearth.util.Point2D;
+import zext.plantuml.com.ctreber.acearth.util.Point3D;
 
 /**
  * <p>Map scanner for orthographic projection.
diff --git a/src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBit.java b/src/zext/plantuml/com/ctreber/acearth/scanbit/ScanBit.java
similarity index 95%
rename from src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBit.java
rename to src/zext/plantuml/com/ctreber/acearth/scanbit/ScanBit.java
index d5f7624d5..13367fe0f 100644
--- a/src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBit.java
+++ b/src/zext/plantuml/com/ctreber/acearth/scanbit/ScanBit.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth.scanbit;
+package zext.plantuml.com.ctreber.acearth.scanbit;
 
 /**
  * <p>Instruction to paint points xFrom to xTo on line y.
diff --git a/src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBitGenerator.java b/src/zext/plantuml/com/ctreber/acearth/scanbit/ScanBitGenerator.java
similarity index 92%
rename from src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBitGenerator.java
rename to src/zext/plantuml/com/ctreber/acearth/scanbit/ScanBitGenerator.java
index c3e0febe3..531c3673d 100644
--- a/src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBitGenerator.java
+++ b/src/zext/plantuml/com/ctreber/acearth/scanbit/ScanBitGenerator.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth.scanbit;
+package zext.plantuml.com.ctreber.acearth.scanbit;
 
 /**
  * <p>A ScanBitGenerator produces ScanBits.</p>
diff --git a/src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBuf.java b/src/zext/plantuml/com/ctreber/acearth/scanbit/ScanBuf.java
similarity index 96%
rename from src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBuf.java
rename to src/zext/plantuml/com/ctreber/acearth/scanbit/ScanBuf.java
index 62c3ed347..88e9098c5 100644
--- a/src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBuf.java
+++ b/src/zext/plantuml/com/ctreber/acearth/scanbit/ScanBuf.java
@@ -1,10 +1,10 @@
-package ext.plantuml.com.ctreber.acearth.scanbit;
+package zext.plantuml.com.ctreber.acearth.scanbit;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import ext.plantuml.com.ctreber.aclib.sort.CTSort;
-import ext.plantuml.com.ctreber.aclib.sort.QuickSort;
+import zext.plantuml.com.ctreber.aclib.sort.CTSort;
+import zext.plantuml.com.ctreber.aclib.sort.QuickSort;
 
 /**
  * <p>For each line, the scanbuffer (= a raster divice) records the points hit
diff --git a/src/ext/plantuml/com/ctreber/acearth/scandot/DotGeneratorLines.java b/src/zext/plantuml/com/ctreber/acearth/scandot/DotGeneratorLines.java
similarity index 86%
rename from src/ext/plantuml/com/ctreber/acearth/scandot/DotGeneratorLines.java
rename to src/zext/plantuml/com/ctreber/acearth/scandot/DotGeneratorLines.java
index 5392a4ef9..7a382a3be 100644
--- a/src/ext/plantuml/com/ctreber/acearth/scandot/DotGeneratorLines.java
+++ b/src/zext/plantuml/com/ctreber/acearth/scandot/DotGeneratorLines.java
@@ -1,9 +1,9 @@
-package ext.plantuml.com.ctreber.acearth.scandot;
+package zext.plantuml.com.ctreber.acearth.scandot;
 
-import ext.plantuml.com.ctreber.acearth.projection.Projection;
-import ext.plantuml.com.ctreber.acearth.util.Coordinate;
-import ext.plantuml.com.ctreber.acearth.util.Point2D;
-import ext.plantuml.com.ctreber.acearth.util.Point3D;
+import zext.plantuml.com.ctreber.acearth.projection.Projection;
+import zext.plantuml.com.ctreber.acearth.util.Coordinate;
+import zext.plantuml.com.ctreber.acearth.util.Point2D;
+import zext.plantuml.com.ctreber.acearth.util.Point3D;
 
 /**
  * <p>Generate latitude and longitude grid as dots.
diff --git a/src/ext/plantuml/com/ctreber/acearth/scandot/DotGeneratorStars.java b/src/zext/plantuml/com/ctreber/acearth/scandot/DotGeneratorStars.java
similarity index 96%
rename from src/ext/plantuml/com/ctreber/acearth/scandot/DotGeneratorStars.java
rename to src/zext/plantuml/com/ctreber/acearth/scandot/DotGeneratorStars.java
index e598a27a2..789563753 100644
--- a/src/ext/plantuml/com/ctreber/acearth/scandot/DotGeneratorStars.java
+++ b/src/zext/plantuml/com/ctreber/acearth/scandot/DotGeneratorStars.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth.scandot;
+package zext.plantuml.com.ctreber.acearth.scandot;
 
 import java.util.Random;
 
diff --git a/src/ext/plantuml/com/ctreber/acearth/scandot/ScanDot.java b/src/zext/plantuml/com/ctreber/acearth/scandot/ScanDot.java
similarity index 90%
rename from src/ext/plantuml/com/ctreber/acearth/scandot/ScanDot.java
rename to src/zext/plantuml/com/ctreber/acearth/scandot/ScanDot.java
index ac0823a7f..c222ee475 100644
--- a/src/ext/plantuml/com/ctreber/acearth/scandot/ScanDot.java
+++ b/src/zext/plantuml/com/ctreber/acearth/scandot/ScanDot.java
@@ -1,6 +1,6 @@
-package ext.plantuml.com.ctreber.acearth.scandot;
+package zext.plantuml.com.ctreber.acearth.scandot;
 
-import ext.plantuml.com.ctreber.acearth.util.Point2D;
+import zext.plantuml.com.ctreber.acearth.util.Point2D;
 
 /**
  * <p>A single scandot (opposed to a Polygon).
diff --git a/src/ext/plantuml/com/ctreber/acearth/scandot/ScanDotGenerator.java b/src/zext/plantuml/com/ctreber/acearth/scandot/ScanDotGenerator.java
similarity index 89%
rename from src/ext/plantuml/com/ctreber/acearth/scandot/ScanDotGenerator.java
rename to src/zext/plantuml/com/ctreber/acearth/scandot/ScanDotGenerator.java
index 0013cf42c..3d7d7fe6f 100644
--- a/src/ext/plantuml/com/ctreber/acearth/scandot/ScanDotGenerator.java
+++ b/src/zext/plantuml/com/ctreber/acearth/scandot/ScanDotGenerator.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth.scandot;
+package zext.plantuml.com.ctreber.acearth.scandot;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/ext/plantuml/com/ctreber/acearth/shader/Shader.java b/src/zext/plantuml/com/ctreber/acearth/shader/Shader.java
similarity index 92%
rename from src/ext/plantuml/com/ctreber/acearth/shader/Shader.java
rename to src/zext/plantuml/com/ctreber/acearth/shader/Shader.java
index e3ba21578..dcca30fe6 100644
--- a/src/ext/plantuml/com/ctreber/acearth/shader/Shader.java
+++ b/src/zext/plantuml/com/ctreber/acearth/shader/Shader.java
@@ -1,11 +1,11 @@
-package ext.plantuml.com.ctreber.acearth.shader;
+package zext.plantuml.com.ctreber.acearth.shader;
 
 import java.awt.Color;
 
-import ext.plantuml.com.ctreber.acearth.projection.Projection;
-import ext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMap;
-import ext.plantuml.com.ctreber.acearth.util.Coordinate;
-import ext.plantuml.com.ctreber.acearth.util.Point3D;
+import zext.plantuml.com.ctreber.acearth.projection.Projection;
+import zext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMap;
+import zext.plantuml.com.ctreber.acearth.util.Coordinate;
+import zext.plantuml.com.ctreber.acearth.util.Point3D;
 
 /**
  * <p>A shader computes Colors for a row of pixel types, depending
diff --git a/src/ext/plantuml/com/ctreber/acearth/shader/ShaderDefault.java b/src/zext/plantuml/com/ctreber/acearth/shader/ShaderDefault.java
similarity index 97%
rename from src/ext/plantuml/com/ctreber/acearth/shader/ShaderDefault.java
rename to src/zext/plantuml/com/ctreber/acearth/shader/ShaderDefault.java
index ffb01e469..2dc3a151b 100644
--- a/src/ext/plantuml/com/ctreber/acearth/shader/ShaderDefault.java
+++ b/src/zext/plantuml/com/ctreber/acearth/shader/ShaderDefault.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth.shader;
+package zext.plantuml.com.ctreber.acearth.shader;
 
 import java.awt.Color;
 
diff --git a/src/ext/plantuml/com/ctreber/acearth/shader/ShaderFlat.java b/src/zext/plantuml/com/ctreber/acearth/shader/ShaderFlat.java
similarity index 91%
rename from src/ext/plantuml/com/ctreber/acearth/shader/ShaderFlat.java
rename to src/zext/plantuml/com/ctreber/acearth/shader/ShaderFlat.java
index a5b983ade..ca7d1c53d 100644
--- a/src/ext/plantuml/com/ctreber/acearth/shader/ShaderFlat.java
+++ b/src/zext/plantuml/com/ctreber/acearth/shader/ShaderFlat.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth.shader;
+package zext.plantuml.com.ctreber.acearth.shader;
 
 import java.awt.Color;
 
diff --git a/src/ext/plantuml/com/ctreber/acearth/shader/ShaderOrtho.java b/src/zext/plantuml/com/ctreber/acearth/shader/ShaderOrtho.java
similarity index 96%
rename from src/ext/plantuml/com/ctreber/acearth/shader/ShaderOrtho.java
rename to src/zext/plantuml/com/ctreber/acearth/shader/ShaderOrtho.java
index 33c646b58..7313ae615 100644
--- a/src/ext/plantuml/com/ctreber/acearth/shader/ShaderOrtho.java
+++ b/src/zext/plantuml/com/ctreber/acearth/shader/ShaderOrtho.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth.shader;
+package zext.plantuml.com.ctreber.acearth.shader;
 
 import java.awt.Color;
 
diff --git a/src/ext/plantuml/com/ctreber/acearth/util/Coordinate.java b/src/zext/plantuml/com/ctreber/acearth/util/Coordinate.java
similarity index 98%
rename from src/ext/plantuml/com/ctreber/acearth/util/Coordinate.java
rename to src/zext/plantuml/com/ctreber/acearth/util/Coordinate.java
index 76d16ae6a..91665e47e 100644
--- a/src/ext/plantuml/com/ctreber/acearth/util/Coordinate.java
+++ b/src/zext/plantuml/com/ctreber/acearth/util/Coordinate.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth.util;
+package zext.plantuml.com.ctreber.acearth.util;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/src/ext/plantuml/com/ctreber/acearth/util/EdgeCrossing.java b/src/zext/plantuml/com/ctreber/acearth/util/EdgeCrossing.java
similarity index 95%
rename from src/ext/plantuml/com/ctreber/acearth/util/EdgeCrossing.java
rename to src/zext/plantuml/com/ctreber/acearth/util/EdgeCrossing.java
index adc3e2342..d4b03f3fc 100644
--- a/src/ext/plantuml/com/ctreber/acearth/util/EdgeCrossing.java
+++ b/src/zext/plantuml/com/ctreber/acearth/util/EdgeCrossing.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth.util;
+package zext.plantuml.com.ctreber.acearth.util;
 
 /**
  * <p>Holds information about a line crossing "the edge of Earth".
diff --git a/src/ext/plantuml/com/ctreber/acearth/util/Point2D.java b/src/zext/plantuml/com/ctreber/acearth/util/Point2D.java
similarity index 90%
rename from src/ext/plantuml/com/ctreber/acearth/util/Point2D.java
rename to src/zext/plantuml/com/ctreber/acearth/util/Point2D.java
index 596f2b425..b71ea8c3b 100644
--- a/src/ext/plantuml/com/ctreber/acearth/util/Point2D.java
+++ b/src/zext/plantuml/com/ctreber/acearth/util/Point2D.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth.util;
+package zext.plantuml.com.ctreber.acearth.util;
 
 /**
  * <p>A point in a 2 axis space.
diff --git a/src/ext/plantuml/com/ctreber/acearth/util/Point3D.java b/src/zext/plantuml/com/ctreber/acearth/util/Point3D.java
similarity index 93%
rename from src/ext/plantuml/com/ctreber/acearth/util/Point3D.java
rename to src/zext/plantuml/com/ctreber/acearth/util/Point3D.java
index 8f0a06561..355d7bc05 100644
--- a/src/ext/plantuml/com/ctreber/acearth/util/Point3D.java
+++ b/src/zext/plantuml/com/ctreber/acearth/util/Point3D.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth.util;
+package zext.plantuml.com.ctreber.acearth.util;
 
 /**
  * <p>A point in a 2 axis space.
diff --git a/src/ext/plantuml/com/ctreber/acearth/util/Polygon.java b/src/zext/plantuml/com/ctreber/acearth/util/Polygon.java
similarity index 93%
rename from src/ext/plantuml/com/ctreber/acearth/util/Polygon.java
rename to src/zext/plantuml/com/ctreber/acearth/util/Polygon.java
index 9ea5f7141..5c43c3938 100644
--- a/src/ext/plantuml/com/ctreber/acearth/util/Polygon.java
+++ b/src/zext/plantuml/com/ctreber/acearth/util/Polygon.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth.util;
+package zext.plantuml.com.ctreber.acearth.util;
 
 
 /**
diff --git a/src/ext/plantuml/com/ctreber/acearth/util/StringParser.java b/src/zext/plantuml/com/ctreber/acearth/util/StringParser.java
similarity index 98%
rename from src/ext/plantuml/com/ctreber/acearth/util/StringParser.java
rename to src/zext/plantuml/com/ctreber/acearth/util/StringParser.java
index 3ba3b1cd8..7f268573c 100644
--- a/src/ext/plantuml/com/ctreber/acearth/util/StringParser.java
+++ b/src/zext/plantuml/com/ctreber/acearth/util/StringParser.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth.util;
+package zext.plantuml.com.ctreber.acearth.util;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/ext/plantuml/com/ctreber/acearth/util/SunPositionCalculator.java b/src/zext/plantuml/com/ctreber/acearth/util/SunPositionCalculator.java
similarity index 99%
rename from src/ext/plantuml/com/ctreber/acearth/util/SunPositionCalculator.java
rename to src/zext/plantuml/com/ctreber/acearth/util/SunPositionCalculator.java
index 736a2c3f7..6cb9624ca 100644
--- a/src/ext/plantuml/com/ctreber/acearth/util/SunPositionCalculator.java
+++ b/src/zext/plantuml/com/ctreber/acearth/util/SunPositionCalculator.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth.util;
+package zext.plantuml.com.ctreber.acearth.util;
 
 import java.util.Calendar;
 import java.util.Date;
diff --git a/src/ext/plantuml/com/ctreber/acearth/util/Toolkit.java b/src/zext/plantuml/com/ctreber/acearth/util/Toolkit.java
similarity index 98%
rename from src/ext/plantuml/com/ctreber/acearth/util/Toolkit.java
rename to src/zext/plantuml/com/ctreber/acearth/util/Toolkit.java
index de5850a6d..21cb17adf 100644
--- a/src/ext/plantuml/com/ctreber/acearth/util/Toolkit.java
+++ b/src/zext/plantuml/com/ctreber/acearth/util/Toolkit.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.acearth.util;
+package zext.plantuml.com.ctreber.acearth.util;
 
 import java.util.HashSet;
 import java.util.StringTokenizer;
diff --git a/src/ext/plantuml/com/ctreber/aclib/gui/MOBoolean.java b/src/zext/plantuml/com/ctreber/aclib/gui/MOBoolean.java
similarity index 93%
rename from src/ext/plantuml/com/ctreber/aclib/gui/MOBoolean.java
rename to src/zext/plantuml/com/ctreber/aclib/gui/MOBoolean.java
index 791eaeeab..e1eefd443 100644
--- a/src/ext/plantuml/com/ctreber/aclib/gui/MOBoolean.java
+++ b/src/zext/plantuml/com/ctreber/aclib/gui/MOBoolean.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.aclib.gui;
+package zext.plantuml.com.ctreber.aclib.gui;
 
 /**
  * <p></p>
diff --git a/src/ext/plantuml/com/ctreber/aclib/gui/MOChangeListener.java b/src/zext/plantuml/com/ctreber/aclib/gui/MOChangeListener.java
similarity index 86%
rename from src/ext/plantuml/com/ctreber/aclib/gui/MOChangeListener.java
rename to src/zext/plantuml/com/ctreber/aclib/gui/MOChangeListener.java
index 29416373d..4b8388f25 100644
--- a/src/ext/plantuml/com/ctreber/aclib/gui/MOChangeListener.java
+++ b/src/zext/plantuml/com/ctreber/aclib/gui/MOChangeListener.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.aclib.gui;
+package zext.plantuml.com.ctreber.aclib.gui;
 
 /**
  * <p>Implemented by classes interetested in MonitoredObject values changes.</p>
diff --git a/src/ext/plantuml/com/ctreber/aclib/gui/MODouble.java b/src/zext/plantuml/com/ctreber/aclib/gui/MODouble.java
similarity index 96%
rename from src/ext/plantuml/com/ctreber/aclib/gui/MODouble.java
rename to src/zext/plantuml/com/ctreber/aclib/gui/MODouble.java
index 722a5db95..c77bc966f 100644
--- a/src/ext/plantuml/com/ctreber/aclib/gui/MODouble.java
+++ b/src/zext/plantuml/com/ctreber/aclib/gui/MODouble.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.aclib.gui;
+package zext.plantuml.com.ctreber.aclib.gui;
 
 /**
  * <p></p>
diff --git a/src/ext/plantuml/com/ctreber/aclib/gui/MOEnum.java b/src/zext/plantuml/com/ctreber/aclib/gui/MOEnum.java
similarity index 96%
rename from src/ext/plantuml/com/ctreber/aclib/gui/MOEnum.java
rename to src/zext/plantuml/com/ctreber/aclib/gui/MOEnum.java
index f2b3cbf68..98848119e 100644
--- a/src/ext/plantuml/com/ctreber/aclib/gui/MOEnum.java
+++ b/src/zext/plantuml/com/ctreber/aclib/gui/MOEnum.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.aclib.gui;
+package zext.plantuml.com.ctreber.aclib.gui;
 
 import java.util.HashSet;
 
diff --git a/src/ext/plantuml/com/ctreber/aclib/gui/MOInteger.java b/src/zext/plantuml/com/ctreber/aclib/gui/MOInteger.java
similarity index 96%
rename from src/ext/plantuml/com/ctreber/aclib/gui/MOInteger.java
rename to src/zext/plantuml/com/ctreber/aclib/gui/MOInteger.java
index 081661562..290dd0783 100644
--- a/src/ext/plantuml/com/ctreber/aclib/gui/MOInteger.java
+++ b/src/zext/plantuml/com/ctreber/aclib/gui/MOInteger.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.aclib.gui;
+package zext.plantuml.com.ctreber.aclib.gui;
 
 /**
  * <p></p>
diff --git a/src/ext/plantuml/com/ctreber/aclib/gui/MOString.java b/src/zext/plantuml/com/ctreber/aclib/gui/MOString.java
similarity index 91%
rename from src/ext/plantuml/com/ctreber/aclib/gui/MOString.java
rename to src/zext/plantuml/com/ctreber/aclib/gui/MOString.java
index 3f06fedb0..7a1537c83 100644
--- a/src/ext/plantuml/com/ctreber/aclib/gui/MOString.java
+++ b/src/zext/plantuml/com/ctreber/aclib/gui/MOString.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.aclib.gui;
+package zext.plantuml.com.ctreber.aclib.gui;
 
 
 
diff --git a/src/ext/plantuml/com/ctreber/aclib/gui/MonitoredObject.java b/src/zext/plantuml/com/ctreber/aclib/gui/MonitoredObject.java
similarity index 95%
rename from src/ext/plantuml/com/ctreber/aclib/gui/MonitoredObject.java
rename to src/zext/plantuml/com/ctreber/aclib/gui/MonitoredObject.java
index 8bb482492..cfd2b57f4 100644
--- a/src/ext/plantuml/com/ctreber/aclib/gui/MonitoredObject.java
+++ b/src/zext/plantuml/com/ctreber/aclib/gui/MonitoredObject.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.aclib.gui;
+package zext.plantuml.com.ctreber.aclib.gui;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/src/ext/plantuml/com/ctreber/aclib/sort/CTSort.java b/src/zext/plantuml/com/ctreber/aclib/sort/CTSort.java
similarity index 91%
rename from src/ext/plantuml/com/ctreber/aclib/sort/CTSort.java
rename to src/zext/plantuml/com/ctreber/aclib/sort/CTSort.java
index 9783f237e..afa16ab2c 100644
--- a/src/ext/plantuml/com/ctreber/aclib/sort/CTSort.java
+++ b/src/zext/plantuml/com/ctreber/aclib/sort/CTSort.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.aclib.sort;
+package zext.plantuml.com.ctreber.aclib.sort;
 
 import java.util.Comparator;
 
diff --git a/src/ext/plantuml/com/ctreber/aclib/sort/DefaultComparator.java b/src/zext/plantuml/com/ctreber/aclib/sort/DefaultComparator.java
similarity index 90%
rename from src/ext/plantuml/com/ctreber/aclib/sort/DefaultComparator.java
rename to src/zext/plantuml/com/ctreber/aclib/sort/DefaultComparator.java
index b183e4122..ef22c7c31 100644
--- a/src/ext/plantuml/com/ctreber/aclib/sort/DefaultComparator.java
+++ b/src/zext/plantuml/com/ctreber/aclib/sort/DefaultComparator.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.aclib.sort;
+package zext.plantuml.com.ctreber.aclib.sort;
 
 import java.util.Comparator;
 
diff --git a/src/ext/plantuml/com/ctreber/aclib/sort/QuickSort.java b/src/zext/plantuml/com/ctreber/aclib/sort/QuickSort.java
similarity index 97%
rename from src/ext/plantuml/com/ctreber/aclib/sort/QuickSort.java
rename to src/zext/plantuml/com/ctreber/aclib/sort/QuickSort.java
index a0922dbbe..d0f6cd165 100644
--- a/src/ext/plantuml/com/ctreber/aclib/sort/QuickSort.java
+++ b/src/zext/plantuml/com/ctreber/aclib/sort/QuickSort.java
@@ -1,4 +1,4 @@
-package ext.plantuml.com.ctreber.aclib.sort;
+package zext.plantuml.com.ctreber.aclib.sort;
 
 import java.util.Comparator;
 
diff --git a/src/ext/plantuml/com/google/zxing/BarcodeFormat.java b/src/zext/plantuml/com/google/zxing/BarcodeFormat.java
similarity index 98%
rename from src/ext/plantuml/com/google/zxing/BarcodeFormat.java
rename to src/zext/plantuml/com/google/zxing/BarcodeFormat.java
index da912f28f..37c444dc2 100644
--- a/src/ext/plantuml/com/google/zxing/BarcodeFormat.java
+++ b/src/zext/plantuml/com/google/zxing/BarcodeFormat.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing;
+package zext.plantuml.com.google.zxing;
 
 import java.util.Hashtable;
 
diff --git a/src/ext/plantuml/com/google/zxing/ChecksumException.java b/src/zext/plantuml/com/google/zxing/ChecksumException.java
similarity index 96%
rename from src/ext/plantuml/com/google/zxing/ChecksumException.java
rename to src/zext/plantuml/com/google/zxing/ChecksumException.java
index fa2a89030..11a232a37 100644
--- a/src/ext/plantuml/com/google/zxing/ChecksumException.java
+++ b/src/zext/plantuml/com/google/zxing/ChecksumException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing;
+package zext.plantuml.com.google.zxing;
 
 /**
  * Thrown when a barcode was successfully detected and decoded, but
diff --git a/src/ext/plantuml/com/google/zxing/DecodeHintType.java b/src/zext/plantuml/com/google/zxing/DecodeHintType.java
similarity index 98%
rename from src/ext/plantuml/com/google/zxing/DecodeHintType.java
rename to src/zext/plantuml/com/google/zxing/DecodeHintType.java
index 39d20f30c..6e0e687d4 100644
--- a/src/ext/plantuml/com/google/zxing/DecodeHintType.java
+++ b/src/zext/plantuml/com/google/zxing/DecodeHintType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing;
+package zext.plantuml.com.google.zxing;
 
 /**
  * Encapsulates a type of hint that a caller may pass to a barcode reader to help it
diff --git a/src/ext/plantuml/com/google/zxing/EncodeHintType.java b/src/zext/plantuml/com/google/zxing/EncodeHintType.java
similarity index 96%
rename from src/ext/plantuml/com/google/zxing/EncodeHintType.java
rename to src/zext/plantuml/com/google/zxing/EncodeHintType.java
index 8fc30c190..ed7228f0b 100644
--- a/src/ext/plantuml/com/google/zxing/EncodeHintType.java
+++ b/src/zext/plantuml/com/google/zxing/EncodeHintType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing;
+package zext.plantuml.com.google.zxing;
 
 /**
  * These are a set of hints that you may pass to Writers to specify their behavior.
diff --git a/src/ext/plantuml/com/google/zxing/FormatException.java b/src/zext/plantuml/com/google/zxing/FormatException.java
similarity index 96%
rename from src/ext/plantuml/com/google/zxing/FormatException.java
rename to src/zext/plantuml/com/google/zxing/FormatException.java
index b8282a6e1..461d09ee2 100644
--- a/src/ext/plantuml/com/google/zxing/FormatException.java
+++ b/src/zext/plantuml/com/google/zxing/FormatException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing;
+package zext.plantuml.com.google.zxing;
 
 /**
  * Thrown when a barcode was successfully detected, but some aspect of
diff --git a/src/ext/plantuml/com/google/zxing/NotFoundException.java b/src/zext/plantuml/com/google/zxing/NotFoundException.java
similarity index 96%
rename from src/ext/plantuml/com/google/zxing/NotFoundException.java
rename to src/zext/plantuml/com/google/zxing/NotFoundException.java
index 7d7624216..f45c7f71a 100644
--- a/src/ext/plantuml/com/google/zxing/NotFoundException.java
+++ b/src/zext/plantuml/com/google/zxing/NotFoundException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing;
+package zext.plantuml.com.google.zxing;
 
 /**
  * Thrown when a barcode was not found in the image. It might have been
diff --git a/src/ext/plantuml/com/google/zxing/ReaderException.java b/src/zext/plantuml/com/google/zxing/ReaderException.java
similarity index 98%
rename from src/ext/plantuml/com/google/zxing/ReaderException.java
rename to src/zext/plantuml/com/google/zxing/ReaderException.java
index 515d71776..8cd652ce1 100644
--- a/src/ext/plantuml/com/google/zxing/ReaderException.java
+++ b/src/zext/plantuml/com/google/zxing/ReaderException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing;
+package zext.plantuml.com.google.zxing;
 
 /**
  * The general exception class throw when something goes wrong during decoding of a barcode.
diff --git a/src/ext/plantuml/com/google/zxing/ResultPoint.java b/src/zext/plantuml/com/google/zxing/ResultPoint.java
similarity index 98%
rename from src/ext/plantuml/com/google/zxing/ResultPoint.java
rename to src/zext/plantuml/com/google/zxing/ResultPoint.java
index 30a7eac9c..e71240e01 100644
--- a/src/ext/plantuml/com/google/zxing/ResultPoint.java
+++ b/src/zext/plantuml/com/google/zxing/ResultPoint.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing;
+package zext.plantuml.com.google.zxing;
 
 /**
  * <p>Encapsulates a point of interest in an image containing a barcode. Typically, this
diff --git a/src/ext/plantuml/com/google/zxing/Writer.java b/src/zext/plantuml/com/google/zxing/Writer.java
old mode 100755
new mode 100644
similarity index 94%
rename from src/ext/plantuml/com/google/zxing/Writer.java
rename to src/zext/plantuml/com/google/zxing/Writer.java
index 90162a575..ae35c9629
--- a/src/ext/plantuml/com/google/zxing/Writer.java
+++ b/src/zext/plantuml/com/google/zxing/Writer.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing;
+package zext.plantuml.com.google.zxing;
 
 import java.util.Hashtable;
 
-import ext.plantuml.com.google.zxing.common.BitMatrix;
+import zext.plantuml.com.google.zxing.common.BitMatrix;
 
 /**
  * The base class for all objects which encode/generate a barcode image.
diff --git a/src/ext/plantuml/com/google/zxing/WriterException.java b/src/zext/plantuml/com/google/zxing/WriterException.java
similarity index 95%
rename from src/ext/plantuml/com/google/zxing/WriterException.java
rename to src/zext/plantuml/com/google/zxing/WriterException.java
index e605dd6af..fce6ac922 100644
--- a/src/ext/plantuml/com/google/zxing/WriterException.java
+++ b/src/zext/plantuml/com/google/zxing/WriterException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing;
+package zext.plantuml.com.google.zxing;
 
 /**
  * A base class which covers the range of exceptions which may occur when encoding a barcode using
diff --git a/src/ext/plantuml/com/google/zxing/client/j2se/MatrixToImageWriter.java b/src/zext/plantuml/com/google/zxing/client/j2se/MatrixToImageWriter.java
similarity index 95%
rename from src/ext/plantuml/com/google/zxing/client/j2se/MatrixToImageWriter.java
rename to src/zext/plantuml/com/google/zxing/client/j2se/MatrixToImageWriter.java
index b6668edad..0778a040a 100644
--- a/src/ext/plantuml/com/google/zxing/client/j2se/MatrixToImageWriter.java
+++ b/src/zext/plantuml/com/google/zxing/client/j2se/MatrixToImageWriter.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.client.j2se;
+package zext.plantuml.com.google.zxing.client.j2se;
 
 import java.awt.image.BufferedImage;
 
-import ext.plantuml.com.google.zxing.common.BitMatrix;
+import zext.plantuml.com.google.zxing.common.BitMatrix;
 
 /**
  * Writes a {@link BitMatrix} to {@link BufferedImage},
diff --git a/src/ext/plantuml/com/google/zxing/common/BitArray.java b/src/zext/plantuml/com/google/zxing/common/BitArray.java
similarity index 99%
rename from src/ext/plantuml/com/google/zxing/common/BitArray.java
rename to src/zext/plantuml/com/google/zxing/common/BitArray.java
index 4145f54c8..b8d795063 100644
--- a/src/ext/plantuml/com/google/zxing/common/BitArray.java
+++ b/src/zext/plantuml/com/google/zxing/common/BitArray.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.common;
+package zext.plantuml.com.google.zxing.common;
 
 /**
  * <p>A simple, fast array of bits, represented compactly by an array of ints internally.</p>
diff --git a/src/ext/plantuml/com/google/zxing/common/BitMatrix.java b/src/zext/plantuml/com/google/zxing/common/BitMatrix.java
similarity index 99%
rename from src/ext/plantuml/com/google/zxing/common/BitMatrix.java
rename to src/zext/plantuml/com/google/zxing/common/BitMatrix.java
index 22712cb53..212d22f24 100644
--- a/src/ext/plantuml/com/google/zxing/common/BitMatrix.java
+++ b/src/zext/plantuml/com/google/zxing/common/BitMatrix.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.common;
+package zext.plantuml.com.google.zxing.common;
 
 /**
  * <p>Represents a 2D matrix of bits. In function arguments below, and throughout the common
diff --git a/src/ext/plantuml/com/google/zxing/common/BitSource.java b/src/zext/plantuml/com/google/zxing/common/BitSource.java
similarity index 98%
rename from src/ext/plantuml/com/google/zxing/common/BitSource.java
rename to src/zext/plantuml/com/google/zxing/common/BitSource.java
index 50e39af77..c15f78afa 100644
--- a/src/ext/plantuml/com/google/zxing/common/BitSource.java
+++ b/src/zext/plantuml/com/google/zxing/common/BitSource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.common;
+package zext.plantuml.com.google.zxing.common;
 
 /**
  * <p>This provides an easy abstraction to read bits at a time from a sequence of bytes, where the
diff --git a/src/ext/plantuml/com/google/zxing/common/CharacterSetECI.java b/src/zext/plantuml/com/google/zxing/common/CharacterSetECI.java
similarity index 98%
rename from src/ext/plantuml/com/google/zxing/common/CharacterSetECI.java
rename to src/zext/plantuml/com/google/zxing/common/CharacterSetECI.java
index f8520734d..1b01e8ff0 100644
--- a/src/ext/plantuml/com/google/zxing/common/CharacterSetECI.java
+++ b/src/zext/plantuml/com/google/zxing/common/CharacterSetECI.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.common;
+package zext.plantuml.com.google.zxing.common;
 
 import java.util.Hashtable;
 
diff --git a/src/ext/plantuml/com/google/zxing/common/DecoderResult.java b/src/zext/plantuml/com/google/zxing/common/DecoderResult.java
similarity index 93%
rename from src/ext/plantuml/com/google/zxing/common/DecoderResult.java
rename to src/zext/plantuml/com/google/zxing/common/DecoderResult.java
index 97884c86b..864509b9a 100644
--- a/src/ext/plantuml/com/google/zxing/common/DecoderResult.java
+++ b/src/zext/plantuml/com/google/zxing/common/DecoderResult.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.common;
+package zext.plantuml.com.google.zxing.common;
 
 import java.util.Vector;
 
-import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import zext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 
 /**
  * <p>Encapsulates the result of decoding a matrix of bits. This typically
diff --git a/src/ext/plantuml/com/google/zxing/common/DetectorResult.java b/src/zext/plantuml/com/google/zxing/common/DetectorResult.java
similarity index 92%
rename from src/ext/plantuml/com/google/zxing/common/DetectorResult.java
rename to src/zext/plantuml/com/google/zxing/common/DetectorResult.java
index d62d4b6dc..38ac8016f 100644
--- a/src/ext/plantuml/com/google/zxing/common/DetectorResult.java
+++ b/src/zext/plantuml/com/google/zxing/common/DetectorResult.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.common;
+package zext.plantuml.com.google.zxing.common;
 
-import ext.plantuml.com.google.zxing.ResultPoint;
+import zext.plantuml.com.google.zxing.ResultPoint;
 
 /**
  * <p>Encapsulates the result of detecting a barcode in an image. This includes the raw
diff --git a/src/ext/plantuml/com/google/zxing/common/ECI.java b/src/zext/plantuml/com/google/zxing/common/ECI.java
similarity index 96%
rename from src/ext/plantuml/com/google/zxing/common/ECI.java
rename to src/zext/plantuml/com/google/zxing/common/ECI.java
index 5414732e1..8046cd179 100644
--- a/src/ext/plantuml/com/google/zxing/common/ECI.java
+++ b/src/zext/plantuml/com/google/zxing/common/ECI.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.common;
+package zext.plantuml.com.google.zxing.common;
 
 /**
  * Superclass of classes encapsulating types ECIs, according to "Extended Channel Interpretations"
diff --git a/src/ext/plantuml/com/google/zxing/common/StringUtils.java b/src/zext/plantuml/com/google/zxing/common/StringUtils.java
similarity index 98%
rename from src/ext/plantuml/com/google/zxing/common/StringUtils.java
rename to src/zext/plantuml/com/google/zxing/common/StringUtils.java
index fbb516f61..d3d501ece 100644
--- a/src/ext/plantuml/com/google/zxing/common/StringUtils.java
+++ b/src/zext/plantuml/com/google/zxing/common/StringUtils.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.common;
+package zext.plantuml.com.google.zxing.common;
 
 import java.util.Hashtable;
 
-import ext.plantuml.com.google.zxing.DecodeHintType;
+import zext.plantuml.com.google.zxing.DecodeHintType;
 
 /**
  * Common string-related functions.
diff --git a/src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256.java b/src/zext/plantuml/com/google/zxing/common/reedsolomon/GF256.java
similarity index 98%
rename from src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256.java
rename to src/zext/plantuml/com/google/zxing/common/reedsolomon/GF256.java
index 3a726ace1..2c3973b88 100644
--- a/src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256.java
+++ b/src/zext/plantuml/com/google/zxing/common/reedsolomon/GF256.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.common.reedsolomon;
+package zext.plantuml.com.google.zxing.common.reedsolomon;
 
 /**
  * <p>This class contains utility methods for performing mathematical operations over
diff --git a/src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256Poly.java b/src/zext/plantuml/com/google/zxing/common/reedsolomon/GF256Poly.java
similarity index 99%
rename from src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256Poly.java
rename to src/zext/plantuml/com/google/zxing/common/reedsolomon/GF256Poly.java
index 29992842f..f4be25bd8 100644
--- a/src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256Poly.java
+++ b/src/zext/plantuml/com/google/zxing/common/reedsolomon/GF256Poly.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.common.reedsolomon;
+package zext.plantuml.com.google.zxing.common.reedsolomon;
 
 /**
  * <p>Represents a polynomial whose coefficients are elements of GF(256).
diff --git a/src/ext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java b/src/zext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java
similarity index 97%
rename from src/ext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java
rename to src/zext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java
index bdc62c87e..f08a12ed1 100644
--- a/src/ext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java
+++ b/src/zext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.common.reedsolomon;
+package zext.plantuml.com.google.zxing.common.reedsolomon;
 
 import java.util.Vector;
 
diff --git a/src/ext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonException.java b/src/zext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonException.java
similarity index 93%
rename from src/ext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonException.java
rename to src/zext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonException.java
index 65301ef3f..de9eb5d55 100644
--- a/src/ext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonException.java
+++ b/src/zext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.common.reedsolomon;
+package zext.plantuml.com.google.zxing.common.reedsolomon;
 
 /**
  * <p>Thrown when an exception occurs during Reed-Solomon decoding, such as when
diff --git a/src/ext/plantuml/com/google/zxing/datamatrix/decoder/BitMatrixParser.java b/src/zext/plantuml/com/google/zxing/datamatrix/decoder/BitMatrixParser.java
similarity index 98%
rename from src/ext/plantuml/com/google/zxing/datamatrix/decoder/BitMatrixParser.java
rename to src/zext/plantuml/com/google/zxing/datamatrix/decoder/BitMatrixParser.java
index 545e6332a..1d3e82147 100644
--- a/src/ext/plantuml/com/google/zxing/datamatrix/decoder/BitMatrixParser.java
+++ b/src/zext/plantuml/com/google/zxing/datamatrix/decoder/BitMatrixParser.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.datamatrix.decoder;
+package zext.plantuml.com.google.zxing.datamatrix.decoder;
 
-import ext.plantuml.com.google.zxing.FormatException;
-import ext.plantuml.com.google.zxing.common.BitMatrix;
+import zext.plantuml.com.google.zxing.FormatException;
+import zext.plantuml.com.google.zxing.common.BitMatrix;
 
 /**
  * @author bbrown@google.com (Brian Brown)
diff --git a/src/ext/plantuml/com/google/zxing/datamatrix/decoder/DataBlock.java b/src/zext/plantuml/com/google/zxing/datamatrix/decoder/DataBlock.java
similarity index 98%
rename from src/ext/plantuml/com/google/zxing/datamatrix/decoder/DataBlock.java
rename to src/zext/plantuml/com/google/zxing/datamatrix/decoder/DataBlock.java
index 21a8d203f..5555b0f6c 100644
--- a/src/ext/plantuml/com/google/zxing/datamatrix/decoder/DataBlock.java
+++ b/src/zext/plantuml/com/google/zxing/datamatrix/decoder/DataBlock.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.datamatrix.decoder;
+package zext.plantuml.com.google.zxing.datamatrix.decoder;
 
 /**
  * <p>Encapsulates a block of data within a Data Matrix Code. Data Matrix Codes may split their data into
diff --git a/src/ext/plantuml/com/google/zxing/datamatrix/decoder/Version.java b/src/zext/plantuml/com/google/zxing/datamatrix/decoder/Version.java
similarity index 98%
rename from src/ext/plantuml/com/google/zxing/datamatrix/decoder/Version.java
rename to src/zext/plantuml/com/google/zxing/datamatrix/decoder/Version.java
index 94c9f1783..a2c2c6f45 100644
--- a/src/ext/plantuml/com/google/zxing/datamatrix/decoder/Version.java
+++ b/src/zext/plantuml/com/google/zxing/datamatrix/decoder/Version.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.datamatrix.decoder;
+package zext.plantuml.com.google.zxing.datamatrix.decoder;
 
-import ext.plantuml.com.google.zxing.FormatException;
+import zext.plantuml.com.google.zxing.FormatException;
 
 /**
  * The Version object encapsulates attributes about a particular
diff --git a/src/ext/plantuml/com/google/zxing/package-info.java b/src/zext/plantuml/com/google/zxing/package-info.java
similarity index 90%
rename from src/ext/plantuml/com/google/zxing/package-info.java
rename to src/zext/plantuml/com/google/zxing/package-info.java
index a2d28d364..bd1914a8b 100644
--- a/src/ext/plantuml/com/google/zxing/package-info.java
+++ b/src/zext/plantuml/com/google/zxing/package-info.java
@@ -13,4 +13,4 @@
  * @see net.sourceforge.plantuml.flashcode
  * 
  */
-package ext.plantuml.com.google.zxing;
+package zext.plantuml.com.google.zxing;
diff --git a/src/ext/plantuml/com/google/zxing/qrcode/QRCodeWriter.java b/src/zext/plantuml/com/google/zxing/qrcode/QRCodeWriter.java
similarity index 85%
rename from src/ext/plantuml/com/google/zxing/qrcode/QRCodeWriter.java
rename to src/zext/plantuml/com/google/zxing/qrcode/QRCodeWriter.java
index be6e8e1f3..53b7f010c 100644
--- a/src/ext/plantuml/com/google/zxing/qrcode/QRCodeWriter.java
+++ b/src/zext/plantuml/com/google/zxing/qrcode/QRCodeWriter.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.qrcode;
+package zext.plantuml.com.google.zxing.qrcode;
 
 import java.util.Hashtable;
 
-import ext.plantuml.com.google.zxing.BarcodeFormat;
-import ext.plantuml.com.google.zxing.EncodeHintType;
-import ext.plantuml.com.google.zxing.Writer;
-import ext.plantuml.com.google.zxing.WriterException;
-import ext.plantuml.com.google.zxing.common.BitMatrix;
-import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-import ext.plantuml.com.google.zxing.qrcode.encoder.ByteMatrix;
-import ext.plantuml.com.google.zxing.qrcode.encoder.Encoder;
-import ext.plantuml.com.google.zxing.qrcode.encoder.QRCode;
+import zext.plantuml.com.google.zxing.BarcodeFormat;
+import zext.plantuml.com.google.zxing.EncodeHintType;
+import zext.plantuml.com.google.zxing.Writer;
+import zext.plantuml.com.google.zxing.WriterException;
+import zext.plantuml.com.google.zxing.common.BitMatrix;
+import zext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import zext.plantuml.com.google.zxing.qrcode.encoder.ByteMatrix;
+import zext.plantuml.com.google.zxing.qrcode.encoder.Encoder;
+import zext.plantuml.com.google.zxing.qrcode.encoder.QRCode;
 
 /**
  * This object renders a QR Code as a BitMatrix 2D array of greyscale values.
diff --git a/src/ext/plantuml/com/google/zxing/qrcode/decoder/BitMatrixParser.java b/src/zext/plantuml/com/google/zxing/qrcode/decoder/BitMatrixParser.java
similarity index 97%
rename from src/ext/plantuml/com/google/zxing/qrcode/decoder/BitMatrixParser.java
rename to src/zext/plantuml/com/google/zxing/qrcode/decoder/BitMatrixParser.java
index 3fe58c24d..3426a5ca1 100644
--- a/src/ext/plantuml/com/google/zxing/qrcode/decoder/BitMatrixParser.java
+++ b/src/zext/plantuml/com/google/zxing/qrcode/decoder/BitMatrixParser.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.qrcode.decoder;
+package zext.plantuml.com.google.zxing.qrcode.decoder;
 
-import ext.plantuml.com.google.zxing.FormatException;
-import ext.plantuml.com.google.zxing.common.BitMatrix;
+import zext.plantuml.com.google.zxing.FormatException;
+import zext.plantuml.com.google.zxing.common.BitMatrix;
 
 /**
  * @author Sean Owen
diff --git a/src/ext/plantuml/com/google/zxing/qrcode/decoder/DataBlock.java b/src/zext/plantuml/com/google/zxing/qrcode/decoder/DataBlock.java
similarity index 98%
rename from src/ext/plantuml/com/google/zxing/qrcode/decoder/DataBlock.java
rename to src/zext/plantuml/com/google/zxing/qrcode/decoder/DataBlock.java
index b6f673cd0..00c932f6d 100644
--- a/src/ext/plantuml/com/google/zxing/qrcode/decoder/DataBlock.java
+++ b/src/zext/plantuml/com/google/zxing/qrcode/decoder/DataBlock.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.qrcode.decoder;
+package zext.plantuml.com.google.zxing.qrcode.decoder;
 
 /**
  * <p>Encapsulates a block of data within a QR Code. QR Codes may split their data into
diff --git a/src/ext/plantuml/com/google/zxing/qrcode/decoder/DataMask.java b/src/zext/plantuml/com/google/zxing/qrcode/decoder/DataMask.java
similarity index 97%
rename from src/ext/plantuml/com/google/zxing/qrcode/decoder/DataMask.java
rename to src/zext/plantuml/com/google/zxing/qrcode/decoder/DataMask.java
index 85e96e72c..475cd4326 100644
--- a/src/ext/plantuml/com/google/zxing/qrcode/decoder/DataMask.java
+++ b/src/zext/plantuml/com/google/zxing/qrcode/decoder/DataMask.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.qrcode.decoder;
+package zext.plantuml.com.google.zxing.qrcode.decoder;
 
-import ext.plantuml.com.google.zxing.common.BitMatrix;
+import zext.plantuml.com.google.zxing.common.BitMatrix;
 
 /**
  * <p>Encapsulates data masks for the data bits in a QR code, per ISO 18004:2006 6.8. Implementations
diff --git a/src/ext/plantuml/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java b/src/zext/plantuml/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java
similarity index 97%
rename from src/ext/plantuml/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java
rename to src/zext/plantuml/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java
index 61760cc09..6eef3588e 100644
--- a/src/ext/plantuml/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java
+++ b/src/zext/plantuml/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.qrcode.decoder;
+package zext.plantuml.com.google.zxing.qrcode.decoder;
 
 /**
  * <p>See ISO 18004:2006, 6.5.1. This enum encapsulates the four error correction levels
diff --git a/src/ext/plantuml/com/google/zxing/qrcode/decoder/FormatInformation.java b/src/zext/plantuml/com/google/zxing/qrcode/decoder/FormatInformation.java
similarity index 99%
rename from src/ext/plantuml/com/google/zxing/qrcode/decoder/FormatInformation.java
rename to src/zext/plantuml/com/google/zxing/qrcode/decoder/FormatInformation.java
index 6ae6bb9bb..48f54308e 100644
--- a/src/ext/plantuml/com/google/zxing/qrcode/decoder/FormatInformation.java
+++ b/src/zext/plantuml/com/google/zxing/qrcode/decoder/FormatInformation.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.qrcode.decoder;
+package zext.plantuml.com.google.zxing.qrcode.decoder;
 
 /**
  * <p>Encapsulates a QR Code's format information, including the data mask used and
diff --git a/src/ext/plantuml/com/google/zxing/qrcode/decoder/Mode.java b/src/zext/plantuml/com/google/zxing/qrcode/decoder/Mode.java
similarity index 98%
rename from src/ext/plantuml/com/google/zxing/qrcode/decoder/Mode.java
rename to src/zext/plantuml/com/google/zxing/qrcode/decoder/Mode.java
index 882a5c6ff..504e5da2f 100644
--- a/src/ext/plantuml/com/google/zxing/qrcode/decoder/Mode.java
+++ b/src/zext/plantuml/com/google/zxing/qrcode/decoder/Mode.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.qrcode.decoder;
+package zext.plantuml.com.google.zxing.qrcode.decoder;
 
 /**
  * <p>See ISO 18004:2006, 6.4.1, Tables 2 and 3. This enum encapsulates the various modes in which
diff --git a/src/ext/plantuml/com/google/zxing/qrcode/decoder/Version.java b/src/zext/plantuml/com/google/zxing/qrcode/decoder/Version.java
similarity index 99%
rename from src/ext/plantuml/com/google/zxing/qrcode/decoder/Version.java
rename to src/zext/plantuml/com/google/zxing/qrcode/decoder/Version.java
index 93b073281..906233518 100644
--- a/src/ext/plantuml/com/google/zxing/qrcode/decoder/Version.java
+++ b/src/zext/plantuml/com/google/zxing/qrcode/decoder/Version.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.qrcode.decoder;
+package zext.plantuml.com.google.zxing.qrcode.decoder;
 
-import ext.plantuml.com.google.zxing.FormatException;
-import ext.plantuml.com.google.zxing.common.BitMatrix;
+import zext.plantuml.com.google.zxing.FormatException;
+import zext.plantuml.com.google.zxing.common.BitMatrix;
 
 /**
  * See ISO 18004:2006 Annex D
diff --git a/src/ext/plantuml/com/google/zxing/qrcode/encoder/BlockPair.java b/src/zext/plantuml/com/google/zxing/qrcode/encoder/BlockPair.java
similarity index 94%
rename from src/ext/plantuml/com/google/zxing/qrcode/encoder/BlockPair.java
rename to src/zext/plantuml/com/google/zxing/qrcode/encoder/BlockPair.java
index b0e031213..1acf3a9b9 100644
--- a/src/ext/plantuml/com/google/zxing/qrcode/encoder/BlockPair.java
+++ b/src/zext/plantuml/com/google/zxing/qrcode/encoder/BlockPair.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.qrcode.encoder;
+package zext.plantuml.com.google.zxing.qrcode.encoder;
 
 final class BlockPair {
 
diff --git a/src/ext/plantuml/com/google/zxing/qrcode/encoder/ByteMatrix.java b/src/zext/plantuml/com/google/zxing/qrcode/encoder/ByteMatrix.java
similarity index 97%
rename from src/ext/plantuml/com/google/zxing/qrcode/encoder/ByteMatrix.java
rename to src/zext/plantuml/com/google/zxing/qrcode/encoder/ByteMatrix.java
index e8c7e444e..e99b7e88b 100644
--- a/src/ext/plantuml/com/google/zxing/qrcode/encoder/ByteMatrix.java
+++ b/src/zext/plantuml/com/google/zxing/qrcode/encoder/ByteMatrix.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.qrcode.encoder;
+package zext.plantuml.com.google.zxing.qrcode.encoder;
 
 /**
  * A class which wraps a 2D array of bytes. The default usage is signed. If you want to use it as a
diff --git a/src/ext/plantuml/com/google/zxing/qrcode/encoder/Encoder.java b/src/zext/plantuml/com/google/zxing/qrcode/encoder/Encoder.java
similarity index 96%
rename from src/ext/plantuml/com/google/zxing/qrcode/encoder/Encoder.java
rename to src/zext/plantuml/com/google/zxing/qrcode/encoder/Encoder.java
index 04ea0b667..c1fc1eb2b 100644
--- a/src/ext/plantuml/com/google/zxing/qrcode/encoder/Encoder.java
+++ b/src/zext/plantuml/com/google/zxing/qrcode/encoder/Encoder.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.qrcode.encoder;
+package zext.plantuml.com.google.zxing.qrcode.encoder;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Hashtable;
 import java.util.Vector;
 
-import ext.plantuml.com.google.zxing.EncodeHintType;
-import ext.plantuml.com.google.zxing.WriterException;
-import ext.plantuml.com.google.zxing.common.BitArray;
-import ext.plantuml.com.google.zxing.common.CharacterSetECI;
-import ext.plantuml.com.google.zxing.common.ECI;
-import ext.plantuml.com.google.zxing.common.reedsolomon.GF256;
-import ext.plantuml.com.google.zxing.common.reedsolomon.ReedSolomonEncoder;
-import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-import ext.plantuml.com.google.zxing.qrcode.decoder.Mode;
-import ext.plantuml.com.google.zxing.qrcode.decoder.Version;
+import zext.plantuml.com.google.zxing.EncodeHintType;
+import zext.plantuml.com.google.zxing.WriterException;
+import zext.plantuml.com.google.zxing.common.BitArray;
+import zext.plantuml.com.google.zxing.common.CharacterSetECI;
+import zext.plantuml.com.google.zxing.common.ECI;
+import zext.plantuml.com.google.zxing.common.reedsolomon.GF256;
+import zext.plantuml.com.google.zxing.common.reedsolomon.ReedSolomonEncoder;
+import zext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import zext.plantuml.com.google.zxing.qrcode.decoder.Mode;
+import zext.plantuml.com.google.zxing.qrcode.decoder.Version;
 
 /**
  * @author satorux@google.com (Satoru Takabayashi) - creator
diff --git a/src/ext/plantuml/com/google/zxing/qrcode/encoder/MaskUtil.java b/src/zext/plantuml/com/google/zxing/qrcode/encoder/MaskUtil.java
similarity index 99%
rename from src/ext/plantuml/com/google/zxing/qrcode/encoder/MaskUtil.java
rename to src/zext/plantuml/com/google/zxing/qrcode/encoder/MaskUtil.java
index 4ccd48b6f..cb3c5bb36 100644
--- a/src/ext/plantuml/com/google/zxing/qrcode/encoder/MaskUtil.java
+++ b/src/zext/plantuml/com/google/zxing/qrcode/encoder/MaskUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.qrcode.encoder;
+package zext.plantuml.com.google.zxing.qrcode.encoder;
 
 /**
  * @author satorux@google.com (Satoru Takabayashi) - creator
diff --git a/src/ext/plantuml/com/google/zxing/qrcode/encoder/MatrixUtil.java b/src/zext/plantuml/com/google/zxing/qrcode/encoder/MatrixUtil.java
similarity index 98%
rename from src/ext/plantuml/com/google/zxing/qrcode/encoder/MatrixUtil.java
rename to src/zext/plantuml/com/google/zxing/qrcode/encoder/MatrixUtil.java
index bbf1c2245..d755bddf5 100644
--- a/src/ext/plantuml/com/google/zxing/qrcode/encoder/MatrixUtil.java
+++ b/src/zext/plantuml/com/google/zxing/qrcode/encoder/MatrixUtil.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.qrcode.encoder;
+package zext.plantuml.com.google.zxing.qrcode.encoder;
 
-import ext.plantuml.com.google.zxing.WriterException;
-import ext.plantuml.com.google.zxing.common.BitArray;
-import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import zext.plantuml.com.google.zxing.WriterException;
+import zext.plantuml.com.google.zxing.common.BitArray;
+import zext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 
 /**
  * @author satorux@google.com (Satoru Takabayashi) - creator
diff --git a/src/ext/plantuml/com/google/zxing/qrcode/encoder/QRCode.java b/src/zext/plantuml/com/google/zxing/qrcode/encoder/QRCode.java
similarity index 97%
rename from src/ext/plantuml/com/google/zxing/qrcode/encoder/QRCode.java
rename to src/zext/plantuml/com/google/zxing/qrcode/encoder/QRCode.java
index dae3e1dc4..cc9baa239 100644
--- a/src/ext/plantuml/com/google/zxing/qrcode/encoder/QRCode.java
+++ b/src/zext/plantuml/com/google/zxing/qrcode/encoder/QRCode.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package ext.plantuml.com.google.zxing.qrcode.encoder;
+package zext.plantuml.com.google.zxing.qrcode.encoder;
 
-import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-import ext.plantuml.com.google.zxing.qrcode.decoder.Mode;
+import zext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import zext.plantuml.com.google.zxing.qrcode.decoder.Mode;
 
 /**
  * @author satorux@google.com (Satoru Takabayashi) - creator