diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CustomListViewConfigFile.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFile.java
similarity index 98%
rename from webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CustomListViewConfigFile.java
rename to webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFile.java
index c93862128..0d8ab6843 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CustomListViewConfigFile.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFile.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.web.templatemodels.individual;
+package edu.cornell.mannlib.vitro.webapp.web.templatemodels.customlistview;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -71,7 +71,7 @@ public class CustomListViewConfigFile {
 	// Might be empty but will not be null.
 	private final String postprocessorName;
 
-	CustomListViewConfigFile(Reader reader) throws InvalidConfigFileException {
+	public CustomListViewConfigFile(Reader reader) throws InvalidConfigFileException {
 		Document doc = parseDocument(reader);
 		selectQueryElement = parseSelectQuery(doc);
 		constructQueries = parseConstructQueries(doc);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
index c22831ae0..6c2eb7d15 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
@@ -32,6 +32,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route;
 import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.web.templatemodels.customlistview.CustomListViewConfigFile;
 import freemarker.cache.TemplateLoader;
 import freemarker.template.Configuration;
 
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CustomListViewConfigFileTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFileTest.java
similarity index 96%
rename from webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CustomListViewConfigFileTest.java
rename to webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFileTest.java
index 90590ba4b..14d06a439 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CustomListViewConfigFileTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFileTest.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.web.templatemodels.individual;
+package edu.cornell.mannlib.vitro.webapp.web.templatemodels.customlistview;
 
 import static org.junit.Assert.assertEquals;
 
@@ -17,7 +17,8 @@ import org.junit.matchers.JUnitMatchers;
 import org.junit.rules.ExpectedException;
 
 import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.CustomListViewConfigFile.InvalidConfigFileException;
+import edu.cornell.mannlib.vitro.webapp.web.templatemodels.customlistview.CustomListViewConfigFile;
+import edu.cornell.mannlib.vitro.webapp.web.templatemodels.customlistview.CustomListViewConfigFile.InvalidConfigFileException;
 
 /**
  * Note: when testing, an "empty" element may be self-closing, or with
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java
index 01b4c8c54..2e73b105e 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java
@@ -157,6 +157,9 @@ public class ObjectPropertyTemplateModel_PropertyListConfigTest extends
 
 	// ----------------------------------------------------------------------
 	// The tests
+	//
+	// TODO - remove any tests that are covered by the newer
+	// CustomListViewConfigFileTest.
 	// ----------------------------------------------------------------------
 
 	//