diff --git a/proposal/myrmidon/build.xml b/proposal/myrmidon/build.xml
index d3fb2cd3e..275300fa3 100644
--- a/proposal/myrmidon/build.xml
+++ b/proposal/myrmidon/build.xml
@@ -276,7 +276,6 @@ Legal:
         <property name="ant.package" value="org/apache/tools/todo"/>
         <property name="taskdef.package" value="${ant.package}/taskdefs"/>
         <property name="antlib.package" value="org/apache/antlib"/>
-        <property name="optional.package" value="org/apache/tools/ant/taskdefs/optional"/>
         <property name="optional.type.package" value="${ant.package}/types/optional"/>
         <property name="util.package" value="${ant.package}/util"/>
         <property name="regexp.package" value="${util.package}/regexp"/>
@@ -294,19 +293,19 @@ Legal:
             <exclude name="${ant.package}/listener/Log4jListener.java"
                      unless="log4j.present" />
 
-            <exclude name="${optional.package}/IContract.java"
+            <exclude name="${taskdefs.package}/IContract.java"
                      unless="icontract.present" />
-            <exclude name="${optional.package}/Script.java"
+            <exclude name="${taskdefs.package}/Script.java"
                      unless="bsf.present" />
-            <exclude name="${optional.package}/StyleBook.java"
+            <exclude name="${taskdefs.package}/stylebook/StyleBook.java"
                      unless="stylebook.present" />
-            <exclude name="${optional.package}/NetRexxC.java"
+            <exclude name="${taskdefs.package}/NetRexxC.java"
                      unless="netrexx.present" />
             <exclude name="${antlib.package}/xml/TraXLiaison.java"
                      unless="trax.present" />
             <exclude name="${antlib.package}/xml/XalanLiaison.java"
                      unless="xalan.present" />
-            <exclude name="${optional.package}/Javah.java"
+            <exclude name="${taskdefs.package}/Javah.java"
                      unless="jdk1.2+" />
             <exclude name="${taskdef.package}/junit/*"
                      unless="junit.present" />
@@ -316,7 +315,7 @@ Legal:
                      unless="javamail.complete" />
             <exclude name="${taskdef.package}/scm/AntStarTeam*.java"
                      unless="starteam.present" />
-            <exclude name="${optional.package}/ANTLR.java"
+            <exclude name="${taskdefs.package}/ANTLR.java"
                      unless="antlr.present" />
             <exclude name="${taskdef.package}/perforce/*.java"
                      unless="jakarta.oro.present" />
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/ANTLR.java
similarity index 98%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/ANTLR.java
index 4d7a2a4fc..3268dc4c8 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/ANTLR.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.todo.taskdefs;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -223,7 +223,7 @@ public class ANTLR extends AbstractTask
      *
      * @param command Description of Parameter
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     private int run( final Commandline command )
         throws TaskException
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Cab.java
similarity index 98%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Cab.java
index d06e7f14f..f2ed5825d 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Cab.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.todo.taskdefs;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -280,7 +280,7 @@ public class Cab
      *
      * @param files Description of Parameter
      * @return Description of the Returned Value
