Removed XML package slug from o2o module

nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/NoStrIdentityPrivateKey.java

@@ -27,7 +27,7 @@
 
 package love.distributedrebirth.nx01.no2all.nostr.model;
 
-import org.x4o.xml.o2o.octo.OctoBitFormat;
+import org.x4o.o2o.octo.OctoBitFormat;
 
 import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplBinHexAdapter;
 import love.distributedrebirth.nx01.no2all.nostr.trust.OctoTrust;

nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/NoStrIdentityPublicKey.java

@@ -27,7 +27,7 @@
 
 package love.distributedrebirth.nx01.no2all.nostr.model;
 
-import org.x4o.xml.o2o.octo.OctoBitFormat;
+import org.x4o.o2o.octo.OctoBitFormat;
 
 import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplBinHexAdapter;
 import love.distributedrebirth.nx01.no2all.nostr.trust.OctoTrust;

nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventId.java

@@ -27,7 +27,7 @@
 
 package love.distributedrebirth.nx01.no2all.nostr.model.event;
 
-import org.x4o.xml.o2o.octo.OctoBitFormat;
+import org.x4o.o2o.octo.OctoBitFormat;
 
 import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplBinHexAdapter;
 

nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventSignature.java

@@ -30,7 +30,7 @@ package love.distributedrebirth.nx01.no2all.nostr.model.event;
 import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
 
-import org.x4o.xml.o2o.octo.OctoBitFormat;
+import org.x4o.o2o.octo.OctoBitFormat;
 
 import jakarta.json.Json;
 import jakarta.json.JsonArray;

nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareB32LinkTLV.java

@@ -30,8 +30,8 @@ package love.distributedrebirth.nx01.no2all.nostr.model.share;
 import java.util.Optional;
 import java.util.function.Consumer;
 
-import org.x4o.xml.o2o.io.tlv.TLVChainOctoBit;
+import org.x4o.o2o.io.tlv.TLVChainOctoBit;
-import org.x4o.xml.o2o.octo.OctoBitFormat;
+import org.x4o.o2o.octo.OctoBitFormat;
 
 import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplShareLink;
 import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplShareTLV;

nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareBitChainTapeDeck.java

@@ -33,10 +33,10 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
-import org.x4o.xml.o2o.io.tlv.TLVChainOctoBit;
+import org.x4o.o2o.io.tlv.TLVChainOctoBit;
-import org.x4o.xml.o2o.io.tlv.TLVChainOctoBitFrame;
+import org.x4o.o2o.io.tlv.TLVChainOctoBitFrame;
-import org.x4o.xml.o2o.octo.OctoBitConverter;
+import org.x4o.o2o.octo.OctoBitConverter;
-import org.x4o.xml.o2o.octo.OctoBitFormat;
+import org.x4o.o2o.octo.OctoBitFormat;
 
 import love.distributedrebirth.nx01.no2all.nostr.model.NoStrIdentityPublicKey;
 import love.distributedrebirth.nx01.no2all.nostr.model.event.NoStrEventKind;

nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareBitChainTapeStudio.java

@@ -31,9 +31,9 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
-import org.x4o.xml.o2o.io.tlv.TLVChainOctoBit;
+import org.x4o.o2o.io.tlv.TLVChainOctoBit;
-import org.x4o.xml.o2o.octo.OctoBitConverter;
+import org.x4o.o2o.octo.OctoBitConverter;
-import org.x4o.xml.o2o.octo.OctoBitFormat;
+import org.x4o.o2o.octo.OctoBitFormat;
 
 import love.distributedrebirth.nx01.no2all.nostr.model.NoStrIdentityPublicKey;
 import love.distributedrebirth.nx01.no2all.nostr.model.event.NoStrEventKind;

nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkEventReference.java

@@ -30,7 +30,7 @@ package love.distributedrebirth.nx01.no2all.nostr.model.share;
 import java.util.List;
 import java.util.Objects;
 
-import org.x4o.xml.o2o.octo.OctoBitFormat;
+import org.x4o.o2o.octo.OctoBitFormat;
 
 import love.distributedrebirth.nx01.no2all.nostr.model.NoStrIdentityPublicKey;
 import love.distributedrebirth.nx01.no2all.nostr.model.event.NoStrEventKind;

nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkRelay.java

@@ -27,7 +27,7 @@
 
 package love.distributedrebirth.nx01.no2all.nostr.model.share;
 
-import org.x4o.xml.o2o.octo.OctoBitFormat;
+import org.x4o.o2o.octo.OctoBitFormat;
 
 import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplShareLink;
 import love.distributedrebirth.nx01.no2all.nostr.trust.OctoBech32String;

nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/nip/NoStrImplBinHexAdapter.java

@@ -29,7 +29,7 @@ package love.distributedrebirth.nx01.no2all.nostr.nip;
 
 import java.util.Objects;
 
-import org.x4o.xml.o2o.octo.OctoBitFormat;
+import org.x4o.o2o.octo.OctoBitFormat;
 
 /// @author للَّٰهِilLצسُو
 /// @version ©Δ∞ 仙上主天

nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/nip/NoStrImplShareTLV.java

@@ -27,7 +27,7 @@
 
 package love.distributedrebirth.nx01.no2all.nostr.nip;
 
-import org.x4o.xml.o2o.io.tlv.TLVChainOctoBitFrameType;
+import org.x4o.o2o.io.tlv.TLVChainOctoBitFrameType;
 
 /// @author للَّٰهِilLצسُو
 /// @version ©Δ∞ 仙上主天

nx01-no2all-nostr/src/test/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventSignatureTest.java

@@ -36,7 +36,7 @@ import java.util.Optional;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.x4o.xml.o2o.octo.OctoBitFormat;
+import org.x4o.o2o.octo.OctoBitFormat;
 
 import jakarta.json.Json;
 import jakarta.json.JsonReader;

nx01-no2all-nostr/src/test/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkProfileTest.java

@@ -32,7 +32,7 @@ import java.util.List;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.x4o.xml.o2o.octo.OctoBitFormat;
+import org.x4o.o2o.octo.OctoBitFormat;
 
 import love.distributedrebirth.nx01.no2all.nostr.model.NoStrIdentityPublicKey;
 import love.distributedrebirth.nx01.no2all.nostr.model.share.NoStrShareLinkProfile;

nx01-popcorn-mm-jdbc/src/main/java/org/eobjects/metamodel/doc/DocModelWriterTable.java

@@ -43,6 +43,7 @@ import org.apache.metamodel.schema.Column;
 import org.apache.metamodel.schema.Relationship;
 import org.apache.metamodel.schema.Table;
 import org.apache.metamodel.schema.TableType;
+import org.x4o.o2o.io.ContentWriterHtml.Tag;
 import org.x4o.xml.eld.doc.api.ApiDocContentCss;
 import org.x4o.xml.eld.doc.api.ApiDocContentWriter;
 import org.x4o.xml.eld.doc.api.ApiDocNodeWriterMethod;
