87 files changed, 6 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index f35a817..67ff74c 100644
--- a/Makefile
+++ b/Makefile
@@ -80,19 +80,14 @@ MVN_TEST_CMD := xvfb-run -a $(MVN_EXE) test
 define pkg
 .PHONY: pkg-$1
 pkg-$1:
-	cd batchtools/$1 && xvfb-run -a $(MVN_EXE) install
+	cd src/$1 && xvfb-run -a $(MVN_EXE) package
 endef
 
-$(eval $(call pkg,rsTester))
-$(eval $(call pkg,headless))
+$(eval $(call pkg,batchtools))
 
-TEST_RUNNER_DIR := testrunner
-HEADLESS_DIR    := batchtools/headless
-RSTESTER_DIR    := batchtools/rsTester
+BATCHTOOLS_DIR := src/batchtools
 
-test: fiveui.crx fiveui.xpi $(topdir)/profiles/chrome $(topdir)/profiles/firefox pkg-rsTester
-#	cd $(TEST_RUNNER_DIR) && $(MVN_TEST_CMD)
-	cd $(RSTESTER_DIR)    && $(MVN_TEST_CMD)
-	cd $(HEADLESS_DIR)    && $(MVN_TEST_CMD)
+test: fiveui.crx fiveui.xpi $(topdir)/profiles/chrome $(topdir)/profiles/firefox
+	cd $(BATCHTOOLS_DIR) && $(MVN_TEST_CMD)
 
 endif
