diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java
similarity index 99%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java
index 13a44b7ff..6364379ae 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java
@@ -5,7 +5,7 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs.optional;
+package org.apache.tools.ant.taskdefs.text;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -21,7 +21,6 @@ import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.RegularExpression;
-import org.apache.tools.ant.types.Substitution;
 import org.apache.tools.ant.util.regexp.Regexp;
 
 /**
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Substitution.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Substitution.java
similarity index 96%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/Substitution.java
rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Substitution.java
index 8cfbb02ad..5b0b30a18 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Substitution.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Substitution.java
@@ -5,11 +5,12 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.types;
+package org.apache.tools.ant.taskdefs.text;
 
 import java.util.Stack;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.DataType;
 
 /**
  * A regular expression substitution datatype. It is an expression that is meant
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java
similarity index 99%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java
index 13a44b7ff..6364379ae 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java
@@ -5,7 +5,7 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs.optional;
+package org.apache.tools.ant.taskdefs.text;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -21,7 +21,6 @@ import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.RegularExpression;
-import org.apache.tools.ant.types.Substitution;
 import org.apache.tools.ant.util.regexp.Regexp;
 
 /**
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Substitution.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Substitution.java
similarity index 96%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/types/Substitution.java
rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Substitution.java
index 8cfbb02ad..5b0b30a18 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Substitution.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Substitution.java
@@ -5,11 +5,12 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.types;
+package org.apache.tools.ant.taskdefs.text;
 
 import java.util.Stack;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.DataType;
 
 /**
  * A regular expression substitution datatype. It is an expression that is meant