diff --git a/src/java/org/apache/http/cookie/impl/AbstractCookieAttributeHandler.java b/src/java/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.java
similarity index 97%
rename from src/java/org/apache/http/cookie/impl/AbstractCookieAttributeHandler.java
rename to src/java/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.java
index 8747e291e..7f9b072f3 100644
--- a/src/java/org/apache/http/cookie/impl/AbstractCookieAttributeHandler.java
+++ b/src/java/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.java
@@ -28,7 +28,7 @@
  * <http://www.apache.org/>.
  *
  */ 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import org.apache.http.cookie.Cookie;
 import org.apache.http.cookie.CookieAttributeHandler;
diff --git a/src/java/org/apache/http/cookie/impl/AbstractCookieSpec.java b/src/java/org/apache/http/impl/cookie/AbstractCookieSpec.java
similarity index 99%
rename from src/java/org/apache/http/cookie/impl/AbstractCookieSpec.java
rename to src/java/org/apache/http/impl/cookie/AbstractCookieSpec.java
index f9602be27..af723f522 100644
--- a/src/java/org/apache/http/cookie/impl/AbstractCookieSpec.java
+++ b/src/java/org/apache/http/impl/cookie/AbstractCookieSpec.java
@@ -29,7 +29,7 @@
  *
  */ 
 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/java/org/apache/http/cookie/impl/BasicCommentHandler.java b/src/java/org/apache/http/impl/cookie/BasicCommentHandler.java
similarity index 97%
rename from src/java/org/apache/http/cookie/impl/BasicCommentHandler.java
rename to src/java/org/apache/http/impl/cookie/BasicCommentHandler.java
index 1f8c8ad91..817d8c8d9 100644
--- a/src/java/org/apache/http/cookie/impl/BasicCommentHandler.java
+++ b/src/java/org/apache/http/impl/cookie/BasicCommentHandler.java
@@ -28,7 +28,7 @@
  * <http://www.apache.org/>.
  *
  */ 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import org.apache.http.cookie.Cookie;
 import org.apache.http.cookie.MalformedCookieException;
diff --git a/src/java/org/apache/http/cookie/impl/BasicDomainHandler.java b/src/java/org/apache/http/impl/cookie/BasicDomainHandler.java
similarity index 99%
rename from src/java/org/apache/http/cookie/impl/BasicDomainHandler.java
rename to src/java/org/apache/http/impl/cookie/BasicDomainHandler.java
index 98e26190a..55df1c7f1 100644
--- a/src/java/org/apache/http/cookie/impl/BasicDomainHandler.java
+++ b/src/java/org/apache/http/impl/cookie/BasicDomainHandler.java
@@ -28,7 +28,7 @@
  * <http://www.apache.org/>.
  *
  */ 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import org.apache.http.cookie.Cookie;
 import org.apache.http.cookie.CookieAttributeHandler;
diff --git a/src/java/org/apache/http/cookie/impl/BasicExpiresHandler.java b/src/java/org/apache/http/impl/cookie/BasicExpiresHandler.java
similarity index 98%
rename from src/java/org/apache/http/cookie/impl/BasicExpiresHandler.java
rename to src/java/org/apache/http/impl/cookie/BasicExpiresHandler.java
index e12a16bb9..1a86e6f0e 100644
--- a/src/java/org/apache/http/cookie/impl/BasicExpiresHandler.java
+++ b/src/java/org/apache/http/impl/cookie/BasicExpiresHandler.java
@@ -28,7 +28,7 @@
  * <http://www.apache.org/>.
  *
  */ 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import org.apache.http.cookie.Cookie;
 import org.apache.http.cookie.CookieOrigin;
diff --git a/src/java/org/apache/http/cookie/impl/BasicMaxAgeHandler.java b/src/java/org/apache/http/impl/cookie/BasicMaxAgeHandler.java
similarity index 98%
rename from src/java/org/apache/http/cookie/impl/BasicMaxAgeHandler.java
rename to src/java/org/apache/http/impl/cookie/BasicMaxAgeHandler.java
index f6ec9499a..93e7f982d 100644
--- a/src/java/org/apache/http/cookie/impl/BasicMaxAgeHandler.java
+++ b/src/java/org/apache/http/impl/cookie/BasicMaxAgeHandler.java
@@ -28,7 +28,7 @@
  * <http://www.apache.org/>.
  *
  */ 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import java.util.Date;
 
