diff --git a/src/test/java/com/rometools/test/AbstractJettyTest.java b/src/test/java/com/rometools/fetcher/AbstractJettyTest.java
similarity index 99%
rename from src/test/java/com/rometools/test/AbstractJettyTest.java
rename to src/test/java/com/rometools/fetcher/AbstractJettyTest.java
index 22427f6..360ebce 100644
--- a/src/test/java/com/rometools/test/AbstractJettyTest.java
+++ b/src/test/java/com/rometools/fetcher/AbstractJettyTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package com.rometools.test;
+package com.rometools.fetcher;
 
 import java.net.URL;
 
diff --git a/src/test/java/com/rometools/test/FetcherTestServlet.java b/src/test/java/com/rometools/fetcher/FetcherTestServlet.java
similarity index 99%
rename from src/test/java/com/rometools/test/FetcherTestServlet.java
rename to src/test/java/com/rometools/fetcher/FetcherTestServlet.java
index 02dc19b..c967517 100644
--- a/src/test/java/com/rometools/test/FetcherTestServlet.java
+++ b/src/test/java/com/rometools/fetcher/FetcherTestServlet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package com.rometools.test;
+package com.rometools.fetcher;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/test/java/com/rometools/test/TestBasicAuthenticator.java b/src/test/java/com/rometools/fetcher/TestBasicAuthenticator.java
similarity index 97%
rename from src/test/java/com/rometools/test/TestBasicAuthenticator.java
rename to src/test/java/com/rometools/fetcher/TestBasicAuthenticator.java
index 402a865..355dd4b 100644
--- a/src/test/java/com/rometools/test/TestBasicAuthenticator.java
+++ b/src/test/java/com/rometools/fetcher/TestBasicAuthenticator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package com.rometools.test;
+package com.rometools.fetcher;
 
 import java.net.Authenticator;
 import java.net.PasswordAuthentication;
diff --git a/src/test/java/com/rometools/test/DiskFeedInfoCacheTest.java b/src/test/java/com/rometools/fetcher/impl/DiskFeedInfoCacheTest.java
similarity index 97%
rename from src/test/java/com/rometools/test/DiskFeedInfoCacheTest.java
rename to src/test/java/com/rometools/fetcher/impl/DiskFeedInfoCacheTest.java
index 37a2a43..59b17bc 100644
--- a/src/test/java/com/rometools/test/DiskFeedInfoCacheTest.java
+++ b/src/test/java/com/rometools/fetcher/impl/DiskFeedInfoCacheTest.java
@@ -1,4 +1,4 @@
-package com.rometools.test;
+package com.rometools.fetcher.impl;
 
 import java.io.File;
 import java.net.URL;
diff --git a/src/test/java/com/rometools/test/HashMapFeedInfoCacheTest.java b/src/test/java/com/rometools/fetcher/impl/HashMapFeedInfoCacheTest.java
similarity index 97%
rename from src/test/java/com/rometools/test/HashMapFeedInfoCacheTest.java
rename to src/test/java/com/rometools/fetcher/impl/HashMapFeedInfoCacheTest.java
index 5f7caf7..1ab7878 100644
--- a/src/test/java/com/rometools/test/HashMapFeedInfoCacheTest.java
+++ b/src/test/java/com/rometools/fetcher/impl/HashMapFeedInfoCacheTest.java
@@ -1,4 +1,4 @@
-package com.rometools.test;
+package com.rometools.fetcher.impl;
 
 import java.net.URL;
 
diff --git a/src/test/java/com/rometools/test/HttpClientFeedFetcherTest.java b/src/test/java/com/rometools/fetcher/impl/HttpClientFeedFetcherTest.java
similarity index 96%
rename from src/test/java/com/rometools/test/HttpClientFeedFetcherTest.java
rename to src/test/java/com/rometools/fetcher/impl/HttpClientFeedFetcherTest.java
index 95f0c08..c64339b 100644
--- a/src/test/java/com/rometools/test/HttpClientFeedFetcherTest.java
+++ b/src/test/java/com/rometools/fetcher/impl/HttpClientFeedFetcherTest.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  *
  */
-package com.rometools.test;
+package com.rometools.fetcher.impl;
 
 import org.apache.commons.httpclient.Credentials;
 import org.apache.commons.httpclient.UsernamePasswordCredentials;
 
+import com.rometools.fetcher.AbstractJettyTest;
 import com.rometools.fetcher.FeedFetcher;
 import com.rometools.fetcher.impl.FeedFetcherCache;
 import com.rometools.fetcher.impl.HttpClientFeedFetcher;
