diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
index 4e4da8409..3d792483d 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
@@ -14,7 +14,7 @@ import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.types.DirectoryScanner;
 import org.apache.tools.ant.taskdefs.condition.Condition;
 import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.Mapper;
+import org.apache.tools.ant.util.mappers.Mapper;
 import org.apache.tools.ant.util.mappers.FileNameMapper;
 import org.apache.tools.ant.util.mappers.MergingMapper;
 import org.apache.tools.ant.types.SourceFileScanner;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java
index 01acb6e10..51d98cf7b 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java
@@ -16,7 +16,7 @@ import org.apache.tools.ant.types.DirectoryScanner;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.Mapper;
+import org.apache.tools.ant.util.mappers.Mapper;
 import org.apache.tools.ant.types.Marker;
 import org.apache.tools.ant.util.mappers.FileNameMapper;
 import org.apache.tools.ant.types.SourceFileScanner;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java
index bd23604b9..c1055cd2c 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java
@@ -20,7 +20,7 @@ import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.FilterSet;
 import org.apache.tools.ant.types.FilterSetCollection;
-import org.apache.tools.ant.types.Mapper;
+import org.apache.tools.ant.util.mappers.Mapper;
 import org.apache.tools.ant.util.mappers.FileNameMapper;
 import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.mappers.FlatFileNameMapper;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Native2Ascii.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Native2Ascii.java
index 61b8d5d34..ac1f695b0 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Native2Ascii.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Native2Ascii.java
@@ -12,7 +12,7 @@ import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.taskdefs.MatchingTask;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.Mapper;
+import org.apache.tools.ant.util.mappers.Mapper;
 import org.apache.tools.ant.types.SourceFileScanner;
 import org.apache.tools.ant.util.mappers.FileNameMapper;
 import org.apache.tools.ant.util.mappers.IdentityMapper;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Mapper.java b/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/Mapper.java
similarity index 97%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/Mapper.java
rename to proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/Mapper.java
index 7cf2bdf66..48b979903 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Mapper.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/Mapper.java
@@ -5,13 +5,13 @@
  * 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.util.mappers;
 
 import java.net.URL;
 import java.net.URLClassLoader;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.ProjectComponent;
