diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestX18Import.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestX18Import.java
index 3394898..c3e6ad0 100644
--- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestX18Import.java
+++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestX18Import.java
@@ -27,7 +27,7 @@
 
 package love.distributedrebirth.nx01.warp.manifestor.manifest;
 
-import org.x4o.o2o.fc18.FourCornerUnicodeImport;
+import org.x4o.fc18.FourCornerUnicodeImport;
 import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceCord;
 import org.x4o.o2o.octal.PrimordialOctalOrangeString;
 
diff --git a/nx01-x4o-driver/pom.xml b/nx01-x4o-driver/pom.xml
index f95be85..81fbd93 100644
--- a/nx01-x4o-driver/pom.xml
+++ b/nx01-x4o-driver/pom.xml
@@ -8,6 +8,10 @@
 	</parent>
 	<artifactId>nx01-x4o-driver</artifactId>
 	<dependencies>
+		<dependency>
+			<groupId>love.distributedrebirth.nx01</groupId>
+			<artifactId>nx01-x4o-fc18</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>love.distributedrebirth.nx01</groupId>
 			<artifactId>nx01-x4o-o2o</artifactId>
diff --git a/nx01-x4o-fc18/pom.xml b/nx01-x4o-fc18/pom.xml
new file mode 100644
index 0000000..f4af4c4
--- /dev/null
+++ b/nx01-x4o-fc18/pom.xml
@@ -0,0 +1,22 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>love.distributedrebirth.nx01</groupId>
+		<artifactId>nx01</artifactId>
+		<version>〇一。壬寅。一〄-SNAPSHOT</version>
+	</parent>
+	<artifactId>nx01-x4o-fc18</artifactId>
+	<dependencies>
+		<dependency>
+			<groupId>love.distributedrebirth.nx01</groupId>
+			<artifactId>nx01-x4o-o2o</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplay.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeDisplay.java
similarity index 92%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplay.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeDisplay.java
index 6cc55bb..9d3d1f5 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplay.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeDisplay.java
@@ -20,7 +20,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18;
+package	org.x4o.fc18;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -30,11 +30,16 @@ import java.util.List;
 import java.util.Objects;
 import java.util.function.Consumer;
 
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zion7.FourCornerZionStenoLexer;
-import org.x4o.o2o.fc18.zion7.FourCornerZionStenoLexerSmoke;
-import org.x4o.o2o.fc18.zion7.FourCornerZion7Candlelier;
-import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceCord;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX00PetitVidePoints;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX18CakeWord;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.zion7.FourCornerZion7Candlelier;
+import org.x4o.fc18.zion7.FourCornerZionStenoLexer;
+import org.x4o.fc18.zion7.FourCornerZionStenoLexerSmoke;
 
 /// Renders unicode from four corner 18 bit text.
 ///
@@ -117,16 +122,6 @@ public class FourCornerUnicodeDisplay {
 		renderFromInt18(charPoints, buf);
 	}
 	
