203 files changed, 28 insertions, 38 deletions

diff --git a/.gitignore b/.gitignore
index 42edf8ff4f..7dbab181fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,6 @@ reports
 .project
 .classpath
 .scala_dependencies
+lib_managed/
+src_managed/
+project/boot/
diff --git a/buildfile b/buildfile
deleted file mode 100644
index 1fb9046e92..0000000000
--- a/buildfile
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'buildr/scala'
-
-# Version number for this release
-VERSION_NUMBER = "0.0.0"
-# Group identifier for your projects
-GROUP = "spark"
-COPYRIGHT = ""
-
-# Specify Maven 2.0 remote repositories here, like this:
-repositories.remote << "http://www.ibiblio.org/maven2/"
-
-THIRD_PARTY_JARS = Dir["third_party/**/*.jar"]
-
-desc "The Spark project"
-define "spark" do
-  project.version = VERSION_NUMBER
-  project.group = GROUP
-  manifest["Implementation-Vendor"] = COPYRIGHT
-  compile.with THIRD_PARTY_JARS
-  compile.using :scalac
-  package(:jar)
-  test.using :scalatest, :fork => true
-end
diff --git a/third_party/apache-log4j-1.2.16/log4j-1.2.16.jar b/lib/apache-log4j-1.2.16/log4j-1.2.16.jar
index 3f9d847618..3f9d847618 100644
--- a/third_party/apache-log4j-1.2.16/log4j-1.2.16.jar
+++ b/lib/apache-log4j-1.2.16/log4j-1.2.16.jar
diff --git a/third_party/asm-3.2/.DS_Store b/lib/asm-3.2/.DS_Store
index 52b0f12a32..52b0f12a32 100644
--- a/third_party/asm-3.2/.DS_Store
+++ b/lib/asm-3.2/.DS_Store
diff --git a/third_party/asm-3.2/lib/all/README.txt b/lib/asm-3.2/lib/all/README.txt
index d7c96a5edb..d7c96a5edb 100644
--- a/third_party/asm-3.2/lib/all/README.txt
+++ b/lib/asm-3.2/lib/all/README.txt
diff --git a/third_party/asm-3.2/lib/all/asm-all-3.2.jar b/lib/asm-3.2/lib/all/asm-all-3.2.jar
index d0ad60ed0a..d0ad60ed0a 100644
--- a/third_party/asm-3.2/lib/all/asm-all-3.2.jar
+++ b/lib/asm-3.2/lib/all/asm-all-3.2.jar
diff --git a/third_party/asm-3.2/lib/all/asm-all-3.2.pom b/lib/asm-3.2/lib/all/asm-all-3.2.pom
index 9899a54c3b..9899a54c3b 100644
--- a/third_party/asm-3.2/lib/all/asm-all-3.2.pom
+++ b/lib/asm-3.2/lib/all/asm-all-3.2.pom
diff --git a/third_party/asm-3.2/lib/all/asm-debug-all-3.2.jar b/lib/asm-3.2/lib/all/asm-debug-all-3.2.jar
index 94b8549142..94b8549142 100644
--- a/third_party/asm-3.2/lib/all/asm-debug-all-3.2.jar
+++ b/lib/asm-3.2/lib/all/asm-debug-all-3.2.jar
diff --git a/third_party/asm-3.2/lib/all/asm-debug-all-3.2.pom b/lib/asm-3.2/lib/all/asm-debug-all-3.2.pom
index 9899a54c3b..9899a54c3b 100644
--- a/third_party/asm-3.2/lib/all/asm-debug-all-3.2.pom
+++ b/lib/asm-3.2/lib/all/asm-debug-all-3.2.pom
diff --git a/third_party/asm-3.2/lib/asm-3.2.jar b/lib/asm-3.2/lib/asm-3.2.jar
index 334e7fdc7f..334e7fdc7f 100644
--- a/third_party/asm-3.2/lib/asm-3.2.jar
+++ b/lib/asm-3.2/lib/asm-3.2.jar
diff --git a/third_party/asm-3.2/lib/asm-3.2.pom b/lib/asm-3.2/lib/asm-3.2.pom
index c714db09b2..c714db09b2 100644
--- a/third_party/asm-3.2/lib/asm-3.2.pom
+++ b/lib/asm-3.2/lib/asm-3.2.pom
diff --git a/third_party/asm-3.2/lib/asm-analysis-3.2.jar b/lib/asm-3.2/lib/asm-analysis-3.2.jar
index 40ee3151cb..40ee3151cb 100644
--- a/third_party/asm-3.2/lib/asm-analysis-3.2.jar
+++ b/lib/asm-3.2/lib/asm-analysis-3.2.jar
diff --git a/third_party/asm-3.2/lib/asm-analysis-3.2.pom b/lib/asm-3.2/lib/asm-analysis-3.2.pom
index b3933387af..b3933387af 100644
--- a/third_party/asm-3.2/lib/asm-analysis-3.2.pom
+++ b/lib/asm-3.2/lib/asm-analysis-3.2.pom
diff --git a/third_party/asm-3.2/lib/asm-commons-3.2.jar b/lib/asm-3.2/lib/asm-commons-3.2.jar
index 8dfed0a9b7..8dfed0a9b7 100644
--- a/third_party/asm-3.2/lib/asm-commons-3.2.jar
+++ b/lib/asm-3.2/lib/asm-commons-3.2.jar
diff --git a/third_party/asm-3.2/lib/asm-commons-3.2.pom b/lib/asm-3.2/lib/asm-commons-3.2.pom
index 8517715b4a..8517715b4a 100644
--- a/third_party/asm-3.2/lib/asm-commons-3.2.pom
+++ b/lib/asm-3.2/lib/asm-commons-3.2.pom
diff --git a/third_party/asm-3.2/lib/asm-parent-3.2.pom b/lib/asm-3.2/lib/asm-parent-3.2.pom
index c220347f6a..c220347f6a 100644
--- a/third_party/asm-3.2/lib/asm-parent-3.2.pom
+++ b/lib/asm-3.2/lib/asm-parent-3.2.pom
diff --git a/third_party/asm-3.2/lib/asm-tree-3.2.jar b/lib/asm-3.2/lib/asm-tree-3.2.jar
index b21fb86a92..b21fb86a92 100644
--- a/third_party/asm-3.2/lib/asm-tree-3.2.jar
+++ b/lib/asm-3.2/lib/asm-tree-3.2.jar
diff --git a/third_party/asm-3.2/lib/asm-tree-3.2.pom b/lib/asm-3.2/lib/asm-tree-3.2.pom
index 9f454528f4..9f454528f4 100644
--- a/third_party/asm-3.2/lib/asm-tree-3.2.pom
+++ b/lib/asm-3.2/lib/asm-tree-3.2.pom
diff --git a/third_party/asm-3.2/lib/asm-util-3.2.jar b/lib/asm-3.2/lib/asm-util-3.2.jar
index 499d229034..499d229034 100644
--- a/third_party/asm-3.2/lib/asm-util-3.2.jar
+++ b/lib/asm-3.2/lib/asm-util-3.2.jar
diff --git a/third_party/asm-3.2/lib/asm-util-3.2.pom b/lib/asm-3.2/lib/asm-util-3.2.pom
index e302b0f356..e302b0f356 100644
--- a/third_party/asm-3.2/lib/asm-util-3.2.pom
+++ b/lib/asm-3.2/lib/asm-util-3.2.pom
diff --git a/third_party/asm-3.2/lib/asm-xml-3.2.jar b/lib/asm-3.2/lib/asm-xml-3.2.jar
index 31b31b56fe..31b31b56fe 100644
--- a/third_party/asm-3.2/lib/asm-xml-3.2.jar
+++ b/lib/asm-3.2/lib/asm-xml-3.2.jar
diff --git a/third_party/asm-3.2/lib/asm-xml-3.2.pom b/lib/asm-3.2/lib/asm-xml-3.2.pom
index 0f3de1f2ab..0f3de1f2ab 100644
--- a/third_party/asm-3.2/lib/asm-xml-3.2.pom
+++ b/lib/asm-3.2/lib/asm-xml-3.2.pom
diff --git a/third_party/colt.jar b/lib/colt.jar
index a7192f68b3..a7192f68b3 100644
--- a/third_party/colt.jar
+++ b/lib/colt.jar
diff --git a/third_party/guava-r07/COPYING b/lib/guava-r07/COPYING
index d645695673..d645695673 100644
--- a/third_party/guava-r07/COPYING
+++ b/lib/guava-r07/COPYING
diff --git a/third_party/guava-r07/README b/lib/guava-r07/README
index a0e832dd54..a0e832dd54 100644
--- a/third_party/guava-r07/README
+++ b/lib/guava-r07/README
diff --git a/third_party/guava-r07/guava-r07.jar b/lib/guava-r07/guava-r07.jar
index a6c9ce02df..a6c9ce02df 100644
--- a/third_party/guava-r07/guava-r07.jar
+++ b/lib/guava-r07/guava-r07.jar
diff --git a/third_party/hadoop-0.20.0/.DS_Store b/lib/hadoop-0.20.0/.DS_Store
index 81f4e05e09..81f4e05e09 100644
--- a/third_party/hadoop-0.20.0/.DS_Store
+++ b/lib/hadoop-0.20.0/.DS_Store
diff --git a/third_party/hadoop-0.20.0/CHANGES.txt b/lib/hadoop-0.20.0/CHANGES.txt
index 95c8b5c08b..95c8b5c08b 100644
--- a/third_party/hadoop-0.20.0/CHANGES.txt
+++ b/lib/hadoop-0.20.0/CHANGES.txt
diff --git a/third_party/hadoop-0.20.0/LICENSE.txt b/lib/hadoop-0.20.0/LICENSE.txt
index 59bcdbc978..59bcdbc978 100644
--- a/third_party/hadoop-0.20.0/LICENSE.txt
+++ b/lib/hadoop-0.20.0/LICENSE.txt
diff --git a/third_party/hadoop-0.20.0/NOTICE.txt b/lib/hadoop-0.20.0/NOTICE.txt
index 62fc5816c9..62fc5816c9 100644
--- a/third_party/hadoop-0.20.0/NOTICE.txt
+++ b/lib/hadoop-0.20.0/NOTICE.txt
diff --git a/third_party/hadoop-0.20.0/README.txt b/lib/hadoop-0.20.0/README.txt
index 148cd31c86..148cd31c86 100644
--- a/third_party/hadoop-0.20.0/README.txt
+++ b/lib/hadoop-0.20.0/README.txt
diff --git a/third_party/hadoop-0.20.0/bin/hadoop b/lib/hadoop-0.20.0/bin/hadoop
index 273549f138..273549f138 100755
--- a/third_party/hadoop-0.20.0/bin/hadoop
+++ b/lib/hadoop-0.20.0/bin/hadoop
diff --git a/third_party/hadoop-0.20.0/bin/hadoop-config.sh b/lib/hadoop-0.20.0/bin/hadoop-config.sh
index 1f9d52da79..1f9d52da79 100755
--- a/third_party/hadoop-0.20.0/bin/hadoop-config.sh
+++ b/lib/hadoop-0.20.0/bin/hadoop-config.sh
diff --git a/third_party/hadoop-0.20.0/bin/hadoop-daemon.sh b/lib/hadoop-0.20.0/bin/hadoop-daemon.sh
index e10390a9e2..e10390a9e2 100755
--- a/third_party/hadoop-0.20.0/bin/hadoop-daemon.sh
+++ b/lib/hadoop-0.20.0/bin/hadoop-daemon.sh
diff --git a/third_party/hadoop-0.20.0/bin/hadoop-daemons.sh b/lib/hadoop-0.20.0/bin/hadoop-daemons.sh
index 894d8ab11a..894d8ab11a 100755
--- a/third_party/hadoop-0.20.0/bin/hadoop-daemons.sh
+++ b/lib/hadoop-0.20.0/bin/hadoop-daemons.sh
diff --git a/third_party/hadoop-0.20.0/bin/rcc b/lib/hadoop-0.20.0/bin/rcc
index a39745be6f..a39745be6f 100755
--- a/third_party/hadoop-0.20.0/bin/rcc
+++ b/lib/hadoop-0.20.0/bin/rcc
diff --git a/third_party/hadoop-0.20.0/bin/slaves.sh b/lib/hadoop-0.20.0/bin/slaves.sh
index fc9f720be7..fc9f720be7 100755
--- a/third_party/hadoop-0.20.0/bin/slaves.sh
+++ b/lib/hadoop-0.20.0/bin/slaves.sh
diff --git a/third_party/hadoop-0.20.0/bin/start-all.sh b/lib/hadoop-0.20.0/bin/start-all.sh
index b1eefc8fbe..b1eefc8fbe 100755
--- a/third_party/hadoop-0.20.0/bin/start-all.sh
+++ b/lib/hadoop-0.20.0/bin/start-all.sh
diff --git a/third_party/hadoop-0.20.0/bin/start-balancer.sh b/lib/hadoop-0.20.0/bin/start-balancer.sh
index e8c93f90ca..e8c93f90ca 100755
--- a/third_party/hadoop-0.20.0/bin/start-balancer.sh
+++ b/lib/hadoop-0.20.0/bin/start-balancer.sh
diff --git a/third_party/hadoop-0.20.0/bin/start-dfs.sh b/lib/hadoop-0.20.0/bin/start-dfs.sh
index bda2035a2b..bda2035a2b 100755
--- a/third_party/hadoop-0.20.0/bin/start-dfs.sh
+++ b/lib/hadoop-0.20.0/bin/start-dfs.sh
diff --git a/third_party/hadoop-0.20.0/bin/start-mapred.sh b/lib/hadoop-0.20.0/bin/start-mapred.sh
index b64c8f51d8..b64c8f51d8 100755
--- a/third_party/hadoop-0.20.0/bin/start-mapred.sh
+++ b/lib/hadoop-0.20.0/bin/start-mapred.sh
diff --git a/third_party/hadoop-0.20.0/bin/stop-all.sh b/lib/hadoop-0.20.0/bin/stop-all.sh
index 033f2fe8d8..033f2fe8d8 100755
--- a/third_party/hadoop-0.20.0/bin/stop-all.sh
+++ b/lib/hadoop-0.20.0/bin/stop-all.sh
diff --git a/third_party/hadoop-0.20.0/bin/stop-balancer.sh b/lib/hadoop-0.20.0/bin/stop-balancer.sh
index 483a9c2549..483a9c2549 100755
--- a/third_party/hadoop-0.20.0/bin/stop-balancer.sh
+++ b/lib/hadoop-0.20.0/bin/stop-balancer.sh
diff --git a/third_party/hadoop-0.20.0/bin/stop-dfs.sh b/lib/hadoop-0.20.0/bin/stop-dfs.sh
index 14fe61d17e..14fe61d17e 100755
--- a/third_party/hadoop-0.20.0/bin/stop-dfs.sh
+++ b/lib/hadoop-0.20.0/bin/stop-dfs.sh
diff --git a/third_party/hadoop-0.20.0/bin/stop-mapred.sh b/lib/hadoop-0.20.0/bin/stop-mapred.sh
index aa51c1f87b..aa51c1f87b 100755
--- a/third_party/hadoop-0.20.0/bin/stop-mapred.sh
+++ b/lib/hadoop-0.20.0/bin/stop-mapred.sh
diff --git a/third_party/hadoop-0.20.0/build.xml b/lib/hadoop-0.20.0/build.xml
index 68932d7d9f..68932d7d9f 100644
--- a/third_party/hadoop-0.20.0/build.xml
+++ b/lib/hadoop-0.20.0/build.xml
diff --git a/third_party/hadoop-0.20.0/c++/Linux-amd64-64/include/hadoop/Pipes.hh b/lib/hadoop-0.20.0/c++/Linux-amd64-64/include/hadoop/Pipes.hh
index 9a785d966a..9a785d966a 100644
--- a/third_party/hadoop-0.20.0/c++/Linux-amd64-64/include/hadoop/Pipes.hh
+++ b/lib/hadoop-0.20.0/c++/Linux-amd64-64/include/hadoop/Pipes.hh
diff --git a/third_party/hadoop-0.20.0/c++/Linux-amd64-64/include/hadoop/SerialUtils.hh b/lib/hadoop-0.20.0/c++/Linux-amd64-64/include/hadoop/SerialUtils.hh
index 16cbab65b2..16cbab65b2 100644
--- a/third_party/hadoop-0.20.0/c++/Linux-amd64-64/include/hadoop/SerialUtils.hh
+++ b/lib/hadoop-0.20.0/c++/Linux-amd64-64/include/hadoop/SerialUtils.hh
diff --git a/third_party/hadoop-0.20.0/c++/Linux-amd64-64/include/hadoop/StringUtils.hh b/lib/hadoop-0.20.0/c++/Linux-amd64-64/include/hadoop/StringUtils.hh
index 4720172725..4720172725 100644
--- a/third_party/hadoop-0.20.0/c++/Linux-amd64-64/include/hadoop/StringUtils.hh
+++ b/lib/hadoop-0.20.0/c++/Linux-amd64-64/include/hadoop/StringUtils.hh
diff --git a/third_party/hadoop-0.20.0/c++/Linux-amd64-64/include/hadoop/TemplateFactory.hh b/lib/hadoop-0.20.0/c++/Linux-amd64-64/include/hadoop/TemplateFactory.hh
index 22e10ae56f..22e10ae56f 100644
--- a/third_party/hadoop-0.20.0/c++/Linux-amd64-64/include/hadoop/TemplateFactory.hh
+++ b/lib/hadoop-0.20.0/c++/Linux-amd64-64/include/hadoop/TemplateFactory.hh
diff --git a/third_party/hadoop-0.20.0/c++/Linux-amd64-64/lib/libhadooppipes.a b/lib/hadoop-0.20.0/c++/Linux-amd64-64/lib/libhadooppipes.a
index be303140cb..be303140cb 100644
--- a/third_party/hadoop-0.20.0/c++/Linux-amd64-64/lib/libhadooppipes.a
+++ b/lib/hadoop-0.20.0/c++/Linux-amd64-64/lib/libhadooppipes.a
diff --git a/third_party/hadoop-0.20.0/c++/Linux-amd64-64/lib/libhadooputils.a b/lib/hadoop-0.20.0/c++/Linux-amd64-64/lib/libhadooputils.a
index 8a0aded98e..8a0aded98e 100644
--- a/third_party/hadoop-0.20.0/c++/Linux-amd64-64/lib/libhadooputils.a
+++ b/lib/hadoop-0.20.0/c++/Linux-amd64-64/lib/libhadooputils.a
diff --git a/third_party/hadoop-0.20.0/c++/Linux-i386-32/include/hadoop/Pipes.hh b/lib/hadoop-0.20.0/c++/Linux-i386-32/include/hadoop/Pipes.hh
index 9a785d966a..9a785d966a 100644
--- a/third_party/hadoop-0.20.0/c++/Linux-i386-32/include/hadoop/Pipes.hh
+++ b/lib/hadoop-0.20.0/c++/Linux-i386-32/include/hadoop/Pipes.hh
diff --git a/third_party/hadoop-0.20.0/c++/Linux-i386-32/include/hadoop/SerialUtils.hh b/lib/hadoop-0.20.0/c++/Linux-i386-32/include/hadoop/SerialUtils.hh
index 16cbab65b2..16cbab65b2 100644
--- a/third_party/hadoop-0.20.0/c++/Linux-i386-32/include/hadoop/SerialUtils.hh
+++ b/lib/hadoop-0.20.0/c++/Linux-i386-32/include/hadoop/SerialUtils.hh
diff --git a/third_party/hadoop-0.20.0/c++/Linux-i386-32/include/hadoop/StringUtils.hh b/lib/hadoop-0.20.0/c++/Linux-i386-32/include/hadoop/StringUtils.hh
index 4720172725..4720172725 100644
--- a/third_party/hadoop-0.20.0/c++/Linux-i386-32/include/hadoop/StringUtils.hh
+++ b/lib/hadoop-0.20.0/c++/Linux-i386-32/include/hadoop/StringUtils.hh
diff --git a/third_party/hadoop-0.20.0/c++/Linux-i386-32/include/hadoop/TemplateFactory.hh b/lib/hadoop-0.20.0/c++/Linux-i386-32/include/hadoop/TemplateFactory.hh
index 22e10ae56f..22e10ae56f 100644
--- a/third_party/hadoop-0.20.0/c++/Linux-i386-32/include/hadoop/TemplateFactory.hh
+++ b/lib/hadoop-0.20.0/c++/Linux-i386-32/include/hadoop/TemplateFactory.hh
diff --git a/third_party/hadoop-0.20.0/c++/Linux-i386-32/lib/libhadooppipes.a b/lib/hadoop-0.20.0/c++/Linux-i386-32/lib/libhadooppipes.a
index 73debcec92..73debcec92 100644
--- a/third_party/hadoop-0.20.0/c++/Linux-i386-32/lib/libhadooppipes.a
+++ b/lib/hadoop-0.20.0/c++/Linux-i386-32/lib/libhadooppipes.a
diff --git a/third_party/hadoop-0.20.0/c++/Linux-i386-32/lib/libhadooputils.a b/lib/hadoop-0.20.0/c++/Linux-i386-32/lib/libhadooputils.a
index 6753169b8a..6753169b8a 100644
--- a/third_party/hadoop-0.20.0/c++/Linux-i386-32/lib/libhadooputils.a
+++ b/lib/hadoop-0.20.0/c++/Linux-i386-32/lib/libhadooputils.a
diff --git a/third_party/hadoop-0.20.0/c++/Linux-i386-32/lib/libhdfs.la b/lib/hadoop-0.20.0/c++/Linux-i386-32/lib/libhdfs.la
index b6ce94229f..b6ce94229f 100644
--- a/third_party/hadoop-0.20.0/c++/Linux-i386-32/lib/libhdfs.la
+++ b/lib/hadoop-0.20.0/c++/Linux-i386-32/lib/libhdfs.la
diff --git a/third_party/hadoop-0.20.0/c++/Linux-i386-32/lib/libhdfs.so b/lib/hadoop-0.20.0/c++/Linux-i386-32/lib/libhdfs.so
index 358d582d43..358d582d43 100644
--- a/third_party/hadoop-0.20.0/c++/Linux-i386-32/lib/libhdfs.so
+++ b/lib/hadoop-0.20.0/c++/Linux-i386-32/lib/libhdfs.so
diff --git a/third_party/hadoop-0.20.0/c++/Linux-i386-32/lib/libhdfs.so.0 b/lib/hadoop-0.20.0/c++/Linux-i386-32/lib/libhdfs.so.0
index 358d582d43..358d582d43 100644
--- a/third_party/hadoop-0.20.0/c++/Linux-i386-32/lib/libhdfs.so.0
+++ b/lib/hadoop-0.20.0/c++/Linux-i386-32/lib/libhdfs.so.0
diff --git a/third_party/hadoop-0.20.0/c++/Linux-i386-32/lib/libhdfs.so.0.0.0 b/lib/hadoop-0.20.0/c++/Linux-i386-32/lib/libhdfs.so.0.0.0
index 358d582d43..358d582d43 100644
--- a/third_party/hadoop-0.20.0/c++/Linux-i386-32/lib/libhdfs.so.0.0.0
+++ b/lib/hadoop-0.20.0/c++/Linux-i386-32/lib/libhdfs.so.0.0.0
diff --git a/third_party/hadoop-0.20.0/conf/capacity-scheduler.xml b/lib/hadoop-0.20.0/conf/capacity-scheduler.xml
index d22a3964b4..d22a3964b4 100644
--- a/third_party/hadoop-0.20.0/conf/capacity-scheduler.xml
+++ b/lib/hadoop-0.20.0/conf/capacity-scheduler.xml
diff --git a/third_party/hadoop-0.20.0/conf/configuration.xsl b/lib/hadoop-0.20.0/conf/configuration.xsl
index 377cdbeb93..377cdbeb93 100644
--- a/third_party/hadoop-0.20.0/conf/configuration.xsl
+++ b/lib/hadoop-0.20.0/conf/configuration.xsl
diff --git a/third_party/hadoop-0.20.0/conf/core-site.xml b/lib/hadoop-0.20.0/conf/core-site.xml
index 970c8fe0e8..970c8fe0e8 100644
--- a/third_party/hadoop-0.20.0/conf/core-site.xml
+++ b/lib/hadoop-0.20.0/conf/core-site.xml
diff --git a/third_party/hadoop-0.20.0/conf/hadoop-env.sh b/lib/hadoop-0.20.0/conf/hadoop-env.sh
index ada5bef1c7..ada5bef1c7 100644
--- a/third_party/hadoop-0.20.0/conf/hadoop-env.sh
+++ b/lib/hadoop-0.20.0/conf/hadoop-env.sh
diff --git a/third_party/hadoop-0.20.0/conf/hadoop-metrics.properties b/lib/hadoop-0.20.0/conf/hadoop-metrics.properties
index d04dffc438..d04dffc438 100644
--- a/third_party/hadoop-0.20.0/conf/hadoop-metrics.properties
+++ b/lib/hadoop-0.20.0/conf/hadoop-metrics.properties
diff --git a/third_party/hadoop-0.20.0/conf/hadoop-policy.xml b/lib/hadoop-0.20.0/conf/hadoop-policy.xml
index ef48f2bbed..ef48f2bbed 100644
--- a/third_party/hadoop-0.20.0/conf/hadoop-policy.xml
+++ b/lib/hadoop-0.20.0/conf/hadoop-policy.xml
diff --git a/third_party/hadoop-0.20.0/conf/hdfs-site.xml b/lib/hadoop-0.20.0/conf/hdfs-site.xml
index 970c8fe0e8..970c8fe0e8 100644
--- a/third_party/hadoop-0.20.0/conf/hdfs-site.xml
+++ b/lib/hadoop-0.20.0/conf/hdfs-site.xml
diff --git a/third_party/hadoop-0.20.0/conf/log4j.properties b/lib/hadoop-0.20.0/conf/log4j.properties
index d797df6dab..d797df6dab 100644
--- a/third_party/hadoop-0.20.0/conf/log4j.properties
+++ b/lib/hadoop-0.20.0/conf/log4j.properties
diff --git a/third_party/hadoop-0.20.0/conf/mapred-site.xml b/lib/hadoop-0.20.0/conf/mapred-site.xml
index 970c8fe0e8..970c8fe0e8 100644
--- a/third_party/hadoop-0.20.0/conf/mapred-site.xml
+++ b/lib/hadoop-0.20.0/conf/mapred-site.xml
diff --git a/third_party/hadoop-0.20.0/conf/masters b/lib/hadoop-0.20.0/conf/masters
index 2fbb50c4a8..2fbb50c4a8 100644
--- a/third_party/hadoop-0.20.0/conf/masters
+++ b/lib/hadoop-0.20.0/conf/masters
diff --git a/third_party/hadoop-0.20.0/conf/slaves b/lib/hadoop-0.20.0/conf/slaves
index 2fbb50c4a8..2fbb50c4a8 100644
--- a/third_party/hadoop-0.20.0/conf/slaves
+++ b/lib/hadoop-0.20.0/conf/slaves
diff --git a/third_party/hadoop-0.20.0/conf/ssl-client.xml.example b/lib/hadoop-0.20.0/conf/ssl-client.xml.example
index ec3fd41fa8..ec3fd41fa8 100644
--- a/third_party/hadoop-0.20.0/conf/ssl-client.xml.example
+++ b/lib/hadoop-0.20.0/conf/ssl-client.xml.example
diff --git a/third_party/hadoop-0.20.0/conf/ssl-server.xml.example b/lib/hadoop-0.20.0/conf/ssl-server.xml.example
index 22e9cb0ebb..22e9cb0ebb 100644
--- a/third_party/hadoop-0.20.0/conf/ssl-server.xml.example
+++ b/lib/hadoop-0.20.0/conf/ssl-server.xml.example
diff --git a/third_party/hadoop-0.20.0/contrib/capacity-scheduler/hadoop-0.20.0-capacity-scheduler.jar b/lib/hadoop-0.20.0/contrib/capacity-scheduler/hadoop-0.20.0-capacity-scheduler.jar
index b4900e565e..b4900e565e 100644
--- a/third_party/hadoop-0.20.0/contrib/capacity-scheduler/hadoop-0.20.0-capacity-scheduler.jar
+++ b/lib/hadoop-0.20.0/contrib/capacity-scheduler/hadoop-0.20.0-capacity-scheduler.jar
diff --git a/third_party/hadoop-0.20.0/contrib/datajoin/hadoop-0.20.0-datajoin.jar b/lib/hadoop-0.20.0/contrib/datajoin/hadoop-0.20.0-datajoin.jar
index 21294d4d1d..21294d4d1d 100644
--- a/third_party/hadoop-0.20.0/contrib/datajoin/hadoop-0.20.0-datajoin.jar
+++ b/lib/hadoop-0.20.0/contrib/datajoin/hadoop-0.20.0-datajoin.jar
diff --git a/third_party/hadoop-0.20.0/contrib/eclipse-plugin/hadoop-0.20.0-eclipse-plugin.jar b/lib/hadoop-0.20.0/contrib/eclipse-plugin/hadoop-0.20.0-eclipse-plugin.jar
index 7b316393f6..7b316393f6 100644
--- a/third_party/hadoop-0.20.0/contrib/eclipse-plugin/hadoop-0.20.0-eclipse-plugin.jar
+++ b/lib/hadoop-0.20.0/contrib/eclipse-plugin/hadoop-0.20.0-eclipse-plugin.jar
diff --git a/third_party/hadoop-0.20.0/contrib/fairscheduler/hadoop-0.20.0-fairscheduler.jar b/lib/hadoop-0.20.0/contrib/fairscheduler/hadoop-0.20.0-fairscheduler.jar
index 758b98367c..758b98367c 100644
--- a/third_party/hadoop-0.20.0/contrib/fairscheduler/hadoop-0.20.0-fairscheduler.jar
+++ b/lib/hadoop-0.20.0/contrib/fairscheduler/hadoop-0.20.0-fairscheduler.jar
diff --git a/third_party/hadoop-0.20.0/contrib/hdfsproxy/README b/lib/hadoop-0.20.0/contrib/hdfsproxy/README
index 2c33988926..2c33988926 100644
--- a/third_party/hadoop-0.20.0/contrib/hdfsproxy/README
+++ b/lib/hadoop-0.20.0/contrib/hdfsproxy/README
diff --git a/third_party/hadoop-0.20.0/contrib/hdfsproxy/bin/hdfsproxy b/lib/hadoop-0.20.0/contrib/hdfsproxy/bin/hdfsproxy
index 1b1e597891..1b1e597891 100755
--- a/third_party/hadoop-0.20.0/contrib/hdfsproxy/bin/hdfsproxy
+++ b/lib/hadoop-0.20.0/contrib/hdfsproxy/bin/hdfsproxy
diff --git a/third_party/hadoop-0.20.0/contrib/hdfsproxy/bin/hdfsproxy-config.sh b/lib/hadoop-0.20.0/contrib/hdfsproxy/bin/hdfsproxy-config.sh
index 8fe6aac68b..8fe6aac68b 100755
--- a/third_party/hadoop-0.20.0/contrib/hdfsproxy/bin/hdfsproxy-config.sh
+++ b/lib/hadoop-0.20.0/contrib/hdfsproxy/bin/hdfsproxy-config.sh
diff --git a/third_party/hadoop-0.20.0/contrib/hdfsproxy/bin/hdfsproxy-daemon.sh b/lib/hadoop-0.20.0/contrib/hdfsproxy/bin/hdfsproxy-daemon.sh
index 6d5a75247f..6d5a75247f 100755
--- a/third_party/hadoop-0.20.0/contrib/hdfsproxy/bin/hdfsproxy-daemon.sh
+++ b/lib/hadoop-0.20.0/contrib/hdfsproxy/bin/hdfsproxy-daemon.sh
diff --git a/third_party/hadoop-0.20.0/contrib/hdfsproxy/bin/hdfsproxy-daemons.sh b/lib/hadoop-0.20.0/contrib/hdfsproxy/bin/hdfsproxy-daemons.sh
index 7dd8568a3b..7dd8568a3b 100755
--- a/third_party/hadoop-0.20.0/contrib/hdfsproxy/bin/hdfsproxy-daemons.sh
+++ b/lib/hadoop-0.20.0/contrib/hdfsproxy/bin/hdfsproxy-daemons.sh
diff --git a/third_party/hadoop-0.20.0/contrib/hdfsproxy/bin/hdfsproxy-slaves.sh b/lib/hadoop-0.20.0/contrib/hdfsproxy/bin/hdfsproxy-slaves.sh
index db54bd5b38..db54bd5b38 100755
--- a/third_party/hadoop-0.20.0/contrib/hdfsproxy/bin/hdfsproxy-slaves.sh
+++ b/lib/hadoop-0.20.0/contrib/hdfsproxy/bin/hdfsproxy-slaves.sh
diff --git a/third_party/hadoop-0.20.0/contrib/hdfsproxy/bin/start-hdfsproxy.sh b/lib/hadoop-0.20.0/contrib/hdfsproxy/bin/start-hdfsproxy.sh
index 2592d9c8cc..2592d9c8cc 100755
--- a/third_party/hadoop-0.20.0/contrib/hdfsproxy/bin/start-hdfsproxy.sh
+++ b/lib/hadoop-0.20.0/contrib/hdfsproxy/bin/start-hdfsproxy.sh
diff --git a/third_party/hadoop-0.20.0/contrib/hdfsproxy/bin/stop-hdfsproxy.sh b/lib/hadoop-0.20.0/contrib/hdfsproxy/bin/stop-hdfsproxy.sh
index 78089e31cf..78089e31cf 100755
--- a/third_party/hadoop-0.20.0/contrib/hdfsproxy/bin/stop-hdfsproxy.sh
+++ b/lib/hadoop-0.20.0/contrib/hdfsproxy/bin/stop-hdfsproxy.sh
diff --git a/third_party/hadoop-0.20.0/contrib/hdfsproxy/build.xml b/lib/hadoop-0.20.0/contrib/hdfsproxy/build.xml
index e62b2f279a..e62b2f279a 100644
--- a/third_party/hadoop-0.20.0/contrib/hdfsproxy/build.xml
+++ b/lib/hadoop-0.20.0/contrib/hdfsproxy/build.xml
diff --git a/third_party/hadoop-0.20.0/contrib/hdfsproxy/conf/configuration.xsl b/lib/hadoop-0.20.0/contrib/hdfsproxy/conf/configuration.xsl
index 377cdbeb93..377cdbeb93 100644
--- a/third_party/hadoop-0.20.0/contrib/hdfsproxy/conf/configuration.xsl
+++ b/lib/hadoop-0.20.0/contrib/hdfsproxy/conf/configuration.xsl
diff --git a/third_party/hadoop-0.20.0/contrib/hdfsproxy/conf/hdfsproxy-default.xml b/lib/hadoop-0.20.0/contrib/hdfsproxy/conf/hdfsproxy-default.xml
index 0d2a006c8e..0d2a006c8e 100644
--- a/third_party/hadoop-0.20.0/contrib/hdfsproxy/conf/hdfsproxy-default.xml
+++ b/lib/hadoop-0.20.0/contrib/hdfsproxy/conf/hdfsproxy-default.xml
diff --git a/third_party/hadoop-0.20.0/contrib/hdfsproxy/conf/hdfsproxy-env.sh b/lib/hadoop-0.20.0/contrib/hdfsproxy/conf/hdfsproxy-env.sh
index a0ff7a5d27..a0ff7a5d27 100644
--- a/third_party/hadoop-0.20.0/contrib/hdfsproxy/conf/hdfsproxy-env.sh
+++ b/lib/hadoop-0.20.0/contrib/hdfsproxy/conf/hdfsproxy-env.sh
diff --git a/third_party/hadoop-0.20.0/contrib/hdfsproxy/conf/hdfsproxy-env.sh.template b/lib/hadoop-0.20.0/contrib/hdfsproxy/conf/hdfsproxy-env.sh.template
index a0ff7a5d27..a0ff7a5d27 100644
--- a/third_party/hadoop-0.20.0/contrib/hdfsproxy/conf/hdfsproxy-env.sh.template
+++ b/lib/hadoop-0.20.0/contrib/hdfsproxy/conf/hdfsproxy-env.sh.template
diff --git a/third_party/hadoop-0.20.0/contrib/hdfsproxy/conf/hdfsproxy-hosts b/lib/hadoop-0.20.0/contrib/hdfsproxy/conf/hdfsproxy-hosts
index 2fbb50c4a8..2fbb50c4a8 100644
--- a/third_party/hadoop-0.20.0/contrib/hdfsproxy/conf/hdfsproxy-hosts
+++ b/lib/hadoop-0.20.0/contrib/hdfsproxy/conf/hdfsproxy-hosts
diff --git a/third_party/hadoop-0.20.0/contrib/hdfsproxy/conf/log4j.properties b/lib/hadoop-0.20.0/contrib/hdfsproxy/conf/log4j.properties
index 2520ab3795..2520ab3795 100644
--- a/third_party/hadoop-0.20.0/contrib/hdfsproxy/conf/log4j.properties
+++ b/lib/hadoop-0.20.0/contrib/hdfsproxy/conf/log4j.properties
diff --git a/third_party/hadoop-0.20.0/contrib/hdfsproxy/conf/user-certs.xml b/lib/hadoop-0.20.0/contrib/hdfsproxy/conf/user-certs.xml
index f572a55294..f572a55294 100644
--- a/third_party/hadoop-0.20.0/contrib/hdfsproxy/conf/user-certs.xml
+++ b/lib/hadoop-0.20.0/contrib/hdfsproxy/conf/user-certs.xml
diff --git a/third_party/hadoop-0.20.0/contrib/hdfsproxy/conf/user-permissions.xml b/lib/hadoop-0.20.0/contrib/hdfsproxy/conf/user-permissions.xml
index b7373751bd..b7373751bd 100644
--- a/third_party/hadoop-0.20.0/contrib/hdfsproxy/conf/user-permissions.xml
+++ b/lib/hadoop-0.20.0/contrib/hdfsproxy/conf/user-permissions.xml
diff --git a/third_party/hadoop-0.20.0/contrib/hdfsproxy/hdfsproxy-1.0.jar b/lib/hadoop-0.20.0/contrib/hdfsproxy/hdfsproxy-1.0.jar
index a313391dfb..a313391dfb 100644
--- a/third_party/hadoop-0.20.0/contrib/hdfsproxy/hdfsproxy-1.0.jar
+++ b/lib/hadoop-0.20.0/contrib/hdfsproxy/hdfsproxy-1.0.jar
diff --git a/third_party/hadoop-0.20.0/contrib/index/hadoop-0.20.0-index.jar b/lib/hadoop-0.20.0/contrib/index/hadoop-0.20.0-index.jar
index f1f850fcd3..f1f850fcd3 100644
--- a/third_party/hadoop-0.20.0/contrib/index/hadoop-0.20.0-index.jar
+++ b/lib/hadoop-0.20.0/contrib/index/hadoop-0.20.0-index.jar
diff --git a/third_party/hadoop-0.20.0/contrib/streaming/hadoop-0.20.0-streaming.jar b/lib/hadoop-0.20.0/contrib/streaming/hadoop-0.20.0-streaming.jar
index 84251e3a3c..84251e3a3c 100644
--- a/third_party/hadoop-0.20.0/contrib/streaming/hadoop-0.20.0-streaming.jar
+++ b/lib/hadoop-0.20.0/contrib/streaming/hadoop-0.20.0-streaming.jar
diff --git a/third_party/hadoop-0.20.0/contrib/thriftfs/hadoop-0.20.0-thriftfs.jar b/lib/hadoop-0.20.0/contrib/thriftfs/hadoop-0.20.0-thriftfs.jar
index bf10c05e1d..bf10c05e1d 100644
--- a/third_party/hadoop-0.20.0/contrib/thriftfs/hadoop-0.20.0-thriftfs.jar
+++ b/lib/hadoop-0.20.0/contrib/thriftfs/hadoop-0.20.0-thriftfs.jar
diff --git a/third_party/hadoop-0.20.0/contrib/vaidya/bin/vaidya.sh b/lib/hadoop-0.20.0/contrib/vaidya/bin/vaidya.sh
index ada6715342..ada6715342 100755
--- a/third_party/hadoop-0.20.0/contrib/vaidya/bin/vaidya.sh
+++ b/lib/hadoop-0.20.0/contrib/vaidya/bin/vaidya.sh
diff --git a/third_party/hadoop-0.20.0/contrib/vaidya/conf/postex_diagnosis_tests.xml b/lib/hadoop-0.20.0/contrib/vaidya/conf/postex_diagnosis_tests.xml
index f30d5d9cc8..f30d5d9cc8 100644
--- a/third_party/hadoop-0.20.0/contrib/vaidya/conf/postex_diagnosis_tests.xml
+++ b/lib/hadoop-0.20.0/contrib/vaidya/conf/postex_diagnosis_tests.xml
diff --git a/third_party/hadoop-0.20.0/contrib/vaidya/hadoop-0.20.0-vaidya.jar b/lib/hadoop-0.20.0/contrib/vaidya/hadoop-0.20.0-vaidya.jar
index 534b18d974..534b18d974 100644
--- a/third_party/hadoop-0.20.0/contrib/vaidya/hadoop-0.20.0-vaidya.jar
+++ b/lib/hadoop-0.20.0/contrib/vaidya/hadoop-0.20.0-vaidya.jar
diff --git a/third_party/hadoop-0.20.0/hadoop-0.20.0-ant.jar b/lib/hadoop-0.20.0/hadoop-0.20.0-ant.jar
index 0c2b74e74f..0c2b74e74f 100644
--- a/third_party/hadoop-0.20.0/hadoop-0.20.0-ant.jar
+++ b/lib/hadoop-0.20.0/hadoop-0.20.0-ant.jar
diff --git a/third_party/hadoop-0.20.0/hadoop-0.20.0-core.jar b/lib/hadoop-0.20.0/hadoop-0.20.0-core.jar
index c99ce6d44d..c99ce6d44d 100644
--- a/third_party/hadoop-0.20.0/hadoop-0.20.0-core.jar
+++ b/lib/hadoop-0.20.0/hadoop-0.20.0-core.jar
diff --git a/third_party/hadoop-0.20.0/hadoop-0.20.0-examples.jar b/lib/hadoop-0.20.0/hadoop-0.20.0-examples.jar
index 23b88f885d..23b88f885d 100644
--- a/third_party/hadoop-0.20.0/hadoop-0.20.0-examples.jar
+++ b/lib/hadoop-0.20.0/hadoop-0.20.0-examples.jar
diff --git a/third_party/hadoop-0.20.0/hadoop-0.20.0-test.jar b/lib/hadoop-0.20.0/hadoop-0.20.0-test.jar
index 02b17d4160..02b17d4160 100644
--- a/third_party/hadoop-0.20.0/hadoop-0.20.0-test.jar
+++ b/lib/hadoop-0.20.0/hadoop-0.20.0-test.jar
diff --git a/third_party/hadoop-0.20.0/hadoop-0.20.0-tools.jar b/lib/hadoop-0.20.0/hadoop-0.20.0-tools.jar
index 60f5e600a6..60f5e600a6 100644
--- a/third_party/hadoop-0.20.0/hadoop-0.20.0-tools.jar
+++ b/lib/hadoop-0.20.0/hadoop-0.20.0-tools.jar
diff --git a/third_party/hadoop-0.20.0/ivy.xml b/lib/hadoop-0.20.0/ivy.xml
index 051ac6efb0..051ac6efb0 100644
--- a/third_party/hadoop-0.20.0/ivy.xml
+++ b/lib/hadoop-0.20.0/ivy.xml
diff --git a/third_party/hadoop-0.20.0/ivy/hadoop-core.pom b/lib/hadoop-0.20.0/ivy/hadoop-core.pom
index ffdd18951e..ffdd18951e 100644
--- a/third_party/hadoop-0.20.0/ivy/hadoop-core.pom
+++ b/lib/hadoop-0.20.0/ivy/hadoop-core.pom
diff --git a/third_party/hadoop-0.20.0/ivy/ivy-2.0.0-rc2.jar b/lib/hadoop-0.20.0/ivy/ivy-2.0.0-rc2.jar
index fa9ef21c7b..fa9ef21c7b 100644
--- a/third_party/hadoop-0.20.0/ivy/ivy-2.0.0-rc2.jar
+++ b/lib/hadoop-0.20.0/ivy/ivy-2.0.0-rc2.jar
diff --git a/third_party/hadoop-0.20.0/ivy/ivysettings.xml b/lib/hadoop-0.20.0/ivy/ivysettings.xml
index a7fcd22031..a7fcd22031 100644
--- a/third_party/hadoop-0.20.0/ivy/ivysettings.xml
+++ b/lib/hadoop-0.20.0/ivy/ivysettings.xml
diff --git a/third_party/hadoop-0.20.0/ivy/libraries.properties b/lib/hadoop-0.20.0/ivy/libraries.properties
index 17cf390d92..17cf390d92 100644
--- a/third_party/hadoop-0.20.0/ivy/libraries.properties
+++ b/lib/hadoop-0.20.0/ivy/libraries.properties
diff --git a/third_party/hadoop-0.20.0/lib/.DS_Store b/lib/hadoop-0.20.0/lib/.DS_Store
index e0d363a012..e0d363a012 100644
--- a/third_party/hadoop-0.20.0/lib/.DS_Store
+++ b/lib/hadoop-0.20.0/lib/.DS_Store
diff --git a/third_party/hadoop-0.20.0/lib/commons-cli-2.0-SNAPSHOT.jar b/lib/hadoop-0.20.0/lib/commons-cli-2.0-SNAPSHOT.jar
index 0b1d51072a..0b1d51072a 100644
--- a/third_party/hadoop-0.20.0/lib/commons-cli-2.0-SNAPSHOT.jar
+++ b/lib/hadoop-0.20.0/lib/commons-cli-2.0-SNAPSHOT.jar
diff --git a/third_party/hadoop-0.20.0/lib/commons-codec-1.3.jar b/lib/hadoop-0.20.0/lib/commons-codec-1.3.jar
index 957b6752af..957b6752af 100644
--- a/third_party/hadoop-0.20.0/lib/commons-codec-1.3.jar
+++ b/lib/hadoop-0.20.0/lib/commons-codec-1.3.jar
diff --git a/third_party/hadoop-0.20.0/lib/commons-el-1.0.jar b/lib/hadoop-0.20.0/lib/commons-el-1.0.jar
index 608ed796ca..608ed796ca 100644
--- a/third_party/hadoop-0.20.0/lib/commons-el-1.0.jar
+++ b/lib/hadoop-0.20.0/lib/commons-el-1.0.jar
diff --git a/third_party/hadoop-0.20.0/lib/commons-httpclient-3.0.1.jar b/lib/hadoop-0.20.0/lib/commons-httpclient-3.0.1.jar
index cfc777c71d..cfc777c71d 100644
--- a/third_party/hadoop-0.20.0/lib/commons-httpclient-3.0.1.jar
+++ b/lib/hadoop-0.20.0/lib/commons-httpclient-3.0.1.jar
diff --git a/third_party/hadoop-0.20.0/lib/commons-logging-1.0.4.jar b/lib/hadoop-0.20.0/lib/commons-logging-1.0.4.jar
index b73a80fab6..b73a80fab6 100644
--- a/third_party/hadoop-0.20.0/lib/commons-logging-1.0.4.jar
+++ b/lib/hadoop-0.20.0/lib/commons-logging-1.0.4.jar
diff --git a/third_party/hadoop-0.20.0/lib/commons-logging-api-1.0.4.jar b/lib/hadoop-0.20.0/lib/commons-logging-api-1.0.4.jar
index ade9a13c78..ade9a13c78 100644
--- a/third_party/hadoop-0.20.0/lib/commons-logging-api-1.0.4.jar
+++ b/lib/hadoop-0.20.0/lib/commons-logging-api-1.0.4.jar
diff --git a/third_party/hadoop-0.20.0/lib/commons-net-1.4.1.jar b/lib/hadoop-0.20.0/lib/commons-net-1.4.1.jar
index 9666a92c80..9666a92c80 100644
--- a/third_party/hadoop-0.20.0/lib/commons-net-1.4.1.jar
+++ b/lib/hadoop-0.20.0/lib/commons-net-1.4.1.jar
diff --git a/third_party/hadoop-0.20.0/lib/core-3.1.1.jar b/lib/hadoop-0.20.0/lib/core-3.1.1.jar
index ae0b635867..ae0b635867 100644
--- a/third_party/hadoop-0.20.0/lib/core-3.1.1.jar
+++ b/lib/hadoop-0.20.0/lib/core-3.1.1.jar
diff --git a/third_party/hadoop-0.20.0/lib/hsqldb-1.8.0.10.LICENSE.txt b/lib/hadoop-0.20.0/lib/hsqldb-1.8.0.10.LICENSE.txt
index d45b9f8cc0..d45b9f8cc0 100644
--- a/third_party/hadoop-0.20.0/lib/hsqldb-1.8.0.10.LICENSE.txt
+++ b/lib/hadoop-0.20.0/lib/hsqldb-1.8.0.10.LICENSE.txt
diff --git a/third_party/hadoop-0.20.0/lib/hsqldb-1.8.0.10.jar b/lib/hadoop-0.20.0/lib/hsqldb-1.8.0.10.jar
index e010269ddf..e010269ddf 100644
--- a/third_party/hadoop-0.20.0/lib/hsqldb-1.8.0.10.jar
+++ b/lib/hadoop-0.20.0/lib/hsqldb-1.8.0.10.jar
diff --git a/third_party/hadoop-0.20.0/lib/jasper-compiler-5.5.12.jar b/lib/hadoop-0.20.0/lib/jasper-compiler-5.5.12.jar
index 2a410b4b58..2a410b4b58 100644
--- a/third_party/hadoop-0.20.0/lib/jasper-compiler-5.5.12.jar
+++ b/lib/hadoop-0.20.0/lib/jasper-compiler-5.5.12.jar
diff --git a/third_party/hadoop-0.20.0/lib/jasper-runtime-5.5.12.jar b/lib/hadoop-0.20.0/lib/jasper-runtime-5.5.12.jar
index 743d906c1f..743d906c1f 100644
--- a/third_party/hadoop-0.20.0/lib/jasper-runtime-5.5.12.jar
+++ b/lib/hadoop-0.20.0/lib/jasper-runtime-5.5.12.jar
diff --git a/third_party/hadoop-0.20.0/lib/jdiff/hadoop_0.17.0.xml b/lib/hadoop-0.20.0/lib/jdiff/hadoop_0.17.0.xml
index 69dded3140..69dded3140 100644
--- a/third_party/hadoop-0.20.0/lib/jdiff/hadoop_0.17.0.xml
+++ b/lib/hadoop-0.20.0/lib/jdiff/hadoop_0.17.0.xml
diff --git a/third_party/hadoop-0.20.0/lib/jdiff/hadoop_0.18.1.xml b/lib/hadoop-0.20.0/lib/jdiff/hadoop_0.18.1.xml
index fd844cbed0..fd844cbed0 100644
--- a/third_party/hadoop-0.20.0/lib/jdiff/hadoop_0.18.1.xml
+++ b/lib/hadoop-0.20.0/lib/jdiff/hadoop_0.18.1.xml
diff --git a/third_party/hadoop-0.20.0/lib/jdiff/hadoop_0.18.2.xml b/lib/hadoop-0.20.0/lib/jdiff/hadoop_0.18.2.xml
index 08173ab82d..08173ab82d 100644
--- a/third_party/hadoop-0.20.0/lib/jdiff/hadoop_0.18.2.xml
+++ b/lib/hadoop-0.20.0/lib/jdiff/hadoop_0.18.2.xml
diff --git a/third_party/hadoop-0.20.0/lib/jdiff/hadoop_0.18.3.xml b/lib/hadoop-0.20.0/lib/jdiff/hadoop_0.18.3.xml
index 564916fef7..564916fef7 100644
--- a/third_party/hadoop-0.20.0/lib/jdiff/hadoop_0.18.3.xml
+++ b/lib/hadoop-0.20.0/lib/jdiff/hadoop_0.18.3.xml
diff --git a/third_party/hadoop-0.20.0/lib/jdiff/hadoop_0.19.0.xml b/lib/hadoop-0.20.0/lib/jdiff/hadoop_0.19.0.xml
index 557ac3cc59..557ac3cc59 100644
--- a/third_party/hadoop-0.20.0/lib/jdiff/hadoop_0.19.0.xml
+++ b/lib/hadoop-0.20.0/lib/jdiff/hadoop_0.19.0.xml
diff --git a/third_party/hadoop-0.20.0/lib/jdiff/hadoop_0.19.1.xml b/lib/hadoop-0.20.0/lib/jdiff/hadoop_0.19.1.xml
index 92bdd2c799..92bdd2c799 100644
--- a/third_party/hadoop-0.20.0/lib/jdiff/hadoop_0.19.1.xml
+++ b/lib/hadoop-0.20.0/lib/jdiff/hadoop_0.19.1.xml
diff --git a/third_party/hadoop-0.20.0/lib/jdiff/hadoop_0.20.0.xml b/lib/hadoop-0.20.0/lib/jdiff/hadoop_0.20.0.xml
index 9067cf1158..9067cf1158 100644
--- a/third_party/hadoop-0.20.0/lib/jdiff/hadoop_0.20.0.xml
+++ b/lib/hadoop-0.20.0/lib/jdiff/hadoop_0.20.0.xml
diff --git a/third_party/hadoop-0.20.0/lib/jets3t-0.6.1.jar b/lib/hadoop-0.20.0/lib/jets3t-0.6.1.jar
index e4048dd685..e4048dd685 100644
--- a/third_party/hadoop-0.20.0/lib/jets3t-0.6.1.jar
+++ b/lib/hadoop-0.20.0/lib/jets3t-0.6.1.jar
diff --git a/third_party/hadoop-0.20.0/lib/jetty-6.1.14.jar b/lib/hadoop-0.20.0/lib/jetty-6.1.14.jar
index 8c503bea21..8c503bea21 100644
--- a/third_party/hadoop-0.20.0/lib/jetty-6.1.14.jar
+++ b/lib/hadoop-0.20.0/lib/jetty-6.1.14.jar
diff --git a/third_party/hadoop-0.20.0/lib/jetty-util-6.1.14.jar b/lib/hadoop-0.20.0/lib/jetty-util-6.1.14.jar
index 8f924bb147..8f924bb147 100644
--- a/third_party/hadoop-0.20.0/lib/jetty-util-6.1.14.jar
+++ b/lib/hadoop-0.20.0/lib/jetty-util-6.1.14.jar
diff --git a/third_party/hadoop-0.20.0/lib/jsp-2.1/jsp-2.1.jar b/lib/hadoop-0.20.0/lib/jsp-2.1/jsp-2.1.jar
index bfdb566c13..bfdb566c13 100644
--- a/third_party/hadoop-0.20.0/lib/jsp-2.1/jsp-2.1.jar
+++ b/lib/hadoop-0.20.0/lib/jsp-2.1/jsp-2.1.jar
diff --git a/third_party/hadoop-0.20.0/lib/jsp-2.1/jsp-api-2.1.jar b/lib/hadoop-0.20.0/lib/jsp-2.1/jsp-api-2.1.jar
index ac3a7a8f7e..ac3a7a8f7e 100644
--- a/third_party/hadoop-0.20.0/lib/jsp-2.1/jsp-api-2.1.jar
+++ b/lib/hadoop-0.20.0/lib/jsp-2.1/jsp-api-2.1.jar
diff --git a/third_party/hadoop-0.20.0/lib/junit-3.8.1.jar b/lib/hadoop-0.20.0/lib/junit-3.8.1.jar
index 674d71e89e..674d71e89e 100644
--- a/third_party/hadoop-0.20.0/lib/junit-3.8.1.jar
+++ b/lib/hadoop-0.20.0/lib/junit-3.8.1.jar
diff --git a/third_party/hadoop-0.20.0/lib/kfs-0.2.2.jar b/lib/hadoop-0.20.0/lib/kfs-0.2.2.jar
index aa32e74baf..aa32e74baf 100644
--- a/third_party/hadoop-0.20.0/lib/kfs-0.2.2.jar
+++ b/lib/hadoop-0.20.0/lib/kfs-0.2.2.jar
diff --git a/third_party/hadoop-0.20.0/lib/kfs-0.2.LICENSE.txt b/lib/hadoop-0.20.0/lib/kfs-0.2.LICENSE.txt
index d645695673..d645695673 100644
--- a/third_party/hadoop-0.20.0/lib/kfs-0.2.LICENSE.txt
+++ b/lib/hadoop-0.20.0/lib/kfs-0.2.LICENSE.txt
diff --git a/third_party/hadoop-0.20.0/lib/log4j-1.2.15.jar b/lib/hadoop-0.20.0/lib/log4j-1.2.15.jar
index c930a6ab4d..c930a6ab4d 100644
--- a/third_party/hadoop-0.20.0/lib/log4j-1.2.15.jar
+++ b/lib/hadoop-0.20.0/lib/log4j-1.2.15.jar
diff --git a/third_party/hadoop-0.20.0/lib/native/.DS_Store b/lib/hadoop-0.20.0/lib/native/.DS_Store
index ff86c6f7f2..ff86c6f7f2 100644
--- a/third_party/hadoop-0.20.0/lib/native/.DS_Store
+++ b/lib/hadoop-0.20.0/lib/native/.DS_Store
diff --git a/third_party/hadoop-0.20.0/lib/native/Linux-amd64-64/libhadoop.a b/lib/hadoop-0.20.0/lib/native/Linux-amd64-64/libhadoop.a
index d8d90cf067..d8d90cf067 100644
--- a/third_party/hadoop-0.20.0/lib/native/Linux-amd64-64/libhadoop.a
+++ b/lib/hadoop-0.20.0/lib/native/Linux-amd64-64/libhadoop.a
diff --git a/third_party/hadoop-0.20.0/lib/native/Linux-amd64-64/libhadoop.la b/lib/hadoop-0.20.0/lib/native/Linux-amd64-64/libhadoop.la
index 2e772fb4ae..2e772fb4ae 100644
--- a/third_party/hadoop-0.20.0/lib/native/Linux-amd64-64/libhadoop.la
+++ b/lib/hadoop-0.20.0/lib/native/Linux-amd64-64/libhadoop.la
diff --git a/third_party/hadoop-0.20.0/lib/native/Linux-amd64-64/libhadoop.so b/lib/hadoop-0.20.0/lib/native/Linux-amd64-64/libhadoop.so
index fb2cbad0b5..fb2cbad0b5 100644
--- a/third_party/hadoop-0.20.0/lib/native/Linux-amd64-64/libhadoop.so
+++ b/lib/hadoop-0.20.0/lib/native/Linux-amd64-64/libhadoop.so
diff --git a/third_party/hadoop-0.20.0/lib/native/Linux-amd64-64/libhadoop.so.1 b/lib/hadoop-0.20.0/lib/native/Linux-amd64-64/libhadoop.so.1
index fb2cbad0b5..fb2cbad0b5 100644
--- a/third_party/hadoop-0.20.0/lib/native/Linux-amd64-64/libhadoop.so.1
+++ b/lib/hadoop-0.20.0/lib/native/Linux-amd64-64/libhadoop.so.1
diff --git a/third_party/hadoop-0.20.0/lib/native/Linux-amd64-64/libhadoop.so.1.0.0 b/lib/hadoop-0.20.0/lib/native/Linux-amd64-64/libhadoop.so.1.0.0
index fb2cbad0b5..fb2cbad0b5 100644
--- a/third_party/hadoop-0.20.0/lib/native/Linux-amd64-64/libhadoop.so.1.0.0
+++ b/lib/hadoop-0.20.0/lib/native/Linux-amd64-64/libhadoop.so.1.0.0
diff --git a/third_party/hadoop-0.20.0/lib/native/Linux-i386-32/libhadoop.a b/lib/hadoop-0.20.0/lib/native/Linux-i386-32/libhadoop.a
index 068d2d6bf6..068d2d6bf6 100644
--- a/third_party/hadoop-0.20.0/lib/native/Linux-i386-32/libhadoop.a
+++ b/lib/hadoop-0.20.0/lib/native/Linux-i386-32/libhadoop.a
diff --git a/third_party/hadoop-0.20.0/lib/native/Linux-i386-32/libhadoop.la b/lib/hadoop-0.20.0/lib/native/Linux-i386-32/libhadoop.la
index 14941670b4..14941670b4 100644
--- a/third_party/hadoop-0.20.0/lib/native/Linux-i386-32/libhadoop.la
+++ b/lib/hadoop-0.20.0/lib/native/Linux-i386-32/libhadoop.la
diff --git a/third_party/hadoop-0.20.0/lib/native/Linux-i386-32/libhadoop.so b/lib/hadoop-0.20.0/lib/native/Linux-i386-32/libhadoop.so
index e3acc2b220..e3acc2b220 100644
--- a/third_party/hadoop-0.20.0/lib/native/Linux-i386-32/libhadoop.so
+++ b/lib/hadoop-0.20.0/lib/native/Linux-i386-32/libhadoop.so
diff --git a/third_party/hadoop-0.20.0/lib/native/Linux-i386-32/libhadoop.so.1 b/lib/hadoop-0.20.0/lib/native/Linux-i386-32/libhadoop.so.1
index e3acc2b220..e3acc2b220 100644
--- a/third_party/hadoop-0.20.0/lib/native/Linux-i386-32/libhadoop.so.1
+++ b/lib/hadoop-0.20.0/lib/native/Linux-i386-32/libhadoop.so.1
diff --git a/third_party/hadoop-0.20.0/lib/native/Linux-i386-32/libhadoop.so.1.0.0 b/lib/hadoop-0.20.0/lib/native/Linux-i386-32/libhadoop.so.1.0.0
index e3acc2b220..e3acc2b220 100644
--- a/third_party/hadoop-0.20.0/lib/native/Linux-i386-32/libhadoop.so.1.0.0
+++ b/lib/hadoop-0.20.0/lib/native/Linux-i386-32/libhadoop.so.1.0.0
diff --git a/third_party/hadoop-0.20.0/lib/oro-2.0.8.jar b/lib/hadoop-0.20.0/lib/oro-2.0.8.jar
index 23488d2600..23488d2600 100644
--- a/third_party/hadoop-0.20.0/lib/oro-2.0.8.jar
+++ b/lib/hadoop-0.20.0/lib/oro-2.0.8.jar
diff --git a/third_party/hadoop-0.20.0/lib/servlet-api-2.5-6.1.14.jar b/lib/hadoop-0.20.0/lib/servlet-api-2.5-6.1.14.jar
index 6d7404fb72..6d7404fb72 100644
--- a/third_party/hadoop-0.20.0/lib/servlet-api-2.5-6.1.14.jar
+++ b/lib/hadoop-0.20.0/lib/servlet-api-2.5-6.1.14.jar
diff --git a/third_party/hadoop-0.20.0/lib/xmlenc-0.52.jar b/lib/hadoop-0.20.0/lib/xmlenc-0.52.jar
index ec568b4c9e..ec568b4c9e 100644
--- a/third_party/hadoop-0.20.0/lib/xmlenc-0.52.jar
+++ b/lib/hadoop-0.20.0/lib/xmlenc-0.52.jar
diff --git a/third_party/hadoop-0.20.0/librecordio/librecordio.a b/lib/hadoop-0.20.0/librecordio/librecordio.a
index 49f7c22d1e..49f7c22d1e 100644
--- a/third_party/hadoop-0.20.0/librecordio/librecordio.a
+++ b/lib/hadoop-0.20.0/librecordio/librecordio.a
diff --git a/third_party/hadoop-0.20.0/webapps/datanode/WEB-INF/web.xml b/lib/hadoop-0.20.0/webapps/datanode/WEB-INF/web.xml
index c271b62815..c271b62815 100644
--- a/third_party/hadoop-0.20.0/webapps/datanode/WEB-INF/web.xml
+++ b/lib/hadoop-0.20.0/webapps/datanode/WEB-INF/web.xml
diff --git a/third_party/hadoop-0.20.0/webapps/hdfs/WEB-INF/web.xml b/lib/hadoop-0.20.0/webapps/hdfs/WEB-INF/web.xml
index 40a73d5293..40a73d5293 100644
--- a/third_party/hadoop-0.20.0/webapps/hdfs/WEB-INF/web.xml
+++ b/lib/hadoop-0.20.0/webapps/hdfs/WEB-INF/web.xml
diff --git a/third_party/hadoop-0.20.0/webapps/hdfs/index.html b/lib/hadoop-0.20.0/webapps/hdfs/index.html
index b9ad74218a..b9ad74218a 100644
--- a/third_party/hadoop-0.20.0/webapps/hdfs/index.html
+++ b/lib/hadoop-0.20.0/webapps/hdfs/index.html
diff --git a/third_party/hadoop-0.20.0/webapps/job/WEB-INF/web.xml b/lib/hadoop-0.20.0/webapps/job/WEB-INF/web.xml
index e124ff744b..e124ff744b 100644
--- a/third_party/hadoop-0.20.0/webapps/job/WEB-INF/web.xml
+++ b/lib/hadoop-0.20.0/webapps/job/WEB-INF/web.xml
diff --git a/third_party/hadoop-0.20.0/webapps/job/index.html b/lib/hadoop-0.20.0/webapps/job/index.html
index 0cc16dce3d..0cc16dce3d 100644
--- a/third_party/hadoop-0.20.0/webapps/job/index.html
+++ b/lib/hadoop-0.20.0/webapps/job/index.html
diff --git a/third_party/hadoop-0.20.0/webapps/static/hadoop-logo.jpg b/lib/hadoop-0.20.0/webapps/static/hadoop-logo.jpg
index 809525d9f1..809525d9f1 100644
--- a/third_party/hadoop-0.20.0/webapps/static/hadoop-logo.jpg
+++ b/lib/hadoop-0.20.0/webapps/static/hadoop-logo.jpg
diff --git a/third_party/hadoop-0.20.0/webapps/static/hadoop.css b/lib/hadoop-0.20.0/webapps/static/hadoop.css
index 0560cb3075..0560cb3075 100644
--- a/third_party/hadoop-0.20.0/webapps/static/hadoop.css
+++ b/lib/hadoop-0.20.0/webapps/static/hadoop.css
diff --git a/third_party/hadoop-0.20.0/webapps/static/jobconf.xsl b/lib/hadoop-0.20.0/webapps/static/jobconf.xsl
index f3c2e33cef..f3c2e33cef 100644
--- a/third_party/hadoop-0.20.0/webapps/static/jobconf.xsl
+++ b/lib/hadoop-0.20.0/webapps/static/jobconf.xsl
diff --git a/third_party/hadoop-0.20.0/webapps/static/jobtracker.js b/lib/hadoop-0.20.0/webapps/static/jobtracker.js
index 7da16c1fcc..7da16c1fcc 100644
--- a/third_party/hadoop-0.20.0/webapps/static/jobtracker.js
+++ b/lib/hadoop-0.20.0/webapps/static/jobtracker.js
diff --git a/third_party/hadoop-0.20.0/webapps/task/WEB-INF/web.xml b/lib/hadoop-0.20.0/webapps/task/WEB-INF/web.xml
index 44a03bed6b..44a03bed6b 100644
--- a/third_party/hadoop-0.20.0/webapps/task/WEB-INF/web.xml
+++ b/lib/hadoop-0.20.0/webapps/task/WEB-INF/web.xml
diff --git a/third_party/hadoop-0.20.0/webapps/task/index.html b/lib/hadoop-0.20.0/webapps/task/index.html
index ab3d56ba46..ab3d56ba46 100644
--- a/third_party/hadoop-0.20.0/webapps/task/index.html
+++ b/lib/hadoop-0.20.0/webapps/task/index.html
diff --git a/third_party/jetty-7.1.6.v20100715/jetty-server-7.1.6.v20100715.jar b/lib/jetty-7.1.6.v20100715/jetty-server-7.1.6.v20100715.jar
index d9ef50be6d..d9ef50be6d 100644
--- a/third_party/jetty-7.1.6.v20100715/jetty-server-7.1.6.v20100715.jar
+++ b/lib/jetty-7.1.6.v20100715/jetty-server-7.1.6.v20100715.jar
diff --git a/third_party/jetty-7.1.6.v20100715/servlet-api-2.5.jar b/lib/jetty-7.1.6.v20100715/servlet-api-2.5.jar
index fb52493468..fb52493468 100644
--- a/third_party/jetty-7.1.6.v20100715/servlet-api-2.5.jar
+++ b/lib/jetty-7.1.6.v20100715/servlet-api-2.5.jar
diff --git a/lib/jline.jar b/lib/jline.jar
new file mode 100644
index 0000000000..6ed67faab6
--- /dev/null
+++ b/lib/jline.jar
diff --git a/third_party/liblzf-3.5/Changes b/lib/liblzf-3.5/Changes
index 09581ff20f..09581ff20f 100644
--- a/third_party/liblzf-3.5/Changes
+++ b/lib/liblzf-3.5/Changes
diff --git a/third_party/liblzf-3.5/LICENSE b/lib/liblzf-3.5/LICENSE
index 9d8e6ec9c8..9d8e6ec9c8 100644
--- a/third_party/liblzf-3.5/LICENSE
+++ b/lib/liblzf-3.5/LICENSE
diff --git a/third_party/liblzf-3.5/Makefile b/lib/liblzf-3.5/Makefile
index 2af118f9d3..2af118f9d3 100644
--- a/third_party/liblzf-3.5/Makefile
+++ b/lib/liblzf-3.5/Makefile
diff --git a/third_party/liblzf-3.5/Makefile.in b/lib/liblzf-3.5/Makefile.in
index bbd53c0370..bbd53c0370 100644
--- a/third_party/liblzf-3.5/Makefile.in
+++ b/lib/liblzf-3.5/Makefile.in
diff --git a/third_party/liblzf-3.5/README b/lib/liblzf-3.5/README
index b5379a3892..b5379a3892 100644
--- a/third_party/liblzf-3.5/README
+++ b/lib/liblzf-3.5/README
diff --git a/third_party/liblzf-3.5/config.h b/lib/liblzf-3.5/config.h
index 966d01ff7d..966d01ff7d 100644
--- a/third_party/liblzf-3.5/config.h
+++ b/lib/liblzf-3.5/config.h
diff --git a/third_party/liblzf-3.5/config.h.in b/lib/liblzf-3.5/config.h.in
index 5fd69c6bd5..5fd69c6bd5 100644
--- a/third_party/liblzf-3.5/config.h.in
+++ b/lib/liblzf-3.5/config.h.in
diff --git a/third_party/liblzf-3.5/config.log b/lib/liblzf-3.5/config.log
index dfa0a83845..dfa0a83845 100644
--- a/third_party/liblzf-3.5/config.log
+++ b/lib/liblzf-3.5/config.log
diff --git a/third_party/liblzf-3.5/config.status b/lib/liblzf-3.5/config.status
index 2498ff6649..2498ff6649 100755
--- a/third_party/liblzf-3.5/config.status
+++ b/lib/liblzf-3.5/config.status
diff --git a/third_party/liblzf-3.5/configure b/lib/liblzf-3.5/configure
index 7a3a2b25c0..7a3a2b25c0 100755
--- a/third_party/liblzf-3.5/configure
+++ b/lib/liblzf-3.5/configure
diff --git a/third_party/liblzf-3.5/configure.ac b/lib/liblzf-3.5/configure.ac
index 58316a01b3..58316a01b3 100644
--- a/third_party/liblzf-3.5/configure.ac
+++ b/lib/liblzf-3.5/configure.ac
diff --git a/third_party/liblzf-3.5/crc32.h b/lib/liblzf-3.5/crc32.h
index cf8f6d4097..cf8f6d4097 100644
--- a/third_party/liblzf-3.5/crc32.h
+++ b/lib/liblzf-3.5/crc32.h
diff --git a/third_party/liblzf-3.5/cs/CLZF.cs b/lib/liblzf-3.5/cs/CLZF.cs
index 4e1b5d50b8..4e1b5d50b8 100644
--- a/third_party/liblzf-3.5/cs/CLZF.cs
+++ b/lib/liblzf-3.5/cs/CLZF.cs
diff --git a/third_party/liblzf-3.5/cs/README b/lib/liblzf-3.5/cs/README
index 9964aff103..9964aff103 100644
--- a/third_party/liblzf-3.5/cs/README
+++ b/lib/liblzf-3.5/cs/README
diff --git a/third_party/liblzf-3.5/install-sh b/lib/liblzf-3.5/install-sh
index e9de23842d..e9de23842d 100755
--- a/third_party/liblzf-3.5/install-sh
+++ b/lib/liblzf-3.5/install-sh
diff --git a/third_party/liblzf-3.5/lzf.c b/lib/liblzf-3.5/lzf.c
index bedfdb6fea..bedfdb6fea 100644
--- a/third_party/liblzf-3.5/lzf.c
+++ b/lib/liblzf-3.5/lzf.c
diff --git a/third_party/liblzf-3.5/lzf.h b/lib/liblzf-3.5/lzf.h
index 919b6e6be2..919b6e6be2 100644
--- a/third_party/liblzf-3.5/lzf.h
+++ b/lib/liblzf-3.5/lzf.h
diff --git a/third_party/liblzf-3.5/lzfP.h b/lib/liblzf-3.5/lzfP.h
index d533f18292..d533f18292 100644
--- a/third_party/liblzf-3.5/lzfP.h
+++ b/lib/liblzf-3.5/lzfP.h
diff --git a/third_party/liblzf-3.5/lzf_c.c b/lib/liblzf-3.5/lzf_c.c
index 0b5d816dd0..0b5d816dd0 100644
--- a/third_party/liblzf-3.5/lzf_c.c
+++ b/lib/liblzf-3.5/lzf_c.c
diff --git a/third_party/liblzf-3.5/lzf_d.c b/lib/liblzf-3.5/lzf_d.c
index 9e2cd829c3..9e2cd829c3 100644
--- a/third_party/liblzf-3.5/lzf_d.c
+++ b/lib/liblzf-3.5/lzf_d.c
diff --git a/third_party/mesos.jar b/lib/mesos.jar
index 60d299c8af..60d299c8af 100644
--- a/third_party/mesos.jar
+++ b/lib/mesos.jar
diff --git a/third_party/scalacheck_2.8.0-1.7.jar b/lib/scalacheck_2.8.0-1.7.jar
index fb3c0e9e12..fb3c0e9e12 100644
--- a/third_party/scalacheck_2.8.0-1.7.jar
+++ b/lib/scalacheck_2.8.0-1.7.jar
diff --git a/third_party/scalatest-1.2/LICENSE b/lib/scalatest-1.2/LICENSE
index d645695673..d645695673 100644
--- a/third_party/scalatest-1.2/LICENSE
+++ b/lib/scalatest-1.2/LICENSE
diff --git a/third_party/scalatest-1.2/NOTICE b/lib/scalatest-1.2/NOTICE
index a405cbd58a..a405cbd58a 100644
--- a/third_party/scalatest-1.2/NOTICE
+++ b/lib/scalatest-1.2/NOTICE
diff --git a/third_party/scalatest-1.2/README.txt b/lib/scalatest-1.2/README.txt
index d505b9c640..d505b9c640 100644
--- a/third_party/scalatest-1.2/README.txt
+++ b/lib/scalatest-1.2/README.txt
diff --git a/third_party/scalatest-1.2/scalatest-1.2.jar b/lib/scalatest-1.2/scalatest-1.2.jar
index cb8db9bdf5..cb8db9bdf5 100644
--- a/third_party/scalatest-1.2/scalatest-1.2.jar
+++ b/lib/scalatest-1.2/scalatest-1.2.jar
diff --git a/third_party/slf4j-1.6.1/slf4j-api-1.6.1.jar b/lib/slf4j-1.6.1/slf4j-api-1.6.1.jar
index 42e0ad0de7..42e0ad0de7 100644
--- a/third_party/slf4j-1.6.1/slf4j-api-1.6.1.jar
+++ b/lib/slf4j-1.6.1/slf4j-api-1.6.1.jar
diff --git a/third_party/slf4j-1.6.1/slf4j-log4j12-1.6.1.jar b/lib/slf4j-1.6.1/slf4j-log4j12-1.6.1.jar
index 873d11983e..873d11983e 100644
--- a/third_party/slf4j-1.6.1/slf4j-log4j12-1.6.1.jar
+++ b/lib/slf4j-1.6.1/slf4j-log4j12-1.6.1.jar
diff --git a/project/build.properties b/project/build.properties
new file mode 100644
index 0000000000..b048c01e2a
--- /dev/null
+++ b/project/build.properties
@@ -0,0 +1,8 @@
+#Project properties
+#Sat Nov 13 21:57:32 PST 2010
+project.organization=UC Berkeley
+project.name=Spark
+sbt.version=0.7.5.RC0
+project.version=0.0.0
+build.scala.versions=2.8.1
+project.initialize=false
diff --git a/run b/run
index b3748e78ab..f68042e129 100755
--- a/run
+++ b/run
@@ -25,7 +25,7 @@ fi
 
 # Set JAVA_OPTS to be able to load native libraries and to set heap size
 JAVA_OPTS="$SPARK_JAVA_OPTS"
