diff --git a/ng-appserver/src/main/java/ng/appserver/NGApplication.java b/ng-appserver/src/main/java/ng/appserver/NGApplication.java
index eae772f7..f0a199f0 100644
--- a/ng-appserver/src/main/java/ng/appserver/NGApplication.java
+++ b/ng-appserver/src/main/java/ng/appserver/NGApplication.java
@@ -37,10 +37,10 @@
 import ng.appserver.wointegration.WOMPRequestHandler;
 import ng.classes.NGClassManager;
 import ng.plugins.NGPlugin;
-import x.junk.NGExceptionPage;
-import x.junk.NGExceptionPageDevelopment;
-import x.junk.NGSessionTimeoutPage;
-import x.junk.NGWelcomePage;
+import ng.xperimental.NGExceptionPage;
+import ng.xperimental.NGExceptionPageDevelopment;
+import ng.xperimental.NGSessionTimeoutPage;
+import ng.xperimental.NGWelcomePage;
 
 /**
  * FIXME: Initialization still feels a little weird, while we're moving away from the way it's handled in WOApplication. Look a little more into the flow of application initialization // Hugi 2021-12-29
diff --git a/ng-appserver/src/main/java/ng/appserver/elements/NGDynamicGroup.java b/ng-appserver/src/main/java/ng/appserver/elements/NGDynamicGroup.java
index 8ea77224..94e0a973 100644
--- a/ng-appserver/src/main/java/ng/appserver/elements/NGDynamicGroup.java
+++ b/ng-appserver/src/main/java/ng/appserver/elements/NGDynamicGroup.java
@@ -11,7 +11,7 @@
 import ng.appserver.NGRequest;
 import ng.appserver.NGResponse;
 import ng.kvc.NGKeyValueCoding.UnknownKeyException;
-import x.junk.NGErrorMessageElement;
+import ng.xperimental.NGErrorMessageElement;
 
 /**
  * A common superclass for dynamic elements that have multiple children in our template element tree
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/NGTemplateParserProxy.java b/ng-appserver/src/main/java/ng/appserver/templating/NGTemplateParserProxy.java
index d4fbc2bf..fc6feae6 100644
--- a/ng-appserver/src/main/java/ng/appserver/templating/NGTemplateParserProxy.java
+++ b/ng-appserver/src/main/java/ng/appserver/templating/NGTemplateParserProxy.java
@@ -27,8 +27,8 @@
 import ng.appserver.templating.parser.PHTMLNode;
 import ng.appserver.templating.parser.PNode;
 import ng.appserver.templating.parser.NGDeclaration.NGBindingValue;
-import x.junk.NGElementNotFoundElement;
-import x.junk.NGErrorMessageElement;
+import ng.xperimental.NGElementNotFoundElement;
+import ng.xperimental.NGErrorMessageElement;
 
 /**
  * Bridges the "new and old world" for template parsing
diff --git a/ng-appserver/src/main/java/x/junk/NGElementNotFoundElement.java b/ng-appserver/src/main/java/ng/xperimental/NGElementNotFoundElement.java
similarity index 99%
rename from ng-appserver/src/main/java/x/junk/NGElementNotFoundElement.java
rename to ng-appserver/src/main/java/ng/xperimental/NGElementNotFoundElement.java
index 41ffd90f..cfb7f9ca 100644
--- a/ng-appserver/src/main/java/x/junk/NGElementNotFoundElement.java
+++ b/ng-appserver/src/main/java/ng/xperimental/NGElementNotFoundElement.java
@@ -1,4 +1,4 @@
-package x.junk;
+package ng.xperimental;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/ng-appserver/src/main/java/x/junk/NGErrorMessageElement.java b/ng-appserver/src/main/java/ng/xperimental/NGErrorMessageElement.java
similarity index 98%
rename from ng-appserver/src/main/java/x/junk/NGErrorMessageElement.java
rename to ng-appserver/src/main/java/ng/xperimental/NGErrorMessageElement.java
index 5036c87a..b2dcc87b 100644
--- a/ng-appserver/src/main/java/x/junk/NGErrorMessageElement.java
+++ b/ng-appserver/src/main/java/ng/xperimental/NGErrorMessageElement.java
@@ -1,4 +1,4 @@
-package x.junk;
+package ng.xperimental;
 
 import ng.appserver.NGContext;
 import ng.appserver.NGElement;
diff --git a/ng-appserver/src/main/java/x/junk/NGExceptionPage.java b/ng-appserver/src/main/java/ng/xperimental/NGExceptionPage.java
similarity index 90%
rename from ng-appserver/src/main/java/x/junk/NGExceptionPage.java
rename to ng-appserver/src/main/java/ng/xperimental/NGExceptionPage.java
index 3716e889..2db772f5 100644
--- a/ng-appserver/src/main/java/x/junk/NGExceptionPage.java
+++ b/ng-appserver/src/main/java/ng/xperimental/NGExceptionPage.java
@@ -1,4 +1,4 @@
-package x.junk;
+package ng.xperimental;
 
 import ng.appserver.NGContext;
 
diff --git a/ng-appserver/src/main/java/x/junk/NGExceptionPageDevelopment.java b/ng-appserver/src/main/java/ng/xperimental/NGExceptionPageDevelopment.java
similarity index 99%
rename from ng-appserver/src/main/java/x/junk/NGExceptionPageDevelopment.java
rename to ng-appserver/src/main/java/ng/xperimental/NGExceptionPageDevelopment.java
index be61a90f..3bb4db1c 100644
--- a/ng-appserver/src/main/java/x/junk/NGExceptionPageDevelopment.java
+++ b/ng-appserver/src/main/java/ng/xperimental/NGExceptionPageDevelopment.java
@@ -1,4 +1,4 @@
-package x.junk;
+package ng.xperimental;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
diff --git a/ng-appserver/src/main/java/x/junk/NGSessionTimeoutPage.java b/ng-appserver/src/main/java/ng/xperimental/NGSessionTimeoutPage.java
similarity index 95%
rename from ng-appserver/src/main/java/x/junk/NGSessionTimeoutPage.java
rename to ng-appserver/src/main/java/ng/xperimental/NGSessionTimeoutPage.java
index 6cbd01c0..6064ccfa 100644
--- a/ng-appserver/src/main/java/x/junk/NGSessionTimeoutPage.java
+++ b/ng-appserver/src/main/java/ng/xperimental/NGSessionTimeoutPage.java
@@ -1,4 +1,4 @@
-package x.junk;
+package ng.xperimental;
 
 import ng.appserver.NGComponent;
 import ng.appserver.NGContext;
diff --git a/ng-appserver/src/main/java/x/junk/NGWelcomePage.java b/ng-appserver/src/main/java/ng/xperimental/NGWelcomePage.java
similarity index 88%
rename from ng-appserver/src/main/java/x/junk/NGWelcomePage.java
rename to ng-appserver/src/main/java/ng/xperimental/NGWelcomePage.java
index 2b4049b8..ab61a3b7 100644
--- a/ng-appserver/src/main/java/x/junk/NGWelcomePage.java
+++ b/ng-appserver/src/main/java/ng/xperimental/NGWelcomePage.java
@@ -1,4 +1,4 @@
-package x.junk;
+package ng.xperimental;
 
 import ng.appserver.NGComponent;
 import ng.appserver.NGContext;