-	public String renderFromJuice(PrimordialOctalOrangeJuiceCord chars) {
-		return buildString(v -> renderFromJuice(chars, v));
-	}
-	
-	public void renderFromJuice(PrimordialOctalOrangeJuiceCord chars, StringBuilder buf) {
-		List<Integer> int18 = new ArrayList<>();
-		chars.juiceForEach(v -> int18.add(v.baitOctalNumber()));
-		renderFromInt18(int18, buf);
-	}
-	
 	public String renderFromInt18(List<Integer> chars) {
 		return buildString(v -> renderFromInt18(chars, v));
 	}
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerUnicodeImport.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeImport.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerUnicodeImport.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeImport.java
index e44067c..18a88fa 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerUnicodeImport.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeImport.java
@@ -20,14 +20,18 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18;
+package	org.x4o.fc18;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.PrimitiveIterator;
 
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerX00PetitVidePoints;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /// Imports unicode as four corner BASIC text from the "FC.CDC1604-P6" code page.
 ///
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerUnicodeMapper.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeMapper.java
similarity index 93%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerUnicodeMapper.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeMapper.java
index 47f9ce6..e4838a2 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerUnicodeMapper.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeMapper.java
@@ -20,7 +20,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18;
+package	org.x4o.fc18;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -32,11 +32,16 @@ import java.util.List;
 import java.util.Map;
 import java.util.PrimitiveIterator;
 
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash10;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash11;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash20;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX00PetitVidePoints;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash10;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash11;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash20;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /// Holds conversion maps between four corner int18 and unicode int21 points.
 ///
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerDotCake.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCake.java
similarity index 86%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerDotCake.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCake.java
index 14efae4..5277d45 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerDotCake.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCake.java
@@ -20,45 +20,45 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18;
+package	org.x4o.fc18.cake2;
 
 import java.util.Optional;
 
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash01;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash02;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash03;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash04;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash05;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash06;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash07;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash08;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash09;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash10;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash11;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash12;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash13;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash14;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash15;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash16;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash17;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash18;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash19;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash20;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash21;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash22;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash23;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash24;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash25;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash26;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash27;
-import org.x4o.o2o.fc18.zero33.FCDotAPL0127DashP7A;
-import org.x4o.o2o.fc18.zero33.FCDotAPL0127DashP7B;
-import org.x4o.o2o.fc18.zero33.FCDotAPL0127DashP7C;
-import org.x4o.o2o.fc18.zero33.FCDotBYD0127DashP7D;
-import org.x4o.o2o.fc18.zero33.FCDotBYD0127DashP7E;
-import org.x4o.o2o.fc18.zero33.FCDotBYD0127DashP7F;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash01;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash02;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash03;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash04;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash05;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash06;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash07;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash08;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash09;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash10;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash11;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash12;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash13;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash14;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash15;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash16;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash17;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash18;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash19;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash20;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash21;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash22;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash23;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash24;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash25;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash26;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash27;
+import org.x4o.fc18.cake2.zero33.FCDotAPL0127DashP7A;
+import org.x4o.fc18.cake2.zero33.FCDotAPL0127DashP7B;
+import org.x4o.fc18.cake2.zero33.FCDotAPL0127DashP7C;
+import org.x4o.fc18.cake2.zero33.FCDotBYD0127DashP7D;
+import org.x4o.fc18.cake2.zero33.FCDotBYD0127DashP7E;
+import org.x4o.fc18.cake2.zero33.FCDotBYD0127DashP7F;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /// The dot cake index of four corner 18 bit words in cake slices which holds the cake points.
 ///
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerX00PetitVidePoints.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitVidePoints.java
similarity index 98%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerX00PetitVidePoints.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitVidePoints.java
index 25955d2..d552b0c 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerX00PetitVidePoints.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitVidePoints.java
@@ -20,7 +20,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18;
+package	org.x4o.fc18.cake2;
 
 /// Empty petit points interface
 ///
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerX06BaklavaPoints.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX06BaklavaPoints.java
similarity index 98%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerX06BaklavaPoints.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX06BaklavaPoints.java
index 8441138..2533568 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerX06BaklavaPoints.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX06BaklavaPoints.java
@@ -20,7 +20,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18;
+package	org.x4o.fc18.cake2;
 
 /// Number index retriever for four corner baklava points.
 ///
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerX08MuffinPoints.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX08MuffinPoints.java
similarity index 98%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerX08MuffinPoints.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX08MuffinPoints.java
index 3ee5ae0..6241c34 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerX08MuffinPoints.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX08MuffinPoints.java
@@ -20,7 +20,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18;
+package	org.x4o.fc18.cake2;
 
 /// Number index retriever for four corner muffin points.
 ///
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerX18CakePoints.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX18CakePoints.java
similarity index 98%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerX18CakePoints.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX18CakePoints.java
index 2246b05..4e64bf1 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerX18CakePoints.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX18CakePoints.java
@@ -20,7 +20,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18;
+package	org.x4o.fc18.cake2;
 
 /// Number index retriever for four corner cake points.
 ///
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerX18CakeWord.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX18CakeWord.java
similarity index 98%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerX18CakeWord.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX18CakeWord.java
index 6f09216..f2ff667 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerX18CakeWord.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX18CakeWord.java
@@ -20,7 +20,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18;
+package	org.x4o.fc18.cake2;
 
 /// Fall back word provider.
 ///
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerX21CodePoints.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePoints.java
similarity index 98%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerX21CodePoints.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePoints.java
index 213c386..b2216d6 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerX21CodePoints.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePoints.java
@@ -20,7 +20,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18;
+package	org.x4o.fc18.cake2;
 
 /// Number index retriever for four corner 21 bit code points.
 ///
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashA.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashA.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashA.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashA.java
index 24b36e6..636be13 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashA.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashA.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter A.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashB.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashB.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashB.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashB.java
index e15e3cd..93b78de 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashB.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashB.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter B.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashC.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashC.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashC.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashC.java
index 6fe71d8..e38ad56 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashC.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashC.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter C.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashD.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashD.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashD.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashD.java
index 08f764b..7a8ca5d 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashD.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashD.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter D.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashE.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashE.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashE.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashE.java
index 46dd8ca..6818cfd 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashE.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashE.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter E.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashF.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashF.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashF.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashF.java
index d487a1d..7932449 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashF.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashF.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter F.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashG.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashG.java
similarity index 96%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashG.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashG.java
index aae0552..3b10f36 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashG.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashG.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter F.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashH.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashH.java
similarity index 95%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashH.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashH.java
index dfb5257..5725f14 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashH.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashH.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter H.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashI.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashI.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashI.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashI.java
index cd1c999..c8f24d4 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashI.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashI.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter I.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashJ.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashJ.java
similarity index 95%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashJ.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashJ.java
index 38d807d..67725af 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashJ.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashJ.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter J.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashK.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashK.java
similarity index 96%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashK.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashK.java
index 750e1fb..d5a23e4 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashK.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashK.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter K.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashL.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashL.java
similarity index 96%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashL.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashL.java
index 59fc1c4..d29343a 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashL.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashL.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter L.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashM.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashM.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashM.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashM.java
index adeeedd..601a059 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashM.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashM.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter M.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashN.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashN.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashN.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashN.java
index b51e7da..2f12a1a 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashN.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashN.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter N.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashO.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashO.java
similarity index 96%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashO.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashO.java
index 1655929..28d7510 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashO.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashO.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter O.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashP.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashP.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashP.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashP.java
index 68c7438..6b3926d 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashP.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashP.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter P.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashQ.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashQ.java
similarity index 95%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashQ.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashQ.java
index 8133a35..59d4e5b 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashQ.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashQ.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter Q.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashR.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashR.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashR.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashR.java
index b044120..fb82345 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashR.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashR.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter R.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashS.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashS.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashS.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashS.java
index f2047e4..98d0e1b 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashS.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashS.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter S.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashT.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashT.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashT.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashT.java
index 764b27f..2050889 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashT.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashT.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter T.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashU.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashU.java
similarity index 96%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashU.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashU.java
index d811cf8..ff720b7 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashU.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashU.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter U.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashV.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashV.java
similarity index 96%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashV.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashV.java
index f429b2d..948e888 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashV.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashV.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter V.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashW.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashW.java
similarity index 96%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashW.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashW.java
index e3a7e3d..5db0622 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashW.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashW.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter W.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashX.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashX.java
similarity index 96%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashX.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashX.java
index a7e0faf..12a47eb 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashX.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashX.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter X.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashY.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashY.java
similarity index 96%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashY.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashY.java
index 346415b..77a851a 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashY.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashY.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.x4o.o2o.fc18.clk1k;
+package org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter Y.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashZ.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashZ.java
similarity index 96%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashZ.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashZ.java
index c4b1322..0b14902 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashZ.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashZ.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.x4o.o2o.fc18.clk1k;
+package org.x4o.fc18.cake2.clk1k;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Code Language Keywords with letter Z.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLKSource.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLKSource.java
similarity index 98%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLKSource.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLKSource.java
index 86ed845..bda1fc7 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLKSource.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLKSource.java
@@ -20,7 +20,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
 import java.util.Objects;
 
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLKSourceCakePoints.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLKSourceCakePoints.java
similarity index 91%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLKSourceCakePoints.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLKSourceCakePoints.java
index d05042b..a24bf0c 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLKSourceCakePoints.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLKSourceCakePoints.java
@@ -20,13 +20,13 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
 import java.util.Optional;
 
