diff --git a/client/src/main/java/org/elasticsearch/client/Sniffer.java b/client/src/main/java/org/elasticsearch/client/sniff/Sniffer.java
similarity index 97%
rename from client/src/main/java/org/elasticsearch/client/Sniffer.java
rename to client/src/main/java/org/elasticsearch/client/sniff/Sniffer.java
index 1bec4eb87e1..a812804cbce 100644
--- a/client/src/main/java/org/elasticsearch/client/Sniffer.java
+++ b/client/src/main/java/org/elasticsearch/client/sniff/Sniffer.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.client;
+package org.elasticsearch.client.sniff;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
@@ -32,6 +32,8 @@ import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.util.EntityUtils;
+import org.elasticsearch.client.ElasticsearchResponseException;
+import org.elasticsearch.client.RequestLogger;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/client/src/main/java/org/elasticsearch/client/SniffingConnectionPool.java b/client/src/main/java/org/elasticsearch/client/sniff/SniffingConnectionPool.java
similarity index 98%
rename from client/src/main/java/org/elasticsearch/client/SniffingConnectionPool.java
rename to client/src/main/java/org/elasticsearch/client/sniff/SniffingConnectionPool.java
index eaaf98d0506..d0171e6b952 100644
--- a/client/src/main/java/org/elasticsearch/client/SniffingConnectionPool.java
+++ b/client/src/main/java/org/elasticsearch/client/sniff/SniffingConnectionPool.java
@@ -17,13 +17,15 @@
  * under the License.
  */
 
-package org.elasticsearch.client;
+package org.elasticsearch.client.sniff;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.impl.client.CloseableHttpClient;
+import org.elasticsearch.client.AbstractStaticConnectionPool;
+import org.elasticsearch.client.StatefulConnection;
 
 import java.io.IOException;
 import java.util.Iterator;
diff --git a/client/src/test/java/org/elasticsearch/client/SnifferTests.java b/client/src/test/java/org/elasticsearch/client/sniff/SnifferTests.java
similarity index 98%
rename from client/src/test/java/org/elasticsearch/client/SnifferTests.java
rename to client/src/test/java/org/elasticsearch/client/sniff/SnifferTests.java
index c2caa5ab4fa..28a9697ac37 100644
--- a/client/src/test/java/org/elasticsearch/client/SnifferTests.java
+++ b/client/src/test/java/org/elasticsearch/client/sniff/SnifferTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.client;
+package org.elasticsearch.client.sniff;
 
 import com.carrotsearch.randomizedtesting.generators.RandomInts;
 import com.carrotsearch.randomizedtesting.generators.RandomPicks;
@@ -33,6 +33,9 @@ import org.apache.http.client.config.RequestConfig;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.lucene.util.LuceneTestCase;
+import org.elasticsearch.client.ElasticsearchResponseException;
+import org.elasticsearch.client.sniff.Sniffer;
+import org.elasticsearch.client.sniff.SniffingConnectionPool;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/client/src/test/java/org/elasticsearch/client/SniffingConnectionPoolTests.java b/client/src/test/java/org/elasticsearch/client/sniff/SniffingConnectionPoolTests.java
similarity index 99%
rename from client/src/test/java/org/elasticsearch/client/SniffingConnectionPoolTests.java
rename to client/src/test/java/org/elasticsearch/client/sniff/SniffingConnectionPoolTests.java
index 1ae9279f78e..06e6b43236b 100644
--- a/client/src/test/java/org/elasticsearch/client/SniffingConnectionPoolTests.java
+++ b/client/src/test/java/org/elasticsearch/client/sniff/SniffingConnectionPoolTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.client;
+package org.elasticsearch.client.sniff;
 
 import com.carrotsearch.randomizedtesting.generators.RandomInts;
 import com.carrotsearch.randomizedtesting.generators.RandomPicks;