diff --git a/xflaim/java/util/XEdit/Attribute.java b/xflaim/java/util/XEdit/xedit/Attribute.java
similarity index 100%
rename from xflaim/java/util/XEdit/Attribute.java
rename to xflaim/java/util/XEdit/xedit/Attribute.java
diff --git a/xflaim/java/util/XEdit/AttributeSelector.java b/xflaim/java/util/XEdit/xedit/AttributeSelector.java
similarity index 100%
rename from xflaim/java/util/XEdit/AttributeSelector.java
rename to xflaim/java/util/XEdit/xedit/AttributeSelector.java
diff --git a/xflaim/java/util/XEdit/Collection.java b/xflaim/java/util/XEdit/xedit/Collection.java
similarity index 100%
rename from xflaim/java/util/XEdit/Collection.java
rename to xflaim/java/util/XEdit/xedit/Collection.java
diff --git a/xflaim/java/util/XEdit/CollectionSelector.java b/xflaim/java/util/XEdit/xedit/CollectionSelector.java
similarity index 100%
rename from xflaim/java/util/XEdit/CollectionSelector.java
rename to xflaim/java/util/XEdit/xedit/CollectionSelector.java
diff --git a/xflaim/java/util/XEdit/Document.java b/xflaim/java/util/XEdit/xedit/Document.java
similarity index 100%
rename from xflaim/java/util/XEdit/Document.java
rename to xflaim/java/util/XEdit/xedit/Document.java
diff --git a/xflaim/java/util/XEdit/DocumentSelector.java b/xflaim/java/util/XEdit/xedit/DocumentSelector.java
similarity index 100%
rename from xflaim/java/util/XEdit/DocumentSelector.java
rename to xflaim/java/util/XEdit/xedit/DocumentSelector.java
diff --git a/xflaim/java/util/XEdit/EditValueDialog.java b/xflaim/java/util/XEdit/xedit/EditValueDialog.java
similarity index 100%
rename from xflaim/java/util/XEdit/EditValueDialog.java
rename to xflaim/java/util/XEdit/xedit/EditValueDialog.java
diff --git a/xflaim/java/util/XEdit/FileImporter.java b/xflaim/java/util/XEdit/xedit/FileImporter.java
similarity index 100%
rename from xflaim/java/util/XEdit/FileImporter.java
rename to xflaim/java/util/XEdit/xedit/FileImporter.java
diff --git a/xflaim/java/util/XEdit/NodeDialog.java b/xflaim/java/util/XEdit/xedit/NodeDialog.java
similarity index 100%
rename from xflaim/java/util/XEdit/NodeDialog.java
rename to xflaim/java/util/XEdit/xedit/NodeDialog.java
diff --git a/xflaim/java/util/XEdit/NodePanel.java b/xflaim/java/util/XEdit/xedit/NodePanel.java
similarity index 100%
rename from xflaim/java/util/XEdit/NodePanel.java
rename to xflaim/java/util/XEdit/xedit/NodePanel.java
diff --git a/xflaim/java/util/XEdit/NodeTag.java b/xflaim/java/util/XEdit/xedit/NodeTag.java
similarity index 100%
rename from xflaim/java/util/XEdit/NodeTag.java
rename to xflaim/java/util/XEdit/xedit/NodeTag.java
diff --git a/xflaim/java/util/XEdit/NodeType.java b/xflaim/java/util/XEdit/xedit/NodeType.java
similarity index 100%
rename from xflaim/java/util/XEdit/NodeType.java
rename to xflaim/java/util/XEdit/xedit/NodeType.java
diff --git a/xflaim/java/util/XEdit/NodeValue.java b/xflaim/java/util/XEdit/xedit/NodeValue.java
similarity index 100%
rename from xflaim/java/util/XEdit/NodeValue.java
rename to xflaim/java/util/XEdit/xedit/NodeValue.java
diff --git a/xflaim/java/util/XEdit/OpenDocumentSelector.java b/xflaim/java/util/XEdit/xedit/OpenDocumentSelector.java
similarity index 100%
rename from xflaim/java/util/XEdit/OpenDocumentSelector.java
rename to xflaim/java/util/XEdit/xedit/OpenDocumentSelector.java
diff --git a/xflaim/java/util/XEdit/ProgressBox.java b/xflaim/java/util/XEdit/xedit/ProgressBox.java
similarity index 100%
rename from xflaim/java/util/XEdit/ProgressBox.java
rename to xflaim/java/util/XEdit/xedit/ProgressBox.java
diff --git a/xflaim/java/util/XEdit/Status.java b/xflaim/java/util/XEdit/xedit/Status.java
similarity index 100%
rename from xflaim/java/util/XEdit/Status.java
rename to xflaim/java/util/XEdit/xedit/Status.java
diff --git a/xflaim/java/util/XEdit/UITools.java b/xflaim/java/util/XEdit/xedit/UITools.java
similarity index 100%
rename from xflaim/java/util/XEdit/UITools.java
rename to xflaim/java/util/XEdit/xedit/UITools.java
diff --git a/xflaim/java/util/XEdit/XEdit.java b/xflaim/java/util/XEdit/xedit/XEdit.java
similarity index 100%
rename from xflaim/java/util/XEdit/XEdit.java
rename to xflaim/java/util/XEdit/xedit/XEdit.java
diff --git a/xflaim/java/util/XEdit/XFileFilter.java b/xflaim/java/util/XEdit/xedit/XFileFilter.java
similarity index 100%
rename from xflaim/java/util/XEdit/XFileFilter.java
rename to xflaim/java/util/XEdit/xedit/XFileFilter.java