diff --git a/src/test/java/com/rometools/test/HttpURLFeedFetcherTest.java b/src/test/java/com/rometools/fetcher/impl/HttpURLFeedFetcherTest.java
similarity index 92%
rename from src/test/java/com/rometools/test/HttpURLFeedFetcherTest.java
rename to src/test/java/com/rometools/fetcher/impl/HttpURLFeedFetcherTest.java
index fe36217..c0ba1fe 100644
--- a/src/test/java/com/rometools/test/HttpURLFeedFetcherTest.java
+++ b/src/test/java/com/rometools/fetcher/impl/HttpURLFeedFetcherTest.java
@@ -14,9 +14,11 @@
  * limitations under the License.
  *
  */
-package com.rometools.test;
+package com.rometools.fetcher.impl;
 
+import com.rometools.fetcher.AbstractJettyTest;
 import com.rometools.fetcher.FeedFetcher;
+import com.rometools.fetcher.TestBasicAuthenticator;
 import com.rometools.fetcher.impl.FeedFetcherCache;
 import com.rometools.fetcher.impl.HttpURLFeedFetcher;
 
diff --git a/src/test/java/com/rometools/test/ResponseHandlerTest.java b/src/test/java/com/rometools/fetcher/impl/ResponseHandlerTest.java
similarity index 97%
rename from src/test/java/com/rometools/test/ResponseHandlerTest.java
rename to src/test/java/com/rometools/fetcher/impl/ResponseHandlerTest.java
index 650a6e5..71bfb4f 100644
--- a/src/test/java/com/rometools/test/ResponseHandlerTest.java
+++ b/src/test/java/com/rometools/fetcher/impl/ResponseHandlerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package com.rometools.test;
+package com.rometools.fetcher.impl;
 
 import junit.framework.TestCase;
 
diff --git a/src/main/java/com/rometools/fetcher/samples/FeedAggregator.java b/src/test/java/com/rometools/fetcher/samples/FeedAggregator.java
similarity index 99%
rename from src/main/java/com/rometools/fetcher/samples/FeedAggregator.java
rename to src/test/java/com/rometools/fetcher/samples/FeedAggregator.java
index da0e870..32b7907 100644
--- a/src/main/java/com/rometools/fetcher/samples/FeedAggregator.java
+++ b/src/test/java/com/rometools/fetcher/samples/FeedAggregator.java
@@ -47,9 +47,13 @@ import com.rometools.rome.io.SyndFeedOutput;
 public class FeedAggregator {
 
     public static void main(final String[] args) {
+
         boolean ok = false;
+
         if (args.length >= 2) {
+
             try {
+
                 final String outputType = args[0];
 
                 final SyndFeed feed = new SyndFeedImpl();
@@ -76,10 +80,12 @@ public class FeedAggregator {
                 output.output(feed, new PrintWriter(System.out));
 
                 ok = true;
+
             } catch (final Exception ex) {
                 System.out.println("ERROR: " + ex.getMessage());
                 ex.printStackTrace();
             }
+
         }
 
         if (!ok) {
diff --git a/src/main/java/com/rometools/fetcher/samples/FeedReader.java b/src/test/java/com/rometools/fetcher/samples/FeedReader.java
similarity index 99%
rename from src/main/java/com/rometools/fetcher/samples/FeedReader.java
rename to src/test/java/com/rometools/fetcher/samples/FeedReader.java
index 2aebae3..54d4be7 100644
--- a/src/main/java/com/rometools/fetcher/samples/FeedReader.java
+++ b/src/test/java/com/rometools/fetcher/samples/FeedReader.java
@@ -36,9 +36,13 @@ import com.rometools.rome.feed.synd.SyndFeed;
  *
  */
 public class FeedReader {
+
     public static void main(final String[] args) {
+
         boolean ok = false;
+
         if (args.length == 1) {
+
             try {
                 final URL feedUrl = new URL(args[0]);
                 final FeedFetcherCache feedInfoCache = HashMapFeedInfoCache.getInstance();
@@ -64,10 +68,12 @@ public class FeedReader {
                 System.err.println("If a \"Feed Unchanged\" event fired then the server supports conditional gets.");
 
                 ok = true;
+
             } catch (final Exception ex) {
                 System.out.println("ERROR: " + ex.getMessage());
                 ex.printStackTrace();
             }
+
         }
 
         if (!ok) {