olinjs · EvanDorsky · May 15, 2015 · May 15, 2015 · May 15, 2015 · May 15, 2015
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Olin.js - Spring 2015
+Olin.js
 ===
 
 ##Course Description
@@ -12,29 +12,26 @@ This repository contains all of the lesson material and assignments to get you g
 Feel free to submit a Github issue if you find any problems in the course and we'll do our best to fix it up.
 
 ##Course Contents
-* [Class 0 - Getting Ready for the Course](./classes/class00)
-* [Class 1 - Course Introduction and The Internet](./classes/class01)
-* [Class 2 - Intro to Javascript](./classes/class02)
-* [Class 3 - Express, Templating, and MongoDB](./classes/class03)
-* [Class 4 - The Client](./classes/class04)
-* [Class 5 - Flex Day](./classes/class05)
-* [Class 6 - Sessions, Users, Errors, CSS, and Debugging](./classes/class06)
-* [Class 7 - Application Integration](./classes/class07)
-* [Class 8 - Unit Testing and Task Running](./classes/class08)
-* [Class 9 - Architecture and Diagramming](./classes/class09)
-* [Class 10 - Application Frameworks (Lab 1)](./classes/class10)
-* [Class 11 - Security](./classes/class11)
-* [Class 12 - Deployment and Scaling](./classes/class12)
-* [Class 13 - Framework Reprise (Lab 2)](./classes/class13)
-* [Class 14 - Project Planning](./classes/class14)
-* [Class 15 - Agile Project Management](./classes/class15)
+* [Lesson 0 - Getting Ready for the Course](./lessons/00-getting-ready)
+* [Lesson 1 - Course Introduction and The Internet](./lessons/01-welcome-internet)
+* [Lesson 2 - Intro to Javascript](./lessons/02-javascript)
+* [Lesson 3 - Express, Templating, and MongoDB](./lessons/03-express-templates-mongo)
+* [Lesson 4 - The Client](./lessons/04-client-jquery-ajax)
+* [Lesson 5 - Sessions, Users, Errors, CSS, and Debugging](./lessons/05-css-development-grace)
+* [Lesson 6 - Application Integration](./lessons/06-apis-debugging)
+* [Lesson 7 - Unit Testing and Task Running](./lessons/07-tests-tasks)
+* [Lesson 8 - Architecture and Diagramming](./lessons/08-designs-diagrams)
+* [Lesson 9 - Application Frameworks (Lab 1)](./lessons/09-clientside-frameworks)
+* [Lesson 10 - Security](./lessons/10-security)
+* [Lesson 11 - Deployment and Scaling](./lessons/11-deployment-scaling)
+* [Lesson 12 - Agile Project Management](./lessons/12-agile)
 * [Lab 1](./lab1)
 * [Lab 2](./lab2)
 * [Final Project](./finalproject)
 
 
 ##Learning Objectives
-1. Understand the modern internet and web applications 
+1. Understand the modern internet and web applications
 2. Become adept with JavaScript, Node, and database technologies
 3. Learn software design skills and strategies relevant to web infrastructure
 4. Work effectively as a member of a project team