diff --git a/src/java/org/apache/http/cookie/impl/BasicPathHandler.java b/src/java/org/apache/http/impl/cookie/BasicPathHandler.java
similarity index 98%
rename from src/java/org/apache/http/cookie/impl/BasicPathHandler.java
rename to src/java/org/apache/http/impl/cookie/BasicPathHandler.java
index 0812b04ba..b0dfd4379 100644
--- a/src/java/org/apache/http/cookie/impl/BasicPathHandler.java
+++ b/src/java/org/apache/http/impl/cookie/BasicPathHandler.java
@@ -28,7 +28,7 @@
  * <http://www.apache.org/>.
  *
  */ 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import org.apache.http.cookie.Cookie;
 import org.apache.http.cookie.CookieAttributeHandler;
diff --git a/src/java/org/apache/http/cookie/impl/BasicSecureHandler.java b/src/java/org/apache/http/impl/cookie/BasicSecureHandler.java
similarity index 98%
rename from src/java/org/apache/http/cookie/impl/BasicSecureHandler.java
rename to src/java/org/apache/http/impl/cookie/BasicSecureHandler.java
index 262886c34..ce602df51 100644
--- a/src/java/org/apache/http/cookie/impl/BasicSecureHandler.java
+++ b/src/java/org/apache/http/impl/cookie/BasicSecureHandler.java
@@ -28,7 +28,7 @@
  * <http://www.apache.org/>.
  *
  */ 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import org.apache.http.cookie.Cookie;
 import org.apache.http.cookie.CookieOrigin;
diff --git a/src/java/org/apache/http/cookie/impl/BrowserCompatSpec.java b/src/java/org/apache/http/impl/cookie/BrowserCompatSpec.java
similarity index 99%
rename from src/java/org/apache/http/cookie/impl/BrowserCompatSpec.java
rename to src/java/org/apache/http/impl/cookie/BrowserCompatSpec.java
index 2423c92dd..e7710b74b 100644
--- a/src/java/org/apache/http/cookie/impl/BrowserCompatSpec.java
+++ b/src/java/org/apache/http/impl/cookie/BrowserCompatSpec.java
@@ -29,7 +29,7 @@
  *
  */ 
 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import org.apache.http.Header;
 import org.apache.http.HeaderElement;
diff --git a/src/java/org/apache/http/cookie/impl/BrowserCompatSpecFactory.java b/src/java/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java
similarity index 98%
rename from src/java/org/apache/http/cookie/impl/BrowserCompatSpecFactory.java
rename to src/java/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java
index 4229be898..ec56ea0ff 100644
--- a/src/java/org/apache/http/cookie/impl/BrowserCompatSpecFactory.java
+++ b/src/java/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java
@@ -29,7 +29,7 @@
  *
  */
 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import org.apache.http.cookie.CookieSpec;
 import org.apache.http.cookie.CookieSpecFactory;
diff --git a/src/java/org/apache/http/cookie/impl/CookieSpecBase.java b/src/java/org/apache/http/impl/cookie/CookieSpecBase.java
similarity index 99%
rename from src/java/org/apache/http/cookie/impl/CookieSpecBase.java
rename to src/java/org/apache/http/impl/cookie/CookieSpecBase.java
index dc8bd24ba..87d54c3c7 100644
--- a/src/java/org/apache/http/cookie/impl/CookieSpecBase.java
+++ b/src/java/org/apache/http/impl/cookie/CookieSpecBase.java
@@ -29,7 +29,7 @@
  *
  */ 
 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import java.util.Iterator;
 
diff --git a/src/java/org/apache/http/cookie/impl/NetscapeDomainHandler.java b/src/java/org/apache/http/impl/cookie/NetscapeDomainHandler.java
similarity index 99%
rename from src/java/org/apache/http/cookie/impl/NetscapeDomainHandler.java
rename to src/java/org/apache/http/impl/cookie/NetscapeDomainHandler.java
index c9f9a4c31..7decf5cad 100644
--- a/src/java/org/apache/http/cookie/impl/NetscapeDomainHandler.java
+++ b/src/java/org/apache/http/impl/cookie/NetscapeDomainHandler.java
@@ -28,7 +28,7 @@
  * <http://www.apache.org/>.
  *
  */ 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import java.util.StringTokenizer;
 