-import org.x4o.o2o.fc18.FourCornerUnicodeImport;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX18CakeWord;
+import org.x4o.fc18.FourCornerUnicodeImport;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX18CakeWord;
 
 /**
  * Adds CLK source lookup support to an cake point.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLKSourceLookup.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLKSourceLookup.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLKSourceLookup.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLKSourceLookup.java
index fa2469d..387794c 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLKSourceLookup.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLKSourceLookup.java
@@ -20,7 +20,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.clk1k;
+package	org.x4o.fc18.cake2.clk1k;
 
 /**
  * 
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/package-info.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/package-info.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/package-info.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/package-info.java
index bc82d25..a55fed5 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/package-info.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/package-info.java
@@ -27,4 +27,4 @@
  *
  * @since 1.0
  */
-package org.x4o.o2o.fc18.clk1k;
+package org.x4o.fc18.cake2.clk1k;
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash01.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash01.java
similarity index 84%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash01.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash01.java
index 0dfeb20..8b47dc7 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash01.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash01.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_01.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash02.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash02.java
similarity index 84%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash02.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash02.java
index 534cd0b..6f4e49f 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash02.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash02.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_02.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash03.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash03.java
similarity index 84%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash03.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash03.java
index 560bafa..2ac1aca 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash03.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash03.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_03.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash04.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash04.java
similarity index 84%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash04.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash04.java
index 4c2e28d..6a97cfc 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash04.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash04.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_04.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash05.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash05.java
similarity index 84%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash05.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash05.java
index ea60c93..56848ba 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash05.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash05.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_05.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash06.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash06.java
similarity index 84%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash06.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash06.java
index c403d87..c734794 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash06.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash06.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_06.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash07.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash07.java
similarity index 85%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash07.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash07.java
index a4e1128..04dd338 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash07.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash07.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_07.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash08.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash08.java
similarity index 85%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash08.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash08.java
index bf326e6..dd8da8c 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash08.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash08.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_08.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash09.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash09.java
similarity index 85%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash09.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash09.java
index 4fdb84d..b6ad288 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash09.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash09.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_09.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash10.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash10.java
similarity index 86%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash10.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash10.java
index 419254c..0d39954 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash10.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash10.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_10.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash11.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash11.java
similarity index 85%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash11.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash11.java
index 5112194..ae4c704 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash11.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash11.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_11.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash12.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash12.java
similarity index 85%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash12.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash12.java
index 22d256b..776d82e 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash12.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash12.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_12.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash13.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash13.java
similarity index 85%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash13.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash13.java
index eaf1dc5..54b61fb 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash13.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash13.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_13.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash14.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash14.java
similarity index 85%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash14.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash14.java
index 10da701..bd26b61 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash14.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash14.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_14.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash15.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash15.java
similarity index 85%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash15.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash15.java
index 2ccaebc..234ef6f 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash15.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash15.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_15.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash16.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash16.java
similarity index 86%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash16.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash16.java
index 74e0c0f..4219310 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash16.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash16.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_16.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash17.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash17.java
similarity index 85%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash17.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash17.java
index 47d447c..a9ae382 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash17.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash17.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_17.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash18.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash18.java
similarity index 86%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash18.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash18.java
index 39e5f29..456ea6b 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash18.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash18.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_18.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash19.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash19.java
similarity index 85%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash19.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash19.java
index afcf878..adb9942 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash19.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash19.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_19.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash20.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash20.java
similarity index 86%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash20.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash20.java
index 0e70c15..a226397 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash20.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash20.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_20.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash21.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash21.java
similarity index 86%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash21.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash21.java
index f80f871..c8863f2 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash21.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash21.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_21.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash22.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash22.java
similarity index 86%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash22.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash22.java
index 443555b..a624ce5 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash22.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash22.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_22.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash23.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash23.java
similarity index 87%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash23.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash23.java
index 255e091..e5beb21 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash23.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash23.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_23.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash24.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash24.java
similarity index 86%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash24.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash24.java
index c9a1fca..d6f3006 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash24.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash24.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_24.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash25.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash25.java
similarity index 87%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash25.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash25.java
index 4a89c76..ee2bde9 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash25.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash25.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_25.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash26.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash26.java
similarity index 86%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash26.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash26.java
index 19ac090..7f1c3f2 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash26.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash26.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_26.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash27.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash27.java
similarity index 87%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash27.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash27.java
index 603caaf..f50dcf2 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash27.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash27.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.pie9c;
+package	org.x4o.fc18.cake2.pie9c;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Pie slice number symbols for NXX_27.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/package-info.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/package-info.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/package-info.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/package-info.java
index 691af8e..545b6d5 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/package-info.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/package-info.java
@@ -27,4 +27,4 @@
  *
  * @since 1.0
  */
