diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Copy.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java
similarity index 99%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Copy.java
rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java
index 39468e440..de6ab1363 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Copy.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.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.tools.ant.taskdefs;
+package org.apache.tools.ant.taskdefs.file;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Delete.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Delete.java
similarity index 99%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Delete.java
rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Delete.java
index 7843604d3..a45cbe40a 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Delete.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Delete.java
@@ -5,13 +5,14 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE file.
  */
-package org.apache.tools.ant.taskdefs;
+package org.apache.tools.ant.taskdefs.file;
 
 import java.io.File;
 import java.util.Vector;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.MatchingTask;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.PatternSet;
 
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Mkdir.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Mkdir.java
similarity index 96%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Mkdir.java
rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Mkdir.java
index f90a52cdd..b4b1cd45e 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Mkdir.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Mkdir.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.tools.ant.taskdefs;
+package org.apache.tools.ant.taskdefs.file;
 
 import java.io.File;
 import org.apache.myrmidon.api.TaskException;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Move.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Move.java
similarity index 99%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Move.java
rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Move.java
index 710917472..432c1b2a2 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Move.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Move.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.tools.ant.taskdefs;
+package org.apache.tools.ant.taskdefs.file;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
index e214a3436..234d798b9 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
@@ -22,7 +22,7 @@ import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Java;
 import org.apache.tools.ant.taskdefs.Javac;
 import org.apache.tools.ant.taskdefs.MatchingTask;
-import org.apache.tools.ant.taskdefs.Mkdir;
+import org.apache.tools.ant.taskdefs.file.Mkdir;
 import org.apache.tools.ant.taskdefs.compilers.DefaultCompilerAdapter;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Copy.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java
similarity index 99%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Copy.java
rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java
index 39468e440..de6ab1363 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Copy.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.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.tools.ant.taskdefs;
+package org.apache.tools.ant.taskdefs.file;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Delete.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Delete.java
similarity index 99%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Delete.java
rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Delete.java
index 7843604d3..a45cbe40a 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Delete.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Delete.java
@@ -5,13 +5,14 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE file.
  */
-package org.apache.tools.ant.taskdefs;
+package org.apache.tools.ant.taskdefs.file;
 
 import java.io.File;
 import java.util.Vector;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.MatchingTask;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.PatternSet;
 
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Mkdir.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Mkdir.java
similarity index 96%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Mkdir.java
rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Mkdir.java
index f90a52cdd..b4b1cd45e 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Mkdir.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Mkdir.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.tools.ant.taskdefs;
+package org.apache.tools.ant.taskdefs.file;
 
 import java.io.File;
 import org.apache.myrmidon.api.TaskException;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Move.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Move.java
similarity index 99%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Move.java
rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Move.java
index 710917472..432c1b2a2 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Move.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Move.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.tools.ant.taskdefs;
+package org.apache.tools.ant.taskdefs.file;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java
index e214a3436..234d798b9 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java
@@ -22,7 +22,7 @@ import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Java;
 import org.apache.tools.ant.taskdefs.Javac;
 import org.apache.tools.ant.taskdefs.MatchingTask;
-import org.apache.tools.ant.taskdefs.Mkdir;
+import org.apache.tools.ant.taskdefs.file.Mkdir;
 import org.apache.tools.ant.taskdefs.compilers.DefaultCompilerAdapter;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;