diff --git a/src/java/org/apache/http/cookie/impl/NetscapeDraftSpec.java b/src/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java
similarity index 99%
rename from src/java/org/apache/http/cookie/impl/NetscapeDraftSpec.java
rename to src/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java
index 32dc8eef8..64bbd4614 100644
--- a/src/java/org/apache/http/cookie/impl/NetscapeDraftSpec.java
+++ b/src/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java
@@ -29,7 +29,7 @@
  *
  */
 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import org.apache.http.Header;
 import org.apache.http.HeaderElement;
diff --git a/src/java/org/apache/http/cookie/impl/NetscapeDraftSpecFactory.java b/src/java/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.java
similarity index 97%
rename from src/java/org/apache/http/cookie/impl/NetscapeDraftSpecFactory.java
rename to src/java/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.java
index 33660ed84..8898956d7 100644
--- a/src/java/org/apache/http/cookie/impl/NetscapeDraftSpecFactory.java
+++ b/src/java/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.java
@@ -29,7 +29,7 @@
  *
  */
 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import org.apache.http.cookie.CookieSpec;
 import org.apache.http.cookie.CookieSpecFactory;
diff --git a/src/java/org/apache/http/cookie/impl/RFC2109DomainHandler.java b/src/java/org/apache/http/impl/cookie/RFC2109DomainHandler.java
similarity index 99%
rename from src/java/org/apache/http/cookie/impl/RFC2109DomainHandler.java
rename to src/java/org/apache/http/impl/cookie/RFC2109DomainHandler.java
index eb207219d..34514fea0 100644
--- a/src/java/org/apache/http/cookie/impl/RFC2109DomainHandler.java
+++ b/src/java/org/apache/http/impl/cookie/RFC2109DomainHandler.java
@@ -28,7 +28,7 @@
  * <http://www.apache.org/>.
  *
  */ 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import org.apache.http.cookie.Cookie;
 import org.apache.http.cookie.CookieAttributeHandler;
diff --git a/src/java/org/apache/http/cookie/impl/RFC2109Spec.java b/src/java/org/apache/http/impl/cookie/RFC2109Spec.java
similarity index 99%
rename from src/java/org/apache/http/cookie/impl/RFC2109Spec.java
rename to src/java/org/apache/http/impl/cookie/RFC2109Spec.java
index 0f24e88bc..7ccd34516 100644
--- a/src/java/org/apache/http/cookie/impl/RFC2109Spec.java
+++ b/src/java/org/apache/http/impl/cookie/RFC2109Spec.java
@@ -29,7 +29,7 @@
  *
  */
 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import java.util.Arrays;
 
diff --git a/src/java/org/apache/http/cookie/impl/RFC2109SpecFactory.java b/src/java/org/apache/http/impl/cookie/RFC2109SpecFactory.java
similarity index 98%
rename from src/java/org/apache/http/cookie/impl/RFC2109SpecFactory.java
rename to src/java/org/apache/http/impl/cookie/RFC2109SpecFactory.java
index 4ae3bfe3d..0ee033f39 100644
--- a/src/java/org/apache/http/cookie/impl/RFC2109SpecFactory.java
+++ b/src/java/org/apache/http/impl/cookie/RFC2109SpecFactory.java
@@ -29,7 +29,7 @@
  *
  */
 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import org.apache.http.cookie.CookieSpec;
 import org.apache.http.cookie.CookieSpecFactory;
diff --git a/src/java/org/apache/http/cookie/impl/RFC2109VersionHandler.java b/src/java/org/apache/http/impl/cookie/RFC2109VersionHandler.java
similarity index 98%
rename from src/java/org/apache/http/cookie/impl/RFC2109VersionHandler.java
rename to src/java/org/apache/http/impl/cookie/RFC2109VersionHandler.java
index 797da7c98..51d14171c 100644
--- a/src/java/org/apache/http/cookie/impl/RFC2109VersionHandler.java
+++ b/src/java/org/apache/http/impl/cookie/RFC2109VersionHandler.java
@@ -28,7 +28,7 @@
  * <http://www.apache.org/>.
  *
  */ 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import org.apache.http.cookie.Cookie;
 import org.apache.http.cookie.CookieOrigin;
