diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/RegularExpression.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/RegularExpression.java
similarity index 98%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/RegularExpression.java
rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/RegularExpression.java
index 4018508b1..7bfddd992 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/RegularExpression.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/RegularExpression.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.types;
+package org.apache.tools.ant.taskdefs.text;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.ProjectComponent;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java
index 28e084fc1..40cb85196 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java
@@ -17,10 +17,9 @@ import java.io.LineNumberReader;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.types.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.util.regexp.Regexp;
 
 /**
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/RegularExpression.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/RegularExpression.java
similarity index 98%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/types/RegularExpression.java
rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/RegularExpression.java
index 4018508b1..7bfddd992 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/RegularExpression.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/RegularExpression.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.types;
+package org.apache.tools.ant.taskdefs.text;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.ProjectComponent;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java
index 28e084fc1..40cb85196 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java
@@ -17,10 +17,9 @@ import java.io.LineNumberReader;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.types.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.util.regexp.Regexp;
 
 /**