diff --git a/README.md b/README.md
index 187d42a..ff8158d 100644
--- a/README.md
+++ b/README.md
@@ -20,15 +20,15 @@ git clone https://github.com/rtfeldman/elm-workshop.git
 cd elm-workshop
 ```
 
-## Install dependencies
+## Install supporting tools
 
 Run this at the terminal:
 
 ```bash
-npm install
+npm install -g elm-live@2.0.4 elm-test@0.16.1-alpha3 elm-css@0.4.0
 ```
 
-This will probably take several minutes.
+This could take several minutes.
 
 ## Start with Stage 1
 
diff --git a/stages/1/src/ElmHub.elm b/stages/1/Main.elm
similarity index 98%
rename from stages/1/src/ElmHub.elm
rename to stages/1/Main.elm
index 37483eb..2ed075a 100644
--- a/stages/1/src/ElmHub.elm
+++ b/stages/1/Main.elm
@@ -1,4 +1,4 @@
-module ElmHub (..) where
+module Main (..) where
 
 import Html exposing (..)
 import Html.Attributes exposing (..)
diff --git a/stages/1/README.md b/stages/1/README.md
index db659a0..7f160e4 100644
--- a/stages/1/README.md
+++ b/stages/1/README.md
@@ -1,8 +1,17 @@
 Stage 1
 =======
 
-To engage Auto-Rebuilding:
+## Installation
 
 ```bash
-npm run watch
+$ elm package install
+```
+
+(Answer `y` at the prompt. In rare cases a known issue can cause the download
+to fail; in that case, just run `elm package install` again.)
+
+## Building
+
+```bash
+$ elm live Main.elm --open -- --output=elm.js
 ```
diff --git a/stages/1/elm-package.json b/stages/1/elm-package.json
index 29889da..588e1cf 100644
--- a/stages/1/elm-package.json
+++ b/stages/1/elm-package.json
@@ -4,7 +4,7 @@
     "repository": "https://github.com/rtfeldman/elm-workshop.git",
     "license": "BSD-3-Clause",
     "source-directories": [
-        "src"
+        "."
     ],
     "exposed-modules": [],
     "dependencies": {
diff --git a/stages/1/index.html b/stages/1/index.html
index f3d5dad..9e803f6 100644
--- a/stages/1/index.html
+++ b/stages/1/index.html
@@ -16,7 +16,7 @@
 </body>
 
 <script type="text/javascript">
-  var app = Elm.fullscreen(Elm.ElmHub, {});
+  var app = Elm.fullscreen(Elm.Main, {});
 
   // Uncomment this line and comment out the above to enable elm-reactor support.
   // var app = Elm.fullscreenDebug("ElmHub", "ElmHub.elm");
diff --git a/stages/2/src/ElmHub.elm b/stages/2/Main.elm
similarity index 98%
rename from stages/2/src/ElmHub.elm
rename to stages/2/Main.elm
index 6f85ceb..b0685de 100644
--- a/stages/2/src/ElmHub.elm
+++ b/stages/2/Main.elm
@@ -1,4 +1,4 @@
-module ElmHub (..) where
+module Main (..) where
 
 import Html exposing (..)
 import Html.Attributes exposing (..)
diff --git a/stages/2/README.md b/stages/2/README.md
index 2a8beb7..f983179 100644
--- a/stages/2/README.md
+++ b/stages/2/README.md
@@ -1,8 +1,17 @@
 Stage 2
 =======
 
-To engage Auto-Rebuilding:
+## Installation
 
 ```bash