diff --git a/src/test/org/apache/http/client/TestAll.java b/src/test/org/apache/http/client/TestAll.java
index 5c7532f62..620e042fa 100644
--- a/src/test/org/apache/http/client/TestAll.java
+++ b/src/test/org/apache/http/client/TestAll.java
@@ -31,7 +31,7 @@
 package org.apache.http.client;
 
 import org.apache.http.cookie.TestAllCookie;
-import org.apache.http.cookie.impl.TestAllCookieImpl;
+import org.apache.http.impl.cookie.TestAllCookieImpl;
 import org.apache.http.conn.ssl.TestAllSSL;
 import org.apache.http.impl.client.TestAllHttpClientImpl;
 
diff --git a/src/test/org/apache/http/cookie/TestCookiePolicy.java b/src/test/org/apache/http/cookie/TestCookiePolicy.java
index 921888e12..02a342700 100644
--- a/src/test/org/apache/http/cookie/TestCookiePolicy.java
+++ b/src/test/org/apache/http/cookie/TestCookiePolicy.java
@@ -30,10 +30,10 @@
 
 package org.apache.http.cookie;
 
-import org.apache.http.cookie.impl.BrowserCompatSpec;
-import org.apache.http.cookie.impl.BrowserCompatSpecFactory;
-import org.apache.http.cookie.impl.NetscapeDraftSpecFactory;
-import org.apache.http.cookie.impl.RFC2109SpecFactory;
+import org.apache.http.impl.cookie.BrowserCompatSpec;
+import org.apache.http.impl.cookie.BrowserCompatSpecFactory;
+import org.apache.http.impl.cookie.NetscapeDraftSpecFactory;
+import org.apache.http.impl.cookie.RFC2109SpecFactory;
 import org.apache.http.cookie.params.CookieSpecParams;
 import org.apache.http.impl.params.DefaultHttpParams;
 import org.apache.http.params.HttpParams;
diff --git a/src/test/org/apache/http/cookie/impl/TestAbstractCookieSpec.java b/src/test/org/apache/http/impl/cookie/TestAbstractCookieSpec.java
similarity index 99%
rename from src/test/org/apache/http/cookie/impl/TestAbstractCookieSpec.java
rename to src/test/org/apache/http/impl/cookie/TestAbstractCookieSpec.java
index 348e20cd6..815b6bda9 100644
--- a/src/test/org/apache/http/cookie/impl/TestAbstractCookieSpec.java
+++ b/src/test/org/apache/http/impl/cookie/TestAbstractCookieSpec.java
@@ -28,7 +28,7 @@
  *
  */
 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import java.io.IOException;
 import java.util.Iterator;
diff --git a/src/test/org/apache/http/cookie/impl/TestAllCookieImpl.java b/src/test/org/apache/http/impl/cookie/TestAllCookieImpl.java
similarity index 98%
rename from src/test/org/apache/http/cookie/impl/TestAllCookieImpl.java
rename to src/test/org/apache/http/impl/cookie/TestAllCookieImpl.java
index 1b52234dc..c07bba8ff 100644
--- a/src/test/org/apache/http/cookie/impl/TestAllCookieImpl.java
+++ b/src/test/org/apache/http/impl/cookie/TestAllCookieImpl.java
@@ -28,7 +28,7 @@
  *
  */
 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import junit.framework.*;
 
diff --git a/src/test/org/apache/http/cookie/impl/TestBasicCookieAttribHandlers.java b/src/test/org/apache/http/impl/cookie/TestBasicCookieAttribHandlers.java
similarity index 99%
rename from src/test/org/apache/http/cookie/impl/TestBasicCookieAttribHandlers.java
rename to src/test/org/apache/http/impl/cookie/TestBasicCookieAttribHandlers.java
index 165844e2f..9e1387cc3 100644
--- a/src/test/org/apache/http/cookie/impl/TestBasicCookieAttribHandlers.java
+++ b/src/test/org/apache/http/impl/cookie/TestBasicCookieAttribHandlers.java
@@ -28,7 +28,7 @@
  *
  */
 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