diff --git a/batchtools/headless/bin/HeadlessRunner-0.0.1-SNAPSHOT.one-jar.jar b/batchtools/headless/bin/HeadlessRunner-0.0.1-SNAPSHOT.one-jar.jar
deleted file mode 100644
index 2c9219d..0000000
--- a/batchtools/headless/bin/HeadlessRunner-0.0.1-SNAPSHOT.one-jar.jar
+++ /dev/null
diff --git a/batchtools/headless/.classpath b/src/batchtools/headless/.classpath
index beba987..beba987 100644
--- a/batchtools/headless/.classpath
+++ b/src/batchtools/headless/.classpath
diff --git a/batchtools/headless/.gitignore b/src/batchtools/headless/.gitignore
index 24c4165..24c4165 100644
--- a/batchtools/headless/.gitignore
+++ b/src/batchtools/headless/.gitignore
diff --git a/batchtools/headless/.settings/org.eclipse.core.resources.prefs b/src/batchtools/headless/.settings/org.eclipse.core.resources.prefs
index cdfe4f1..cdfe4f1 100644
--- a/batchtools/headless/.settings/org.eclipse.core.resources.prefs
+++ b/src/batchtools/headless/.settings/org.eclipse.core.resources.prefs
diff --git a/batchtools/headless/.settings/org.eclipse.jdt.core.prefs b/src/batchtools/headless/.settings/org.eclipse.jdt.core.prefs
index abec6ca..abec6ca 100644
--- a/batchtools/headless/.settings/org.eclipse.jdt.core.prefs
+++ b/src/batchtools/headless/.settings/org.eclipse.jdt.core.prefs
diff --git a/batchtools/headless/.settings/org.eclipse.m2e.core.prefs b/src/batchtools/headless/.settings/org.eclipse.m2e.core.prefs
index f897a7f..f897a7f 100644
--- a/batchtools/headless/.settings/org.eclipse.m2e.core.prefs
+++ b/src/batchtools/headless/.settings/org.eclipse.m2e.core.prefs
diff --git a/batchtools/headless/bin/runHeadless.sh b/src/batchtools/headless/bin/runHeadless.sh
index 4c4d863..4c4d863 100755
--- a/batchtools/headless/bin/runHeadless.sh
+++ b/src/batchtools/headless/bin/runHeadless.sh
diff --git a/batchtools/headless/pom.xml b/src/batchtools/headless/pom.xml
index da5b348..da5b348 100644
--- a/batchtools/headless/pom.xml
+++ b/src/batchtools/headless/pom.xml
diff --git a/batchtools/headless/programs.properties.example b/src/batchtools/headless/programs.properties.example
index 97bd0c6..97bd0c6 100644
--- a/batchtools/headless/programs.properties.example
+++ b/src/batchtools/headless/programs.properties.example
diff --git a/batchtools/headless/src/main/java/com/galois/fiveui/BasicCrawler.java b/src/batchtools/headless/src/main/java/com/galois/fiveui/BasicCrawler.java
index 7f64b1a..7f64b1a 100644
--- a/batchtools/headless/src/main/java/com/galois/fiveui/BasicCrawler.java
+++ b/src/batchtools/headless/src/main/java/com/galois/fiveui/BasicCrawler.java
diff --git a/batchtools/headless/src/main/java/com/galois/fiveui/BasicCrawlerController.java b/src/batchtools/headless/src/main/java/com/galois/fiveui/BasicCrawlerController.java
index 79338ec..79338ec 100644
--- a/batchtools/headless/src/main/java/com/galois/fiveui/BasicCrawlerController.java
+++ b/src/batchtools/headless/src/main/java/com/galois/fiveui/BasicCrawlerController.java
diff --git a/batchtools/headless/src/main/java/com/galois/fiveui/BatchRunner.java b/src/batchtools/headless/src/main/java/com/galois/fiveui/BatchRunner.java
index 9f3f301..9f3f301 100644
--- a/batchtools/headless/src/main/java/com/galois/fiveui/BatchRunner.java
+++ b/src/batchtools/headless/src/main/java/com/galois/fiveui/BatchRunner.java
diff --git a/batchtools/headless/src/main/java/com/galois/fiveui/CrawlParameters.java b/src/batchtools/headless/src/main/java/com/galois/fiveui/CrawlParameters.java
index a07d43a..a07d43a 100644
--- a/batchtools/headless/src/main/java/com/galois/fiveui/CrawlParameters.java
+++ b/src/batchtools/headless/src/main/java/com/galois/fiveui/CrawlParameters.java
diff --git a/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessAtom.java b/src/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessAtom.java
index 01ffae0..01ffae0 100644
--- a/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessAtom.java
+++ b/src/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessAtom.java
diff --git a/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessRunDescription.java b/src/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessRunDescription.java
index 92f2ef1..92f2ef1 100644
--- a/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessRunDescription.java
+++ b/src/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessRunDescription.java
diff --git a/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessRunner.java b/src/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessRunner.java
index aba0ad7..aba0ad7 100644
--- a/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessRunner.java
+++ b/src/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessRunner.java
diff --git a/batchtools/headless/src/main/java/com/galois/fiveui/Reporter.java b/src/batchtools/headless/src/main/java/com/galois/fiveui/Reporter.java
index 5c0b233..5c0b233 100644
--- a/batchtools/headless/src/main/java/com/galois/fiveui/Reporter.java
+++ b/src/batchtools/headless/src/main/java/com/galois/fiveui/Reporter.java
diff --git a/batchtools/headless/src/test/java/com/galois/fiveui/BatchExecutorTest.java b/src/batchtools/headless/src/test/java/com/galois/fiveui/BatchExecutorTest.java
index f7f593f..f7f593f 100644
--- a/batchtools/headless/src/test/java/com/galois/fiveui/BatchExecutorTest.java
+++ b/src/batchtools/headless/src/test/java/com/galois/fiveui/BatchExecutorTest.java
diff --git a/batchtools/headless/src/test/java/com/galois/fiveui/CrawlParametersTest.java b/src/batchtools/headless/src/test/java/com/galois/fiveui/CrawlParametersTest.java
index f5ffa35..f5ffa35 100644
--- a/batchtools/headless/src/test/java/com/galois/fiveui/CrawlParametersTest.java
+++ b/src/batchtools/headless/src/test/java/com/galois/fiveui/CrawlParametersTest.java
diff --git a/batchtools/headless/src/test/java/com/galois/fiveui/CrawlTest.java b/src/batchtools/headless/src/test/java/com/galois/fiveui/CrawlTest.java
index 0f932c2..0f932c2 100644
--- a/batchtools/headless/src/test/java/com/galois/fiveui/CrawlTest.java
+++ b/src/batchtools/headless/src/test/java/com/galois/fiveui/CrawlTest.java
diff --git a/batchtools/headless/src/test/java/com/galois/fiveui/HeadlessTest.java b/src/batchtools/headless/src/test/java/com/galois/fiveui/HeadlessTest.java
index 804d9f6..804d9f6 100644
--- a/batchtools/headless/src/test/java/com/galois/fiveui/HeadlessTest.java
+++ b/src/batchtools/headless/src/test/java/com/galois/fiveui/HeadlessTest.java
diff --git a/batchtools/headless/src/test/java/com/galois/fiveui/NanoHTTPD.java b/src/batchtools/headless/src/test/java/com/galois/fiveui/NanoHTTPD.java
index 53434be..53434be 100644
--- a/batchtools/headless/src/test/java/com/galois/fiveui/NanoHTTPD.java
+++ b/src/batchtools/headless/src/test/java/com/galois/fiveui/NanoHTTPD.java
diff --git a/batchtools/headless/src/test/java/com/galois/fiveui/ReporterTest.java b/src/batchtools/headless/src/test/java/com/galois/fiveui/ReporterTest.java
index 39a8e5c..39a8e5c 100644
--- a/batchtools/headless/src/test/java/com/galois/fiveui/ReporterTest.java
+++ b/src/batchtools/headless/src/test/java/com/galois/fiveui/ReporterTest.java
diff --git a/batchtools/headless/src/test/resources/crawlTest/four.html b/src/batchtools/headless/src/test/resources/crawlTest/four.html
index a25405b..a25405b 100644
--- a/batchtools/headless/src/test/resources/crawlTest/four.html
+++ b/src/batchtools/headless/src/test/resources/crawlTest/four.html
diff --git a/batchtools/headless/src/test/resources/crawlTest/one.html b/src/batchtools/headless/src/test/resources/crawlTest/one.html
index d5fae55..d5fae55 100644
--- a/batchtools/headless/src/test/resources/crawlTest/one.html
+++ b/src/batchtools/headless/src/test/resources/crawlTest/one.html
diff --git a/batchtools/headless/src/test/resources/crawlTest/one_a.html b/src/batchtools/headless/src/test/resources/crawlTest/one_a.html
index 3dd01ae..3dd01ae 100644
--- a/batchtools/headless/src/test/resources/crawlTest/one_a.html
+++ b/src/batchtools/headless/src/test/resources/crawlTest/one_a.html
diff --git a/batchtools/headless/src/test/resources/crawlTest/one_b.html b/src/batchtools/headless/src/test/resources/crawlTest/one_b.html
index dbbf635..dbbf635 100644
--- a/batchtools/headless/src/test/resources/crawlTest/one_b.html
+++ b/src/batchtools/headless/src/test/resources/crawlTest/one_b.html
diff --git a/batchtools/headless/src/test/resources/crawlTest/one_c.html b/src/batchtools/headless/src/test/resources/crawlTest/one_c.html
index f1ef9bc..f1ef9bc 100644
--- a/batchtools/headless/src/test/resources/crawlTest/one_c.html
+++ b/src/batchtools/headless/src/test/resources/crawlTest/one_c.html
diff --git a/batchtools/headless/src/test/resources/crawlTest/one_d.html b/src/batchtools/headless/src/test/resources/crawlTest/one_d.html
index 2bfb0fd..2bfb0fd 100644
--- a/batchtools/headless/src/test/resources/crawlTest/one_d.html
+++ b/src/batchtools/headless/src/test/resources/crawlTest/one_d.html
diff --git a/batchtools/headless/src/test/resources/crawlTest/one_e.html b/src/batchtools/headless/src/test/resources/crawlTest/one_e.html
index 3016b17..3016b17 100644
--- a/batchtools/headless/src/test/resources/crawlTest/one_e.html
+++ b/src/batchtools/headless/src/test/resources/crawlTest/one_e.html
diff --git a/batchtools/headless/src/test/resources/crawlTest/three.html b/src/batchtools/headless/src/test/resources/crawlTest/three.html
index a6f1c32..a6f1c32 100644
--- a/batchtools/headless/src/test/resources/crawlTest/three.html
+++ b/src/batchtools/headless/src/test/resources/crawlTest/three.html
diff --git a/batchtools/headless/src/test/resources/crawlTest/two.html b/src/batchtools/headless/src/test/resources/crawlTest/two.html
index 9fe3c68..9fe3c68 100644
--- a/batchtools/headless/src/test/resources/crawlTest/two.html
+++ b/src/batchtools/headless/src/test/resources/crawlTest/two.html
diff --git a/batchtools/headless/src/test/resources/ruleSets/emptyRuleSet.json b/src/batchtools/headless/src/test/resources/ruleSets/emptyRuleSet.json
index a01bc68..a01bc68 100644
--- a/batchtools/headless/src/test/resources/ruleSets/emptyRuleSet.json
+++ b/src/batchtools/headless/src/test/resources/ruleSets/emptyRuleSet.json
diff --git a/batchtools/headless/src/test/resources/runDescriptions/headlessRunTest0.json b/src/batchtools/headless/src/test/resources/runDescriptions/headlessRunTest0.json
index e6c4c3b..e6c4c3b 100644
--- a/batchtools/headless/src/test/resources/runDescriptions/headlessRunTest0.json
+++ b/src/batchtools/headless/src/test/resources/runDescriptions/headlessRunTest0.json
diff --git a/batchtools/headless/src/test/resources/runDescriptions/headlessRunTestCNN.json b/src/batchtools/headless/src/test/resources/runDescriptions/headlessRunTestCNN.json
index 07aaab8..07aaab8 100644
--- a/batchtools/headless/src/test/resources/runDescriptions/headlessRunTestCNN.json
+++ b/src/batchtools/headless/src/test/resources/runDescriptions/headlessRunTestCNN.json
diff --git a/batchtools/headless/src/test/resources/runDescriptions/headlessRunTestGalois.json b/src/batchtools/headless/src/test/resources/runDescriptions/headlessRunTestGalois.json
index 5e1e5e6..5e1e5e6 100644
--- a/batchtools/headless/src/test/resources/runDescriptions/headlessRunTestGalois.json
+++ b/src/batchtools/headless/src/test/resources/runDescriptions/headlessRunTestGalois.json
diff --git a/batchtools/headless/src/test/resources/runDescriptions/headlessSample0.json b/src/batchtools/headless/src/test/resources/runDescriptions/headlessSample0.json
index 2b3a51a..2b3a51a 100644
--- a/batchtools/headless/src/test/resources/runDescriptions/headlessSample0.json
+++ b/src/batchtools/headless/src/test/resources/runDescriptions/headlessSample0.json
diff --git a/batchtools/headless/src/test/resources/runDescriptions/headlessSample1.json b/src/batchtools/headless/src/test/resources/runDescriptions/headlessSample1.json
index 4b33419..8e4d6c6 100644
--- a/batchtools/headless/src/test/resources/runDescriptions/headlessSample1.json
+++ b/src/batchtools/headless/src/test/resources/runDescriptions/headlessSample1.json
@@ -1,8 +1,4 @@
 [{
   'url': 'http://testhost',
-<<<<<<< HEAD
   'ruleSet': '../../../../../rsTester/src/test/resources/ruleSets/headingGuidelines.json'
-=======
-  'ruleSet': '../ruleSets/headingGuidelines.json'
->>>>>>> ea59a5c829886959b30b2abdfe0a8308993795fd
 }]