-package org.x4o.o2o.fc18.pie9c;
+package org.x4o.fc18.cake2.pie9c;
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotAMD0110DashSA.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAMD0110DashSA.java
similarity index 93%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotAMD0110DashSA.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAMD0110DashSA.java
index ef323b3..3eb0053 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotAMD0110DashSA.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAMD0110DashSA.java
@@ -20,10 +20,10 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zero33;
+package	org.x4o.fc18.cake2.zero33;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
 
 /**
  * "FC.AMD0110-SA" Four Corner Application Methodoums Decimals
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotAPL0127DashP7A.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7A.java
similarity index 92%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotAPL0127DashP7A.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7A.java
index 4773dd8..6bf5534 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotAPL0127DashP7A.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7A.java
@@ -20,13 +20,13 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zero33;
+package	org.x4o.fc18.cake2.zero33;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
 
 /// "FC.APL0127-P8A" Four Corner A Programming Language symbols cake slice of cake points.
 ///
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotAPL0127DashP7B.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7B.java
similarity index 93%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotAPL0127DashP7B.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7B.java
index 635da36..eac41f2 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotAPL0127DashP7B.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7B.java
@@ -20,13 +20,13 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zero33;
+package	org.x4o.fc18.cake2.zero33;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
 
 /// "FC.APL0127-P8B" Four Corner A Programming Language symbols cake slice of cake points.
 ///
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotAPL0127DashP7C.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7C.java
similarity index 93%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotAPL0127DashP7C.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7C.java
index 9261736..c236d2e 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotAPL0127DashP7C.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7C.java
@@ -20,13 +20,13 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zero33;
+package	org.x4o.fc18.cake2.zero33;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
 
 /// "FC.APL0127-P8C" Four Corner A Programming Language symbols cake slice of cake points.
 ///
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBMW0102DashS2.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBMW0102DashS2.java
similarity index 92%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBMW0102DashS2.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBMW0102DashS2.java
index 471e0dc..2419c74 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBMW0102DashS2.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBMW0102DashS2.java
@@ -20,10 +20,10 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zero33;
+package	org.x4o.fc18.cake2.zero33;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
 
 /**
  * "FC.BMW0102-S2" Four Corner Binary Model Word encoding.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBYD0127DashP7D.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7D.java
similarity index 91%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBYD0127DashP7D.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7D.java
index 952eac7..6972c4d 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBYD0127DashP7D.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7D.java
@@ -20,13 +20,13 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zero33;
+package	org.x4o.fc18.cake2.zero33;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
 
 /// "FC.BYD0127-P8D" Four Corner Block Your Display terminal application.
 ///
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBYD0127DashP7E.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7E.java
similarity index 90%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBYD0127DashP7E.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7E.java
index dcaa079..84f7923 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBYD0127DashP7E.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7E.java
@@ -20,13 +20,13 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zero33;
+package	org.x4o.fc18.cake2.zero33;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
 
 /// "FC.BYD0127-P8E" Four Corner Block Your Display terminal application.
 ///
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBYD0127DashP7F.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7F.java
similarity index 90%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBYD0127DashP7F.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7F.java
index 3ae3c86..a1d5dce 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBYD0127DashP7F.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7F.java
@@ -20,13 +20,13 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zero33;
+package	org.x4o.fc18.cake2.zero33;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
 
 /// "FC.BYD0127-P8F" Four Corner Block Your Display terminal application.
 ///
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotCDC1604DashP6.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6.java
similarity index 95%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotCDC1604DashP6.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6.java
index 84a5533..68bb129 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotCDC1604DashP6.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6.java
@@ -20,12 +20,12 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zero33;
+package	org.x4o.fc18.cake2.zero33;
 
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.FourCornerX21CodePoints;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerX21CodePoints;
 
 ///
 /// "FC.CDC1604-P6" Four Corner Core Data Cake has 27 pie slice number systems "Packed" for MATH and BASIC letters.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotDEC0127DashPX0.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotDEC0127DashPX0.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotDEC0127DashPX0.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotDEC0127DashPX0.java
index 6142a6a..0a208fa 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotDEC0127DashPX0.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotDEC0127DashPX0.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zero33;
+package	org.x4o.fc18.cake2.zero33;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
 
 /**
  * "FC.DEC0127-PX0" Four Corner dot Direct or Escaped Control in grid of 1 by 27 of dashed CDC invisible page X Zero codes.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotDNA0104DashS4.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotDNA0104DashS4.java
similarity index 93%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotDNA0104DashS4.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotDNA0104DashS4.java
index 0d91fb2..e7f0302 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotDNA0104DashS4.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotDNA0104DashS4.java
@@ -20,10 +20,10 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zero33;
+package	org.x4o.fc18.cake2.zero33;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
 
 /**
  * "FC.DNA0104-S4" Four Corner Application Direct Nuclear Air strike for quadratonic values.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotIBM1616DashH8.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotIBM1616DashH8.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotIBM1616DashH8.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotIBM1616DashH8.java
index 9fe43a0..0a9cafd 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotIBM1616DashH8.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotIBM1616DashH8.java
@@ -20,10 +20,10 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zero33;
+package	org.x4o.fc18.cake2.zero33;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
 
 /**
  * "FC.IBM1616-H8" Four Corner Interim Byte Mode, embed raw 8 bit Data
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotNXP0103DashS3.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotNXP0103DashS3.java
similarity index 93%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotNXP0103DashS3.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotNXP0103DashS3.java
index 21260f7..fe91bad 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotNXP0103DashS3.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotNXP0103DashS3.java
@@ -20,10 +20,10 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zero33;
+package	org.x4o.fc18.cake2.zero33;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
 
 /**
  * "FC.NXP0103-S3" Four Corner Application Natural X-state Phasing for tri-state or high impedance (Hi-Z) signals.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotOCE0801DashH3.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotOCE0801DashH3.java
similarity index 93%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotOCE0801DashH3.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotOCE0801DashH3.java
index a417d8d..e50c51c 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotOCE0801DashH3.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotOCE0801DashH3.java
@@ -20,10 +20,10 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zero33;
+package	org.x4o.fc18.cake2.zero33;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
 
 /**
  * "FC.OCE0801-H3" Four Corner Octal Character Encoding in Hinari 3 bit.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotOCE0808DashH6.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotOCE0808DashH6.java
similarity index 94%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotOCE0808DashH6.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotOCE0808DashH6.java
index 5e40f76..e7df776 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotOCE0808DashH6.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotOCE0808DashH6.java
@@ -20,10 +20,10 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zero33;
+package	org.x4o.fc18.cake2.zero33;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
 
 /**
  * "FC.OCE0808-H6" Four Corner Octal Character Encoding in Hinari 6 bit.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotOCE0864DashH9.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotOCE0864DashH9.java
similarity index 98%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotOCE0864DashH9.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotOCE0864DashH9.java
index add1d8a..415c092 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotOCE0864DashH9.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotOCE0864DashH9.java
@@ -20,10 +20,10 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zero33;
+package	org.x4o.fc18.cake2.zero33;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
 
 /**
  * "FC.OCE0864-H9" Four Corner Octal Character Encoding in Hinari 9 bit.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/package-info.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/package-info.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/package-info.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/package-info.java
index 0b52484..2b6e15c 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/package-info.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/package-info.java
@@ -27,4 +27,4 @@
  *
  * @since 1.0
  */
