diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/GrefinePropertyListServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java
similarity index 98%
rename from webapp/src/edu/cornell/mannlib/vitro/webapp/controller/GrefinePropertyListServlet.java
rename to webapp/src/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java
index cbdf8c611..3eb5659db 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/GrefinePropertyListServlet.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java
@@ -1,6 +1,6 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.controller;
+package edu.cornell.mannlib.vitro.webapp.controller.grefine;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -27,6 +27,8 @@ import com.hp.hpl.jena.vocabulary.OWL;
 
 import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JSONReconcileServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java
similarity index 99%
rename from webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JSONReconcileServlet.java
rename to webapp/src/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java
index ada3de026..9badeb101 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JSONReconcileServlet.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java
@@ -1,6 +1,6 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.controller;
+package edu.cornell.mannlib.vitro.webapp.controller.grefine;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -24,6 +24,8 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames;
 import edu.cornell.mannlib.vitro.webapp.search.solr.SolrSetup;
 
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/JSONReconcileServletTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServletTest.java
similarity index 95%
rename from webapp/test/edu/cornell/mannlib/vitro/webapp/controller/JSONReconcileServletTest.java
rename to webapp/test/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServletTest.java
index fbf1d455a..17aab1fd8 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/JSONReconcileServletTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServletTest.java
@@ -1,6 +1,6 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.controller;
+package edu.cornell.mannlib.vitro.webapp.controller.grefine;
 
 import java.net.URL;
 import java.util.ArrayList;
@@ -30,12 +30,9 @@ import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
  */
 public class JSONReconcileServletTest extends AbstractTestClass {
 
-
-
-
 	private HttpServletRequestStub request;
 	private HttpServletResponseStub response;
-	private SolrJsonReconcileServlet reconcile;
+	private JSONReconcileServlet reconcile;
 
 	@Before
 	public void setup() throws Exception {
@@ -43,7 +40,7 @@ public class JSONReconcileServletTest extends AbstractTestClass {
 		request.setRequestUrl(new URL("http://vivo.this.that/reconcile"));
 		request.setMethod("POST");
 		response = new HttpServletResponseStub();
-		reconcile = new SolrJsonReconcileServlet();
+		reconcile = new JSONReconcileServlet();
 	}
 	
 	@Test