diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DistinguishedName.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/security/DistinguishedName.java
similarity index 97%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DistinguishedName.java
rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/security/DistinguishedName.java
index 8f7739903..3c9bdd787 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DistinguishedName.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/security/DistinguishedName.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;
+package org.apache.tools.ant.taskdefs.security;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DnameParam.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/security/DnameParam.java
similarity index 93%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DnameParam.java
rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/security/DnameParam.java
index 2b2f0d46c..a67b4296c 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DnameParam.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/security/DnameParam.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;
+package org.apache.tools.ant.taskdefs.security;
public final class DnameParam
{
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GenerateKey.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/security/GenerateKey.java
similarity index 99%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GenerateKey.java
rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/security/GenerateKey.java
index 1a51c332e..a54b6d036 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GenerateKey.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/security/GenerateKey.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;
+package org.apache.tools.ant.taskdefs.security;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SignJar.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/security/SignJar.java
similarity index 98%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SignJar.java
rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/security/SignJar.java
index 29f08a286..e6382bdc0 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SignJar.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/security/SignJar.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;
+package org.apache.tools.ant.taskdefs.security;
import java.io.File;
import java.io.IOException;
@@ -27,9 +27,9 @@ import org.apache.tools.ant.types.FileSet;
* @author Nick Fortescue
* nick@ox.compsoc.net
*/
-public class SignJar extends Task
+public class SignJar
+ extends Task
{
-
/**
* the filesets of the jars to sign
*/
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DistinguishedName.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/security/DistinguishedName.java
similarity index 97%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DistinguishedName.java
rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/security/DistinguishedName.java
index 8f7739903..3c9bdd787 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DistinguishedName.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/security/DistinguishedName.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;
+package org.apache.tools.ant.taskdefs.security;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DnameParam.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/security/DnameParam.java
similarity index 93%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DnameParam.java
rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/security/DnameParam.java
index 2b2f0d46c..a67b4296c 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DnameParam.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/security/DnameParam.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;
+package org.apache.tools.ant.taskdefs.security;
public final class DnameParam
{
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/security/GenerateKey.java
similarity index 99%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/security/GenerateKey.java
index 1a51c332e..a54b6d036 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/security/GenerateKey.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;
+package org.apache.tools.ant.taskdefs.security;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/security/SignJar.java
similarity index 98%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java
rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/security/SignJar.java
index 29f08a286..e6382bdc0 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/security/SignJar.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;
+package org.apache.tools.ant.taskdefs.security;
import java.io.File;
import java.io.IOException;
@@ -27,9 +27,9 @@ import org.apache.tools.ant.types.FileSet;
* @author Nick Fortescue
* nick@ox.compsoc.net
*/
-public class SignJar extends Task
+public class SignJar
+ extends Task
{
-
/**
* the filesets of the jars to sign
*/