diff --git a/src/main/org/apache/ant/antunit/antlib.xml b/src/main/org/apache/ant/antunit/antlib.xml
index 2fe4c74..773d168 100644
--- a/src/main/org/apache/ant/antunit/antlib.xml
+++ b/src/main/org/apache/ant/antunit/antlib.xml
@@ -28,10 +28,10 @@ under the License.
     classname="org.apache.ant.antunit.ExpectFailureTask"/>
 
   <typedef name="plainlistener"
-    classname="org.apache.ant.antunit.PlainAntUnitListener"/>
+    classname="org.apache.ant.antunit.listener.PlainAntUnitListener"/>
 
   <typedef name="xmllistener"
-    classname="org.apache.ant.antunit.XMLAntUnitListener"/>
+    classname="org.apache.ant.antunit.listener.XMLAntUnitListener"/>
 
   <typedef name="logcapturer"
            classname="org.apache.ant.antunit.LogCapturer"/>
diff --git a/src/main/org/apache/ant/antunit/BaseAntUnitListener.java b/src/main/org/apache/ant/antunit/listener/BaseAntUnitListener.java
similarity index 97%
rename from src/main/org/apache/ant/antunit/BaseAntUnitListener.java
rename to src/main/org/apache/ant/antunit/listener/BaseAntUnitListener.java
index f6edc9f..ca466a5 100644
--- a/src/main/org/apache/ant/antunit/BaseAntUnitListener.java
+++ b/src/main/org/apache/ant/antunit/listener/BaseAntUnitListener.java
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.ant.antunit;
+package org.apache.ant.antunit.listener;
 
 import java.io.IOException;
 import java.io.File;
@@ -28,6 +28,9 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.text.NumberFormat;
 
+import org.apache.ant.antunit.AntUnitListener;
+import org.apache.ant.antunit.AssertionFailedException;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectComponent;
diff --git a/src/main/org/apache/ant/antunit/PlainAntUnitListener.java b/src/main/org/apache/ant/antunit/listener/PlainAntUnitListener.java
similarity index 97%
rename from src/main/org/apache/ant/antunit/PlainAntUnitListener.java
rename to src/main/org/apache/ant/antunit/listener/PlainAntUnitListener.java
index d4fbb26..aead2e6 100644
--- a/src/main/org/apache/ant/antunit/PlainAntUnitListener.java
+++ b/src/main/org/apache/ant/antunit/listener/PlainAntUnitListener.java
@@ -18,13 +18,15 @@
  *
  */
 
-package org.apache.ant.antunit;
+package org.apache.ant.antunit.listener;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
+import org.apache.ant.antunit.AssertionFailedException;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 
diff --git a/src/main/org/apache/ant/antunit/XMLAntUnitListener.java b/src/main/org/apache/ant/antunit/listener/XMLAntUnitListener.java
similarity index 98%
rename from src/main/org/apache/ant/antunit/XMLAntUnitListener.java
rename to src/main/org/apache/ant/antunit/listener/XMLAntUnitListener.java
index 9c940ef..c328897 100644
--- a/src/main/org/apache/ant/antunit/XMLAntUnitListener.java
+++ b/src/main/org/apache/ant/antunit/listener/XMLAntUnitListener.java
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.ant.antunit;
+package org.apache.ant.antunit.listener;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -28,6 +28,8 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Date;
 
+import org.apache.ant.antunit.AssertionFailedException;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.optional.junit.XMLConstants;
@@ -39,7 +41,6 @@ import org.apache.tools.ant.util.StringUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-
 /**
  * A test listener for &lt;antunit&gt; modelled after the XML JUnit
  * test listener that is part of Ant.