-npm run watch
+$ elm package install
+```
+
+(Answer `y` at the prompt. In rare cases a known issue can cause the download
+to fail; in that case, just run `elm package install` again.)
+
+## Building
+
+```bash
+$ elm live Main.elm --open -- --output=elm.js
 ```
diff --git a/stages/2/elm-package.json b/stages/2/elm-package.json
index 29889da..588e1cf 100644
--- a/stages/2/elm-package.json
+++ b/stages/2/elm-package.json
@@ -4,7 +4,7 @@
     "repository": "https://github.com/rtfeldman/elm-workshop.git",
     "license": "BSD-3-Clause",
     "source-directories": [
-        "src"
+        "."
     ],
     "exposed-modules": [],
     "dependencies": {
diff --git a/stages/2/index.html b/stages/2/index.html
index f3d5dad..9e803f6 100644
--- a/stages/2/index.html
+++ b/stages/2/index.html
@@ -16,7 +16,7 @@
 </body>
 
 <script type="text/javascript">
-  var app = Elm.fullscreen(Elm.ElmHub, {});
+  var app = Elm.fullscreen(Elm.Main, {});
 
   // Uncomment this line and comment out the above to enable elm-reactor support.
   // var app = Elm.fullscreenDebug("ElmHub", "ElmHub.elm");
diff --git a/stages/3/src/ElmHub.elm b/stages/3/Main.elm
similarity index 99%
rename from stages/3/src/ElmHub.elm
rename to stages/3/Main.elm
index effe200..cd95e51 100644
--- a/stages/3/src/ElmHub.elm
+++ b/stages/3/Main.elm
@@ -1,4 +1,4 @@
-module ElmHub (..) where
+module Main (..) where
 
 import Html exposing (..)
 import Html.Attributes exposing (..)
diff --git a/stages/3/README.md b/stages/3/README.md
index 90d73a8..240a32e 100644
--- a/stages/3/README.md
+++ b/stages/3/README.md
@@ -1,8 +1,17 @@
 Stage 3
 =======
 
-To engage Auto-Rebuilding:
+## Installation
 
 ```bash
-npm run watch
+$ elm package install
+```
+
+(Answer `y` at the prompt. In rare cases a known issue can cause the download
+to fail; in that case, just run `elm package install` again.)
+
+## Building
+
+```bash
+$ elm live Main.elm --open -- --output=elm.js
 ```
diff --git a/stages/3/elm-package.json b/stages/3/elm-package.json
index 29889da..588e1cf 100644
--- a/stages/3/elm-package.json
+++ b/stages/3/elm-package.json
@@ -4,7 +4,7 @@
     "repository": "https://github.com/rtfeldman/elm-workshop.git",
     "license": "BSD-3-Clause",
     "source-directories": [
-        "src"
+        "."
     ],
     "exposed-modules": [],
     "dependencies": {
diff --git a/stages/3/index.html b/stages/3/index.html
index f3d5dad..9e803f6 100644
--- a/stages/3/index.html
+++ b/stages/3/index.html
@@ -16,7 +16,7 @@
 </body>
 
 <script type="text/javascript">
-  var app = Elm.fullscreen(Elm.ElmHub, {});
+  var app = Elm.fullscreen(Elm.Main, {});
 
   // Uncomment this line and comment out the above to enable elm-reactor support.
   // var app = Elm.fullscreenDebug("ElmHub", "ElmHub.elm");
diff --git a/stages/4/src/ElmHub.elm b/stages/4/Main.elm
similarity index 99%
rename from stages/4/src/ElmHub.elm
rename to stages/4/Main.elm
index 411934b..cf1ac7a 100644
--- a/stages/4/src/ElmHub.elm
+++ b/stages/4/Main.elm
@@ -1,4 +1,4 @@
-module ElmHub (..) where
+module Main (..) where
 
 import Html exposing (..)
 import Html.Attributes exposing (..)
diff --git a/stages/4/README.md b/stages/4/README.md
index ac43c83..57149d5 100644
--- a/stages/4/README.md
+++ b/stages/4/README.md
@@ -1,8 +1,17 @@
 Stage 4
 =======
 
-To engage Auto-Rebuilding:
+## Installation
 
 ```bash