-JAVA_OPTS+=" -Djava.library.path=$SPARK_LIBRARY_PATH:$FWDIR/third_party:$FWDIR/src/native:$MESOS_LIBRARY_PATH"
+JAVA_OPTS+=" -Djava.library.path=$SPARK_LIBRARY_PATH:$FWDIR/lib:$FWDIR/src/native:$MESOS_LIBRARY_PATH"
 JAVA_OPTS+=" -Xms$SPARK_MEM -Xmx$SPARK_MEM"
 # Load extra JAVA_OPTS from conf/java-opts, if it exists
 if [ -e $FWDIR/conf/java-opts ] ; then
@@ -34,21 +34,21 @@ fi
 export JAVA_OPTS
 
 # build up classpath
-CLASSPATH="$SPARK_CLASSPATH:$FWDIR/target/classes:$FWDIR/target/test/classes:$MESOS_CLASSPATH"
+CLASSPATH="$SPARK_CLASSPATH:$FWDIR/target/scala_2.8.1/classes:$MESOS_CLASSPATH"
 CLASSPATH+=:$FWDIR/conf
-CLASSPATH+=:$FWDIR/third_party/mesos.jar
-CLASSPATH+=:$FWDIR/third_party/asm-3.2/lib/all/asm-all-3.2.jar
-CLASSPATH+=:$FWDIR/third_party/colt.jar
-CLASSPATH+=:$FWDIR/third_party/guava-r07/guava-r07.jar
-CLASSPATH+=:$FWDIR/third_party/hadoop-0.20.0/hadoop-0.20.0-core.jar
-CLASSPATH+=:$FWDIR/third_party/scalatest-1.2/scalatest-1.2.jar
-CLASSPATH+=:$FWDIR/third_party/scalacheck_2.8.0-1.7.jar
-CLASSPATH+=:$FWDIR/third_party/jetty-7.1.6.v20100715/jetty-server-7.1.6.v20100715.jar
-CLASSPATH+=:$FWDIR/third_party/jetty-7.1.6.v20100715/servlet-api-2.5.jar
-CLASSPATH+=:$FWDIR/third_party/apache-log4j-1.2.16/log4j-1.2.16.jar
-CLASSPATH+=:$FWDIR/third_party/slf4j-1.6.1/slf4j-api-1.6.1.jar
-CLASSPATH+=:$FWDIR/third_party/slf4j-1.6.1/slf4j-log4j12-1.6.1.jar
-for jar in $FWDIR/third_party/hadoop-0.20.0/lib/*.jar; do
+CLASSPATH+=:$FWDIR/lib/mesos.jar
+CLASSPATH+=:$FWDIR/lib/asm-3.2/lib/all/asm-all-3.2.jar
+CLASSPATH+=:$FWDIR/lib/colt.jar
+CLASSPATH+=:$FWDIR/lib/guava-r07/guava-r07.jar
+CLASSPATH+=:$FWDIR/lib/hadoop-0.20.0/hadoop-0.20.0-core.jar
+CLASSPATH+=:$FWDIR/lib/scalatest-1.2/scalatest-1.2.jar
+CLASSPATH+=:$FWDIR/lib/scalacheck_2.8.0-1.7.jar
+CLASSPATH+=:$FWDIR/lib/jetty-7.1.6.v20100715/jetty-server-7.1.6.v20100715.jar
+CLASSPATH+=:$FWDIR/lib/jetty-7.1.6.v20100715/servlet-api-2.5.jar
+CLASSPATH+=:$FWDIR/lib/apache-log4j-1.2.16/log4j-1.2.16.jar
+CLASSPATH+=:$FWDIR/lib/slf4j-1.6.1/slf4j-api-1.6.1.jar
+CLASSPATH+=:$FWDIR/lib/slf4j-1.6.1/slf4j-log4j12-1.6.1.jar
+for jar in $FWDIR/lib/hadoop-0.20.0/lib/*.jar; do
   CLASSPATH+=:$jar
 done
 export CLASSPATH # Needed for spark-shell
diff --git a/sbt/sbt b/sbt/sbt
new file mode 100755
index 0000000000..ac19f6472a
--- /dev/null
+++ b/sbt/sbt
@@ -0,0 +1,2 @@
+#!/bin/bash
+java -Xmx512M -jar `dirname $0`/sbt-launch-*.jar "$@"
diff --git a/sbt/sbt-launch-0.7.5.RC0.jar b/sbt/sbt-launch-0.7.5.RC0.jar
new file mode 100644
index 0000000000..e8a5c00f80
--- /dev/null
+++ b/sbt/sbt-launch-0.7.5.RC0.jar