diff --git a/src/test/org/apache/http/cookie/impl/TestBrowserCompatSpec.java b/src/test/org/apache/http/impl/cookie/TestBrowserCompatSpec.java
similarity index 99%
rename from src/test/org/apache/http/cookie/impl/TestBrowserCompatSpec.java
rename to src/test/org/apache/http/impl/cookie/TestBrowserCompatSpec.java
index 4e61ccde8..7b4621857 100644
--- a/src/test/org/apache/http/cookie/impl/TestBrowserCompatSpec.java
+++ b/src/test/org/apache/http/impl/cookie/TestBrowserCompatSpec.java
@@ -28,7 +28,7 @@
  *
  */
 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import java.util.Date;
 
diff --git a/src/test/org/apache/http/cookie/impl/TestCookieNetscapeDraft.java b/src/test/org/apache/http/impl/cookie/TestCookieNetscapeDraft.java
similarity index 99%
rename from src/test/org/apache/http/cookie/impl/TestCookieNetscapeDraft.java
rename to src/test/org/apache/http/impl/cookie/TestCookieNetscapeDraft.java
index 3e48fe242..222a651c1 100644
--- a/src/test/org/apache/http/cookie/impl/TestCookieNetscapeDraft.java
+++ b/src/test/org/apache/http/impl/cookie/TestCookieNetscapeDraft.java
@@ -28,7 +28,7 @@
  *
  */
 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import org.apache.http.Header;
 import org.apache.http.cookie.Cookie;
diff --git a/src/test/org/apache/http/cookie/impl/TestCookieRFC2109Spec.java b/src/test/org/apache/http/impl/cookie/TestCookieRFC2109Spec.java
similarity index 99%
rename from src/test/org/apache/http/cookie/impl/TestCookieRFC2109Spec.java
rename to src/test/org/apache/http/impl/cookie/TestCookieRFC2109Spec.java
index 25aa81beb..ca1c45b2a 100644
--- a/src/test/org/apache/http/cookie/impl/TestCookieRFC2109Spec.java
+++ b/src/test/org/apache/http/impl/cookie/TestCookieRFC2109Spec.java
@@ -28,7 +28,7 @@
  *
  */
 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import org.apache.http.Header;
 import org.apache.http.cookie.Cookie;
diff --git a/src/test/org/apache/http/cookie/impl/TestNetscapeCookieAttribHandlers.java b/src/test/org/apache/http/impl/cookie/TestNetscapeCookieAttribHandlers.java
similarity index 99%
rename from src/test/org/apache/http/cookie/impl/TestNetscapeCookieAttribHandlers.java
rename to src/test/org/apache/http/impl/cookie/TestNetscapeCookieAttribHandlers.java
index 82c4ea9be..bce1dbaec 100644
--- a/src/test/org/apache/http/cookie/impl/TestNetscapeCookieAttribHandlers.java
+++ b/src/test/org/apache/http/impl/cookie/TestNetscapeCookieAttribHandlers.java
@@ -28,7 +28,7 @@
  *
  */
 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
diff --git a/src/test/org/apache/http/cookie/impl/TestRFC2109CookieAttribHandlers.java b/src/test/org/apache/http/impl/cookie/TestRFC2109CookieAttribHandlers.java
similarity index 99%
rename from src/test/org/apache/http/cookie/impl/TestRFC2109CookieAttribHandlers.java
rename to src/test/org/apache/http/impl/cookie/TestRFC2109CookieAttribHandlers.java
index c13b710c8..dde6afcfe 100644
--- a/src/test/org/apache/http/cookie/impl/TestRFC2109CookieAttribHandlers.java
+++ b/src/test/org/apache/http/impl/cookie/TestRFC2109CookieAttribHandlers.java
@@ -28,7 +28,7 @@
  *
  */
 
-package org.apache.http.cookie.impl;
+package org.apache.http.impl.cookie;
 
 import junit.framework.Test;
 import junit.framework.TestCase;