-npm run watch
+$ elm package install
+```
+
+(Answer `y` at the prompt. In rare cases a known issue can cause the download
+to fail; in that case, just run `elm package install` again.)
+
+## Building
+
+```bash
+$ elm live Main.elm --open -- --output=elm.js
 ```
diff --git a/stages/4/elm-package.json b/stages/4/elm-package.json
index dfaf05d..5728b71 100644
--- a/stages/4/elm-package.json
+++ b/stages/4/elm-package.json
@@ -4,7 +4,7 @@
     "repository": "https://github.com/rtfeldman/elm-workshop.git",
     "license": "BSD-3-Clause",
     "source-directories": [
-        "src"
+        "."
     ],
     "exposed-modules": [],
     "dependencies": {
diff --git a/stages/4/index.html b/stages/4/index.html
index f3d5dad..9e803f6 100644
--- a/stages/4/index.html
+++ b/stages/4/index.html
@@ -16,7 +16,7 @@
 </body>
 
 <script type="text/javascript">
-  var app = Elm.fullscreen(Elm.ElmHub, {});
+  var app = Elm.fullscreen(Elm.Main, {});
 
   // Uncomment this line and comment out the above to enable elm-reactor support.
   // var app = Elm.fullscreenDebug("ElmHub", "ElmHub.elm");
diff --git a/stages/5/src/ElmHub.elm b/stages/5/ElmHub.elm
similarity index 100%
rename from stages/5/src/ElmHub.elm
rename to stages/5/ElmHub.elm
diff --git a/stages/5/src/Main.elm b/stages/5/Main.elm
similarity index 100%
rename from stages/5/src/Main.elm
rename to stages/5/Main.elm
diff --git a/stages/5/README.md b/stages/5/README.md
index cc12159..fb4648a 100644
--- a/stages/5/README.md
+++ b/stages/5/README.md
@@ -1,14 +1,24 @@
 Stage 5
 =======
 
-To run tests:
+## Installation
 
 ```bash
-npm test
+$ elm package install
 ```
 
-To engage Auto-Rebuilding:
+(Answer `y` at the prompt. In rare cases a known issue can cause the download
+to fail; in that case, just run `elm package install` again.)
+
+## Building
 
 ```bash
-npm run watch
+$ elm live Main.elm --open -- --output=elm.js
+```
+
+## Running Tests
+
+```bash
+$ cd test
+$ elm test TestRunner.elm
 ```
diff --git a/stages/5/elm-package.json b/stages/5/elm-package.json
index dfaf05d..5728b71 100644
--- a/stages/5/elm-package.json
+++ b/stages/5/elm-package.json
@@ -4,7 +4,7 @@
     "repository": "https://github.com/rtfeldman/elm-workshop.git",
     "license": "BSD-3-Clause",
     "source-directories": [
-        "src"
+        "."
     ],
     "exposed-modules": [],
     "dependencies": {
diff --git a/stages/5/test/elm-package.json b/stages/5/test/elm-package.json
index abbb0c1..a440485 100644
--- a/stages/5/test/elm-package.json
+++ b/stages/5/test/elm-package.json
@@ -5,7 +5,7 @@
     "license": "BSD-3-Clause",
     "source-directories": [
         ".",
-        "../src"
+        ".."
     ],
     "exposed-modules": [],
     "dependencies": {
diff --git a/stages/6/src/ElmHub.elm b/stages/6/ElmHub.elm
similarity index 100%
rename from stages/6/src/ElmHub.elm
rename to stages/6/ElmHub.elm
diff --git a/stages/6/src/Main.elm b/stages/6/Main.elm
similarity index 100%
rename from stages/6/src/Main.elm
rename to stages/6/Main.elm
diff --git a/stages/6/README.md b/stages/6/README.md
index cc12159..fb4648a 100644
--- a/stages/6/README.md
+++ b/stages/6/README.md
@@ -1,14 +1,24 @@
 Stage 5
 =======
 
-To run tests:
+## Installation
 
 ```bash
-npm test
+$ elm package install
 ```
 
-To engage Auto-Rebuilding:
+(Answer `y` at the prompt. In rare cases a known issue can cause the download
+to fail; in that case, just run `elm package install` again.)
+
+## Building
 
 ```bash
