diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 9f1c8bc6db8..4bcfdd28cd7 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -332,6 +332,10 @@ Bug Fixes
 Other Changes
 ----------------------
 
+* SOLR-1602: Refactor SOLR package structure to include o.a.solr.response 
+  and move QueryResponseWriters in there
+  (Chris A. Mattmann, ryan, hoss)
+
 * SOLR-1516: Addition of an abstract BaseResponseWriter class to simplify the
   development of QueryResponseWriter implementations.
   (Chris A. Mattmann via noble)
diff --git a/solr/src/java/org/apache/solr/request/BinaryResponseWriter.java b/solr/src/java/org/apache/solr/request/BinaryResponseWriter.java
index 897abac11bd..8af34b6987a 100644
--- a/solr/src/java/org/apache/solr/request/BinaryResponseWriter.java
+++ b/solr/src/java/org/apache/solr/request/BinaryResponseWriter.java
@@ -16,11 +16,19 @@
  */
 package org.apache.solr.request;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 /**
  * @deprecated use org.apache.solr.response.BinaryResponseWriter
  */
 public class BinaryResponseWriter extends org.apache.solr.response.BinaryResponseWriter 
 {
-	
+  private static Logger log =  LoggerFactory.getLogger(BinaryResponseWriter.class.getName());
+  
+	 public BinaryResponseWriter(){
+	   super();
+	   log.warn(BinaryResponseWriter.class.getName()+" is deprecated. Please use the corresponding class in org.apache.solr.response");
+	 }
 }
diff --git a/solr/src/java/org/apache/solr/request/JSONResponseWriter.java b/solr/src/java/org/apache/solr/request/JSONResponseWriter.java
index 39e2e698637..db98f52f931 100644
--- a/solr/src/java/org/apache/solr/request/JSONResponseWriter.java
+++ b/solr/src/java/org/apache/solr/request/JSONResponseWriter.java
@@ -16,11 +16,21 @@
  */
 package org.apache.solr.request;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 /**
  * @deprecated use org.apache.solr.response.JSONResponseWriter
  */
 public class JSONResponseWriter extends org.apache.solr.response.JSONResponseWriter 
 {
-	
+  
+  private static Logger log = LoggerFactory.getLogger(JSONResponseWriter.class.getName());
+
+	public JSONResponseWriter(){
+	  super();
+    log.warn(JSONResponseWriter.class.getName()+" is deprecated. Please use the corresponding class in org.apache.solr.response");
+
+	}
 }
diff --git a/solr/src/java/org/apache/solr/request/PHPResponseWriter.java b/solr/src/java/org/apache/solr/request/PHPResponseWriter.java
index 19eb7490e05..9c68743aec8 100644
--- a/solr/src/java/org/apache/solr/request/PHPResponseWriter.java
+++ b/solr/src/java/org/apache/solr/request/PHPResponseWriter.java
@@ -16,11 +16,22 @@
  */
 package org.apache.solr.request;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 /**
  * @deprecated use org.apache.solr.response.PHPResponseWriter
  */
 public class PHPResponseWriter extends org.apache.solr.response.PHPResponseWriter 
 {
+  private static Logger log = LoggerFactory.getLogger(PHPResponseWriter.class.getName());
+
+  
+  public PHPResponseWriter(){
+    super();
+    log.warn(PHPResponseWriter.class.getName()+" is deprecated. Please use the corresponding class in org.apache.solr.response");
+
+  }
 	
 }
diff --git a/solr/src/java/org/apache/solr/request/PHPSerializedResponseWriter.java b/solr/src/java/org/apache/solr/request/PHPSerializedResponseWriter.java
index a2103cc0fa6..db7298b7e51 100644
--- a/solr/src/java/org/apache/solr/request/PHPSerializedResponseWriter.java
+++ b/solr/src/java/org/apache/solr/request/PHPSerializedResponseWriter.java
@@ -16,11 +16,20 @@
  */
 package org.apache.solr.request;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 /**
  * @deprecated use org.apache.solr.response.PHPSerializedResponseWriter
  */
 public class PHPSerializedResponseWriter extends org.apache.solr.response.PHPSerializedResponseWriter 
 {
-	
+  private static Logger log = LoggerFactory.getLogger(PHPSerializedResponseWriter.class.getName());
+
+  public PHPSerializedResponseWriter(){
+    super();
+    log.warn(PHPSerializedResponseWriter.class.getName()+" is deprecated. Please use the corresponding class in org.apache.solr.response");
+
+  }
 }
diff --git a/solr/src/java/org/apache/solr/request/PythonResponseWriter.java b/solr/src/java/org/apache/solr/request/PythonResponseWriter.java
index b736eba7422..4282941d2f3 100644
--- a/solr/src/java/org/apache/solr/request/PythonResponseWriter.java
+++ b/solr/src/java/org/apache/solr/request/PythonResponseWriter.java
@@ -16,11 +16,20 @@
  */
 package org.apache.solr.request;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 /**
  * @deprecated use org.apache.solr.response.PythonResponseWriter
  */
 public class PythonResponseWriter extends org.apache.solr.response.PythonResponseWriter 
 {
-	
+  private static Logger log = LoggerFactory.getLogger(PythonResponseWriter.class.getName());
+
+  public PythonResponseWriter(){
+    super();
+    log.warn(PythonResponseWriter.class.getName()+" is deprecated. Please use the corresponding class in org.apache.solr.response");
+
+  }	
 }
