diff --git a/src/java/org/apache/http/conn/PlainSocketFactory.java b/src/java/org/apache/http/conn/PlainSocketFactory.java
index ff22bd3ad..344ba8eb7 100644
--- a/src/java/org/apache/http/conn/PlainSocketFactory.java
+++ b/src/java/org/apache/http/conn/PlainSocketFactory.java
@@ -27,14 +27,13 @@
  *
  */
 
-package org.apache.http.impl.io;
+package org.apache.http.conn;
 
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.UnknownHostException;
 
-import org.apache.http.io.SocketFactory;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpParams;
 
diff --git a/src/java/org/apache/http/conn/Scheme.java b/src/java/org/apache/http/conn/Scheme.java
index ee4ab4e79..542da3c0e 100644
--- a/src/java/org/apache/http/conn/Scheme.java
+++ b/src/java/org/apache/http/conn/Scheme.java
@@ -26,15 +26,13 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http;
+package org.apache.http.conn;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.http.io.CharArrayBuffer;
-import org.apache.http.io.SecureSocketFactory;
-import org.apache.http.io.SocketFactory;
 import org.apache.http.util.LangUtils;
 
 /**
diff --git a/src/java/org/apache/http/conn/SecureSocketFactory.java b/src/java/org/apache/http/conn/SecureSocketFactory.java
index d3a22e664..2962541f4 100644
--- a/src/java/org/apache/http/conn/SecureSocketFactory.java
+++ b/src/java/org/apache/http/conn/SecureSocketFactory.java
@@ -27,7 +27,7 @@
  *
  */
 
-package org.apache.http.io;
+package org.apache.http.conn;
 
 import java.io.IOException;
 import java.net.Socket;
diff --git a/src/java/org/apache/http/conn/SocketFactory.java b/src/java/org/apache/http/conn/SocketFactory.java
index bea9f742e..b52e63f45 100644
--- a/src/java/org/apache/http/conn/SocketFactory.java
+++ b/src/java/org/apache/http/conn/SocketFactory.java
@@ -27,7 +27,7 @@
  *
  */
 
-package org.apache.http.io;
+package org.apache.http.conn;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -35,7 +35,6 @@ import java.net.Socket;
 import java.net.UnknownHostException;
 
 import org.apache.http.ConnectTimeoutException;
-import org.apache.http.Scheme;
 import org.apache.http.params.HttpParams;
 
 /**
diff --git a/src/java/org/apache/http/conn/ssl/SSLSocketFactory.java b/src/java/org/apache/http/conn/ssl/SSLSocketFactory.java
index 195885179..6e360e7f2 100644
--- a/src/java/org/apache/http/conn/ssl/SSLSocketFactory.java
+++ b/src/java/org/apache/http/conn/ssl/SSLSocketFactory.java
@@ -49,7 +49,7 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 
 import org.apache.http.ConnectTimeoutException;
-import org.apache.http.io.SecureSocketFactory;
+import org.apache.http.conn.SecureSocketFactory;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpParams;