diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/ConfigurationTest.java b/proposal/myrmidon/src/java/org/apache/antlib/selftest/ConfigurationTest.java
similarity index 97%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/ConfigurationTest.java
rename to proposal/myrmidon/src/java/org/apache/antlib/selftest/ConfigurationTest.java
index 7667b651d..372a878f3 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/ConfigurationTest.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/selftest/ConfigurationTest.java
@@ -5,7 +5,7 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE file.
  */
-package org.apache.myrmidon.libs.selftest;
+package org.apache.antlib.selftest;
 
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/ContentTest.java b/proposal/myrmidon/src/java/org/apache/antlib/selftest/ContentTest.java
similarity index 95%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/ContentTest.java
rename to proposal/myrmidon/src/java/org/apache/antlib/selftest/ContentTest.java
index 4565508a2..b3633efb8 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/ContentTest.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/selftest/ContentTest.java
@@ -5,7 +5,7 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE file.
  */
-package org.apache.myrmidon.libs.selftest;
+package org.apache.antlib.selftest;
 
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/ExtensionsTest.java b/proposal/myrmidon/src/java/org/apache/antlib/selftest/ExtensionsTest.java
similarity index 84%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/ExtensionsTest.java
rename to proposal/myrmidon/src/java/org/apache/antlib/selftest/ExtensionsTest.java
index 2d320e67a..186ad44ac 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/ExtensionsTest.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/selftest/ExtensionsTest.java
@@ -5,11 +5,11 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE file.
  */
-package org.apache.myrmidon.libs.selftest;
+package org.apache.antlib.selftest;
 
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.libs.selftest.extension1.ExtensionsLoadedClass;
+import org.apache.antlib.selftest.extension1.ExtensionsLoadedClass;
 
 /**
  * This is to test whether extension is loaded.
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/PrimitiveTypesTest.java b/proposal/myrmidon/src/java/org/apache/antlib/selftest/PrimitiveTypesTest.java
similarity index 98%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/PrimitiveTypesTest.java
rename to proposal/myrmidon/src/java/org/apache/antlib/selftest/PrimitiveTypesTest.java
index 4225c39ad..13ccabaf8 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/PrimitiveTypesTest.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/selftest/PrimitiveTypesTest.java
@@ -5,7 +5,7 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE file.
  */
-package org.apache.myrmidon.libs.selftest;
+package org.apache.antlib.selftest;
 
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/SubElementTest.java b/proposal/myrmidon/src/java/org/apache/antlib/selftest/SubElementTest.java
similarity index 95%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/SubElementTest.java
rename to proposal/myrmidon/src/java/org/apache/antlib/selftest/SubElementTest.java
index 377b8069b..81bbe7f8e 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/SubElementTest.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/selftest/SubElementTest.java
@@ -5,7 +5,7 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE file.
  */
-package org.apache.myrmidon.libs.selftest;
+package org.apache.antlib.selftest;
 
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/extension1/ExtensionsLoadedClass.java b/proposal/myrmidon/src/java/org/apache/antlib/selftest/extension1/ExtensionsLoadedClass.java
similarity index 90%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/extension1/ExtensionsLoadedClass.java
rename to proposal/myrmidon/src/java/org/apache/antlib/selftest/extension1/ExtensionsLoadedClass.java
index f70168124..f6126058b 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/extension1/ExtensionsLoadedClass.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/selftest/extension1/ExtensionsLoadedClass.java
@@ -5,7 +5,7 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE file.
  */
-package org.apache.myrmidon.libs.selftest.extension1;
+package org.apache.antlib.selftest.extension1;
 
 /**
  * This is to test whether extension is loaded.
diff --git a/proposal/myrmidon/src/manifest/selftest-ant-descriptor.xml b/proposal/myrmidon/src/manifest/selftest-ant-descriptor.xml
index 4232cd70e..95d22d1a7 100644
--- a/proposal/myrmidon/src/manifest/selftest-ant-descriptor.xml
+++ b/proposal/myrmidon/src/manifest/selftest-ant-descriptor.xml
@@ -1,11 +1,11 @@
-<ant-lib> 
+<ant-lib>
   <types>
     <!-- tasks to test operation of engine -->
-    <task name="prim-test" classname="org.apache.myrmidon.libs.selftest.PrimitiveTypesTest" />
-    <task name="sub-elements-test" classname="org.apache.myrmidon.libs.selftest.SubElementTest" />
-    <task name="conf-test" classname="org.apache.myrmidon.libs.selftest.ConfigurationTest" />
-    <task name="content-test" classname="org.apache.myrmidon.libs.selftest.ContentTest" />
-    <task name="file-manip-test" classname="org.apache.myrmidon.libs.selftest.FileManipulationTest" />
-    <task name="extensions-test" classname="org.apache.myrmidon.libs.selftest.ExtensionsTest" />
+    <task name="prim-test" classname="org.apache.antlib.selftest.PrimitiveTypesTest" />
+    <task name="sub-elements-test" classname="org.apache.antlib.selftest.SubElementTest" />
+    <task name="conf-test" classname="org.apache.antlib.selftest.ConfigurationTest" />
+    <task name="content-test" classname="org.apache.antlib.selftest.ContentTest" />
+    <task name="file-manip-test" classname="org.apache.antlib.selftest.FileManipulationTest" />
+    <task name="extensions-test" classname="org.apache.antlib.selftest.ExtensionsTest" />
   </types>
 </ant-lib>
\ No newline at end of file