-package org.x4o.o2o.fc18.zero33;
+package org.x4o.fc18.cake2.zero33;
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/vt06/VTDash06DotZero.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/vt06/VTDash06DotZero.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/vt06/VTDash06DotZero.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/vt06/VTDash06DotZero.java
index 32d8ba3..deee30b 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/vt06/VTDash06DotZero.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/vt06/VTDash06DotZero.java
@@ -20,11 +20,11 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.vt06;
+package	org.x4o.fc18.cake2.zero33.vt06;
 
 import java.util.Objects;
 
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
 
 /**
  * The "VT-06.0" defines the action group identifiers.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/vt06/VTDash06DotZeroACursor.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/vt06/VTDash06DotZeroACursor.java
similarity index 90%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/vt06/VTDash06DotZeroACursor.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/vt06/VTDash06DotZeroACursor.java
index 3d4bcf0..206935c 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/vt06/VTDash06DotZeroACursor.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/vt06/VTDash06DotZeroACursor.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.vt06;
+package	org.x4o.fc18.cake2.zero33.vt06;
 
 import java.util.Objects;
 
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * The "VT-06.0A" cursor action sequences.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/vt06/VTDash06DotZeroCClear.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/vt06/VTDash06DotZeroCClear.java
similarity index 88%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/vt06/VTDash06DotZeroCClear.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/vt06/VTDash06DotZeroCClear.java
index c940aee..87c8144 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/vt06/VTDash06DotZeroCClear.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/vt06/VTDash06DotZeroCClear.java
@@ -20,15 +20,15 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.vt06;
+package	org.x4o.fc18.cake2.zero33.vt06;
 
 import java.util.Objects;
 
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.FourCornerX08MuffinPoints;
-import org.x4o.o2o.fc18.FourCornerX18CakePoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * The "VT-06.0A" cursor action sequences.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/package-info.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/package-info.java
similarity index 98%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/package-info.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/package-info.java
index 589c5d1..daad567 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/package-info.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/package-info.java
@@ -27,4 +27,4 @@
  *
  * @since 1.0
  */