@@ -50,7 +51,6 @@ import org.x4o.xml.eld.doc.api.dom.ApiDocIndexItem;
 import org.x4o.xml.eld.doc.api.dom.ApiDocNode;
 import org.x4o.xml.eld.doc.api.dom.ApiDocNodeBody;
 import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent;
-import org.x4o.xml.o2o.io.ContentWriterHtml.Tag;
 import org.xml.sax.SAXException;
 
 public class DocModelWriterTable {

nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/WarpManifestorDriver.java

@@ -41,8 +41,8 @@ import java.util.Objects;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
-import org.x4o.xml.o2o.io.tlv.TLVChainOctalSex;
+import org.x4o.o2o.io.tlv.TLVChainOctalSex;
-import org.x4o.xml.o2o.io.tlv.TLVChainSexTeenBit;
+import org.x4o.o2o.io.tlv.TLVChainSexTeenBit;
 
 import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifest2;
 import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifest2HeaderField;

nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifest4.java

@@ -30,7 +30,7 @@ package love.distributedrebirth.nx01.warp.manifestor.manifest;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuiceAtoms;
+import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms;
 
 /// Warp manifest4 model.
 /// 

nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifest4HeaderField.java

@@ -30,7 +30,7 @@ package love.distributedrebirth.nx01.warp.manifestor.manifest;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuiceAtoms;
+import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms;
 
 /// Warp manifest4 name value pair entry.
 /// 

nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifest4Section.java

@@ -30,7 +30,7 @@ package love.distributedrebirth.nx01.warp.manifestor.manifest;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuiceAtoms;
+import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms;
 
 /// Warp manifest4 section.
 /// 

nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestTheVersion.java

@@ -30,8 +30,8 @@ package love.distributedrebirth.nx01.warp.manifestor.manifest;
 import java.util.Arrays;
 import java.util.Optional;
 
-import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuiceAtoms;
+import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms;
-import org.x4o.xml.o2o.octal.PrimordialOctalOrangeString;
+import org.x4o.o2o.octal.PrimordialOctalOrangeString;
 
 /// Warp manifest schema of the version.
 /// 

nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/ioini/ScopicIniContentReader.java

@@ -34,7 +34,7 @@ import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.util.PrimitiveIterator;
 
-import org.x4o.xml.o2o.io.sax3.XMLConstants;
+import org.x4o.o2o.io.sax3.XMLConstants;
 
 import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestContent;
 import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestException;

nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf/ScopicManifestConstants.java

@@ -29,8 +29,8 @@ package love.distributedrebirth.nx01.warp.manifestor.scopic.iomf;
 
 import java.util.PrimitiveIterator;
 
-import org.x4o.xml.o2o.io.sax3.XMLConstants;
+import org.x4o.o2o.io.sax3.XMLConstants;
-import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuiceAtoms;
+import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms;
 
 /// Stroboscopic manifest 1 and 2 constants.
 /// 

nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf/ScopicManifestContentReader.java

@@ -35,7 +35,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 import java.util.PrimitiveIterator;
 
-import org.x4o.xml.o2o.io.sax3.XMLConstants;
+import org.x4o.o2o.io.sax3.XMLConstants;
 
 import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifest3HeaderField;
 import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifestTheVersion;

nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3ContentReader.java

@@ -31,8 +31,8 @@ import java.util.Iterator;
 import java.util.Objects;
 import java.util.Optional;
 
-import org.x4o.xml.o2o.io.tlv.TLVChainSexTeenBit;
+import org.x4o.o2o.io.tlv.TLVChainSexTeenBit;
-import org.x4o.xml.o2o.io.tlv.TLVChainSexTeenBitFrame;
+import org.x4o.o2o.io.tlv.TLVChainSexTeenBitFrame;
 
 import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifestTheVersion;
 import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestContent;

nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3ContentWriter.java

@@ -27,8 +27,8 @@ w * Copyright ©Δ∞ 仙上主天
 
 package love.distributedrebirth.nx01.warp.manifestor.scopic.iomf3;
 
-import org.x4o.xml.o2o.io.tlv.TLVChainSexTeenBit;
+import org.x4o.o2o.io.tlv.TLVChainSexTeenBit;
-import org.x4o.xml.o2o.io.tlv.TLVChainSexTeenBitFrameType;
+import org.x4o.o2o.io.tlv.TLVChainSexTeenBitFrameType;
 
 import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestContent;
 import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestDuplicateDetector;

nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3FrameTLV.java

@@ -27,7 +27,7 @@
 
 package love.distributedrebirth.nx01.warp.manifestor.scopic.iomf3;
 
-import org.x4o.xml.o2o.io.tlv.TLVChainSexTeenBitFrameType;
+import org.x4o.o2o.io.tlv.TLVChainSexTeenBitFrameType;
 
 /// @author للَّٰهِilLצسُو
 /// @version ©Δ∞ 仙上主天

nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentHandler.java

@@ -31,7 +31,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuiceAtoms;
+import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms;
 
 import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifest4;
 import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifest4Section;

nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentReader.java

@@ -30,9 +30,9 @@ package love.distributedrebirth.nx01.warp.manifestor.scopic.iomf4;
 import java.util.Iterator;
 import java.util.Objects;
 
-import org.x4o.xml.o2o.io.tlv.TLVChainOctalSex;
+import org.x4o.o2o.io.tlv.TLVChainOctalSex;
-import org.x4o.xml.o2o.io.tlv.TLVChainOctalSexFrame;
+import org.x4o.o2o.io.tlv.TLVChainOctalSexFrame;
-import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuiceAtoms;
+import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms;
 
 import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifestTheVersion;
 import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestContent;

nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentWriter.java

@@ -27,9 +27,9 @@
 
 package love.distributedrebirth.nx01.warp.manifestor.scopic.iomf4;
 
-import org.x4o.xml.o2o.io.tlv.TLVChainOctalSex;
+import org.x4o.o2o.io.tlv.TLVChainOctalSex;
-import org.x4o.xml.o2o.io.tlv.TLVChainOctalSexFrameType;
+import org.x4o.o2o.io.tlv.TLVChainOctalSexFrameType;
-import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuiceAtoms;
+import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms;
 
 import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestContent;
 import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestDuplicateDetector;

nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4FrameTLV.java

@@ -27,10 +27,10 @@
 
 package love.distributedrebirth.nx01.warp.manifestor.scopic.iomf4;
 
-import org.x4o.xml.o2o.io.tlv.TLVChainOctalSexFrameType;
+import org.x4o.o2o.io.tlv.TLVChainOctalSexFrameType;
-import org.x4o.xml.o2o.io.tlv.TLVChainSexTeenBitFrameType;
+import org.x4o.o2o.io.tlv.TLVChainSexTeenBitFrameType;
-import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuice;
+import org.x4o.o2o.octal.PrimordialOctalOrangeJuice;
-import org.x4o.xml.o2o.octal.PrimordialOctalOrangeSexWord;
+import org.x4o.o2o.octal.PrimordialOctalOrangeSexWord;
 
 import love.distributedrebirth.nx01.warp.manifestor.scopic.iomf3.ScopicManifest3FrameTLV;
 

nx01-warp-manifestor/src/test/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestNameDupTest.java

@@ -31,7 +31,7 @@ import java.util.Arrays;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.x4o.xml.o2o.octal.PrimordialOctalOrangeString;
+import org.x4o.o2o.octal.PrimordialOctalOrangeString;
 
 import love.distributedrebirth.nx01.warp.manifestor.WarpManifestorDriver;
 import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifest3;

nx01-warp-manifestor/src/test/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestNameEmptyTest.java

@@ -31,7 +31,7 @@ import java.util.Arrays;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.x4o.xml.o2o.octal.PrimordialOctalOrangeString;
+import org.x4o.o2o.octal.PrimordialOctalOrangeString;
 
 import love.distributedrebirth.nx01.warp.manifestor.WarpManifestorDriver;
 import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifest3;

nx01-warp-manifestor/src/test/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestSectionNameEmptyTest.java

@@ -31,7 +31,7 @@ import java.util.Arrays;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.x4o.xml.o2o.octal.PrimordialOctalOrangeString;
+import org.x4o.o2o.octal.PrimordialOctalOrangeString;
 
 import love.distributedrebirth.nx01.warp.manifestor.WarpManifestorDriver;
 import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifest3;

nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdLanguageTask.java

@@ -24,11 +24,11 @@ package org.x4o.xml.eld.xsd;
 
 import java.io.IOException;
 
+import org.x4o.o2o.PropertyConfig;
 import org.x4o.xml.lang.X4OLanguage;
 import org.x4o.xml.lang.task.AbstractX4OLanguageTask;
 import org.x4o.xml.lang.task.X4OLanguageTaskException;
 import org.x4o.xml.lang.task.X4OLanguageTaskExecutor;
-import org.x4o.xml.o2o.PropertyConfig;
 import org.xml.sax.SAXException;
 
 /**

nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriter.java

@@ -28,13 +28,13 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 
+import org.x4o.o2o.PropertyConfig;
+import org.x4o.o2o.PropertyConfig.PropertyConfigItem;
+import org.x4o.o2o.io.ContentWriterXsd;
+import org.x4o.o2o.io.sax3.ContentWriterXml;
 import org.x4o.xml.element.ElementClass;
 import org.x4o.xml.element.ElementNamespace;
 import org.x4o.xml.lang.X4OLanguageModule;
-import org.x4o.xml.o2o.PropertyConfig;
-import org.x4o.xml.o2o.PropertyConfig.PropertyConfigItem;
-import org.x4o.xml.o2o.io.ContentWriterXsd;
-import org.x4o.xml.o2o.io.sax3.ContentWriterXml;
 import org.x4o.xml.lang.X4OLanguage;
 import org.xml.sax.SAXException;
 

nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriterElement.java

@@ -32,6 +32,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.x4o.o2o.PropertyConfig;
+import org.x4o.o2o.io.ContentWriterXsd;
+import org.x4o.o2o.io.ContentWriterXsd.Tag;
+import org.x4o.o2o.io.sax3.ContentWriterXml;
+import org.x4o.o2o.io.sax3.XMLConstants;
 import org.x4o.xml.element.ElementBindingHandler;
 import org.x4o.xml.element.ElementClass;
 import org.x4o.xml.element.ElementClassAttribute;
@@ -40,11 +45,6 @@ import org.x4o.xml.element.ElementMetaBase;
 import org.x4o.xml.element.ElementNamespace;
 import org.x4o.xml.element.ElementNamespaceAttribute;
 import org.x4o.xml.lang.X4OLanguageModule;
-import org.x4o.xml.o2o.PropertyConfig;
-import org.x4o.xml.o2o.io.ContentWriterXsd;
-import org.x4o.xml.o2o.io.ContentWriterXsd.Tag;
-import org.x4o.xml.o2o.io.sax3.ContentWriterXml;
-import org.x4o.xml.o2o.io.sax3.XMLConstants;
 import org.x4o.xml.lang.X4OLanguage;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;

nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OConnection.java

@@ -26,8 +26,8 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import org.x4o.o2o.PropertyConfig;
 import org.x4o.xml.lang.X4OLanguage;
-import org.x4o.xml.o2o.PropertyConfig;
 
 /**
  * AbstractX4OConnection is the read/write interface for the classes.

nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OConnectionDebug.java

@@ -28,14 +28,14 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
 
+import org.x4o.o2o.io.sax3.ContentWriter;
+import org.x4o.o2o.io.sax3.ContentWriterXml;
 import org.x4o.xml.lang.X4OLanguageSession;
 import org.x4o.xml.lang.X4OLanguageSessionLocal;
 import org.x4o.xml.lang.phase.X4OPhase;
 import org.x4o.xml.lang.phase.X4OPhaseException;
 import org.x4o.xml.lang.phase.X4OPhaseLanguageRead;
 import org.x4o.xml.lang.phase.X4OPhaseLanguageWrite;
-import org.x4o.xml.o2o.io.sax3.ContentWriter;
-import org.x4o.xml.o2o.io.sax3.ContentWriterXml;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 

nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OWriterSession.java

@@ -28,9 +28,9 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
+import org.x4o.o2o.io.sax3.ContentWriterXml;
 import org.x4o.xml.lang.X4OLanguage;
 import org.x4o.xml.lang.X4OLanguageSession;
-import org.x4o.xml.o2o.io.sax3.ContentWriterXml;
 import org.xml.sax.SAXException;
 
 /**

nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4OReader.java

@@ -31,15 +31,15 @@ import java.net.URL;
 import javax.el.ValueExpression;
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.x4o.o2o.PropertyConfig;
+import org.x4o.o2o.PropertyConfig.PropertyConfigItem;
+import org.x4o.o2o.io.sax3.ContentWriter;
+import org.x4o.o2o.io.sax3.XMLConstants;
 import org.x4o.xml.lang.X4OLanguage;
 import org.x4o.xml.lang.X4OLanguageSession;
 import org.x4o.xml.lang.X4OLanguageSessionLocal;
 import org.x4o.xml.lang.phase.X4OPhaseException;
 import org.x4o.xml.lang.phase.X4OPhaseType;
-import org.x4o.xml.o2o.PropertyConfig;
-import org.x4o.xml.o2o.PropertyConfig.PropertyConfigItem;
-import org.x4o.xml.o2o.io.sax3.ContentWriter;
-import org.x4o.xml.o2o.io.sax3.XMLConstants;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.InputSource;

nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4OWriter.java

@@ -33,6 +33,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.x4o.o2o.PropertyConfig;
+import org.x4o.o2o.PropertyConfig.PropertyConfigItem;
+import org.x4o.o2o.io.sax3.ContentWriter;
+import org.x4o.o2o.io.sax3.ContentWriterXml;
+import org.x4o.o2o.io.sax3.XMLConstants;
+import org.x4o.o2o.io.sax3.xdbx.XDBXWriterXml;
 import org.x4o.xml.element.Element;
 import org.x4o.xml.element.ElementClass;
 import org.x4o.xml.element.ElementClassAttribute;
@@ -45,12 +51,6 @@ import org.x4o.xml.lang.X4OLanguageModule;
 import org.x4o.xml.lang.phase.X4OPhaseException;
 import org.x4o.xml.lang.phase.X4OPhaseLanguageWrite;
 import org.x4o.xml.lang.phase.X4OPhaseType;
-import org.x4o.xml.o2o.PropertyConfig;
-import org.x4o.xml.o2o.PropertyConfig.PropertyConfigItem;
-import org.x4o.xml.o2o.io.sax3.ContentWriter;
-import org.x4o.xml.o2o.io.sax3.ContentWriterXml;
-import org.x4o.xml.o2o.io.sax3.XMLConstants;
-import org.x4o.xml.o2o.io.sax3.xdbx.XDBXWriterXml;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 

nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentHandler.java

@@ -22,14 +22,14 @@
  */
 package org.x4o.xml.io;
 
+import org.x4o.o2o.PropertyConfig;
+import org.x4o.o2o.io.sax3.AttributeMap;
 import org.x4o.xml.element.Element;
 import org.x4o.xml.element.Element.ElementType;
 import org.x4o.xml.element.ElementException;
 import org.x4o.xml.element.ElementNamespace;
 import org.x4o.xml.element.ElementNamespaceInstanceProvider;
 import org.x4o.xml.lang.X4OLanguageSession;
-import org.x4o.xml.o2o.PropertyConfig;
-import org.x4o.xml.o2o.io.sax3.AttributeMap;
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;

nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentParser.java

@@ -22,10 +22,10 @@
  */
 package org.x4o.xml.io;
 
+import org.x4o.o2o.PropertyConfig;
 import org.x4o.xml.eld.EldDriver;
 import org.x4o.xml.element.ElementException;
 import org.x4o.xml.lang.X4OLanguageSession;
-import org.x4o.xml.o2o.PropertyConfig;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;

nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4ODebugWriter.java

@@ -28,6 +28,9 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
+import org.x4o.o2o.io.sax3.ContentWriter;
+import org.x4o.o2o.io.sax3.ContentWriterTagWrapper;
+import org.x4o.o2o.io.sax3.XMLConstants;
 import org.x4o.xml.conv.ObjectConverter;
 import org.x4o.xml.element.Element;
 import org.x4o.xml.element.ElementNamespaceAttribute;
@@ -48,9 +51,6 @@ import org.x4o.xml.lang.X4OLanguageConfiguration;
 import org.x4o.xml.lang.phase.X4OPhase;
 import org.x4o.xml.lang.phase.X4OPhaseException;
 import org.x4o.xml.lang.phase.X4OPhaseListener;
-import org.x4o.xml.o2o.io.sax3.ContentWriter;
-import org.x4o.xml.o2o.io.sax3.ContentWriterTagWrapper;
-import org.x4o.xml.o2o.io.sax3.XMLConstants;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 

nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OEntityResolver.java

@@ -30,10 +30,10 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
 
+import org.x4o.o2o.PropertyConfig;
 import org.x4o.xml.element.ElementNamespace;
 import org.x4o.xml.lang.X4OLanguageModule;
 import org.x4o.xml.lang.X4OLanguageSession;
-import org.x4o.xml.o2o.PropertyConfig;
 import org.x4o.xml.lang.X4OLanguageClassLoader;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;

nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OErrorHandler.java

@@ -22,9 +22,9 @@
  */
 package org.x4o.xml.io;
 
+import org.x4o.o2o.PropertyConfig;
 import org.x4o.xml.element.ElementException;
 import org.x4o.xml.lang.X4OLanguageSession;
-import org.x4o.xml.o2o.PropertyConfig;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;

nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/AbstractX4OLanguageTask.java

@@ -24,7 +24,7 @@ package	org.x4o.xml.lang.task;
 
 import java.util.List;
 
-import org.x4o.xml.o2o.PropertyConfig;
+import org.x4o.o2o.PropertyConfig;
 
 /**
  * AbstractX4OLanguageTask holds the language task meta info.
@@ -53,7 +53,7 @@ public abstract class AbstractX4OLanguageTask implements X4OLanguageTask {
 	protected abstract X4OLanguageTaskExecutor createTaskExecutorChecked(PropertyConfig config);
 	
 	/**
-	 * @see org.x4o.xml.lang.task.X4OLanguageTask#createTaskExecutor(org.x4o.xml.o2o.PropertyConfig)
+	 * @see org.x4o.xml.lang.task.X4OLanguageTask#createTaskExecutor(org.x4o.o2o.PropertyConfig)
 	 */
 	public X4OLanguageTaskExecutor createTaskExecutor(PropertyConfig config) {
 		return createTaskExecutorChecked(checkConfig(config));

nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OLanguageTask.java

@@ -22,7 +22,7 @@
  */
 package	org.x4o.xml.lang.task;
 
-import org.x4o.xml.o2o.PropertyConfig;
+import org.x4o.o2o.PropertyConfig;
 
 /**
  * X4OLanguageTask runs a task for a language.

nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OLanguageTaskException.java

@@ -22,7 +22,7 @@
  */
 package	org.x4o.xml.lang.task;
 
-import org.x4o.xml.o2o.PropertyConfig;
+import org.x4o.o2o.PropertyConfig;
 
 /**
  * X4OLanguageTaskException addes the property config to the exception.

nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OStaticLanguageTask.java

@@ -24,8 +24,8 @@ package org.x4o.xml.lang.task;
 
 import java.io.IOException;
 
+import org.x4o.o2o.PropertyConfig;
 import org.x4o.xml.lang.X4OLanguage;
-import org.x4o.xml.o2o.PropertyConfig;
 import org.xml.sax.SAXException;
 
 /**

nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OStaticWriter.java

@@ -28,9 +28,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import org.x4o.o2o.PropertyConfig;
+import org.x4o.o2o.PropertyConfig.PropertyConfigItem;
 import org.x4o.xml.lang.X4OLanguageClassLoader;
-import org.x4o.xml.o2o.PropertyConfig;
-import org.x4o.xml.o2o.PropertyConfig.PropertyConfigItem;
 import org.xml.sax.SAXException;
 
 /**

nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/run/X4OTaskCommandLine.java

@@ -32,13 +32,13 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 
+import org.x4o.o2o.PropertyConfig;
 import org.x4o.xml.X4ODriver;
 import org.x4o.xml.X4ODriverManager;
 import org.x4o.xml.lang.X4OLanguage;
 import org.x4o.xml.lang.task.X4OLanguageTask;
 import org.x4o.xml.lang.task.X4OLanguageTaskException;
 import org.x4o.xml.lang.task.X4OLanguageTaskExecutor;
-import org.x4o.xml.o2o.PropertyConfig;
 
 /**
  * X4OLanguageTaskCommandLine runs a language task from the command line.

nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/run/X4OTaskRunner.java

@@ -24,13 +24,13 @@ package org.x4o.xml.lang.task.run;
 
 import java.util.List;
 
+import org.x4o.o2o.PropertyConfig;
 import org.x4o.xml.X4ODriver;
 import org.x4o.xml.X4ODriverManager;
 import org.x4o.xml.lang.X4OLanguage;
 import org.x4o.xml.lang.task.X4OLanguageTask;
 import org.x4o.xml.lang.task.X4OLanguageTaskException;
 import org.x4o.xml.lang.task.X4OLanguageTaskExecutor;
-import org.x4o.xml.o2o.PropertyConfig;
 
 /**
  * X4OTaskRunner finds all x4o objects and configs and then run the x4o langauge task.

nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4OEntityResolverTest.java

@@ -26,12 +26,12 @@ import java.io.IOException;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.x4o.o2o.PropertyConfig;
 import org.x4o.xml.X4ODriver;
 import org.x4o.xml.eld.CelDriver;
 import org.x4o.xml.io.DefaultX4OReader;
 import org.x4o.xml.io.X4OEntityResolver;
 import org.x4o.xml.lang.X4OLanguageSession;
-import org.x4o.xml.o2o.PropertyConfig;
 import org.x4o.xml.test.TestDriver;
 import org.x4o.xml.test.models.TestObjectRoot;
 import org.xml.sax.EntityResolver;

nx01-x4o-driver/src/test/java/org/x4o/xml/eld/xsd/EldXsdLanguageTaskTest.java

@@ -28,6 +28,8 @@ import java.util.Map;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.x4o.o2o.PropertyConfig;
+import org.x4o.o2o.io.sax3.ContentWriterXml;
 import org.x4o.xml.X4ODriver;
 import org.x4o.xml.X4ODriverManager;
 import org.x4o.xml.eld.CelDriver;
@@ -35,8 +37,6 @@ import org.x4o.xml.eld.EldDriver;
 import org.x4o.xml.eld.EldModuleLoaderCore;
 import org.x4o.xml.io.X4OWriterTest;
 import org.x4o.xml.lang.task.X4OLanguageTask;
-import org.x4o.xml.o2o.PropertyConfig;
-import org.x4o.xml.o2o.io.sax3.ContentWriterXml;
 import org.x4o.xml.test.swixml.SwiXmlDriver;
 
 /**

nx01-x4o-driver/src/test/java/org/x4o/xml/test/element/InlinePropertiesElement.java

@@ -24,9 +24,9 @@ package org.x4o.xml.test.element;
 
 import java.io.StringWriter;
 
+import org.x4o.o2o.io.sax3.ContentWriterXml;
 import org.x4o.xml.element.AbstractElement;
 import org.x4o.xml.element.ElementException;
-import org.x4o.xml.o2o.io.sax3.ContentWriterXml;
 
 /**
  * InlinePropertiesElement to test 

nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocLanguageTask.java

@@ -22,12 +22,12 @@
  */
 package org.x4o.xml.eld.doc;
 
+import org.x4o.o2o.PropertyConfig;
 import org.x4o.xml.element.ElementException;
 import org.x4o.xml.lang.X4OLanguage;
 import org.x4o.xml.lang.task.AbstractX4OLanguageTask;
 import org.x4o.xml.lang.task.X4OLanguageTaskException;
 import org.x4o.xml.lang.task.X4OLanguageTaskExecutor;
-import org.x4o.xml.o2o.PropertyConfig;
 
 /**
  * X4OWriteLanguageDoc is support class to write html documentation from the eld.

nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriter.java

@@ -29,6 +29,9 @@ import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
 
+import org.x4o.o2o.PropertyConfig;
+import org.x4o.o2o.PropertyConfig.PropertyConfigItem;
+import org.x4o.o2o.io.sax3.ContentWriterXml;
 import org.x4o.xml.eld.doc.api.ApiDocGenerator;
 import org.x4o.xml.eld.doc.api.DefaultPageWriterHelp;
 import org.x4o.xml.eld.doc.api.DefaultPageWriterIndexAll;
@@ -49,9 +52,6 @@ import org.x4o.xml.element.ElementNamespace;
 import org.x4o.xml.lang.X4OLanguage;
 import org.x4o.xml.lang.X4OLanguageModule;
 import org.x4o.xml.lang.X4OLanguageSession;
-import org.x4o.xml.o2o.PropertyConfig;
-import org.x4o.xml.o2o.PropertyConfig.PropertyConfigItem;
-import org.x4o.xml.o2o.io.sax3.ContentWriterXml;
 import org.xml.sax.SAXException;
 
 /**

nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementClass.java

@@ -24,6 +24,7 @@ package org.x4o.xml.eld.doc;
 
 import java.util.List;
 
+import org.x4o.o2o.io.ContentWriterHtml.Tag;
 import org.x4o.xml.eld.doc.EldDocXTreePageWriter.TreeNode;
 import org.x4o.xml.eld.doc.api.ApiDocContentPrinter;
 import org.x4o.xml.eld.doc.api.ApiDocContentWriter;
@@ -40,7 +41,6 @@ import org.x4o.xml.element.ElementConfigurator;
 import org.x4o.xml.element.ElementNamespace;
 import org.x4o.xml.lang.X4OLanguage;
 import org.x4o.xml.lang.X4OLanguageModule;
-import org.x4o.xml.o2o.io.ContentWriterHtml.Tag;
 import org.xml.sax.SAXException;
 
 /**

nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocXTreePageWriter.java

@@ -27,6 +27,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import org.x4o.o2o.io.ContentWriterHtml.Tag;
 import org.x4o.xml.eld.doc.api.ApiDocContentWriter;
 import org.x4o.xml.eld.doc.api.DefaultPageWriterTree;
 import org.x4o.xml.eld.doc.api.dom.ApiDoc;
@@ -40,7 +41,6 @@ import org.x4o.xml.element.ElementInterface;
 import org.x4o.xml.element.ElementNamespace;
 import org.x4o.xml.lang.X4OLanguage;
 import org.x4o.xml.lang.X4OLanguageModule;
-import org.x4o.xml.o2o.io.ContentWriterHtml.Tag;
 import org.xml.sax.SAXException;
 
 /**

nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocContentWriter.java

@@ -26,7 +26,7 @@ import java.io.Writer;
 import java.util.Date;
 import java.util.List;
 
-import org.x4o.xml.o2o.io.ContentWriterHtml;
+import org.x4o.o2o.io.ContentWriterHtml;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 

nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocGenerator.java

@@ -40,6 +40,10 @@ import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 
+import org.x4o.o2o.io.ContentWriterHtml.DocType;
+import org.x4o.o2o.io.ContentWriterHtml.Tag;
+import org.x4o.o2o.io.sax3.ContentWriterXml;
+import org.x4o.o2o.io.sax3.XMLConstants;
 import org.x4o.xml.eld.doc.api.dom.ApiDoc;
 import org.x4o.xml.eld.doc.api.dom.ApiDocConcept;
 import org.x4o.xml.eld.doc.api.dom.ApiDocNavLink;
@@ -52,10 +56,6 @@ import org.x4o.xml.eld.doc.api.dom.ApiDocNodeWriter;
 import org.x4o.xml.eld.doc.api.dom.ApiDocPage;
 import org.x4o.xml.eld.doc.api.dom.ApiDocPageWriter;
 import org.x4o.xml.lang.X4OLanguageClassLoader;
-import org.x4o.xml.o2o.io.ContentWriterHtml.DocType;
-import org.x4o.xml.o2o.io.ContentWriterHtml.Tag;
-import org.x4o.xml.o2o.io.sax3.ContentWriterXml;
-import org.x4o.xml.o2o.io.sax3.XMLConstants;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 

nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocWriter.java

@@ -29,6 +29,9 @@ import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
 
+import org.x4o.o2o.PropertyConfig;
+import org.x4o.o2o.PropertyConfig.PropertyConfigItem;
+import org.x4o.o2o.io.sax3.ContentWriterXml;
 import org.x4o.xml.eld.doc.api.ApiDocGenerator;
 import org.x4o.xml.eld.doc.api.DefaultPageWriterHelp;
 import org.x4o.xml.eld.doc.api.DefaultPageWriterIndexAll;
@@ -49,9 +52,6 @@ import org.x4o.xml.element.ElementNamespace;
 import org.x4o.xml.lang.X4OLanguage;
 import org.x4o.xml.lang.X4OLanguageModule;
 import org.x4o.xml.lang.X4OLanguageSession;
-import org.x4o.xml.o2o.PropertyConfig;
-import org.x4o.xml.o2o.PropertyConfig.PropertyConfigItem;
-import org.x4o.xml.o2o.io.sax3.ContentWriterXml;
 import org.xml.sax.SAXException;
 
 /**

nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterHelp.java

@@ -22,12 +22,12 @@
  */
 package org.x4o.xml.eld.doc.api;
 
+import org.x4o.o2o.io.ContentWriterHtml.Tag;
 import org.x4o.xml.eld.doc.api.dom.ApiDoc;
 import org.x4o.xml.eld.doc.api.dom.ApiDocConcept;
 import org.x4o.xml.eld.doc.api.dom.ApiDocPage;
 import org.x4o.xml.eld.doc.api.dom.ApiDocPageWriter;
 import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent;
-import org.x4o.xml.o2o.io.ContentWriterHtml.Tag;
 import org.xml.sax.SAXException;
 
 /**

nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterIndexAll.java

@@ -22,10 +22,10 @@
  */
 package org.x4o.xml.eld.doc.api;
 
+import org.x4o.o2o.io.ContentWriterHtml.Tag;
 import org.x4o.xml.eld.doc.api.dom.ApiDocPage;
 import org.x4o.xml.eld.doc.api.dom.ApiDocPageWriter;
 import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent;
-import org.x4o.xml.o2o.io.ContentWriterHtml.Tag;
 import org.xml.sax.SAXException;
 
 /**

nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterTree.java

@@ -22,12 +22,12 @@
  */
 package org.x4o.xml.eld.doc.api;
 
+import org.x4o.o2o.io.ContentWriterHtml.Tag;
 import org.x4o.xml.eld.doc.api.dom.ApiDoc;
 import org.x4o.xml.eld.doc.api.dom.ApiDocNode;
 import org.x4o.xml.eld.doc.api.dom.ApiDocPage;
 import org.x4o.xml.eld.doc.api.dom.ApiDocPageWriter;
 import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent;
-import org.x4o.xml.o2o.io.ContentWriterHtml.Tag;
 import org.xml.sax.SAXException;
 
 /**

nx01-x4o-eld-doc/src/test/java/org/x4o/xml/eld/doc/X4OWriteLanguageDocExecutorTest.java

@@ -26,12 +26,12 @@ import java.io.File;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.x4o.o2o.PropertyConfig;
 import org.x4o.xml.X4ODriver;
 import org.x4o.xml.X4ODriverManager;
 import org.x4o.xml.eld.CelDriver;
 import org.x4o.xml.eld.EldDriver;
 import org.x4o.xml.lang.task.X4OLanguageTask;
-import org.x4o.xml.o2o.PropertyConfig;
 import org.x4o.xml.test.TestDriver;
 
 /**

nx01-x4o-o2o/src/main/java/org/x4o/o2o/PropertyConfig.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.xml.o2o;
+package	org.x4o.o2o;
 
 import java.io.File;
 import java.util.ArrayList;

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/ContentWriterHtml.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.xml.o2o.io;
+package	org.x4o.o2o.io;
 
 import java.io.Writer;
 import java.util.Calendar;
 
-import org.x4o.xml.o2o.PropertyConfig;
+import org.x4o.o2o.PropertyConfig;
-import org.x4o.xml.o2o.io.sax3.ContentWriterTagWrapper;
+import org.x4o.o2o.io.sax3.ContentWriterTagWrapper;
-import org.x4o.xml.o2o.io.sax3.ContentWriterXml;
+import org.x4o.o2o.io.sax3.ContentWriterXml;
-import org.x4o.xml.o2o.io.sax3.XMLConstants;
+import org.x4o.o2o.io.sax3.XMLConstants;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/ContentWriterXsd.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.xml.o2o.io;
+package	org.x4o.o2o.io;
 
 import java.io.Writer;
 
-import org.x4o.xml.o2o.PropertyConfig;
+import org.x4o.o2o.PropertyConfig;
-import org.x4o.xml.o2o.io.sax3.ContentWriterTagWrapper;
+import org.x4o.o2o.io.sax3.ContentWriterTagWrapper;
-import org.x4o.xml.o2o.io.sax3.ContentWriterXml;
+import org.x4o.o2o.io.sax3.ContentWriterXml;
-import org.x4o.xml.o2o.io.sax3.XMLConstants;
+import org.x4o.o2o.io.sax3.XMLConstants;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/package-info.java

@@ -27,4 +27,4 @@
  *
  * @since 1.0
  */
-package org.x4o.xml.o2o.io;
+package org.x4o.o2o.io;

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/AbstractContentWriter.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.xml.o2o.io.sax3;
+package	org.x4o.o2o.io.sax3;
 
 import java.io.Writer;
 
@@ -45,7 +45,7 @@ public abstract class AbstractContentWriter extends AbstractContentWriterLexical
 
 	/**
 	 * Starts and end then element.
-	 * @see org.x4o.xml.o2o.io.sax3.ContentWriter#startElementEnd(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
+	 * @see org.x4o.o2o.io.sax3.ContentWriter#startElementEnd(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
 	 */
 	public void startElementEnd(String uri, String localName, String name, Attributes atts) throws SAXException {
 		startElement(uri,localName,name, atts);

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/AbstractContentWriterHandler.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.xml.o2o.io.sax3;
+package	org.x4o.o2o.io.sax3;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -39,8 +39,8 @@ import java.util.PrimitiveIterator;
 import java.util.Set;
 import java.util.Stack;
 
-import org.x4o.xml.o2o.PropertyConfig;
+import org.x4o.o2o.PropertyConfig;
-import org.x4o.xml.o2o.PropertyConfig.PropertyConfigItem;
+import org.x4o.o2o.PropertyConfig.PropertyConfigItem;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.Locator;
@@ -516,7 +516,7 @@ public class AbstractContentWriterHandler implements ContentHandler {
 	 * Escape and prints xml characters.
 	 * @param text The text to write.
 	 * @throws SAXException When IOException has happend while printing.
-	 * @see org.x4o.xml.o2o.io.sax3.ContentWriter#characters(java.lang.String)
+	 * @see org.x4o.o2o.io.sax3.ContentWriter#characters(java.lang.String)
 	 */
 	public void characters(String text) throws SAXException {
 		if (text==null) {
@@ -557,7 +557,7 @@ public class AbstractContentWriterHandler implements ContentHandler {
 	 * 
 	 * @param text	The text to print.
 	 * @throws SAXException When IOException has happend while printing.
-	 * @see org.x4o.xml.o2o.io.sax3.ContentWriter#ignorableWhitespace(java.lang.String)
+	 * @see org.x4o.o2o.io.sax3.ContentWriter#ignorableWhitespace(java.lang.String)
 	 */
 	public void ignorableWhitespace(String text) throws SAXException {
 		if (text==null) {
@@ -644,7 +644,7 @@ public class AbstractContentWriterHandler implements ContentHandler {
 	 * 
 	 * @param text The text to write.
 	 * @throws SAXException When IOException has happend while printing.
-	 * @see org.x4o.xml.o2o.io.sax3.ContentWriter#comment(java.lang.String)
+	 * @see org.x4o.o2o.io.sax3.ContentWriter#comment(java.lang.String)
 	 */
 	public void comment(String text) throws SAXException {
 		if (text==null) {

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/AbstractContentWriterLexical.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.xml.o2o.io.sax3;
+package	org.x4o.o2o.io.sax3;
 
 import java.io.Writer;
 
@@ -101,7 +101,7 @@ public abstract class AbstractContentWriterLexical extends AbstractContentWriter
 	}
 
 	/**
-	 * @see org.x4o.xml.o2o.io.sax3.AbstractContentWriterHandler#characters(char[], int, int)
+	 * @see org.x4o.o2o.io.sax3.AbstractContentWriterHandler#characters(char[], int, int)
 	 */
 	@Override
 	public void characters(char[] ch, int start, int length) throws SAXException {
@@ -109,7 +109,7 @@ public abstract class AbstractContentWriterLexical extends AbstractContentWriter
 	}
 
 	/**
-	 * @see org.x4o.xml.o2o.io.sax3.AbstractContentWriterHandler#characters(java.lang.String)
+	 * @see org.x4o.o2o.io.sax3.AbstractContentWriterHandler#characters(java.lang.String)
 	 */
 	@Override
 	public void characters(String text) throws SAXException {

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/AttributeMap.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.xml.o2o.io.sax3;
+package org.x4o.o2o.io.sax3;
 
 import org.xml.sax.Attributes;
 import java.util.ArrayList;

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/ContentWriter.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.xml.o2o.io.sax3;
+package	org.x4o.o2o.io.sax3;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/ContentWriterTag.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.xml.o2o.io.sax3;
+package	org.x4o.o2o.io.sax3;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/ContentWriterTagWrapper.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.xml.o2o.io.sax3;
+package	org.x4o.o2o.io.sax3;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/ContentWriterXml.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.xml.o2o.io.sax3;
+package	org.x4o.o2o.io.sax3;
 
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/XMLConstants.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.xml.o2o.io.sax3;
+package org.x4o.o2o.io.sax3;
 
 import java.util.PrimitiveIterator;
 

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/package-info.java

@@ -26,4 +26,4 @@
  * @since 1.0
  */
 
-package org.x4o.xml.o2o.io.sax3;
+package org.x4o.o2o.io.sax3;

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/AbstractXDBXWriter.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.xml.o2o.io.sax3.xdbx;
+package	org.x4o.o2o.io.sax3.xdbx;
 
 import java.io.OutputStream;
 
-import org.x4o.xml.o2o.io.sax3.ContentWriter;
+import org.x4o.o2o.io.sax3.ContentWriter;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -46,7 +46,7 @@ public abstract class AbstractXDBXWriter extends AbstractXDBXWriterLexical imple
 
 	/**
 	 * Starts and end then element.
-	 * @see org.x4o.xml.o2o.io.sax3.ContentWriter#startElementEnd(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
+	 * @see org.x4o.o2o.io.sax3.ContentWriter#startElementEnd(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
 	 */
 	public void startElementEnd(String uri, String localName, String name, Attributes atts) throws SAXException {
 		startElement(uri,localName,name, atts);

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/AbstractXDBXWriterHandler.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.xml.o2o.io.sax3.xdbx;
+package	org.x4o.o2o.io.sax3.xdbx;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -40,9 +40,9 @@ import java.util.PrimitiveIterator;
 import java.util.Set;
 import java.util.Stack;
 
-import org.x4o.xml.o2o.PropertyConfig;
+import org.x4o.o2o.PropertyConfig;
-import org.x4o.xml.o2o.PropertyConfig.PropertyConfigItem;
+import org.x4o.o2o.PropertyConfig.PropertyConfigItem;
-import org.x4o.xml.o2o.io.sax3.XMLConstants;
+import org.x4o.o2o.io.sax3.XMLConstants;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.Locator;
@@ -494,7 +494,7 @@ public class AbstractXDBXWriterHandler implements ContentHandler {
 	 * Escape and prints xml characters.
 	 * @param text The text to write.
 	 * @throws SAXException When IOException has happend while printing.
-	 * @see org.x4o.xml.o2o.io.sax3.ContentWriter#characters(java.lang.String)
+	 * @see org.x4o.o2o.io.sax3.ContentWriter#characters(java.lang.String)
 	 */
 	public void characters(String text) throws SAXException {
 		if (text==null) {
@@ -533,7 +533,7 @@ public class AbstractXDBXWriterHandler implements ContentHandler {
 	 * 
 	 * @param text	The text to print.
 	 * @throws SAXException When IOException has happend while printing.
-	 * @see org.x4o.xml.o2o.io.sax3.ContentWriter#ignorableWhitespace(java.lang.String)
+	 * @see org.x4o.o2o.io.sax3.ContentWriter#ignorableWhitespace(java.lang.String)
 	 */
 	public void ignorableWhitespace(String text) throws SAXException {
 		if (text==null) {
@@ -621,7 +621,7 @@ public class AbstractXDBXWriterHandler implements ContentHandler {
 	 * 
 	 * @param text The text to write.
 	 * @throws SAXException When IOException has happend while printing.
-	 * @see org.x4o.xml.o2o.io.sax3.ContentWriter#comment(java.lang.String)
+	 * @see org.x4o.o2o.io.sax3.ContentWriter#comment(java.lang.String)
 	 */
 	public void comment(String text) throws SAXException {
 		if (text==null) {

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/AbstractXDBXWriterLexical.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.xml.o2o.io.sax3.xdbx;
+package	org.x4o.o2o.io.sax3.xdbx;
 
 import java.io.OutputStream;
 
-import org.x4o.xml.o2o.io.sax3.XMLConstants;
+import org.x4o.o2o.io.sax3.XMLConstants;
 import org.xml.sax.SAXException;
 import org.xml.sax.ext.LexicalHandler;
 
@@ -86,7 +86,7 @@ public abstract class AbstractXDBXWriterLexical extends AbstractXDBXWriterHandle
 	}
 
 	/**
-	 * @see org.x4o.xml.o2o.io.sax3.AbstractContentWriterHandler#characters(char[], int, int)
+	 * @see org.x4o.o2o.io.sax3.AbstractContentWriterHandler#characters(char[], int, int)
 	 */
 	@Override
 	public void characters(char[] ch, int start, int length) throws SAXException {
@@ -94,7 +94,7 @@ public abstract class AbstractXDBXWriterLexical extends AbstractXDBXWriterHandle
 	}
 
 	/**
-	 * @see org.x4o.xml.o2o.io.sax3.AbstractContentWriterHandler#characters(java.lang.String)
+	 * @see org.x4o.o2o.io.sax3.AbstractContentWriterHandler#characters(java.lang.String)
 	 */
 	@Override
 	public void characters(String text) throws SAXException {

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/XDBXConstants.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.xml.o2o.io.sax3.xdbx;
+package org.x4o.o2o.io.sax3.xdbx;
 
 /**
  * XDBXConstants for writing binary XML.

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/XDBXContentTag.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.xml.o2o.io.sax3.xdbx;
+package org.x4o.o2o.io.sax3.xdbx;
 
 /**
  * XDBXContentTag indicate the binary tag of the XDBX stream.

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/XDBXReaderXml.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.xml.o2o.io.sax3.xdbx;
+package	org.x4o.o2o.io.sax3.xdbx;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,7 +29,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Stack;
 
-import org.x4o.xml.o2o.io.sax3.ContentWriter;
+import org.x4o.o2o.io.sax3.ContentWriter;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/XDBXWriterXml.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.xml.o2o.io.sax3.xdbx;
+package	org.x4o.o2o.io.sax3.xdbx;
 
 import java.io.OutputStream;
 

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/package-info.java

@@ -26,4 +26,4 @@
  * @since 1.0
  */
 
-package org.x4o.xml.o2o.io.sax3.xdbx;
+package org.x4o.o2o.io.sax3.xdbx;

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/AbstractTLVChainAtom.java

@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.x4o.xml.o2o.io.tlv;
+package org.x4o.o2o.io.tlv;
 
 import java.util.ArrayList;
 import java.util.Iterator;

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtom.java

@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.x4o.xml.o2o.io.tlv;
+package org.x4o.o2o.io.tlv;
 
 import java.util.ArrayList;
 import java.util.Iterator;

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtomFrame.java

@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.x4o.xml.o2o.io.tlv;
+package org.x4o.o2o.io.tlv;
 
 /// @author للَّٰهِilLצسُو
 /// @version ©Δ∞ 仙上主天

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtomFrameType.java

@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.x4o.xml.o2o.io.tlv;
+package org.x4o.o2o.io.tlv;
 
 /// @author للَّٰهِilLצسُو
 /// @version ©Δ∞ 仙上主天

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtomSerializable.java

@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.x4o.xml.o2o.io.tlv;
+package org.x4o.o2o.io.tlv;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSex.java

@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.x4o.xml.o2o.io.tlv;
+package org.x4o.o2o.io.tlv;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -33,11 +33,11 @@ import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.x4o.xml.o2o.octal.PrimordialOctal;
+import org.x4o.o2o.octal.PrimordialOctal;
-import org.x4o.xml.o2o.octal.PrimordialOctalIterator;
+import org.x4o.o2o.octal.PrimordialOctalIterator;
-import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuice;
+import org.x4o.o2o.octal.PrimordialOctalOrangeJuice;
-import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuiceAtoms;
+import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms;
-import org.x4o.xml.o2o.octal.PrimordialOctalOrangeSexWord;
+import org.x4o.o2o.octal.PrimordialOctalOrangeSexWord;
 
 /// @author للَّٰهِilLצسُو
 /// @version ©Δ∞ 仙上主天

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSexFrame.java

@@ -25,13 +25,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.x4o.xml.o2o.io.tlv;
+package org.x4o.o2o.io.tlv;
 
 import java.util.Objects;
 
-import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuice;
+import org.x4o.o2o.octal.PrimordialOctalOrangeJuice;
-import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuiceAtoms;
+import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms;
-import org.x4o.xml.o2o.octal.PrimordialOctalOrangeString;
+import org.x4o.o2o.octal.PrimordialOctalOrangeString;
 
 /// @author للَّٰهِilLצسُو
 /// @version ©Δ∞ 仙上主天

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSexFrameType.java

@@ -25,9 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.x4o.xml.o2o.io.tlv;
+package org.x4o.o2o.io.tlv;
 
-import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuice;
+import org.x4o.o2o.octal.PrimordialOctalOrangeJuice;
 
 /// @author للَّٰهِilLצسُو
 /// @version ©Δ∞ 仙上主天

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctoBit.java

@@ -25,14 +25,14 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.x4o.xml.o2o.io.tlv;
+package org.x4o.o2o.io.tlv;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
 
-import org.x4o.xml.o2o.octo.OctoBitConverter;
+import org.x4o.o2o.octo.OctoBitConverter;
 
 /// @author للَّٰهِilLצسُو
 /// @version ©Δ∞ 仙上主天

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctoBitFrame.java

@@ -25,12 +25,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.x4o.xml.o2o.io.tlv;
+package org.x4o.o2o.io.tlv;
 
 import java.util.Arrays;
 import java.util.Objects;
 
-import org.x4o.xml.o2o.octo.OctoBitConverter;
+import org.x4o.o2o.octo.OctoBitConverter;
 
 /// @author للَّٰهِilLצسُو
 /// @version ©Δ∞ 仙上主天

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctoBitFrameType.java

@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.x4o.xml.o2o.io.tlv;
+package org.x4o.o2o.io.tlv;
 
 /// @author للَّٰهِilLצسُو
 /// @version ©Δ∞ 仙上主天

nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainSexTeenBit.java

@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.x4o.xml.o2o.io.tlv;
+package org.x4o.o2o.io.tlv;
 
 import java.io.IOException;
 import java.io.InputStream;