-npm run watch
+$ elm live Main.elm --open -- --output=elm.js
+```
+
+## Running Tests
+
+```bash
+$ cd test
+$ elm test TestRunner.elm
 ```
diff --git a/stages/6/elm-package.json b/stages/6/elm-package.json
index d61295e..5728b71 100644
--- a/stages/6/elm-package.json
+++ b/stages/6/elm-package.json
@@ -4,7 +4,7 @@
     "repository": "https://github.com/rtfeldman/elm-workshop.git",
     "license": "BSD-3-Clause",
     "source-directories": [
-        "src"
+        "."
     ],
     "exposed-modules": [],
     "dependencies": {
@@ -15,4 +15,4 @@
         "evancz/start-app": "2.0.0 <= v < 3.0.0"
     },
     "elm-version": "0.16.0 <= v < 0.17.0"
-}
\ No newline at end of file
+}
diff --git a/stages/6/test/elm-package.json b/stages/6/test/elm-package.json
index 7ba317d..e4c57c0 100644
--- a/stages/6/test/elm-package.json
+++ b/stages/6/test/elm-package.json
@@ -5,7 +5,7 @@
     "license": "BSD-3-Clause",
     "source-directories": [
         ".",
-        "../src"
+        ".."
     ],
     "exposed-modules": [],
     "dependencies": {
diff --git a/stages/7/src/ElmHub.elm b/stages/7/ElmHub.elm
similarity index 100%
rename from stages/7/src/ElmHub.elm
rename to stages/7/ElmHub.elm
diff --git a/stages/7/src/Main.elm b/stages/7/Main.elm
similarity index 100%
rename from stages/7/src/Main.elm
rename to stages/7/Main.elm
diff --git a/stages/7/README.md b/stages/7/README.md
index cc12159..fb4648a 100644
--- a/stages/7/README.md
+++ b/stages/7/README.md
@@ -1,14 +1,24 @@
 Stage 5
 =======
 
-To run tests:
+## Installation
 
 ```bash
-npm test
+$ elm package install
 ```
 
-To engage Auto-Rebuilding:
+(Answer `y` at the prompt. In rare cases a known issue can cause the download
+to fail; in that case, just run `elm package install` again.)
+
+## Building
 
 ```bash
-npm run watch
+$ elm live Main.elm --open -- --output=elm.js
+```
+
+## Running Tests
+
+```bash
+$ cd test
+$ elm test TestRunner.elm
 ```
diff --git a/stages/7/elm-package.json b/stages/7/elm-package.json
index d61295e..5728b71 100644
--- a/stages/7/elm-package.json
+++ b/stages/7/elm-package.json
@@ -4,7 +4,7 @@
     "repository": "https://github.com/rtfeldman/elm-workshop.git",
     "license": "BSD-3-Clause",
     "source-directories": [
-        "src"
+        "."
     ],
     "exposed-modules": [],
     "dependencies": {
@@ -15,4 +15,4 @@
         "evancz/start-app": "2.0.0 <= v < 3.0.0"
     },
     "elm-version": "0.16.0 <= v < 0.17.0"
-}
\ No newline at end of file
+}
diff --git a/stages/7/test/elm-package.json b/stages/7/test/elm-package.json
index 7ba317d..e4c57c0 100644
--- a/stages/7/test/elm-package.json
+++ b/stages/7/test/elm-package.json
@@ -5,7 +5,7 @@
     "license": "BSD-3-Clause",
     "source-directories": [
         ".",
-        "../src"
+        ".."
     ],
     "exposed-modules": [],
     "dependencies": {
diff --git a/stages/8/src/Component/ElmHub.elm b/stages/8/Component/ElmHub.elm
similarity index 100%
rename from stages/8/src/Component/ElmHub.elm
rename to stages/8/Component/ElmHub.elm
diff --git a/stages/8/src/Component/SearchResult.elm b/stages/8/Component/SearchResult.elm
similarity index 100%
rename from stages/8/src/Component/SearchResult.elm
rename to stages/8/Component/SearchResult.elm
diff --git a/stages/8/src/Main.elm b/stages/8/Main.elm
similarity index 100%
rename from stages/8/src/Main.elm
rename to stages/8/Main.elm
diff --git a/stages/8/README.md b/stages/8/README.md
index cc12159..fb4648a 100644
--- a/stages/8/README.md
+++ b/stages/8/README.md
@@ -1,14 +1,24 @@
 Stage 5
 =======
 
-To run tests:
+## Installation
 
 ```bash
-npm test
+$ elm package install
 ```
 
-To engage Auto-Rebuilding:
+(Answer `y` at the prompt. In rare cases a known issue can cause the download
+to fail; in that case, just run `elm package install` again.)
+
+## Building
 
 ```bash