diff --git a/classes/class05/README.md b/classes/class05/README.md
diff --git a/classes/class06/homework b/classes/class06/homework
diff --git a/classes/class13/README.md b/classes/class13/README.md
diff --git a/classes/class14/README.md b/classes/class14/README.md
diff --git a/classes/class00/README.md → lessons/00-getting-ready/README.md b/classes/class00/README.md → lessons/00-getting-ready/README.md
@@ -57,3 +57,88 @@ To pull any new additions from the upstream remote, simply run
 git pull upstream master
 ```
 If everything is going according to plan, there shouldn't be any conflicts, but if there are, you will have to resolve them. 
+
+## Git Best Practices
+
+In the real world (and in this class), it's not good practice to commit directly to the `master` branch. If a real project is under version control, committing a bug to `master` could break live code. The `master` branch is generally eserved for code that has been tested and shown to work in a branch.
+
+Here's how to create a pull request:
+
+1. Create a new branch on your `olinjs` repository.
+
+  ```bash
+  $ git checkout -b branchname
+  ```
+
+2. Commit something on the branch.
+3. Pull request that branch to `master` on **your fork** of `olinjs/olinjs` on GitHub.
+
+With the pull request, you now have a nice interface for conducting code reviews and looking through any changes made n a branch.
+You also get a merge button that will let you know if your branch has any merge conflicts.
+
+## The Repo and `.gitignore`
+
+This is the directory structure of the `olinjs` repo:
+
+```bash
+.
+├── .git
+├── .gitignore
+├── README.md
+├── lessons
+├── finalproject
+├── lab1
+├── lab2
+
+6 directories, 2 files
+```
+
+The `.gitignore` file lives in the root directory of the git repository. Each line is a pattern for a file to ignore.
+
+###### .gitignore
+
+```bash
+# Logs
+**/logs
+**/*.log
+
+# Runtime data
+pids
+**/*.pid
+**/*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+**/lib-cov
+
+# Coverage directory used by tools like istanbul
+**/coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+**/.grunt
+
+# node-waf configuration
+**/.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+**/build/Release
+
+# Dependency folders
+**/node_modules
+
+# Debug log from npm
+**/npm-debug.log
+
+# For Mac users without global gitignore
+# http://islegend.com/development/setting-global-gitignore-mac-windows/
+**/.DS_Store
+```
+
+This is worth perusing but we won't cover it in detail now. Your `.gitignore` can be as simple as:
+
+###### .gitignore
+
+```bash
+node_modules
+```
+
+Which will ignore the `node_modules` folder — standard for a Node repository.
diff --git a/classes/class01/README.md → lessons/01-welcome-internet/README.md b/classes/class01/README.md → lessons/01-welcome-internet/README.md
@@ -1,4 +1,4 @@
-#Class 1
+#Lesson 1 - Welcome! The Internet and JavaScript
 
 ##Goals
 After this class, you should:
@@ -21,7 +21,7 @@ With help from the course assistants:
 - Josh Langowitz
 - Sarah Walters
 
-##Introduction to the Internet:
+##Introduction to the Internet
 ![Series of tubes](http://crackerdiet.net/pub/Tedstevenstubesomgwhat.jpg)
 
 This is obviously a comic misconception about the true nature of the internet, so let's dive deeper and have a look at the true nature of our old friend.
@@ -145,7 +145,7 @@ Acording to the official website,
 
 What this really means is that it is JavaScript running on the server, accepting incoming requests and handling them. The thing that makes Node.js so awesome is that it is entirely **non-blocking**. To understand exactly what this means, realize that with other server frameworks, when a request comes in, the server has to process that request and send the response before it can accept the next incoming request. Node is structured in such a way that when a request comes in, it can immediately continue listening for other requests.
 
-##Exercises:
+##Exercises
 Before moving on to the next lesson, go through the following introductory tutorials on JavaScript and Node.
 
 ####JavaScript Tutorial

diff --git a/classes/class02/README.md → lessons/02-javascript/README.md b/classes/class02/README.md → lessons/02-javascript/README.md
@@ -1,4 +1,4 @@
-#Class2 - JavaScript
+#Lesson 2 - JavaScript
 
 ## JavaScript is Everywhere
 

diff --git a/classes/class02/exercises.md → lessons/02-javascript/exercises.md b/classes/class02/exercises.md → lessons/02-javascript/exercises.md
diff --git a/classes/class03/README.md → lessons/03-express-templates-mongo/README.md b/classes/class03/README.md → lessons/03-express-templates-mongo/README.md
@@ -1,4 +1,4 @@
-#Class 3 - Express, Templating, and MongoDB
+#Lesson 3 - Express, Templating, and MongoDB
 
 ##Express
 Now that we've explored Node.js a little, we will abstract the details away with the [Express](http://expressjs.com/) development framework. Before, in the Node Beginner's Book, our code looked a lot like this:

diff --git a/classes/class03/exercises.md → ...s/03-express-templates-mongo/exercises.md b/classes/class03/exercises.md → ...s/03-express-templates-mongo/exercises.md
diff --git a/classes/class03/expressintro/app.js → ...press-templates-mongo/expressintro/app.js b/classes/class03/expressintro/app.js → ...press-templates-mongo/expressintro/app.js
diff --git a/classes/class03/expressintro/package.json → ...templates-mongo/expressintro/package.json b/classes/class03/expressintro/package.json → ...templates-mongo/expressintro/package.json
diff --git a/...lass03/expressintro/public/images/cat.jpg → ...-mongo/expressintro/public/images/cat.jpg b/...lass03/expressintro/public/images/cat.jpg → ...-mongo/expressintro/public/images/cat.jpg
diff --git a/classes/class03/expressintro/routes/index.js → ...plates-mongo/expressintro/routes/index.js b/classes/class03/expressintro/routes/index.js → ...plates-mongo/expressintro/routes/index.js
diff --git a/...lass03/expressintro/views/home.handlebars → ...-mongo/expressintro/views/home.handlebars b/...lass03/expressintro/views/home.handlebars → ...-mongo/expressintro/views/home.handlebars
diff --git a/...xpressintro/views/layouts/main.handlebars → ...xpressintro/views/layouts/main.handlebars b/...xpressintro/views/layouts/main.handlebars → ...xpressintro/views/layouts/main.handlebars
diff --git a/classes/class03/homework-solution/Procfile → ...emplates-mongo/homework-solution/Procfile b/classes/class03/homework-solution/Procfile → ...emplates-mongo/homework-solution/Procfile
diff --git a/classes/class03/homework-solution/app.js → ...-templates-mongo/homework-solution/app.js b/classes/class03/homework-solution/app.js → ...-templates-mongo/homework-solution/app.js
diff --git a/...ss03/homework-solution/models/catModel.js → ...ongo/homework-solution/models/catModel.js b/...ss03/homework-solution/models/catModel.js → ...ongo/homework-solution/models/catModel.js
diff --git a/...es/class03/homework-solution/package.json → ...ates-mongo/homework-solution/package.json b/...es/class03/homework-solution/package.json → ...ates-mongo/homework-solution/package.json
diff --git a/...3/homework-solution/public/images/cat.jpg → ...o/homework-solution/public/images/cat.jpg b/...3/homework-solution/public/images/cat.jpg → ...o/homework-solution/public/images/cat.jpg
diff --git a/...ass03/homework-solution/routes/catData.js → ...mongo/homework-solution/routes/catData.js b/...ass03/homework-solution/routes/catData.js → ...mongo/homework-solution/routes/catData.js
diff --git a/.../class03/homework-solution/routes/cats.js → ...es-mongo/homework-solution/routes/cats.js b/.../class03/homework-solution/routes/cats.js → ...es-mongo/homework-solution/routes/cats.js
diff --git a/...class03/homework-solution/routes/index.js → ...s-mongo/homework-solution/routes/index.js b/...class03/homework-solution/routes/index.js → ...s-mongo/homework-solution/routes/index.js
diff --git a/...3/homework-solution/views/cats.handlebars → ...o/homework-solution/views/cats.handlebars b/...3/homework-solution/views/cats.handlebars → ...o/homework-solution/views/cats.handlebars
diff --git a/...3/homework-solution/views/home.handlebars → ...o/homework-solution/views/home.handlebars b/...3/homework-solution/views/home.handlebars → ...o/homework-solution/views/home.handlebars
diff --git a/...rk-solution/views/layouts/main.handlebars → ...rk-solution/views/layouts/main.handlebars b/...rk-solution/views/layouts/main.handlebars → ...rk-solution/views/layouts/main.handlebars
diff --git a/classes/class04/README.md → lessons/04-client-jquery-ajax/README.md b/classes/class04/README.md → lessons/04-client-jquery-ajax/README.md
@@ -1,4 +1,4 @@
-# Class 4 - The Client
+# Lesson 4 - The Client, jQuery, and AJAX
 Web Applications handle much of their database communication and logic on the server,
 but the front-end is what the client actually sees and interacts with.
 Without a clean, intuitive, responsive, and enjoyable client-side,

diff --git a/classes/class04/classApp/app.js → ...ons/04-client-jquery-ajax/classApp/app.js b/classes/class04/classApp/app.js → ...ons/04-client-jquery-ajax/classApp/app.js
diff --git a/classes/class04/classApp/package.json → ...-client-jquery-ajax/classApp/package.json b/classes/class04/classApp/package.json → ...-client-jquery-ajax/classApp/package.json
diff --git a/...es/class04/classApp/public/images/cat.jpg → ...query-ajax/classApp/public/images/cat.jpg b/...es/class04/classApp/public/images/cat.jpg → ...query-ajax/classApp/public/images/cat.jpg
diff --git a/...lass04/classApp/public/images/grumpy.jpeg → ...y-ajax/classApp/public/images/grumpy.jpeg b/...lass04/classApp/public/images/grumpy.jpeg → ...y-ajax/classApp/public/images/grumpy.jpeg
diff --git a/...ass04/classApp/public/javascripts/main.js → ...-ajax/classApp/public/javascripts/main.js b/...ass04/classApp/public/javascripts/main.js → ...-ajax/classApp/public/javascripts/main.js
diff --git a/classes/class04/classApp/routes/getCat.js → ...ent-jquery-ajax/classApp/routes/getCat.js b/classes/class04/classApp/routes/getCat.js → ...ent-jquery-ajax/classApp/routes/getCat.js
diff --git a/classes/class04/classApp/routes/index.js → ...ient-jquery-ajax/classApp/routes/index.js b/classes/class04/classApp/routes/index.js → ...ient-jquery-ajax/classApp/routes/index.js
diff --git a/...es/class04/classApp/views/home.handlebars → ...query-ajax/classApp/views/home.handlebars b/...es/class04/classApp/views/home.handlebars → ...query-ajax/classApp/views/home.handlebars
diff --git a/...04/classApp/views/layouts/main.handlebars → ...ax/classApp/views/layouts/main.handlebars b/...04/classApp/views/layouts/main.handlebars → ...ax/classApp/views/layouts/main.handlebars
diff --git a/classes/class04/exercises.md → lessons/04-client-jquery-ajax/exercises.md b/classes/class04/exercises.md → lessons/04-client-jquery-ajax/exercises.md
diff --git a/classes/class04/homework-soln/Procfile → ...client-jquery-ajax/homework-soln/Procfile b/classes/class04/homework-soln/Procfile → ...client-jquery-ajax/homework-soln/Procfile
diff --git a/classes/class04/homework-soln/app.js → ...4-client-jquery-ajax/homework-soln/app.js b/classes/class04/homework-soln/app.js → ...4-client-jquery-ajax/homework-soln/app.js
diff --git a/...4/homework-soln/models/ingredientModel.js → ...x/homework-soln/models/ingredientModel.js b/...4/homework-soln/models/ingredientModel.js → ...x/homework-soln/models/ingredientModel.js
diff --git a/...lass04/homework-soln/models/orderModel.js → ...y-ajax/homework-soln/models/orderModel.js b/...lass04/homework-soln/models/orderModel.js → ...y-ajax/homework-soln/models/orderModel.js
diff --git a/classes/class04/homework-soln/package.json → ...nt-jquery-ajax/homework-soln/package.json b/classes/class04/homework-soln/package.json → ...nt-jquery-ajax/homework-soln/package.json
diff --git a/...work-soln/public/javascripts/callbacks.js → ...work-soln/public/javascripts/callbacks.js b/...work-soln/public/javascripts/callbacks.js → ...work-soln/public/javascripts/callbacks.js
diff --git a/...ework-soln/public/javascripts/handlers.js → ...ework-soln/public/javascripts/handlers.js b/...ework-soln/public/javascripts/handlers.js → ...ework-soln/public/javascripts/handlers.js
diff --git a/.../homework-soln/public/javascripts/main.js → .../homework-soln/public/javascripts/main.js b/.../homework-soln/public/javascripts/main.js → .../homework-soln/public/javascripts/main.js
diff --git a/...mework-soln/public/stylesheets/styles.css → ...mework-soln/public/stylesheets/styles.css b/...mework-soln/public/stylesheets/styles.css → ...mework-soln/public/stylesheets/styles.css
diff --git a/...ses/class04/homework-soln/routes/index.js → ...jquery-ajax/homework-soln/routes/index.js b/...ses/class04/homework-soln/routes/index.js → ...jquery-ajax/homework-soln/routes/index.js
diff --git a/...omework-soln/views/ingredients.handlebars → ...omework-soln/views/ingredients.handlebars b/...omework-soln/views/ingredients.handlebars → ...omework-soln/views/ingredients.handlebars
diff --git a/...04/homework-soln/views/kitchen.handlebars → ...ax/homework-soln/views/kitchen.handlebars b/...04/homework-soln/views/kitchen.handlebars → ...ax/homework-soln/views/kitchen.handlebars
diff --git a/...mework-soln/views/layouts/main.handlebars → ...mework-soln/views/layouts/main.handlebars b/...mework-soln/views/layouts/main.handlebars → ...mework-soln/views/layouts/main.handlebars
diff --git a/...04/homework-soln/views/message.handlebars → ...ax/homework-soln/views/message.handlebars b/...04/homework-soln/views/message.handlebars → ...ax/homework-soln/views/message.handlebars
diff --git a/...ss04/homework-soln/views/order.handlebars → ...ajax/homework-soln/views/order.handlebars b/...ss04/homework-soln/views/order.handlebars → ...ajax/homework-soln/views/order.handlebars
diff --git a/classes/class04/images/consoleicon.png → ...client-jquery-ajax/images/consoleicon.png b/classes/class04/images/consoleicon.png → ...client-jquery-ajax/images/consoleicon.png
diff --git a/classes/class04/images/cookie1.png → .../04-client-jquery-ajax/images/cookie1.png b/classes/class04/images/cookie1.png → .../04-client-jquery-ajax/images/cookie1.png
diff --git a/classes/class04/images/cookie2.png → .../04-client-jquery-ajax/images/cookie2.png b/classes/class04/images/cookie2.png → .../04-client-jquery-ajax/images/cookie2.png
diff --git a/.../class04/images/desktop_browser_share.png → ...ery-ajax/images/desktop_browser_share.png b/.../class04/images/desktop_browser_share.png → ...ery-ajax/images/desktop_browser_share.png
diff --git a/classes/class04/images/devconsole.png → ...-client-jquery-ajax/images/devconsole.png b/classes/class04/images/devconsole.png → ...-client-jquery-ajax/images/devconsole.png
diff --git a/classes/class04/images/formpage.png → ...04-client-jquery-ajax/images/formpage.png b/classes/class04/images/formpage.png → ...04-client-jquery-ajax/images/formpage.png
diff --git a/classes/class06/README.md → lessons/05-css-development-grace/README.md b/classes/class06/README.md → lessons/05-css-development-grace/README.md
@@ -1,4 +1,4 @@
-# Class6 - CSS, Development Style and Grace
+# Lesson 5 - CSS, Development Style and Grace
 
 In this lesson we're going to cover some big ideas that span front-end and back-end development (and life!), and also round out our front-end knowledge by learning about CSS.
 

diff --git a/classes/class06/box.png → lessons/05-css-development-grace/box.png b/classes/class06/box.png → lessons/05-css-development-grace/box.png
diff --git a/classes/class06/example.png → lessons/05-css-development-grace/example.png b/classes/class06/example.png → lessons/05-css-development-grace/example.png
diff --git a/classes/class06/exercises.md → ...ons/05-css-development-grace/exercises.md b/classes/class06/exercises.md → ...ons/05-css-development-grace/exercises.md
@@ -1,4 +1,4 @@
-# Exercise 6
+# Exercise 5
 
 ## Assignment
 

diff --git a/classes/class06/sessions/.gitignore → ...css-development-grace/sessions/.gitignore b/classes/class06/sessions/.gitignore → ...css-development-grace/sessions/.gitignore
diff --git a/classes/class06/sessions/app.js → .../05-css-development-grace/sessions/app.js b/classes/class06/sessions/app.js → .../05-css-development-grace/sessions/app.js
diff --git a/classes/class06/sessions/package.json → ...s-development-grace/sessions/package.json b/classes/class06/sessions/package.json → ...s-development-grace/sessions/package.json
diff --git a/classes/class07/README.md → lessons/06-apis-debugging/README.md b/classes/class07/README.md → lessons/06-apis-debugging/README.md
@@ -1,4 +1,4 @@
-#Class 7: APIs and Debugging Strategies
+#Lesson 6 - APIs and Debugging Strategies
 ##APIs: Your *real* on-ramp to the information superhighway
 
 ![Take it to the moon, take it to the stars.](./images/tothemoon.jpg)

diff --git a/classes/class07/exercises.md → lessons/06-apis-debugging/exercises.md b/classes/class07/exercises.md → lessons/06-apis-debugging/exercises.md
@@ -1,4 +1,4 @@
-#Exercise 7
+#Exercise 6
 
 ##Passport and "Sign in using __"
 One of the great features of OAuth is that it allows us to use another service to authenticate users of our service. This means we can piggy back on someone else to handle the hard parts of signing in to a service. The library `Passport` makes this really easy, if not a bit complicated.

diff --git a/classes/class07/images/facebook.png → ...ons/06-apis-debugging/images/facebook.png b/classes/class07/images/facebook.png → ...ons/06-apis-debugging/images/facebook.png
diff --git a/classes/class07/images/oauth.png → lessons/06-apis-debugging/images/oauth.png b/classes/class07/images/oauth.png → lessons/06-apis-debugging/images/oauth.png
diff --git a/classes/class07/images/tothemoon.jpg → ...ns/06-apis-debugging/images/tothemoon.jpg b/classes/class07/images/tothemoon.jpg → ...ns/06-apis-debugging/images/tothemoon.jpg
diff --git a/classes/class07/word_cloud/.gitignore → ...s/06-apis-debugging/word_cloud/.gitignore b/classes/class07/word_cloud/.gitignore → ...s/06-apis-debugging/word_cloud/.gitignore
diff --git a/classes/class07/word_cloud/app.js → lessons/06-apis-debugging/word_cloud/app.js b/classes/class07/word_cloud/app.js → lessons/06-apis-debugging/word_cloud/app.js
diff --git a/classes/class07/word_cloud/package.json → ...06-apis-debugging/word_cloud/package.json b/classes/class07/word_cloud/package.json → ...06-apis-debugging/word_cloud/package.json
diff --git a/...es/class07/word_cloud/public/css/main.css → ...-debugging/word_cloud/public/css/main.css b/...es/class07/word_cloud/public/css/main.css → ...-debugging/word_cloud/public/css/main.css
diff --git a/...07/word_cloud/public/javascripts/cloud.js → ...ng/word_cloud/public/javascripts/cloud.js b/...07/word_cloud/public/javascripts/cloud.js → ...ng/word_cloud/public/javascripts/cloud.js
diff --git a/...ass07/word_cloud/public/javascripts/d3.js → ...gging/word_cloud/public/javascripts/d3.js b/...ass07/word_cloud/public/javascripts/d3.js → ...gging/word_cloud/public/javascripts/d3.js
diff --git a/...s07/word_cloud/public/javascripts/main.js → ...ing/word_cloud/public/javascripts/main.js b/...s07/word_cloud/public/javascripts/main.js → ...ing/word_cloud/public/javascripts/main.js
diff --git a/...rd_cloud/public/javascripts/underscore.js → ...rd_cloud/public/javascripts/underscore.js b/...rd_cloud/public/javascripts/underscore.js → ...rd_cloud/public/javascripts/underscore.js
diff --git a/classes/class07/word_cloud/util/text.js → ...06-apis-debugging/word_cloud/util/text.js b/classes/class07/word_cloud/util/text.js → ...06-apis-debugging/word_cloud/util/text.js
diff --git a/...class07/word_cloud/views/index.handlebars → ...bugging/word_cloud/views/index.handlebars b/...class07/word_cloud/views/index.handlebars → ...bugging/word_cloud/views/index.handlebars
diff --git a/.../word_cloud/views/layouts/main.handlebars → .../word_cloud/views/layouts/main.handlebars b/.../word_cloud/views/layouts/main.handlebars → .../word_cloud/views/layouts/main.handlebars
diff --git a/classes/class08/README.md → lessons/07-tests-tasks/README.md b/classes/class08/README.md → lessons/07-tests-tasks/README.md
@@ -1,4 +1,4 @@
-#Class 8 - Unit Testing and Task Running
+#Lesson 7 - Unit Testing and Task Running
 
 ##What is Unit Testing?
 

diff --git a/classes/class08/in_class/.gitignore → lessons/07-tests-tasks/in_class/.gitignore b/classes/class08/in_class/.gitignore → lessons/07-tests-tasks/in_class/.gitignore
diff --git a/classes/class08/in_class/app.js → lessons/07-tests-tasks/in_class/app.js b/classes/class08/in_class/app.js → lessons/07-tests-tasks/in_class/app.js
diff --git a/classes/class08/in_class/karma.conf.js → ...ons/07-tests-tasks/in_class/karma.conf.js b/classes/class08/in_class/karma.conf.js → ...ons/07-tests-tasks/in_class/karma.conf.js
diff --git a/classes/class08/in_class/package.json → lessons/07-tests-tasks/in_class/package.json b/classes/class08/in_class/package.json → lessons/07-tests-tasks/in_class/package.json
diff --git a/...ass08/in_class/public/javascripts/main.js → ...tasks/in_class/public/javascripts/main.js b/...ass08/in_class/public/javascripts/main.js → ...tasks/in_class/public/javascripts/main.js
diff --git a/classes/class08/in_class/routes/index.js → ...s/07-tests-tasks/in_class/routes/index.js b/classes/class08/in_class/routes/index.js → ...s/07-tests-tasks/in_class/routes/index.js
diff --git a/...ses/class08/in_class/tests/client/test.js → ...tests-tasks/in_class/tests/client/test.js b/...ses/class08/in_class/tests/client/test.js → ...tests-tasks/in_class/tests/client/test.js
diff --git a/...ses/class08/in_class/tests/server/test.js → ...tests-tasks/in_class/tests/server/test.js b/...ses/class08/in_class/tests/server/test.js → ...tests-tasks/in_class/tests/server/test.js
diff --git a/...es/class08/in_class/views/home.handlebars → ...ests-tasks/in_class/views/home.handlebars b/...es/class08/in_class/views/home.handlebars → ...ests-tasks/in_class/views/home.handlebars
diff --git a/...08/in_class/views/layouts/main.handlebars → ...ks/in_class/views/layouts/main.handlebars b/...08/in_class/views/layouts/main.handlebars → ...ks/in_class/views/layouts/main.handlebars
diff --git a/classes/class09/README.md → lessons/08-designs-diagrams/README.md b/classes/class09/README.md → lessons/08-designs-diagrams/README.md
@@ -1,4 +1,4 @@
-#Class 9 - Application Design and Diagramming
+#Lesson 8 - Application Design and Diagramming
 
 As we begin to develop larger and more complex applications, we'll want to start being methodical about how we design and plan them. 
 In this lesson we will talk about strategies for planning and documenting large applications to make developing and debugging as simple as possible.

diff --git a/classes/class09/images/AWSexample.png → ...08-designs-diagrams/images/AWSexample.png b/classes/class09/images/AWSexample.png → ...08-designs-diagrams/images/AWSexample.png
diff --git a/classes/class09/images/app_flow.png → ...s/08-designs-diagrams/images/app_flow.png b/classes/class09/images/app_flow.png → ...s/08-designs-diagrams/images/app_flow.png
diff --git a/classes/class09/images/draw_example.png → ...-designs-diagrams/images/draw_example.png b/classes/class09/images/draw_example.png → ...-designs-diagrams/images/draw_example.png
diff --git a/classes/class10/README.md → lessons/09-clientside-frameworks/README.md b/classes/class10/README.md → lessons/09-clientside-frameworks/README.md
@@ -1,4 +1,4 @@
-#Class 10 - Client-side Javascript Frameworks
+#Lesson 9 - Client-side Javascript Frameworks
 
 ##Intro
 So far we have seen how to organize an increasingly complex system of components on our node server. 

diff --git a/...s/class10/images/apiDrivenDevelopment.png → ...rameworks/images/apiDrivenDevelopment.png b/...s/class10/images/apiDrivenDevelopment.png → ...rameworks/images/apiDrivenDevelopment.png
diff --git a/...s10/images/clientsideWebCommunication.png → ...rks/images/clientsideWebCommunication.png b/...s10/images/clientsideWebCommunication.png → ...rks/images/clientsideWebCommunication.png
diff --git a/...s/class10/images/frameworksPopularity.png → ...rameworks/images/frameworksPopularity.png b/...s/class10/images/frameworksPopularity.png → ...rameworks/images/frameworksPopularity.png
diff --git a/...10/images/traditionalWebCommunication.png → ...ks/images/traditionalWebCommunication.png b/...10/images/traditionalWebCommunication.png → ...ks/images/traditionalWebCommunication.png
diff --git a/classes/class10/in_class/Procfile → ...9-clientside-frameworks/in_class/Procfile b/classes/class10/in_class/Procfile → ...9-clientside-frameworks/in_class/Procfile
diff --git a/classes/class10/in_class/app.js → .../09-clientside-frameworks/in_class/app.js b/classes/class10/in_class/app.js → .../09-clientside-frameworks/in_class/app.js
diff --git a/classes/class10/in_class/models/catModel.js → ...de-frameworks/in_class/models/catModel.js b/classes/class10/in_class/models/catModel.js → ...de-frameworks/in_class/models/catModel.js
diff --git a/classes/class10/in_class/package.json → ...ientside-frameworks/in_class/package.json b/classes/class10/in_class/package.json → ...ientside-frameworks/in_class/package.json
diff --git a/...es/class10/in_class/public/images/cat.jpg → ...frameworks/in_class/public/images/cat.jpg b/...es/class10/in_class/public/images/cat.jpg → ...frameworks/in_class/public/images/cat.jpg
diff --git a/...ss/public/javascript/handlebars-v3.0.0.js → ...ss/public/javascript/handlebars-v3.0.0.js b/...ss/public/javascript/handlebars-v3.0.0.js → ...ss/public/javascript/handlebars-v3.0.0.js
diff --git a/...lass10/in_class/public/javascript/main.js → ...eworks/in_class/public/javascript/main.js b/...lass10/in_class/public/javascript/main.js → ...eworks/in_class/public/javascript/main.js
diff --git a/classes/class10/in_class/public/main.html → ...side-frameworks/in_class/public/main.html b/classes/class10/in_class/public/main.html → ...side-frameworks/in_class/public/main.html
diff --git a/classes/class10/in_class/routes/catData.js → ...ide-frameworks/in_class/routes/catData.js b/classes/class10/in_class/routes/catData.js → ...ide-frameworks/in_class/routes/catData.js
diff --git a/classes/class10/in_class/routes/cats.js → ...ntside-frameworks/in_class/routes/cats.js b/classes/class10/in_class/routes/cats.js → ...ntside-frameworks/in_class/routes/cats.js
diff --git a/classes/class10/in_class/routes/index.js → ...tside-frameworks/in_class/routes/index.js b/classes/class10/in_class/routes/index.js → ...tside-frameworks/in_class/routes/index.js
diff --git a/...es/class10/in_class/views/cats.handlebars → ...frameworks/in_class/views/cats.handlebars b/...es/class10/in_class/views/cats.handlebars → ...frameworks/in_class/views/cats.handlebars
diff --git a/...es/class10/in_class/views/home.handlebars → ...frameworks/in_class/views/home.handlebars b/...es/class10/in_class/views/home.handlebars → ...frameworks/in_class/views/home.handlebars
diff --git a/...10/in_class/views/layouts/main.handlebars → ...ks/in_class/views/layouts/main.handlebars b/...10/in_class/views/layouts/main.handlebars → ...ks/in_class/views/layouts/main.handlebars
diff --git a/classes/class11/README.md → lessons/10-security/README.md b/classes/class11/README.md → lessons/10-security/README.md
@@ -1,4 +1,4 @@
-#Class 11 - Application Security
+#Lesson 10 - Application Security
 Hello and welcome to possibly the most important lesson you will have in this course.
 All of the applications you make and all of the websites that you put out into the world will be vulnerable to some sort of attack, and it's important for you to know what those attacks are, and how you can mitigate against them.
 Before we get started, I'll take a moment to acknowledge one of the authoritative sources for all matters web security, [OWASP](https://www.owasp.org/index.php/Main_Page), the Open Web Application Security Project.

diff --git a/classes/class12/DigitalOcean.md → ...ons/11-deployment-scaling/DigitalOcean.md b/classes/class12/DigitalOcean.md → ...ons/11-deployment-scaling/DigitalOcean.md
diff --git a/classes/class12/README.md → lessons/11-deployment-scaling/README.md b/classes/class12/README.md → lessons/11-deployment-scaling/README.md
@@ -1,4 +1,4 @@
-#Class 12 - Deployment and Scaling
+#Lesson 11 - Deployment and Scaling
 
 Once your applications are ready you will need a way to share them with the world.
 There is more to consider than just running your app on a remote server with its own URL.

diff --git a/classes/class12/images/1.png → lessons/11-deployment-scaling/images/1.png b/classes/class12/images/1.png → lessons/11-deployment-scaling/images/1.png
diff --git a/classes/class12/images/2.png → lessons/11-deployment-scaling/images/2.png b/classes/class12/images/2.png → lessons/11-deployment-scaling/images/2.png
diff --git a/classes/class12/images/3.png → lessons/11-deployment-scaling/images/3.png b/classes/class12/images/3.png → lessons/11-deployment-scaling/images/3.png
diff --git a/classes/class12/images/aws_services.png → ...eployment-scaling/images/aws_services.png b/classes/class12/images/aws_services.png → ...eployment-scaling/images/aws_services.png
diff --git a/classes/class12/images/ci.png → lessons/11-deployment-scaling/images/ci.png b/classes/class12/images/ci.png → lessons/11-deployment-scaling/images/ci.png
diff --git a/classes/class15/README.md → lessons/12-agile/README.md b/classes/class15/README.md → lessons/12-agile/README.md
@@ -1,4 +1,4 @@
-#Class 15: Agile
+#Lesson 12 - Agile
 
 ##Intro
 In the most simple interpretation, agile is a project management methodology and attitude.