diff --git a/batchtools/headless/src/test/resources/runDescriptions/headlessSample2.json b/src/batchtools/headless/src/test/resources/runDescriptions/headlessSample2.json
index 3c348f7..b5ea2ee 100644
--- a/batchtools/headless/src/test/resources/runDescriptions/headlessSample2.json
+++ b/src/batchtools/headless/src/test/resources/runDescriptions/headlessSample2.json
@@ -5,9 +5,5 @@
 },
 {
   'url': 'http://testhost2',
-<<<<<<< HEAD
   'ruleSet': '../../../../../rsTester/src/test/resources/ruleSets/headingGuidelines.json'
-=======
-  'ruleSet': '../ruleSets/headingGuidelines.json'
->>>>>>> ea59a5c829886959b30b2abdfe0a8308993795fd
 }]
diff --git a/batchtools/headless/test.html b/src/batchtools/headless/test.html
index e69de29..e69de29 100644
--- a/batchtools/headless/test.html
+++ b/src/batchtools/headless/test.html
diff --git a/batchtools/pom.xml b/src/batchtools/pom.xml
index 548cc0f..548cc0f 100644
--- a/batchtools/pom.xml
+++ b/src/batchtools/pom.xml
diff --git a/batchtools/rsTester/.buildpath b/src/batchtools/rsTester/.buildpath
index 24e3b93..24e3b93 100644
--- a/batchtools/rsTester/.buildpath
+++ b/src/batchtools/rsTester/.buildpath
diff --git a/batchtools/rsTester/.classpath b/src/batchtools/rsTester/.classpath
index 9fc2de7..9fc2de7 100644
--- a/batchtools/rsTester/.classpath
+++ b/src/batchtools/rsTester/.classpath
diff --git a/batchtools/rsTester/.gitignore b/src/batchtools/rsTester/.gitignore
index 7e7291c..7e7291c 100644
--- a/batchtools/rsTester/.gitignore
+++ b/src/batchtools/rsTester/.gitignore
diff --git a/batchtools/rsTester/.settings/org.ebayopensource.vjet.eclipse.core.prefs b/src/batchtools/rsTester/.settings/org.ebayopensource.vjet.eclipse.core.prefs
index 6e8a644..6e8a644 100644
--- a/batchtools/rsTester/.settings/org.ebayopensource.vjet.eclipse.core.prefs
+++ b/src/batchtools/rsTester/.settings/org.ebayopensource.vjet.eclipse.core.prefs
diff --git a/batchtools/rsTester/.settings/org.eclipse.jdt.core.prefs b/src/batchtools/rsTester/.settings/org.eclipse.jdt.core.prefs
index abec6ca..abec6ca 100644
--- a/batchtools/rsTester/.settings/org.eclipse.jdt.core.prefs
+++ b/src/batchtools/rsTester/.settings/org.eclipse.jdt.core.prefs
diff --git a/batchtools/rsTester/.settings/org.eclipse.m2e.core.prefs b/src/batchtools/rsTester/.settings/org.eclipse.m2e.core.prefs
index f897a7f..f897a7f 100644
--- a/batchtools/rsTester/.settings/org.eclipse.m2e.core.prefs
+++ b/src/batchtools/rsTester/.settings/org.eclipse.m2e.core.prefs
diff --git a/batchtools/rsTester/.settings/org.maven.ide.eclipse.prefs b/src/batchtools/rsTester/.settings/org.maven.ide.eclipse.prefs
index 0512605..0512605 100644
--- a/batchtools/rsTester/.settings/org.maven.ide.eclipse.prefs
+++ b/src/batchtools/rsTester/.settings/org.maven.ide.eclipse.prefs
diff --git a/batchtools/rsTester/pom.xml b/src/batchtools/rsTester/pom.xml
index b3d637f..b3d637f 100644
--- a/batchtools/rsTester/pom.xml
+++ b/src/batchtools/rsTester/pom.xml
diff --git a/batchtools/rsTester/src/main/java/com/galois/fiveui/BatchRunner.java b/src/batchtools/rsTester/src/main/java/com/galois/fiveui/BatchRunner.java
index e065128..e065128 100644
--- a/batchtools/rsTester/src/main/java/com/galois/fiveui/BatchRunner.java
+++ b/src/batchtools/rsTester/src/main/java/com/galois/fiveui/BatchRunner.java
diff --git a/batchtools/rsTester/src/main/java/com/galois/fiveui/RSTestDescription.java b/src/batchtools/rsTester/src/main/java/com/galois/fiveui/RSTestDescription.java
index 8341c6f..8341c6f 100644
--- a/batchtools/rsTester/src/main/java/com/galois/fiveui/RSTestDescription.java
+++ b/src/batchtools/rsTester/src/main/java/com/galois/fiveui/RSTestDescription.java
diff --git a/batchtools/rsTester/src/main/java/com/galois/fiveui/ResType.java b/src/batchtools/rsTester/src/main/java/com/galois/fiveui/ResType.java
index ef14a60..ef14a60 100644
--- a/batchtools/rsTester/src/main/java/com/galois/fiveui/ResType.java
+++ b/src/batchtools/rsTester/src/main/java/com/galois/fiveui/ResType.java
diff --git a/batchtools/rsTester/src/main/java/com/galois/fiveui/Result.java b/src/batchtools/rsTester/src/main/java/com/galois/fiveui/Result.java
index 6543476..6543476 100644
--- a/batchtools/rsTester/src/main/java/com/galois/fiveui/Result.java
+++ b/src/batchtools/rsTester/src/main/java/com/galois/fiveui/Result.java
diff --git a/batchtools/rsTester/src/main/java/com/galois/fiveui/Rule.java b/src/batchtools/rsTester/src/main/java/com/galois/fiveui/Rule.java
index 3f420cb..3f420cb 100644
--- a/batchtools/rsTester/src/main/java/com/galois/fiveui/Rule.java
+++ b/src/batchtools/rsTester/src/main/java/com/galois/fiveui/Rule.java
diff --git a/batchtools/rsTester/src/main/java/com/galois/fiveui/RuleSet.java b/src/batchtools/rsTester/src/main/java/com/galois/fiveui/RuleSet.java
index ed9bc99..ed9bc99 100644
--- a/batchtools/rsTester/src/main/java/com/galois/fiveui/RuleSet.java
+++ b/src/batchtools/rsTester/src/main/java/com/galois/fiveui/RuleSet.java
diff --git a/batchtools/rsTester/src/main/java/com/galois/fiveui/RuleSetTester.java b/src/batchtools/rsTester/src/main/java/com/galois/fiveui/RuleSetTester.java
index 3c85b22..3c85b22 100644
--- a/batchtools/rsTester/src/main/java/com/galois/fiveui/RuleSetTester.java
+++ b/src/batchtools/rsTester/src/main/java/com/galois/fiveui/RuleSetTester.java
diff --git a/batchtools/rsTester/src/main/java/com/galois/fiveui/RuleTest.java b/src/batchtools/rsTester/src/main/java/com/galois/fiveui/RuleTest.java
index acf6743..acf6743 100644
--- a/batchtools/rsTester/src/main/java/com/galois/fiveui/RuleTest.java
+++ b/src/batchtools/rsTester/src/main/java/com/galois/fiveui/RuleTest.java
diff --git a/batchtools/rsTester/src/main/java/com/galois/fiveui/Utils.java b/src/batchtools/rsTester/src/main/java/com/galois/fiveui/Utils.java
index 429997f..429997f 100644
--- a/batchtools/rsTester/src/main/java/com/galois/fiveui/Utils.java
+++ b/src/batchtools/rsTester/src/main/java/com/galois/fiveui/Utils.java
diff --git a/batchtools/rsTester/src/main/resources/javascript/ruleEval.js b/src/batchtools/rsTester/src/main/resources/javascript/ruleEval.js
index 04e81ba..04e81ba 100644
--- a/batchtools/rsTester/src/main/resources/javascript/ruleEval.js
+++ b/src/batchtools/rsTester/src/main/resources/javascript/ruleEval.js
diff --git a/batchtools/rsTester/src/main/resources/seleniumDrivers/linux64/chromedriver b/src/batchtools/rsTester/src/main/resources/seleniumDrivers/linux64/chromedriver
index b0a0e4a..b0a0e4a 100755
--- a/batchtools/rsTester/src/main/resources/seleniumDrivers/linux64/chromedriver
+++ b/src/batchtools/rsTester/src/main/resources/seleniumDrivers/linux64/chromedriver
diff --git a/batchtools/rsTester/src/test/java/com/galois/fiveui/BasicRuleSetParseTest.java b/src/batchtools/rsTester/src/test/java/com/galois/fiveui/BasicRuleSetParseTest.java
index 5db53f8..5db53f8 100644
--- a/batchtools/rsTester/src/test/java/com/galois/fiveui/BasicRuleSetParseTest.java
+++ b/src/batchtools/rsTester/src/test/java/com/galois/fiveui/BasicRuleSetParseTest.java
diff --git a/batchtools/rsTester/src/test/java/com/galois/fiveui/BasicRunDescriptionParseTest.java b/src/batchtools/rsTester/src/test/java/com/galois/fiveui/BasicRunDescriptionParseTest.java
index 57cf772..57cf772 100644
--- a/batchtools/rsTester/src/test/java/com/galois/fiveui/BasicRunDescriptionParseTest.java
+++ b/src/batchtools/rsTester/src/test/java/com/galois/fiveui/BasicRunDescriptionParseTest.java
diff --git a/batchtools/rsTester/src/test/java/com/galois/fiveui/RunDescriptionTest.java b/src/batchtools/rsTester/src/test/java/com/galois/fiveui/RunDescriptionTest.java
index 0d5d4c4..0d5d4c4 100644
--- a/batchtools/rsTester/src/test/java/com/galois/fiveui/RunDescriptionTest.java
+++ b/src/batchtools/rsTester/src/test/java/com/galois/fiveui/RunDescriptionTest.java
diff --git a/batchtools/rsTester/src/test/resources/ruleSets/emptyCheck.js b/src/batchtools/rsTester/src/test/resources/ruleSets/emptyCheck.js
index 6588e5b..6588e5b 100644
--- a/batchtools/rsTester/src/test/resources/ruleSets/emptyCheck.js
+++ b/src/batchtools/rsTester/src/test/resources/ruleSets/emptyCheck.js
diff --git a/batchtools/rsTester/src/test/resources/ruleSets/emptyRuleSet.json b/src/batchtools/rsTester/src/test/resources/ruleSets/emptyRuleSet.json
index a01bc68..a01bc68 100644
--- a/batchtools/rsTester/src/test/resources/ruleSets/emptyRuleSet.json
+++ b/src/batchtools/rsTester/src/test/resources/ruleSets/emptyRuleSet.json
diff --git a/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines-caps.js b/src/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines-caps.js
index f6c1cb6..f6c1cb6 100644
--- a/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines-caps.js
+++ b/src/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines-caps.js
diff --git a/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines-noEmptyHdrs.js b/src/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines-noEmptyHdrs.js
index a70f71c..a70f71c 100644
--- a/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines-noEmptyHdrs.js
+++ b/src/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines-noEmptyHdrs.js
diff --git a/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines.json b/src/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines.json
index 330f389..330f389 100644
--- a/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines.json
+++ b/src/batchtools/rsTester/src/test/resources/ruleSets/headingGuidelines.json
diff --git a/batchtools/rsTester/src/test/resources/ruleSets/simpleRuleSet1.json b/src/batchtools/rsTester/src/test/resources/ruleSets/simpleRuleSet1.json
index 71905cd..71905cd 100644
--- a/batchtools/rsTester/src/test/resources/ruleSets/simpleRuleSet1.json
+++ b/src/batchtools/rsTester/src/test/resources/ruleSets/simpleRuleSet1.json
diff --git a/batchtools/rsTester/src/test/resources/runDescriptions/headingSample-1-fails.json b/src/batchtools/rsTester/src/test/resources/runDescriptions/headingSample-1-fails.json
index 23860b4..23860b4 100644
--- a/batchtools/rsTester/src/test/resources/runDescriptions/headingSample-1-fails.json
+++ b/src/batchtools/rsTester/src/test/resources/runDescriptions/headingSample-1-fails.json
diff --git a/batchtools/rsTester/src/test/resources/runDescriptions/headingSample-2-fails.json b/src/batchtools/rsTester/src/test/resources/runDescriptions/headingSample-2-fails.json
index 8a1cb38..8a1cb38 100644
--- a/batchtools/rsTester/src/test/resources/runDescriptions/headingSample-2-fails.json
+++ b/src/batchtools/rsTester/src/test/resources/runDescriptions/headingSample-2-fails.json
diff --git a/batchtools/rsTester/src/test/resources/runDescriptions/headingSample.json b/src/batchtools/rsTester/src/test/resources/runDescriptions/headingSample.json
index 69deb49..69deb49 100644
--- a/batchtools/rsTester/src/test/resources/runDescriptions/headingSample.json
+++ b/src/batchtools/rsTester/src/test/resources/runDescriptions/headingSample.json
diff --git a/batchtools/rsTester/src/test/resources/runDescriptions/sample0.json b/src/batchtools/rsTester/src/test/resources/runDescriptions/sample0.json
index 0c2bbb7..0c2bbb7 100644
--- a/batchtools/rsTester/src/test/resources/runDescriptions/sample0.json
+++ b/src/batchtools/rsTester/src/test/resources/runDescriptions/sample0.json
diff --git a/batchtools/rsTester/src/test/resources/runDescriptions/sample1.json b/src/batchtools/rsTester/src/test/resources/runDescriptions/sample1.json
index 91f8f34..91f8f34 100644
--- a/batchtools/rsTester/src/test/resources/runDescriptions/sample1.json
+++ b/src/batchtools/rsTester/src/test/resources/runDescriptions/sample1.json
diff --git a/batchtools/rsTester/src/test/resources/runDescriptions/sample2-fails.json b/src/batchtools/rsTester/src/test/resources/runDescriptions/sample2-fails.json
index a8ea9ec..a8ea9ec 100644
--- a/batchtools/rsTester/src/test/resources/runDescriptions/sample2-fails.json
+++ b/src/batchtools/rsTester/src/test/resources/runDescriptions/sample2-fails.json
diff --git a/batchtools/rsTester/src/test/resources/runDescriptions/sample2.json b/src/batchtools/rsTester/src/test/resources/runDescriptions/sample2.json
index acff2d7..acff2d7 100644
--- a/batchtools/rsTester/src/test/resources/runDescriptions/sample2.json
+++ b/src/batchtools/rsTester/src/test/resources/runDescriptions/sample2.json
diff --git a/batchtools/rsTester/src/test/resources/runDescriptions/sample3.json b/src/batchtools/rsTester/src/test/resources/runDescriptions/sample3.json
index e4d1cea..e4d1cea 100644
--- a/batchtools/rsTester/src/test/resources/runDescriptions/sample3.json
+++ b/src/batchtools/rsTester/src/test/resources/runDescriptions/sample3.json
diff --git a/batchtools/rsTester/src/test/resources/runDescriptions/sample4.json b/src/batchtools/rsTester/src/test/resources/runDescriptions/sample4.json
index c4f46cd..c4f46cd 100644
--- a/batchtools/rsTester/src/test/resources/runDescriptions/sample4.json
+++ b/src/batchtools/rsTester/src/test/resources/runDescriptions/sample4.json
diff --git a/batchtools/rsTester/src/test/resources/runDescriptions/sample5.json b/src/batchtools/rsTester/src/test/resources/runDescriptions/sample5.json
index 11ca957..11ca957 100644
--- a/batchtools/rsTester/src/test/resources/runDescriptions/sample5.json
+++ b/src/batchtools/rsTester/src/test/resources/runDescriptions/sample5.json
diff --git a/batchtools/rsTester/test.html b/src/batchtools/rsTester/test.html
index e69de29..e69de29 100644
--- a/batchtools/rsTester/test.html
+++ b/src/batchtools/rsTester/test.html
diff --git a/batchtools/webdrivers/.classpath b/src/batchtools/webdrivers/.classpath
index 75e85b7..75e85b7 100644
--- a/batchtools/webdrivers/.classpath
+++ b/src/batchtools/webdrivers/.classpath
diff --git a/batchtools/webdrivers/.gitignore b/src/batchtools/webdrivers/.gitignore
index eb5a316..eb5a316 100644
--- a/batchtools/webdrivers/.gitignore
+++ b/src/batchtools/webdrivers/.gitignore
diff --git a/batchtools/webdrivers/.settings/org.eclipse.jdt.core.prefs b/src/batchtools/webdrivers/.settings/org.eclipse.jdt.core.prefs
index abec6ca..abec6ca 100644
--- a/batchtools/webdrivers/.settings/org.eclipse.jdt.core.prefs
+++ b/src/batchtools/webdrivers/.settings/org.eclipse.jdt.core.prefs
diff --git a/batchtools/webdrivers/.settings/org.eclipse.m2e.core.prefs b/src/batchtools/webdrivers/.settings/org.eclipse.m2e.core.prefs
index f897a7f..f897a7f 100644
--- a/batchtools/webdrivers/.settings/org.eclipse.m2e.core.prefs
+++ b/src/batchtools/webdrivers/.settings/org.eclipse.m2e.core.prefs
diff --git a/batchtools/webdrivers/pom.xml b/src/batchtools/webdrivers/pom.xml
index 4d8847f..4d8847f 100644
--- a/batchtools/webdrivers/pom.xml
+++ b/src/batchtools/webdrivers/pom.xml
diff --git a/batchtools/webdrivers/src/main/java/com/galois/fiveui/drivers/Drivers.java b/src/batchtools/webdrivers/src/main/java/com/galois/fiveui/drivers/Drivers.java
index d4bf40b..db73fec 100644
--- a/batchtools/webdrivers/src/main/java/com/galois/fiveui/drivers/Drivers.java
+++ b/src/batchtools/webdrivers/src/main/java/com/galois/fiveui/drivers/Drivers.java
@@ -39,7 +39,7 @@ public class Drivers {
             "seleniumChromeDrivers");
     
     private static final String FIVEUI_ROOT_PATH = "FIVEUI_ROOT_PATH";
-    private static final String defaultFiveuiRootPath = "../../";
+    private static final String defaultFiveuiRootPath = "../../../";
     private static final String firefoxProfilePath = "profiles/firefox";
     private static final String chromeProfilePath = "profiles/chrome";
     private static final String firefoxExtensionPath = "binaries/fiveui.xpi";