-package org.x4o.o2o.fc18;
+package org.x4o.fc18;
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZion7AlphaOmega.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZion7AlphaOmega.java
similarity index 98%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZion7AlphaOmega.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZion7AlphaOmega.java
index 9324acb..3a93c6e 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZion7AlphaOmega.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZion7AlphaOmega.java
@@ -20,7 +20,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zion7;
+package	org.x4o.fc18.zion7;
 
 /// Handles the lexer document mode begin and end strobes.
 ///
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZion7Candlelier.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZion7Candlelier.java
similarity index 96%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZion7Candlelier.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZion7Candlelier.java
index 751539e..7eb6d86 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZion7Candlelier.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZion7Candlelier.java
@@ -20,12 +20,12 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zion7;
+package	org.x4o.fc18.zion7;
 
 import java.math.BigInteger;
 import java.util.List;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /// Handles the main lexer four corner cake strobes.
 ///
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZion7SalahSequence.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZion7SalahSequence.java
similarity index 95%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZion7SalahSequence.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZion7SalahSequence.java
index e63eb95..dfcabe6 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZion7SalahSequence.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZion7SalahSequence.java
@@ -20,11 +20,11 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zion7;
+package	org.x4o.fc18.zion7;
 
 import java.util.List;
 
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /// Handles the lexer salah sequence strobes.
 ///
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZion7TempleScrolls.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZion7TempleScrolls.java
similarity index 98%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZion7TempleScrolls.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZion7TempleScrolls.java
index 0d5f64a..5d90117 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZion7TempleScrolls.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZion7TempleScrolls.java
@@ -20,7 +20,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zion7;
+package	org.x4o.fc18.zion7;
 
 /// Handles the four corner temple scrolls strobes.
 ///
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZionStenoGrapher.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoGrapher.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZionStenoGrapher.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoGrapher.java
index 7d9db27..fe9dafe 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZionStenoGrapher.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoGrapher.java
@@ -20,7 +20,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zion7;
+package	org.x4o.fc18.zion7;
 
 /// Write steno for zion.
 ///
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZionStenoLexer.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexer.java
similarity index 99%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZionStenoLexer.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexer.java
index 402499e..badd786 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZionStenoLexer.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexer.java
@@ -20,7 +20,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zion7;
+package	org.x4o.fc18.zion7;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -29,9 +29,9 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /// Parsed FC text and calls the handler methods for the classified strobe lights.
 ///
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZionStenoLexerFire.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexerFire.java
similarity index 98%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZionStenoLexerFire.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexerFire.java
index 6e5b4e1..466adae 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZionStenoLexerFire.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexerFire.java
@@ -20,7 +20,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zion7;
+package	org.x4o.fc18.zion7;
 
 /// Provides lexer fire state signals.
 ///
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZionStenoLexerSmoke.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexerSmoke.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZionStenoLexerSmoke.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexerSmoke.java
index d11c2c2..eee1679 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/FourCornerZionStenoLexerSmoke.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexerSmoke.java
@@ -20,9 +20,9 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package	org.x4o.o2o.fc18.zion7;
+package	org.x4o.fc18.zion7;
 
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /// Provides lexer smoke signals feedback.
 ///
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/package-info.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/package-info.java
similarity index 97%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/package-info.java
rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/package-info.java
index e76bc79..db872d9 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zion7/package-info.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/package-info.java
@@ -26,4 +26,4 @@
  *
  * @since 1.0
  */
