diff --git a/src/main/java/com/metaweb/gridworks/browsing/Engine.java b/src/main/java/com/metaweb/gridworks/browsing/Engine.java
index e946512ee..2176288fd 100644
--- a/src/main/java/com/metaweb/gridworks/browsing/Engine.java
+++ b/src/main/java/com/metaweb/gridworks/browsing/Engine.java
@@ -15,8 +15,9 @@ import com.metaweb.gridworks.browsing.facets.ListFacet;
 import com.metaweb.gridworks.browsing.facets.RangeFacet;
 import com.metaweb.gridworks.browsing.facets.ScatterplotFacet;
 import com.metaweb.gridworks.browsing.facets.TextSearchFacet;
-import com.metaweb.gridworks.browsing.filters.RecordFilter;
-import com.metaweb.gridworks.browsing.filters.RowFilter;
+import com.metaweb.gridworks.browsing.util.ConjunctiveFilteredRecords;
+import com.metaweb.gridworks.browsing.util.ConjunctiveFilteredRows;
+import com.metaweb.gridworks.browsing.util.FilteredRecordsAsFilteredRows;
 import com.metaweb.gridworks.model.Project;
 import com.metaweb.gridworks.model.Row;
 
diff --git a/src/main/java/com/metaweb/gridworks/browsing/filters/RecordFilter.java b/src/main/java/com/metaweb/gridworks/browsing/RecordFilter.java
similarity index 87%
rename from src/main/java/com/metaweb/gridworks/browsing/filters/RecordFilter.java
rename to src/main/java/com/metaweb/gridworks/browsing/RecordFilter.java
index 606db4ae1..69ee803ec 100644
--- a/src/main/java/com/metaweb/gridworks/browsing/filters/RecordFilter.java
+++ b/src/main/java/com/metaweb/gridworks/browsing/RecordFilter.java
@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.browsing.filters;
+package com.metaweb.gridworks.browsing;
 
 import com.metaweb.gridworks.model.Project;
 import com.metaweb.gridworks.model.Record;
diff --git a/src/main/java/com/metaweb/gridworks/browsing/filters/RowFilter.java b/src/main/java/com/metaweb/gridworks/browsing/RowFilter.java
similarity index 87%
rename from src/main/java/com/metaweb/gridworks/browsing/filters/RowFilter.java
rename to src/main/java/com/metaweb/gridworks/browsing/RowFilter.java
index 0e6ff136d..165fd729c 100644
--- a/src/main/java/com/metaweb/gridworks/browsing/filters/RowFilter.java
+++ b/src/main/java/com/metaweb/gridworks/browsing/RowFilter.java
@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.browsing.filters;
+package com.metaweb.gridworks.browsing;
 
 import com.metaweb.gridworks.model.Project;
 import com.metaweb.gridworks.model.Row;
diff --git a/src/main/java/com/metaweb/gridworks/browsing/facets/Facet.java b/src/main/java/com/metaweb/gridworks/browsing/facets/Facet.java
index 39ec54a6e..65af4e444 100644
--- a/src/main/java/com/metaweb/gridworks/browsing/facets/Facet.java
+++ b/src/main/java/com/metaweb/gridworks/browsing/facets/Facet.java
@@ -5,8 +5,8 @@ import org.json.JSONObject;
 import com.metaweb.gridworks.Jsonizable;
 import com.metaweb.gridworks.browsing.FilteredRecords;
 import com.metaweb.gridworks.browsing.FilteredRows;
