diff --git a/scala-tutorial/FrenchDate.scala b/scala/official-tutorial/FrenchDate.scala
similarity index 100%
rename from scala-tutorial/FrenchDate.scala
rename to scala/official-tutorial/FrenchDate.scala
diff --git a/scala-tutorial/HelloWorld.scala b/scala/official-tutorial/HelloWorld.scala
similarity index 100%
rename from scala-tutorial/HelloWorld.scala
rename to scala/official-tutorial/HelloWorld.scala
diff --git a/scala-tutorial/README b/scala/official-tutorial/README
similarity index 100%
rename from scala-tutorial/README
rename to scala/official-tutorial/README
diff --git a/scala-tutorial/Timer.scala b/scala/official-tutorial/Timer.scala
similarity index 100%
rename from scala-tutorial/Timer.scala
rename to scala/official-tutorial/Timer.scala
diff --git a/scala/sbt-guide/.gitignore b/scala/sbt-guide/.gitignore
new file mode 100644
index 0000000..ae3c172
--- /dev/null
+++ b/scala/sbt-guide/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/scala/sbt-guide/lib/.gitkeep b/scala/sbt-guide/lib/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/scala/sbt-guide/setup b/scala/sbt-guide/setup
new file mode 100755
index 0000000..4032ce5
--- /dev/null
+++ b/scala/sbt-guide/setup
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+mkdir -p ./bin
+pushd ./bin
+curl -O 'https://raw.github.com/paulp/sbt-extras/master/sbt'
+chmod +x sbt
+popd
+./bin/sbt -sbt-create about