-npm run watch
+$ elm live Main.elm --open -- --output=elm.js
+```
+
+## Running Tests
+
+```bash
+$ cd test
+$ elm test TestRunner.elm
 ```
diff --git a/stages/8/elm-package.json b/stages/8/elm-package.json
index d61295e..5728b71 100644
--- a/stages/8/elm-package.json
+++ b/stages/8/elm-package.json
@@ -4,7 +4,7 @@
     "repository": "https://github.com/rtfeldman/elm-workshop.git",
     "license": "BSD-3-Clause",
     "source-directories": [
-        "src"
+        "."
     ],
     "exposed-modules": [],
     "dependencies": {
@@ -15,4 +15,4 @@
         "evancz/start-app": "2.0.0 <= v < 3.0.0"
     },
     "elm-version": "0.16.0 <= v < 0.17.0"
-}
\ No newline at end of file
+}
diff --git a/stages/8/test/elm-package.json b/stages/8/test/elm-package.json
index 7ba317d..e4c57c0 100644
--- a/stages/8/test/elm-package.json
+++ b/stages/8/test/elm-package.json
@@ -5,7 +5,7 @@
     "license": "BSD-3-Clause",
     "source-directories": [
         ".",
-        "../src"
+        ".."
     ],
     "exposed-modules": [],
     "dependencies": {
diff --git a/stages/9/src/Component/ElmHub.elm b/stages/9/Component/ElmHub.elm
similarity index 100%
rename from stages/9/src/Component/ElmHub.elm
rename to stages/9/Component/ElmHub.elm
diff --git a/stages/9/src/Component/SearchResult.elm b/stages/9/Component/SearchResult.elm
similarity index 100%
rename from stages/9/src/Component/SearchResult.elm
rename to stages/9/Component/SearchResult.elm
diff --git a/stages/9/ElmHub.elm b/stages/9/ElmHub.elm
index e69de29..e3ed2f3 100644
--- a/stages/9/ElmHub.elm
+++ b/stages/9/ElmHub.elm
@@ -0,0 +1,8 @@
+module ElmHub (..) where
+
+import Css exposing (..)
+
+
+css =
+  stylesheet
+    [ (.) "foo" [] ]
diff --git a/stages/9/src/Main.elm b/stages/9/Main.elm
similarity index 100%
rename from stages/9/src/Main.elm
rename to stages/9/Main.elm
diff --git a/stages/9/README.md b/stages/9/README.md
index e27c7cf..bc65db1 100644
--- a/stages/9/README.md
+++ b/stages/9/README.md
@@ -1,20 +1,23 @@
 Stage 5
 =======
 
-To run tests:
+## Installation
 
 ```bash
-npm test
+$ elm package install
 ```
 
-To compile CSS:
+(Answer `y` at the prompt. In rare cases a known issue can cause the download
+to fail; in that case, just run `elm package install` again.)
+
+## Building
 
 ```bash
-npm run css
+$ elm live Main.elm --open -- --output=elm.js
 ```
 
-To engage Auto-Rebuilding:
+## Compiling CSS
 
 ```bash
-npm run watch
+$ elm test css/Stylesheets.elm
 ```
diff --git a/stages/9/elm-package.json b/stages/9/elm-package.json
index c278a8e..ea197b6 100644
--- a/stages/9/elm-package.json
+++ b/stages/9/elm-package.json
@@ -4,8 +4,7 @@
     "repository": "https://github.com/rtfeldman/elm-workshop.git",
     "license": "BSD-3-Clause",
     "source-directories": [
-        "src",
-        "css"
+        "."
     ],
     "exposed-modules": [],
     "dependencies": {
@@ -17,4 +16,4 @@
         "rtfeldman/elm-css": "1.0.0 <= v < 2.0.0"
     },
     "elm-version": "0.16.0 <= v < 0.17.0"
-}
\ No newline at end of file
+}
diff --git a/stages/9/src/ElmHub.elm b/stages/9/src/ElmHub.elm
deleted file mode 100644
index e3ed2f3..0000000
--- a/stages/9/src/ElmHub.elm
+++ /dev/null
@@ -1,8 +0,0 @@
-module ElmHub (..) where
-
-import Css exposing (..)
-
-
-css =
-  stylesheet
-    [ (.) "foo" [] ]
diff --git a/stages/9/test/elm-package.json b/stages/9/test/elm-package.json
index 7ba317d..e4c57c0 100644
--- a/stages/9/test/elm-package.json
+++ b/stages/9/test/elm-package.json
@@ -5,7 +5,7 @@
     "license": "BSD-3-Clause",
     "source-directories": [
         ".",
-        "../src"
+        ".."
     ],
     "exposed-modules": [],
     "dependencies": {