-import com.metaweb.gridworks.browsing.filters.RecordFilter;
-import com.metaweb.gridworks.browsing.filters.RowFilter;
+import com.metaweb.gridworks.browsing.RecordFilter;
+import com.metaweb.gridworks.browsing.RowFilter;
 import com.metaweb.gridworks.model.Project;
 
 /**
diff --git a/src/main/java/com/metaweb/gridworks/browsing/facets/ListFacet.java b/src/main/java/com/metaweb/gridworks/browsing/facets/ListFacet.java
index c5d29a326..6d8b4dc6c 100644
--- a/src/main/java/com/metaweb/gridworks/browsing/facets/ListFacet.java
+++ b/src/main/java/com/metaweb/gridworks/browsing/facets/ListFacet.java
@@ -12,10 +12,11 @@ import org.json.JSONWriter;
 import com.metaweb.gridworks.browsing.DecoratedValue;
 import com.metaweb.gridworks.browsing.FilteredRecords;
 import com.metaweb.gridworks.browsing.FilteredRows;
+import com.metaweb.gridworks.browsing.RecordFilter;
+import com.metaweb.gridworks.browsing.RowFilter;
 import com.metaweb.gridworks.browsing.filters.AnyRowRecordFilter;
 import com.metaweb.gridworks.browsing.filters.ExpressionEqualRowFilter;
-import com.metaweb.gridworks.browsing.filters.RecordFilter;
-import com.metaweb.gridworks.browsing.filters.RowFilter;
+import com.metaweb.gridworks.browsing.util.ExpressionNominalValueGrouper;
 import com.metaweb.gridworks.expr.Evaluable;
 import com.metaweb.gridworks.expr.MetaParser;
 import com.metaweb.gridworks.expr.ParsingException;
@@ -172,8 +173,8 @@ public class ListFacet implements Facet {
     @Override
     public void computeChoices(Project project, FilteredRows filteredRows) {
         if (_eval != null && _errorMessage == null) {
-            ExpressionNominalRowGrouper grouper = 
-                new ExpressionNominalRowGrouper(_eval, _columnName, _cellIndex);
+            ExpressionNominalValueGrouper grouper = 
+                new ExpressionNominalValueGrouper(_eval, _columnName, _cellIndex);
             
             filteredRows.accept(project, grouper);
             
@@ -184,8 +185,8 @@ public class ListFacet implements Facet {
     @Override
     public void computeChoices(Project project, FilteredRecords filteredRecords) {
         if (_eval != null && _errorMessage == null) {
-            ExpressionNominalRowGrouper grouper = 
-                new ExpressionNominalRowGrouper(_eval, _columnName, _cellIndex);
+            ExpressionNominalValueGrouper grouper = 
+                new ExpressionNominalValueGrouper(_eval, _columnName, _cellIndex);
             
             filteredRecords.accept(project, grouper);
             
@@ -193,7 +194,7 @@ public class ListFacet implements Facet {
         }
     }
     
-    protected void postProcessGrouper(ExpressionNominalRowGrouper grouper) {
+    protected void postProcessGrouper(ExpressionNominalValueGrouper grouper) {
         _choices.clear();
         _choices.addAll(grouper.choices.values());
         
diff --git a/src/main/java/com/metaweb/gridworks/browsing/facets/RangeFacet.java b/src/main/java/com/metaweb/gridworks/browsing/facets/RangeFacet.java
index bed7c40ae..d4f8eca94 100644
--- a/src/main/java/com/metaweb/gridworks/browsing/facets/RangeFacet.java
+++ b/src/main/java/com/metaweb/gridworks/browsing/facets/RangeFacet.java
@@ -8,10 +8,14 @@ import org.json.JSONWriter;
 
 import com.metaweb.gridworks.browsing.FilteredRecords;
 import com.metaweb.gridworks.browsing.FilteredRows;
+import com.metaweb.gridworks.browsing.RecordFilter;
+import com.metaweb.gridworks.browsing.RowFilter;
 import com.metaweb.gridworks.browsing.filters.AnyRowRecordFilter;
 import com.metaweb.gridworks.browsing.filters.ExpressionNumberComparisonRowFilter;
-import com.metaweb.gridworks.browsing.filters.RecordFilter;
-import com.metaweb.gridworks.browsing.filters.RowFilter;
+import com.metaweb.gridworks.browsing.util.ExpressionNumericValueBinner;
+import com.metaweb.gridworks.browsing.util.NumericBinIndex;
+import com.metaweb.gridworks.browsing.util.NumericBinRecordIndex;
+import com.metaweb.gridworks.browsing.util.NumericBinRowIndex;
 import com.metaweb.gridworks.expr.Evaluable;
 import com.metaweb.gridworks.expr.MetaParser;
 import com.metaweb.gridworks.expr.ParsingException;
@@ -187,8 +191,8 @@ public class RangeFacet implements Facet {
             
             retrieveDataFromBaseBinIndex(index);
             
-            ExpressionNumericRowBinner binner = 
-                new ExpressionNumericRowBinner(_eval, _columnName, _cellIndex, index);
+            ExpressionNumericValueBinner binner = 
+                new ExpressionNumericValueBinner(_eval, _columnName, _cellIndex, index);
             
             filteredRows.accept(project, binner);
             retrieveDataFromBinner(binner);
@@ -208,8 +212,8 @@ public class RangeFacet implements Facet {
             
             retrieveDataFromBaseBinIndex(index);
             
-            ExpressionNumericRowBinner binner = 
-                new ExpressionNumericRowBinner(_eval, _columnName, _cellIndex, index);
+            ExpressionNumericValueBinner binner = 
+                new ExpressionNumericValueBinner(_eval, _columnName, _cellIndex, index);
             
             filteredRecords.accept(project, binner);
             
@@ -237,7 +241,7 @@ public class RangeFacet implements Facet {
         }
     }
     
-    protected void retrieveDataFromBinner(ExpressionNumericRowBinner binner) {
+    protected void retrieveDataFromBinner(ExpressionNumericValueBinner binner) {
         _bins = binner.bins;
         _numericCount = binner.numericCount;
         _nonNumericCount = binner.nonNumericCount;
diff --git a/src/main/java/com/metaweb/gridworks/browsing/facets/ScatterplotFacet.java b/src/main/java/com/metaweb/gridworks/browsing/facets/ScatterplotFacet.java
index 16f3fe3e5..4455b4075 100644
--- a/src/main/java/com/metaweb/gridworks/browsing/facets/ScatterplotFacet.java
+++ b/src/main/java/com/metaweb/gridworks/browsing/facets/ScatterplotFacet.java
@@ -20,10 +20,13 @@ import org.slf4j.LoggerFactory;
 
 import com.metaweb.gridworks.browsing.FilteredRecords;
 import com.metaweb.gridworks.browsing.FilteredRows;
+import com.metaweb.gridworks.browsing.RecordFilter;
+import com.metaweb.gridworks.browsing.RowFilter;
 import com.metaweb.gridworks.browsing.filters.AnyRowRecordFilter;
 import com.metaweb.gridworks.browsing.filters.DualExpressionsNumberComparisonRowFilter;
-import com.metaweb.gridworks.browsing.filters.RecordFilter;
-import com.metaweb.gridworks.browsing.filters.RowFilter;
+import com.metaweb.gridworks.browsing.util.NumericBinIndex;
+import com.metaweb.gridworks.browsing.util.NumericBinRecordIndex;
+import com.metaweb.gridworks.browsing.util.NumericBinRowIndex;
 import com.metaweb.gridworks.expr.Evaluable;
 import com.metaweb.gridworks.expr.MetaParser;
 import com.metaweb.gridworks.expr.ParsingException;
diff --git a/src/main/java/com/metaweb/gridworks/browsing/facets/TextSearchFacet.java b/src/main/java/com/metaweb/gridworks/browsing/facets/TextSearchFacet.java
index 074608338..8344d2eb8 100644
--- a/src/main/java/com/metaweb/gridworks/browsing/facets/TextSearchFacet.java
+++ b/src/main/java/com/metaweb/gridworks/browsing/facets/TextSearchFacet.java
@@ -9,10 +9,10 @@ import org.json.JSONWriter;
 
 import com.metaweb.gridworks.browsing.FilteredRecords;
 import com.metaweb.gridworks.browsing.FilteredRows;
+import com.metaweb.gridworks.browsing.RecordFilter;
+import com.metaweb.gridworks.browsing.RowFilter;
 import com.metaweb.gridworks.browsing.filters.AnyRowRecordFilter;
 import com.metaweb.gridworks.browsing.filters.ExpressionStringComparisonRowFilter;
-import com.metaweb.gridworks.browsing.filters.RecordFilter;
-import com.metaweb.gridworks.browsing.filters.RowFilter;
 import com.metaweb.gridworks.expr.Evaluable;
 import com.metaweb.gridworks.gel.ast.VariableExpr;
 import com.metaweb.gridworks.model.Project;
diff --git a/src/main/java/com/metaweb/gridworks/browsing/filters/AnyRowRecordFilter.java b/src/main/java/com/metaweb/gridworks/browsing/filters/AnyRowRecordFilter.java
index 4dfd3c862..8208bf2cc 100644
--- a/src/main/java/com/metaweb/gridworks/browsing/filters/AnyRowRecordFilter.java
+++ b/src/main/java/com/metaweb/gridworks/browsing/filters/AnyRowRecordFilter.java
@@ -1,5 +1,7 @@
 package com.metaweb.gridworks.browsing.filters;
 
+import com.metaweb.gridworks.browsing.RecordFilter;
+import com.metaweb.gridworks.browsing.RowFilter;
 import com.metaweb.gridworks.model.Project;
 import com.metaweb.gridworks.model.Record;
 
diff --git a/src/main/java/com/metaweb/gridworks/browsing/filters/DualExpressionsNumberComparisonRowFilter.java b/src/main/java/com/metaweb/gridworks/browsing/filters/DualExpressionsNumberComparisonRowFilter.java
index 1179f3d9c..7571c588a 100644
--- a/src/main/java/com/metaweb/gridworks/browsing/filters/DualExpressionsNumberComparisonRowFilter.java
+++ b/src/main/java/com/metaweb/gridworks/browsing/filters/DualExpressionsNumberComparisonRowFilter.java
@@ -3,6 +3,7 @@ package com.metaweb.gridworks.browsing.filters;
 import java.util.Collection;
 import java.util.Properties;
 
+import com.metaweb.gridworks.browsing.RowFilter;
 import com.metaweb.gridworks.expr.Evaluable;
 import com.metaweb.gridworks.expr.ExpressionUtils;
 import com.metaweb.gridworks.model.Cell;
diff --git a/src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionEqualRowFilter.java b/src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionEqualRowFilter.java
index 6b05ad3fa..3f7c783a1 100644
--- a/src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionEqualRowFilter.java
+++ b/src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionEqualRowFilter.java
@@ -3,6 +3,7 @@ package com.metaweb.gridworks.browsing.filters;
 import java.util.Collection;
 import java.util.Properties;
 
+import com.metaweb.gridworks.browsing.RowFilter;
 import com.metaweb.gridworks.expr.Evaluable;
 import com.metaweb.gridworks.expr.ExpressionUtils;
 import com.metaweb.gridworks.model.Cell;
diff --git a/src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionNumberComparisonRowFilter.java b/src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionNumberComparisonRowFilter.java
index 6fd3e950e..1bf578094 100644
--- a/src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionNumberComparisonRowFilter.java
+++ b/src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionNumberComparisonRowFilter.java
@@ -3,6 +3,7 @@ package com.metaweb.gridworks.browsing.filters;
 import java.util.Collection;
 import java.util.Properties;
 
+import com.metaweb.gridworks.browsing.RowFilter;
 import com.metaweb.gridworks.expr.Evaluable;
 import com.metaweb.gridworks.expr.ExpressionUtils;
 import com.metaweb.gridworks.model.Cell;
diff --git a/src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionStringComparisonRowFilter.java b/src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionStringComparisonRowFilter.java
index b9f6142d4..3083bd76e 100644
--- a/src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionStringComparisonRowFilter.java
+++ b/src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionStringComparisonRowFilter.java
@@ -2,6 +2,7 @@ package com.metaweb.gridworks.browsing.filters;
 
 import java.util.Properties;
 
+import com.metaweb.gridworks.browsing.RowFilter;
 import com.metaweb.gridworks.expr.Evaluable;
 import com.metaweb.gridworks.expr.ExpressionUtils;
 import com.metaweb.gridworks.model.Cell;
diff --git a/src/main/java/com/metaweb/gridworks/browsing/ConjunctiveFilteredRecords.java b/src/main/java/com/metaweb/gridworks/browsing/util/ConjunctiveFilteredRecords.java
similarity index 85%
rename from src/main/java/com/metaweb/gridworks/browsing/ConjunctiveFilteredRecords.java
rename to src/main/java/com/metaweb/gridworks/browsing/util/ConjunctiveFilteredRecords.java
index 22622c50b..7b90abe18 100644
--- a/src/main/java/com/metaweb/gridworks/browsing/ConjunctiveFilteredRecords.java
+++ b/src/main/java/com/metaweb/gridworks/browsing/util/ConjunctiveFilteredRecords.java
@@ -1,9 +1,11 @@
-package com.metaweb.gridworks.browsing;
+package com.metaweb.gridworks.browsing.util;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import com.metaweb.gridworks.browsing.filters.RecordFilter;
+import com.metaweb.gridworks.browsing.FilteredRecords;
+import com.metaweb.gridworks.browsing.RecordFilter;
+import com.metaweb.gridworks.browsing.RecordVisitor;
 import com.metaweb.gridworks.model.Project;
 import com.metaweb.gridworks.model.Record;
 
diff --git a/src/main/java/com/metaweb/gridworks/browsing/ConjunctiveFilteredRows.java b/src/main/java/com/metaweb/gridworks/browsing/util/ConjunctiveFilteredRows.java
similarity index 86%
rename from src/main/java/com/metaweb/gridworks/browsing/ConjunctiveFilteredRows.java
rename to src/main/java/com/metaweb/gridworks/browsing/util/ConjunctiveFilteredRows.java
index 3902e3157..bae1a4dd4 100644
--- a/src/main/java/com/metaweb/gridworks/browsing/ConjunctiveFilteredRows.java
+++ b/src/main/java/com/metaweb/gridworks/browsing/util/ConjunctiveFilteredRows.java
@@ -1,9 +1,11 @@
-package com.metaweb.gridworks.browsing;
+package com.metaweb.gridworks.browsing.util;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import com.metaweb.gridworks.browsing.filters.RowFilter;
+import com.metaweb.gridworks.browsing.FilteredRows;
+import com.metaweb.gridworks.browsing.RowFilter;
+import com.metaweb.gridworks.browsing.RowVisitor;
 import com.metaweb.gridworks.model.Project;
 import com.metaweb.gridworks.model.Row;
 
diff --git a/src/main/java/com/metaweb/gridworks/browsing/facets/ExpressionNominalRowGrouper.java b/src/main/java/com/metaweb/gridworks/browsing/util/ExpressionNominalValueGrouper.java
similarity index 90%
rename from src/main/java/com/metaweb/gridworks/browsing/facets/ExpressionNominalRowGrouper.java
rename to src/main/java/com/metaweb/gridworks/browsing/util/ExpressionNominalValueGrouper.java
index e9f19b2d5..b6774214a 100644
--- a/src/main/java/com/metaweb/gridworks/browsing/facets/ExpressionNominalRowGrouper.java
+++ b/src/main/java/com/metaweb/gridworks/browsing/util/ExpressionNominalValueGrouper.java
@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.browsing.facets;
+package com.metaweb.gridworks.browsing.util;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -8,6 +8,7 @@ import java.util.Properties;
 import com.metaweb.gridworks.browsing.DecoratedValue;
 import com.metaweb.gridworks.browsing.RecordVisitor;
 import com.metaweb.gridworks.browsing.RowVisitor;
+import com.metaweb.gridworks.browsing.facets.NominalFacetChoice;
 import com.metaweb.gridworks.expr.Evaluable;
 import com.metaweb.gridworks.expr.ExpressionUtils;
 import com.metaweb.gridworks.model.Cell;
@@ -16,10 +17,10 @@ import com.metaweb.gridworks.model.Record;
 import com.metaweb.gridworks.model.Row;
 
 /**
- * Visit matched rows and group them into facet choices based on the values computed
+ * Visit matched rows or records and group them into facet choices based on the values computed
  * from a given expression.
  */