diff --git a/solr/src/java/org/apache/solr/request/RawResponseWriter.java b/solr/src/java/org/apache/solr/request/RawResponseWriter.java
index c425aaf36d1..81e61645796 100644
--- a/solr/src/java/org/apache/solr/request/RawResponseWriter.java
+++ b/solr/src/java/org/apache/solr/request/RawResponseWriter.java
@@ -16,11 +16,21 @@
  */
 package org.apache.solr.request;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 /**
  * @deprecated use org.apache.solr.response.RawResponseWriter
  */
 public class RawResponseWriter extends org.apache.solr.response.RawResponseWriter 
 {
-	
+  private static Logger log = LoggerFactory.getLogger(RawResponseWriter.class.getName());
+
+  
+  public RawResponseWriter(){
+    super();
+    log.warn(RawResponseWriter.class.getName()+" is deprecated. Please use the corresponding class in org.apache.solr.response");
+
+  }	
 }
diff --git a/solr/src/java/org/apache/solr/request/RubyResponseWriter.java b/solr/src/java/org/apache/solr/request/RubyResponseWriter.java
index eff59fcc4e9..3dd41b0a5a7 100644
--- a/solr/src/java/org/apache/solr/request/RubyResponseWriter.java
+++ b/solr/src/java/org/apache/solr/request/RubyResponseWriter.java
@@ -16,11 +16,21 @@
  */
 package org.apache.solr.request;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 /**
  * @deprecated use org.apache.solr.response.RubyResponseWriter
  */
 public class RubyResponseWriter extends org.apache.solr.response.RubyResponseWriter 
 {
-	
+  private static Logger log = LoggerFactory.getLogger(RubyResponseWriter.class.getName());
+
+  
+  public RubyResponseWriter(){
+    super();
+    log.warn(RubyResponseWriter.class.getName()+" is deprecated. Please use the corresponding class in org.apache.solr.response");
+
+  } 	
 }
diff --git a/solr/src/java/org/apache/solr/request/SolrQueryResponse.java b/solr/src/java/org/apache/solr/request/SolrQueryResponse.java
index a71bb880ba5..9df1502cf3a 100644
--- a/solr/src/java/org/apache/solr/request/SolrQueryResponse.java
+++ b/solr/src/java/org/apache/solr/request/SolrQueryResponse.java
@@ -16,11 +16,19 @@
  */
 package org.apache.solr.request;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 /**
  * @deprecated use org.apache.solr.response.SolrQueryResponse
  */
 public class SolrQueryResponse extends org.apache.solr.response.SolrQueryResponse 
 {
-	
+  private static Logger log = LoggerFactory.getLogger(SolrQueryResponse.class.getName());
+  
+  public SolrQueryResponse() {
+    super();
+    log.warn(SolrQueryResponse.class.getName()+" is deprecated. Please use the corresponding class in org.apache.solr.response");    
+  }
 }
diff --git a/solr/src/java/org/apache/solr/request/TextResponseWriter.java b/solr/src/java/org/apache/solr/request/TextResponseWriter.java
index a205d2eba69..e8372913b71 100644
--- a/solr/src/java/org/apache/solr/request/TextResponseWriter.java
+++ b/solr/src/java/org/apache/solr/request/TextResponseWriter.java
@@ -19,6 +19,8 @@ package org.apache.solr.request;
 import java.io.Writer;
 
 import org.apache.solr.response.SolrQueryResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -26,7 +28,10 @@ import org.apache.solr.response.SolrQueryResponse;
  */
 public abstract class TextResponseWriter extends org.apache.solr.response.TextResponseWriter 
 {
+  private static Logger log = LoggerFactory.getLogger(TextResponseWriter.class.getName());
+
   public TextResponseWriter(Writer writer, SolrQueryRequest req, SolrQueryResponse rsp) {
     super(writer, req, rsp);
+    log.warn(TextResponseWriter.class.getName()+" is deprecated. Please use the corresponding class in org.apache.solr.response");    
   }
 }
diff --git a/solr/src/java/org/apache/solr/request/XMLResponseWriter.java b/solr/src/java/org/apache/solr/request/XMLResponseWriter.java
index c1ece987018..a137efa4052 100644
--- a/solr/src/java/org/apache/solr/request/XMLResponseWriter.java
+++ b/solr/src/java/org/apache/solr/request/XMLResponseWriter.java
@@ -16,11 +16,21 @@
  */
 package org.apache.solr.request;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 /**
  * @deprecated use org.apache.solr.response.XMLResponseWriter
  */
 public class XMLResponseWriter extends org.apache.solr.response.XMLResponseWriter 
 {
-	
+  private static Logger log = LoggerFactory.getLogger(XMLResponseWriter.class.getName());
+
+  
+  public XMLResponseWriter(){
+    super();
+    log.warn(XMLResponseWriter.class.getName()+" is deprecated. Please use the corresponding class in org.apache.solr.response");
+
+  } 
 }
diff --git a/solr/src/java/org/apache/solr/request/XSLTResponseWriter.java b/solr/src/java/org/apache/solr/request/XSLTResponseWriter.java
index bfa039f870b..1f9c747e8d5 100644
--- a/solr/src/java/org/apache/solr/request/XSLTResponseWriter.java
+++ b/solr/src/java/org/apache/solr/request/XSLTResponseWriter.java
@@ -16,11 +16,21 @@
  */
 package org.apache.solr.request;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 /**
  * @deprecated use org.apache.solr.response.XSLTResponseWriter
  */
 public class XSLTResponseWriter extends org.apache.solr.response.XSLTResponseWriter 
 {
-	
+  private static Logger log = LoggerFactory.getLogger(XSLTResponseWriter.class.getName());
+
+  
+  public XSLTResponseWriter(){
+    super();
+    log.warn(XSLTResponseWriter.class.getName()+" is deprecated. Please use the corresponding class in org.apache.solr.response");
+
+  } 	
 }