-import org.apache.tools.ant.util.mappers.FileNameMapper;
+import org.apache.tools.ant.types.Path;
 
 /**
  * Element to define a FileNameMapper.
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/MapperType.java b/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/MapperType.java
similarity index 68%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/MapperType.java
rename to proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/MapperType.java
index 5b0df32af..6ccfe5657 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/MapperType.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/MapperType.java
@@ -5,9 +5,10 @@
  * 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.util.mappers;
 
 import java.util.Properties;
+import org.apache.tools.ant.types.EnumeratedAttribute;
 
 /**
  * Class as Argument to FileNameMapper.setType.
@@ -15,26 +16,26 @@ import java.util.Properties;
 public class MapperType
     extends EnumeratedAttribute
 {
-    private final Properties m_implementations;
+    private final Properties c_implementations;
 
     public MapperType()
     {
-        m_implementations = new Properties();
-        m_implementations.put( "identity",
+        c_implementations = new Properties();
+        c_implementations.put( "identity",
                                "org.apache.tools.ant.util.IdentityMapper" );
-        m_implementations.put( "flatten",
+        c_implementations.put( "flatten",
                                "org.apache.tools.ant.util.FlatFileNameMapper" );
-        m_implementations.put( "glob",
+        c_implementations.put( "glob",
                                "org.apache.tools.ant.util.GlobPatternMapper" );
-        m_implementations.put( "merge",
+        c_implementations.put( "merge",
                                "org.apache.tools.ant.util.MergingMapper" );
-        m_implementations.put( "regexp",
+        c_implementations.put( "regexp",
                                "org.apache.tools.ant.util.RegexpPatternMapper" );
     }
 
     public String getImplementation()
     {
-        return m_implementations.getProperty( getValue() );
+        return c_implementations.getProperty( getValue() );
     }
 
     public String[] getValues()
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java
index 4e4da8409..3d792483d 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java
@@ -14,7 +14,7 @@ import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.types.DirectoryScanner;
 import org.apache.tools.ant.taskdefs.condition.Condition;
 import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.Mapper;
+import org.apache.tools.ant.util.mappers.Mapper;
 import org.apache.tools.ant.util.mappers.FileNameMapper;
 import org.apache.tools.ant.util.mappers.MergingMapper;
 import org.apache.tools.ant.types.SourceFileScanner;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java
index 01acb6e10..51d98cf7b 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java
@@ -16,7 +16,7 @@ import org.apache.tools.ant.types.DirectoryScanner;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.Mapper;
+import org.apache.tools.ant.util.mappers.Mapper;
 import org.apache.tools.ant.types.Marker;
 import org.apache.tools.ant.util.mappers.FileNameMapper;
 import org.apache.tools.ant.types.SourceFileScanner;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java
index bd23604b9..c1055cd2c 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java
@@ -20,7 +20,7 @@ import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.FilterSet;
 import org.apache.tools.ant.types.FilterSetCollection;
-import org.apache.tools.ant.types.Mapper;
+import org.apache.tools.ant.util.mappers.Mapper;
 import org.apache.tools.ant.util.mappers.FileNameMapper;
 import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.mappers.FlatFileNameMapper;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Native2Ascii.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Native2Ascii.java
index 61b8d5d34..ac1f695b0 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Native2Ascii.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Native2Ascii.java
@@ -12,7 +12,7 @@ import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.taskdefs.MatchingTask;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.Mapper;
+import org.apache.tools.ant.util.mappers.Mapper;
 import org.apache.tools.ant.types.SourceFileScanner;
 import org.apache.tools.ant.util.mappers.FileNameMapper;
 import org.apache.tools.ant.util.mappers.IdentityMapper;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Mapper.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/Mapper.java
similarity index 97%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/types/Mapper.java
rename to proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/Mapper.java
index 7cf2bdf66..48b979903 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Mapper.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/Mapper.java
@@ -5,13 +5,13 @@
  * 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.util.mappers;
 
 import java.net.URL;
 import java.net.URLClassLoader;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.ProjectComponent;
-import org.apache.tools.ant.util.mappers.FileNameMapper;
+import org.apache.tools.ant.types.Path;
 
 /**
  * Element to define a FileNameMapper.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/MapperType.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/MapperType.java
similarity index 68%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/types/MapperType.java
rename to proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/MapperType.java
index 5b0df32af..6ccfe5657 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/MapperType.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/MapperType.java
@@ -5,9 +5,10 @@
  * 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.util.mappers;
 
 import java.util.Properties;
+import org.apache.tools.ant.types.EnumeratedAttribute;
 
 /**
  * Class as Argument to FileNameMapper.setType.
@@ -15,26 +16,26 @@ import java.util.Properties;
 public class MapperType
     extends EnumeratedAttribute
 {
-    private final Properties m_implementations;
+    private final Properties c_implementations;
 
     public MapperType()
     {
-        m_implementations = new Properties();
-        m_implementations.put( "identity",
+        c_implementations = new Properties();
+        c_implementations.put( "identity",
                                "org.apache.tools.ant.util.IdentityMapper" );
-        m_implementations.put( "flatten",
+        c_implementations.put( "flatten",
                                "org.apache.tools.ant.util.FlatFileNameMapper" );
-        m_implementations.put( "glob",
+        c_implementations.put( "glob",
                                "org.apache.tools.ant.util.GlobPatternMapper" );
-        m_implementations.put( "merge",
+        c_implementations.put( "merge",
                                "org.apache.tools.ant.util.MergingMapper" );
-        m_implementations.put( "regexp",
+        c_implementations.put( "regexp",
                                "org.apache.tools.ant.util.RegexpPatternMapper" );
     }
 
     public String getImplementation()
     {
-        return m_implementations.getProperty( getValue() );
+        return c_implementations.getProperty( getValue() );
     }
 
     public String[] getValues()