-package org.x4o.o2o.fc18.zion7;
+package org.x4o.fc18.zion7;
diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerDotCakeTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerDotCakeTest.java
similarity index 96%
rename from nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerDotCakeTest.java
rename to nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerDotCakeTest.java
index 2925dbb..9330c37 100644
--- a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerDotCakeTest.java
+++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerDotCakeTest.java
@@ -20,10 +20,11 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.x4o.o2o.fc18;
+package org.x4o.fc18;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Tests FourCornerDotCake values.
diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplayTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeDisplayTest.java
similarity index 95%
rename from nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplayTest.java
rename to nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeDisplayTest.java
index ca1fb72..943f0b8 100644
--- a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplayTest.java
+++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeDisplayTest.java
@@ -20,7 +20,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.x4o.o2o.fc18;
+package org.x4o.fc18;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -28,9 +28,10 @@ import java.util.List;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash26;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash26;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Tests four corner displayed as unicode.
diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeImportTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeImportTest.java
similarity index 96%
rename from nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeImportTest.java
rename to nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeImportTest.java
index 0ef59b9..306a85c 100644
--- a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeImportTest.java
+++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeImportTest.java
@@ -20,16 +20,19 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.x4o.o2o.fc18;
+package org.x4o.fc18;
 
 import java.util.List;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash10;
-import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash26;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.FourCornerX08MuffinPoints;
+import org.x4o.fc18.cake2.FourCornerX18CakePoints;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash10;
+import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash26;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Tests four corner unicode import.
diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerWriteExampleMD.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerWriteExampleMD.java
similarity index 95%
rename from nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerWriteExampleMD.java
rename to nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerWriteExampleMD.java
index d088d92..8507693 100644
--- a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerWriteExampleMD.java
+++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerWriteExampleMD.java
@@ -20,7 +20,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.x4o.o2o.fc18;
+package org.x4o.fc18;
 
 import java.io.File;
 import java.io.IOException;
@@ -30,14 +30,15 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
 
