diff --git a/utilities/load-testing/build.xml b/utilities/load-testing/build.xml
index c7a097d9..65c953b5 100644
--- a/utilities/load-testing/build.xml
+++ b/utilities/load-testing/build.xml
@@ -215,7 +215,7 @@ report - Just summarize output from previously run tests.
-
diff --git a/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/OutputMarshaller.java b/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/OutputMarshaller.java
similarity index 95%
rename from utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/OutputMarshaller.java
rename to utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/OutputMarshaller.java
index 689267a5..4eb3902f 100644
--- a/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/OutputMarshaller.java
+++ b/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/OutputMarshaller.java
@@ -1,6 +1,6 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-package edu.cornell.mannlib.vitro.utilities.loadtesting;
+package edu.cornell.mannlib.vitro.utilities.loadtesting.reportmerger;
import java.io.PrintWriter;
import java.text.SimpleDateFormat;
@@ -10,6 +10,7 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
+
/**
* Write the merged data to an HTML page.
*/
diff --git a/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/OutputMarshaller2.java b/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/OutputMarshaller2.java
similarity index 95%
rename from utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/OutputMarshaller2.java
rename to utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/OutputMarshaller2.java
index d9339698..0c7cd907 100644
--- a/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/OutputMarshaller2.java
+++ b/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/OutputMarshaller2.java
@@ -1,6 +1,6 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-package edu.cornell.mannlib.vitro.utilities.loadtesting;
+package edu.cornell.mannlib.vitro.utilities.loadtesting.reportmerger;
import java.io.PrintWriter;
import java.text.SimpleDateFormat;
@@ -10,6 +10,7 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
+
/**
* Write the merged data to an HTML page.
*
diff --git a/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/ReportsMerger.java b/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/ReportsMerger.java
similarity index 93%
rename from utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/ReportsMerger.java
rename to utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/ReportsMerger.java
index af9fd4fb..7e329b8c 100644
--- a/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/ReportsMerger.java
+++ b/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/ReportsMerger.java
@@ -1,12 +1,13 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-package edu.cornell.mannlib.vitro.utilities.loadtesting;
+package edu.cornell.mannlib.vitro.utilities.loadtesting.reportmerger;
import java.io.File;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.List;
+
/**
* Take two or more reports from JMeter's test results, and merge them into a
* unified HTML report.
diff --git a/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/ReportsMergerParameters.java b/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/ReportsMergerParameters.java
similarity index 84%
rename from utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/ReportsMergerParameters.java
rename to utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/ReportsMergerParameters.java
index d3ba073c..d6d8d990 100644
--- a/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/ReportsMergerParameters.java
+++ b/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/ReportsMergerParameters.java
@@ -1,11 +1,12 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-package edu.cornell.mannlib.vitro.utilities.loadtesting;
+package edu.cornell.mannlib.vitro.utilities.loadtesting.reportmerger;
import java.io.File;
import java.io.PrintWriter;
import java.util.List;
+
/**
* Parse the command-line parameters for the ReportManager
*/
diff --git a/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/ReportsMergerParametersImpl.java b/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/ReportsMergerParametersImpl.java
similarity index 93%
rename from utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/ReportsMergerParametersImpl.java
rename to utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/ReportsMergerParametersImpl.java
index 6a77a88e..f7007b5a 100644
--- a/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/ReportsMergerParametersImpl.java
+++ b/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/ReportsMergerParametersImpl.java
@@ -1,6 +1,6 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-package edu.cornell.mannlib.vitro.utilities.loadtesting;
+package edu.cornell.mannlib.vitro.utilities.loadtesting.reportmerger;
import java.io.File;
import java.io.FileWriter;
@@ -10,6 +10,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+
/**
* A base implementation of ReportsMergerParameters
*/
diff --git a/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/TestResultInfo.java b/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/TestResultInfo.java
similarity index 90%
rename from utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/TestResultInfo.java
rename to utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/TestResultInfo.java
index a5510f8c..11931534 100644
--- a/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/TestResultInfo.java
+++ b/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/TestResultInfo.java
@@ -1,6 +1,6 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-package edu.cornell.mannlib.vitro.utilities.loadtesting;
+package edu.cornell.mannlib.vitro.utilities.loadtesting.reportmerger;
/**
* Info about the executions of a single test in a single file.
diff --git a/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/TestResultsFileData.java b/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/TestResultsFileData.java
similarity index 91%
rename from utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/TestResultsFileData.java
rename to utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/TestResultsFileData.java
index ad7bca00..ef333d7e 100644
--- a/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/TestResultsFileData.java
+++ b/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/TestResultsFileData.java
@@ -1,12 +1,13 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-package edu.cornell.mannlib.vitro.utilities.loadtesting;
+package edu.cornell.mannlib.vitro.utilities.loadtesting.reportmerger;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.Map;
+
/**
* Holds the data that was parsed from a single results file.
*/
diff --git a/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/TestResultsParser.java b/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/TestResultsParser.java
similarity index 95%
rename from utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/TestResultsParser.java
rename to utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/TestResultsParser.java
index 95fe5fe0..df756c3a 100644
--- a/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/TestResultsParser.java
+++ b/utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/TestResultsParser.java
@@ -1,6 +1,6 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-package edu.cornell.mannlib.vitro.utilities.loadtesting;
+package edu.cornell.mannlib.vitro.utilities.loadtesting.reportmerger;
import java.io.BufferedReader;
import java.io.File;
@@ -14,6 +14,7 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+
/**
* Parse a single test results file.
*/