diff --git a/src/java/org/apache/http/conn/ConnectTimeoutException.java b/src/java/org/apache/http/conn/ConnectTimeoutException.java
index f6d348793..12f139fba 100644
--- a/src/java/org/apache/http/conn/ConnectTimeoutException.java
+++ b/src/java/org/apache/http/conn/ConnectTimeoutException.java
@@ -27,7 +27,7 @@
  *
  */
 
-package org.apache.http;
+package org.apache.http.conn;
 
 import java.io.InterruptedIOException;
 
diff --git a/src/java/org/apache/http/conn/SocketFactory.java b/src/java/org/apache/http/conn/SocketFactory.java
index b52e63f45..34c07c7a7 100644
--- a/src/java/org/apache/http/conn/SocketFactory.java
+++ b/src/java/org/apache/http/conn/SocketFactory.java
@@ -34,7 +34,6 @@ import java.net.InetAddress;
 import java.net.Socket;
 import java.net.UnknownHostException;
 
-import org.apache.http.ConnectTimeoutException;
 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 6e360e7f2..8b4e63518 100644
--- a/src/java/org/apache/http/conn/ssl/SSLSocketFactory.java
+++ b/src/java/org/apache/http/conn/ssl/SSLSocketFactory.java
@@ -48,7 +48,7 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 
-import org.apache.http.ConnectTimeoutException;
+import org.apache.http.conn.ConnectTimeoutException;
 import org.apache.http.conn.SecureSocketFactory;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpParams;
diff --git a/src/test/org/apache/http/conn/TestScheme.java b/src/test/org/apache/http/conn/TestScheme.java
index e02024e5b..4ebfb279a 100644
--- a/src/test/org/apache/http/conn/TestScheme.java
+++ b/src/test/org/apache/http/conn/TestScheme.java
@@ -27,10 +27,9 @@
  *
  */
 
-package org.apache.http;
+package org.apache.http.conn;
 
-import org.apache.http.impl.io.PlainSocketFactory;
-import org.apache.http.impl.io.SSLSocketFactory;
+import org.apache.http.conn.ssl.SSLSocketFactory;
 
 import junit.framework.Test;
 import junit.framework.TestCase;