-import org.x4o.o2o.fc18.zero33.FCDotAPL0127DashP7A;
-import org.x4o.o2o.fc18.zero33.FCDotAPL0127DashP7B;
-import org.x4o.o2o.fc18.zero33.FCDotAPL0127DashP7C;
-import org.x4o.o2o.fc18.zero33.FCDotBYD0127DashP7D;
-import org.x4o.o2o.fc18.zero33.FCDotBYD0127DashP7E;
-import org.x4o.o2o.fc18.zero33.FCDotBYD0127DashP7F;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.zero33.FCDotAPL0127DashP7A;
+import org.x4o.fc18.cake2.zero33.FCDotAPL0127DashP7B;
+import org.x4o.fc18.cake2.zero33.FCDotAPL0127DashP7C;
+import org.x4o.fc18.cake2.zero33.FCDotBYD0127DashP7D;
+import org.x4o.fc18.cake2.zero33.FCDotBYD0127DashP7E;
+import org.x4o.fc18.cake2.zero33.FCDotBYD0127DashP7F;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Writes fc example markdown document.
diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zero33/FCDotAPLTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotAPLTest.java
similarity index 98%
rename from nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zero33/FCDotAPLTest.java
rename to nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotAPLTest.java
index 9b77905..04f3fa2 100644
--- a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zero33/FCDotAPLTest.java
+++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotAPLTest.java
@@ -20,7 +20,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.x4o.o2o.fc18.zero33;
+package org.x4o.fc18.cake2.zero33;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zero33/FCDotBYDTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotBYDTest.java
similarity index 95%
rename from nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zero33/FCDotBYDTest.java
rename to nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotBYDTest.java
index edc386d..d1a0a8e 100644
--- a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zero33/FCDotBYDTest.java
+++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotBYDTest.java
@@ -20,7 +20,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.x4o.o2o.fc18.zero33;
+package org.x4o.fc18.cake2.zero33;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -29,8 +29,8 @@ import java.util.Map;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.x4o.o2o.fc18.FourCornerUnicodeDisplay;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.FourCornerUnicodeDisplay;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
 
 /**
  * Tests BYD encoding.
diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zero33/FCDotCDC1604DashP6Test.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6Test.java
similarity index 98%
rename from nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zero33/FCDotCDC1604DashP6Test.java
rename to nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6Test.java
index 0b83ad1..e35434e 100644
--- a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zero33/FCDotCDC1604DashP6Test.java
+++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6Test.java
@@ -20,7 +20,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.x4o.o2o.fc18.zero33;
+package org.x4o.fc18.cake2.zero33;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zero33/FCDotDEC0127DashPX0Test.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotDEC0127DashPX0Test.java
similarity index 98%
rename from nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zero33/FCDotDEC0127DashPX0Test.java
rename to nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotDEC0127DashPX0Test.java
index 991b761..4673e56 100644
--- a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zero33/FCDotDEC0127DashPX0Test.java
+++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotDEC0127DashPX0Test.java
@@ -20,7 +20,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.x4o.o2o.fc18.zero33;
+package org.x4o.fc18.cake2.zero33;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zero33/FCDotVT06Test.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotVT06Test.java
similarity index 90%
rename from nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zero33/FCDotVT06Test.java
rename to nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotVT06Test.java
index fcef3b1..edb049c 100644
--- a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zero33/FCDotVT06Test.java
+++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotVT06Test.java
@@ -20,18 +20,18 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.x4o.o2o.fc18.zero33;
+package org.x4o.fc18.cake2.zero33;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.x4o.o2o.fc18.FourCornerUnicodeDisplay;
-import org.x4o.o2o.fc18.FourCornerUnicodeMapper;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.vt06.VTDash06DotZeroACursor;
-import org.x4o.o2o.fc18.vt06.VTDash06DotZeroCClear;
+import org.x4o.fc18.FourCornerUnicodeDisplay;
+import org.x4o.fc18.FourCornerUnicodeMapper;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.zero33.vt06.VTDash06DotZeroACursor;
+import org.x4o.fc18.cake2.zero33.vt06.VTDash06DotZeroCClear;
 
 /**
  * Tests VT-06 encoding.
diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zion7/LexerNCRTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/LexerNCRTest.java
similarity index 95%
rename from nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zion7/LexerNCRTest.java
rename to nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/LexerNCRTest.java
index 88f0df8..8f6499f 100644
--- a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zion7/LexerNCRTest.java
+++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/LexerNCRTest.java
@@ -20,18 +20,18 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.x4o.o2o.fc18.zion7;
+package org.x4o.fc18.zion7;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.x4o.o2o.fc18.FourCornerDotCake;
-import org.x4o.o2o.fc18.FourCornerUnicodeDisplay;
-import org.x4o.o2o.fc18.FourCornerX06BaklavaPoints;
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC0127DashPX0;
+import org.x4o.fc18.FourCornerUnicodeDisplay;
+import org.x4o.fc18.cake2.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints;
+import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6;
+import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0;
 
 /**
  * Tests four corner lexer parts.
diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zion7/LexerUNI21Test.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/LexerUNI21Test.java
similarity index 96%
rename from nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zion7/LexerUNI21Test.java
rename to nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/LexerUNI21Test.java
index 0292e2b..acb1966 100644
--- a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zion7/LexerUNI21Test.java
+++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/LexerUNI21Test.java
@@ -20,14 +20,14 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.x4o.o2o.fc18.zion7;
+package org.x4o.fc18.zion7;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.x4o.o2o.fc18.FourCornerDotCake;
+import org.x4o.fc18.cake2.FourCornerDotCake;
 
 /**
  * Tests four corner lexer parts.
diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zion7/TestSmokeReader.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/TestSmokeReader.java
similarity index 98%
rename from nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zion7/TestSmokeReader.java
rename to nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/TestSmokeReader.java
index e32814a..d69a1c8 100644
--- a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zion7/TestSmokeReader.java
+++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/TestSmokeReader.java
@@ -20,7 +20,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.x4o.o2o.fc18.zion7;
+package org.x4o.fc18.zion7;
 
 /**
  * Tests four corner lexer parts.
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax4/X4ContentFrameTag.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax4/X4ContentFrameTag.java
index 83b364b..c6fc59a 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax4/X4ContentFrameTag.java
+++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax4/X4ContentFrameTag.java
@@ -24,7 +24,6 @@ package	org.x4o.o2o.io.sax4;
 
 import java.util.Objects;
 
-import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
 import org.x4o.o2o.octal.PrimordialOctalOrangeJuice;
 import org.x4o.o2o.octal.PrimordialOctalOrangeSexWord;
 
@@ -35,7 +34,7 @@ import org.x4o.o2o.octal.PrimordialOctalOrangeSexWord;
  * @version 1.0 Dec 25, 2024
  */
 public enum X4ContentFrameTag {
-	
+	/*
 	DOCUMENT_END(FCDotCDC1604DashP6.NX27_AMPERSAND),
 	ELEMENT_END(FCDotCDC1604DashP6.NX26_Z),
 	
@@ -52,13 +51,14 @@ public enum X4ContentFrameTag {
 	COMMENT(FCDotCDC1604DashP6.NX03_C),
 	
 	STRING_ID(FCDotCDC1604DashP6.NX09_I),
+	*/
 	;
 	
 	private final PrimordialOctalOrangeJuice tagNumber;
 	
-	private X4ContentFrameTag(FCDotCDC1604DashP6 tag) {
-		this(PrimordialOctalOrangeSexWord.valueOfSmurf(tag.ordinal()));
-	}
+//	private X4ContentFrameTag(FCDotCDC1604DashP6 tag) {
+//		this(PrimordialOctalOrangeSexWord.valueOfSmurf(tag.ordinal()));
+//	}
 	
 	private X4ContentFrameTag(PrimordialOctalOrangeJuice tagNumber) {
 		this.tagNumber = Objects.requireNonNull(tagNumber);
diff --git a/pom.xml b/pom.xml
index 0d28492..8a97093 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,7 @@
 		<module>nx01-x4o-tool-ant-plugin</module>
 		<module>nx01-x4o-tool-maven-plugin</module>
 		<module>nx01-zerofungus-server</module>
+		<module>nx01-x4o-fc18</module>
 	</modules>
 	<dependencyManagement>
 		<dependencies>
@@ -389,6 +390,11 @@
 				<artifactId>nx01-x4o-eld-doc</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>love.distributedrebirth.nx01</groupId>
+				<artifactId>nx01-x4o-fc18</artifactId>
+				<version>${project.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>love.distributedrebirth.nx01</groupId>
 				<artifactId>nx01-x4o-meta</artifactId>