-public class ExpressionNominalRowGrouper implements RowVisitor, RecordVisitor {
+public class ExpressionNominalValueGrouper implements RowVisitor, RecordVisitor {
 	static public class IndexedNominalFacetChoice extends NominalFacetChoice {
 		int _latestIndex;
 		
@@ -42,10 +43,14 @@ public class ExpressionNominalRowGrouper implements RowVisitor, RecordVisitor {
     final public Map<Object, IndexedNominalFacetChoice> choices = new HashMap<Object, IndexedNominalFacetChoice>();
     public int blankCount = 0;
     public int errorCount = 0;
+    
+    /*
+     * Scratch pad variables
+     */
     protected boolean hasBlank;
     protected boolean hasError;
     
-    public ExpressionNominalRowGrouper(Evaluable evaluable, String columnName, int cellIndex) {
+    public ExpressionNominalValueGrouper(Evaluable evaluable, String columnName, int cellIndex) {
         _evaluable = evaluable;
         _columnName = columnName;
         _cellIndex = cellIndex;
diff --git a/src/main/java/com/metaweb/gridworks/browsing/facets/ExpressionNumericRowBinner.java b/src/main/java/com/metaweb/gridworks/browsing/util/ExpressionNumericValueBinner.java
similarity index 92%
rename from src/main/java/com/metaweb/gridworks/browsing/facets/ExpressionNumericRowBinner.java
rename to src/main/java/com/metaweb/gridworks/browsing/util/ExpressionNumericValueBinner.java
index 483614b57..b83c1ac21 100644
--- a/src/main/java/com/metaweb/gridworks/browsing/facets/ExpressionNumericRowBinner.java
+++ b/src/main/java/com/metaweb/gridworks/browsing/util/ExpressionNumericValueBinner.java
@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.browsing.facets;
+package com.metaweb.gridworks.browsing.util;
 
 import java.util.Collection;
 import java.util.Properties;
@@ -13,10 +13,10 @@ import com.metaweb.gridworks.model.Record;
 import com.metaweb.gridworks.model.Row;
 
 /**
- * Visit matched rows and slot them into bins based on the numbers computed
+ * Visit matched rows or records and slot them into bins based on the numbers computed
  * from a given expression.
  */
-public class ExpressionNumericRowBinner implements RowVisitor, RecordVisitor {
+public class ExpressionNumericValueBinner implements RowVisitor, RecordVisitor {
     /*
      * Configuration
      */
@@ -42,7 +42,7 @@ public class ExpressionNumericRowBinner implements RowVisitor, RecordVisitor {
     protected boolean hasNumeric;
     protected boolean hasNonNumeric;
     
-    public ExpressionNumericRowBinner(Evaluable evaluable, String columnName, int cellIndex, NumericBinIndex index) {
+    public ExpressionNumericValueBinner(Evaluable evaluable, String columnName, int cellIndex, NumericBinIndex index) {
         _evaluable = evaluable;
         _columnName = columnName;
         _cellIndex = cellIndex;
diff --git a/src/main/java/com/metaweb/gridworks/browsing/FilteredRecordsAsFilteredRows.java b/src/main/java/com/metaweb/gridworks/browsing/util/FilteredRecordsAsFilteredRows.java
similarity index 68%
rename from src/main/java/com/metaweb/gridworks/browsing/FilteredRecordsAsFilteredRows.java
rename to src/main/java/com/metaweb/gridworks/browsing/util/FilteredRecordsAsFilteredRows.java
index a56140d7f..4704ec7ae 100644
--- a/src/main/java/com/metaweb/gridworks/browsing/FilteredRecordsAsFilteredRows.java
+++ b/src/main/java/com/metaweb/gridworks/browsing/util/FilteredRecordsAsFilteredRows.java
@@ -1,5 +1,8 @@
-package com.metaweb.gridworks.browsing;
+package com.metaweb.gridworks.browsing.util;
 
+import com.metaweb.gridworks.browsing.FilteredRecords;
+import com.metaweb.gridworks.browsing.FilteredRows;
+import com.metaweb.gridworks.browsing.RowVisitor;
 import com.metaweb.gridworks.model.Project;
 
 public class FilteredRecordsAsFilteredRows implements FilteredRows {
diff --git a/src/main/java/com/metaweb/gridworks/browsing/facets/NumericBinIndex.java b/src/main/java/com/metaweb/gridworks/browsing/util/NumericBinIndex.java
similarity index 99%
rename from src/main/java/com/metaweb/gridworks/browsing/facets/NumericBinIndex.java
rename to src/main/java/com/metaweb/gridworks/browsing/util/NumericBinIndex.java
index 0f06b1385..f7794ddee 100644
--- a/src/main/java/com/metaweb/gridworks/browsing/facets/NumericBinIndex.java
+++ b/src/main/java/com/metaweb/gridworks/browsing/util/NumericBinIndex.java
@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.browsing.facets;
+package com.metaweb.gridworks.browsing.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/main/java/com/metaweb/gridworks/browsing/facets/NumericBinRecordIndex.java b/src/main/java/com/metaweb/gridworks/browsing/util/NumericBinRecordIndex.java
similarity index 96%
rename from src/main/java/com/metaweb/gridworks/browsing/facets/NumericBinRecordIndex.java
rename to src/main/java/com/metaweb/gridworks/browsing/util/NumericBinRecordIndex.java
index c75f6377e..1af3c18cb 100644
--- a/src/main/java/com/metaweb/gridworks/browsing/facets/NumericBinRecordIndex.java
+++ b/src/main/java/com/metaweb/gridworks/browsing/util/NumericBinRecordIndex.java
@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.browsing.facets;
+package com.metaweb.gridworks.browsing.util;
 
 import java.util.List;
 import java.util.Properties;
diff --git a/src/main/java/com/metaweb/gridworks/browsing/facets/NumericBinRowIndex.java b/src/main/java/com/metaweb/gridworks/browsing/util/NumericBinRowIndex.java
similarity index 95%
rename from src/main/java/com/metaweb/gridworks/browsing/facets/NumericBinRowIndex.java
rename to src/main/java/com/metaweb/gridworks/browsing/util/NumericBinRowIndex.java
index 8d5d253a2..582eb8de3 100644
--- a/src/main/java/com/metaweb/gridworks/browsing/facets/NumericBinRowIndex.java
+++ b/src/main/java/com/metaweb/gridworks/browsing/util/NumericBinRowIndex.java
@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.browsing.facets;
+package com.metaweb.gridworks.browsing.util;
 
 import java.util.List;
 import java.util.Properties;
diff --git a/src/main/java/com/metaweb/gridworks/browsing/RowVisitorAsRecordVisitor.java b/src/main/java/com/metaweb/gridworks/browsing/util/RowVisitorAsRecordVisitor.java
similarity index 78%
rename from src/main/java/com/metaweb/gridworks/browsing/RowVisitorAsRecordVisitor.java
rename to src/main/java/com/metaweb/gridworks/browsing/util/RowVisitorAsRecordVisitor.java
index c3feafd9b..9d2a151c8 100644
--- a/src/main/java/com/metaweb/gridworks/browsing/RowVisitorAsRecordVisitor.java
+++ b/src/main/java/com/metaweb/gridworks/browsing/util/RowVisitorAsRecordVisitor.java
@@ -1,5 +1,7 @@
-package com.metaweb.gridworks.browsing;
+package com.metaweb.gridworks.browsing.util;
 
+import com.metaweb.gridworks.browsing.RecordVisitor;
+import com.metaweb.gridworks.browsing.RowVisitor;
 import com.metaweb.gridworks.model.Project;
 import com.metaweb.gridworks.model.Record;
 
diff --git a/src/main/java/com/metaweb/gridworks/commands/browsing/GetScatterplotCommand.java b/src/main/java/com/metaweb/gridworks/commands/browsing/GetScatterplotCommand.java
index 391628f22..cf8b94ff0 100644
--- a/src/main/java/com/metaweb/gridworks/commands/browsing/GetScatterplotCommand.java
+++ b/src/main/java/com/metaweb/gridworks/commands/browsing/GetScatterplotCommand.java
@@ -18,9 +18,9 @@ import org.slf4j.LoggerFactory;
 
 import com.metaweb.gridworks.browsing.Engine;
 import com.metaweb.gridworks.browsing.FilteredRows;
-import com.metaweb.gridworks.browsing.facets.NumericBinIndex;
 import com.metaweb.gridworks.browsing.facets.ScatterplotDrawingRowVisitor;
 import com.metaweb.gridworks.browsing.facets.ScatterplotFacet;
+import com.metaweb.gridworks.browsing.util.NumericBinIndex;
 import com.metaweb.gridworks.commands.Command;
 import com.metaweb.gridworks.expr.Evaluable;
 import com.metaweb.gridworks.expr.MetaParser;
diff --git a/src/main/java/com/metaweb/gridworks/commands/column/GetColumnsInfoCommand.java b/src/main/java/com/metaweb/gridworks/commands/column/GetColumnsInfoCommand.java
index 677728cdc..2bd5489ff 100644
--- a/src/main/java/com/metaweb/gridworks/commands/column/GetColumnsInfoCommand.java
+++ b/src/main/java/com/metaweb/gridworks/commands/column/GetColumnsInfoCommand.java
@@ -9,8 +9,8 @@ import javax.servlet.http.HttpServletResponse;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.browsing.facets.NumericBinIndex;
-import com.metaweb.gridworks.browsing.facets.NumericBinRowIndex;
+import com.metaweb.gridworks.browsing.util.NumericBinIndex;
+import com.metaweb.gridworks.browsing.util.NumericBinRowIndex;
 import com.metaweb.gridworks.commands.Command;
 import com.metaweb.gridworks.expr.Evaluable;
 import com.metaweb.gridworks.expr.MetaParser;