-     * @exception IOException Description of Exception
+     * @exception java.io.IOException Description of Exception
      */
     protected File createListFile( ArrayList files )
         throws IOException
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ClassArgument.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/ClassArgument.java
similarity index 90%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ClassArgument.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/ClassArgument.java
index 636228dc0..1b8323d3f 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ClassArgument.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/ClassArgument.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.todo.taskdefs;
 
 public class ClassArgument
 {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Entry.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Entry.java
similarity index 97%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Entry.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Entry.java
index 93c9ebfc6..a715ca8a6 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Entry.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Entry.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.todo.taskdefs;
 
 import java.text.DateFormat;
 import java.text.DecimalFormat;
@@ -120,7 +120,7 @@ public class Entry
     /**
      * Check if parameter combinations can be supported
      *
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     private void checkParameters()
         throws TaskException
@@ -151,7 +151,7 @@ public class Entry
      * @param oldValue the current value read from the property file or
      *      <code>null</code> if the <code>key</code> was not contained in
      *      the property file.
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     private void executeDate( String oldValue )
         throws TaskException
@@ -282,7 +282,7 @@ public class Entry
      * @param oldValue the current value read from the property file or
      *      <code>null</code> if the <code>key</code> was not contained in
      *      the property file.
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     private void executeInteger( String oldValue )
         throws TaskException
@@ -372,7 +372,7 @@ public class Entry
      * @param oldValue the current value read from the property file or
      *      <code>null</code> if the <code>key</code> was not contained in
      *      the property file.
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     private void executeString( String oldValue )
         throws TaskException
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/IContract.java
similarity index 99%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/IContract.java
index 612e1b2a1..af5be2eb3 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/IContract.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.todo.taskdefs;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -672,7 +672,7 @@ public class IContract extends MatchingTask
     /**
      * Executes the task
      *
-     * @exception TaskException if the instrumentation fails
+     * @exception org.apache.myrmidon.api.TaskException if the instrumentation fails
      */
     public void execute()
         throws TaskException
@@ -875,7 +875,7 @@ public class IContract extends MatchingTask
     /**
      * Checks that the required attributes are set.
      *
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     private void preconditions()
         throws TaskException
@@ -914,7 +914,7 @@ public class IContract extends MatchingTask
      * Also creates a temporary file with a list of the source files, that will
      * be deleted upon exit.
      *
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     private void scan()
         throws TaskException
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Javah.java
similarity index 98%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Javah.java
index 651b8e7ca..25f61b229 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Javah.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.todo.taskdefs;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -18,6 +18,7 @@ import org.apache.myrmidon.api.TaskContext;
 import org.apache.tools.todo.types.Commandline;
 import org.apache.tools.todo.types.Path;
 import org.apache.tools.todo.util.FileUtils;
+import org.apache.tools.todo.taskdefs.ClassArgument;
 
 /**
  * Task to generate JNI header files using javah. This task can take the
@@ -308,7 +309,7 @@ public class Javah
      * Peforms a compile using the classic compiler that shipped with JDK 1.1
      * and 1.2.
      *
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
 
     private void doClassicCompile()
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/NetRexxC.java
similarity index 99%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/NetRexxC.java
index f2ff8d14b..e99b66290 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/NetRexxC.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.todo.taskdefs;
 
 import java.io.File;
 import java.io.IOException;
@@ -477,7 +477,7 @@ public class NetRexxC extends MatchingTask
     /**
      * Executes the task, i.e. does the actual compiler call
      *
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public void execute()
         throws TaskException
@@ -639,7 +639,7 @@ public class NetRexxC extends MatchingTask
     /**
      * Peforms a copmile using the NetRexx 1.1.x compiler
      *
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     private void doNetRexxCompile()
         throws TaskException
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Script.java
similarity index 96%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Script.java
index 0dde5c845..78c7167a4 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Script.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.todo.taskdefs;
 
 import com.ibm.bsf.BSFException;
 import com.ibm.bsf.BSFManager;
@@ -81,7 +81,7 @@ public class Script extends AbstractTask
     /**
      * Do the work.
      *
-     * @exception TaskException if someting goes wrong with the build
+     * @exception org.apache.myrmidon.api.TaskException if someting goes wrong with the build
      */
     public void execute()
         throws TaskException
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/stylebook/StyleBook.java
similarity index 97%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/stylebook/StyleBook.java
index 8d837dbb4..f8d0a8d71 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/stylebook/StyleBook.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.todo.taskdefs.stylebook;
 
 import java.io.File;
 import org.apache.myrmidon.api.TaskException;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/ANTLR.java
similarity index 98%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/ANTLR.java
index 4d7a2a4fc..3268dc4c8 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/ANTLR.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.todo.taskdefs;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -223,7 +223,7 @@ public class ANTLR extends AbstractTask
      *
      * @param command Description of Parameter
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     private int run( final Commandline command )
         throws TaskException
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Cab.java
similarity index 98%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Cab.java
index d06e7f14f..f2ed5825d 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Cab.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.todo.taskdefs;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -280,7 +280,7 @@ public class Cab
      *
      * @param files Description of Parameter
      * @return Description of the Returned Value
-     * @exception IOException Description of Exception
+     * @exception java.io.IOException Description of Exception
      */
     protected File createListFile( ArrayList files )
         throws IOException
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ClassArgument.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/ClassArgument.java
similarity index 90%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ClassArgument.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/ClassArgument.java
index 636228dc0..1b8323d3f 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ClassArgument.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/ClassArgument.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.todo.taskdefs;
 
 public class ClassArgument
 {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Entry.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Entry.java
similarity index 97%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Entry.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Entry.java
index 93c9ebfc6..a715ca8a6 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Entry.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Entry.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.todo.taskdefs;
 
 import java.text.DateFormat;
 import java.text.DecimalFormat;
@@ -120,7 +120,7 @@ public class Entry
     /**
      * Check if parameter combinations can be supported
      *
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     private void checkParameters()
         throws TaskException
@@ -151,7 +151,7 @@ public class Entry
      * @param oldValue the current value read from the property file or
      *      <code>null</code> if the <code>key</code> was not contained in
      *      the property file.
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     private void executeDate( String oldValue )
         throws TaskException
@@ -282,7 +282,7 @@ public class Entry
      * @param oldValue the current value read from the property file or
      *      <code>null</code> if the <code>key</code> was not contained in
      *      the property file.
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     private void executeInteger( String oldValue )
         throws TaskException
@@ -372,7 +372,7 @@ public class Entry
      * @param oldValue the current value read from the property file or
      *      <code>null</code> if the <code>key</code> was not contained in
      *      the property file.
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     private void executeString( String oldValue )
         throws TaskException
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/IContract.java
similarity index 99%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/IContract.java
index 612e1b2a1..af5be2eb3 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/IContract.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.todo.taskdefs;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -672,7 +672,7 @@ public class IContract extends MatchingTask
     /**
      * Executes the task
      *
-     * @exception TaskException if the instrumentation fails
+     * @exception org.apache.myrmidon.api.TaskException if the instrumentation fails
      */
     public void execute()
         throws TaskException
@@ -875,7 +875,7 @@ public class IContract extends MatchingTask
     /**
      * Checks that the required attributes are set.
      *
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     private void preconditions()
         throws TaskException
@@ -914,7 +914,7 @@ public class IContract extends MatchingTask
      * Also creates a temporary file with a list of the source files, that will
      * be deleted upon exit.
      *
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     private void scan()
         throws TaskException
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Javah.java
similarity index 98%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Javah.java
index 651b8e7ca..25f61b229 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Javah.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.todo.taskdefs;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -18,6 +18,7 @@ import org.apache.myrmidon.api.TaskContext;
 import org.apache.tools.todo.types.Commandline;
 import org.apache.tools.todo.types.Path;
 import org.apache.tools.todo.util.FileUtils;
+import org.apache.tools.todo.taskdefs.ClassArgument;
 
 /**
  * Task to generate JNI header files using javah. This task can take the
@@ -308,7 +309,7 @@ public class Javah
      * Peforms a compile using the classic compiler that shipped with JDK 1.1
      * and 1.2.
      *
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
 
     private void doClassicCompile()
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/NetRexxC.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/NetRexxC.java
similarity index 99%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/NetRexxC.java
index f2ff8d14b..e99b66290 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/NetRexxC.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.todo.taskdefs;
 
 import java.io.File;
 import java.io.IOException;
@@ -477,7 +477,7 @@ public class NetRexxC extends MatchingTask
     /**
      * Executes the task, i.e. does the actual compiler call
      *
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public void execute()
         throws TaskException
@@ -639,7 +639,7 @@ public class NetRexxC extends MatchingTask
     /**
      * Peforms a copmile using the NetRexx 1.1.x compiler
      *
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     private void doNetRexxCompile()
         throws TaskException
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Script.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Script.java
similarity index 96%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Script.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Script.java
index 0dde5c845..78c7167a4 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Script.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Script.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.todo.taskdefs;
 
 import com.ibm.bsf.BSFException;
 import com.ibm.bsf.BSFManager;
@@ -81,7 +81,7 @@ public class Script extends AbstractTask
     /**
      * Do the work.
      *
-     * @exception TaskException if someting goes wrong with the build
+     * @exception org.apache.myrmidon.api.TaskException if someting goes wrong with the build
      */
     public void execute()
         throws TaskException
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/StyleBook.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/stylebook/StyleBook.java
similarity index 97%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/StyleBook.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/stylebook/StyleBook.java
index 8d837dbb4..f8d0a8d71 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/StyleBook.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/stylebook/StyleBook.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.todo.taskdefs.stylebook;
 
 import java.io.File;
 import org.apache.myrmidon.api.TaskException;