diff --git a/.gitignore b/.gitignore
index bdaac0763..9c8387696 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@ tutorial/*/build/*
 tutorial/*/Makefile
 external/glew/build
 *buildXcode*
+tutorial/build*
diff --git a/tutorial/101_FileIO/CMakeLists.txt b/tutorial/101_FileIO/CMakeLists.txt
index 8d806abc8..561f6aba1 100644
--- a/tutorial/101_FileIO/CMakeLists.txt
+++ b/tutorial/101_FileIO/CMakeLists.txt
@@ -7,5 +7,5 @@ set(SOURCES
 ${PROJECT_SOURCE_DIR}/main.cpp
 )
 
-add_executable(101_FileIO ${SOURCES} ${SHARED_SOURCES})
-target_link_libraries(101_FileIO ${SHARED_LIBRARIES})
+add_executable(${PROJECT_NAME} ${SOURCES} ${SHARED_SOURCES})
+target_link_libraries(${PROJECT_NAME} ${SHARED_LIBRARIES})
diff --git a/tutorial/102_DrawMesh/CMakeLists.txt b/tutorial/102_DrawMesh/CMakeLists.txt
new file mode 100644
index 000000000..026a95913
--- /dev/null
+++ b/tutorial/102_DrawMesh/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 2.6)
+project(102_DrawMesh)
+
+include("../CMakeLists.shared")
+
+set(SOURCES
+${PROJECT_SOURCE_DIR}/main.cpp
+)
+
+add_executable(${PROJECT_NAME} ${SOURCES} ${SHARED_SOURCES})
+target_link_libraries(${PROJECT_NAME} ${SHARED_LIBRARIES})
diff --git a/tutorial/103_DrawMesh/main.cpp b/tutorial/102_DrawMesh/main.cpp
similarity index 100%
rename from tutorial/103_DrawMesh/main.cpp
rename to tutorial/102_DrawMesh/main.cpp
diff --git a/tutorial/103_DrawMesh/CMakeLists.txt b/tutorial/103_DrawMesh/CMakeLists.txt
deleted file mode 100644
index 61f976c2a..000000000
--- a/tutorial/103_DrawMesh/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-project(103_DrawMesh)
-
-include("../CMakeLists.shared")
-
-set(SOURCES
-${PROJECT_SOURCE_DIR}/main.cpp
-)
-
-add_executable(103_DrawMesh ${SOURCES} ${SHARED_SOURCES})
-target_link_libraries(103_DrawMesh ${SHARED_LIBRARIES})
diff --git a/tutorial/103_Events/CMakeLists.txt b/tutorial/103_Events/CMakeLists.txt
new file mode 100644
index 000000000..e417d7df1
--- /dev/null
+++ b/tutorial/103_Events/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 2.6)
+project(103_Events)
+
+include("../CMakeLists.shared")
+
+set(SOURCES
+${PROJECT_SOURCE_DIR}/main.cpp
+)
+
+add_executable(${PROJECT_NAME} ${SOURCES} ${SHARED_SOURCES})
+target_link_libraries(${PROJECT_NAME} ${SHARED_LIBRARIES})
diff --git a/tutorial/104_Events/main.cpp b/tutorial/103_Events/main.cpp
similarity index 100%
rename from tutorial/104_Events/main.cpp
rename to tutorial/103_Events/main.cpp
diff --git a/tutorial/104_Colors/CMakeLists.txt b/tutorial/104_Colors/CMakeLists.txt
new file mode 100644
index 000000000..00b19d6e1
--- /dev/null
+++ b/tutorial/104_Colors/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 2.6)
+project(104_Colors)
+
+include("../CMakeLists.shared")
+
+set(SOURCES
+${PROJECT_SOURCE_DIR}/main.cpp
+)
+
+add_executable(${PROJECT_NAME} ${SOURCES} ${SHARED_SOURCES})
+target_link_libraries(${PROJECT_NAME} ${SHARED_LIBRARIES})
diff --git a/tutorial/105_Colors/main.cpp b/tutorial/104_Colors/main.cpp
similarity index 89%
rename from tutorial/105_Colors/main.cpp
rename to tutorial/104_Colors/main.cpp
index ac6541bc4..d0579c412 100755
--- a/tutorial/105_Colors/main.cpp
+++ b/tutorial/104_Colors/main.cpp
@@ -13,7 +13,7 @@ int main(int argc, char *argv[])
 
   // Plot the mesh
   igl::Viewer viewer;
-  viewer.draw_mesh(V, F);
+  viewer.set_mesh(V, F);
 
 
   // Normalize x coordinate between 0 and 1
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
   }
 
   // Add per-vertex colors
-  viewer.draw_colors(C);
+  viewer.set_colors(C);
 
   // Launch the viewer
   viewer.launch();
diff --git a/tutorial/104_Events/CMakeLists.txt b/tutorial/104_Events/CMakeLists.txt
deleted file mode 100644
index 8cb21f1fa..000000000
--- a/tutorial/104_Events/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-project(104_Events)
-
-include("../CMakeLists.shared")
-
-set(SOURCES
-${PROJECT_SOURCE_DIR}/main.cpp
-)
-
-add_executable(104_Events ${SOURCES} ${SHARED_SOURCES})
-target_link_libraries(104_Events ${SHARED_LIBRARIES})
diff --git a/tutorial/105_Colors/CMakeLists.txt b/tutorial/105_Colors/CMakeLists.txt
deleted file mode 100644
index c9a9644fb..000000000
--- a/tutorial/105_Colors/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-project(105_Colors)
-
-include("../CMakeLists.shared")
-
-set(SOURCES
-${PROJECT_SOURCE_DIR}/main.cpp
-)
-
-add_executable(105_Colors ${SOURCES} ${SHARED_SOURCES})
-target_link_libraries(105_Colors ${SHARED_LIBRARIES})
diff --git a/tutorial/105_Overlays/CMakeLists.txt b/tutorial/105_Overlays/CMakeLists.txt
new file mode 100644
index 000000000..f4309f80a
--- /dev/null
+++ b/tutorial/105_Overlays/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 2.6)
+project(105_Overlays)
+
+include("../CMakeLists.shared")
+
+set(SOURCES
+${PROJECT_SOURCE_DIR}/main.cpp
+)
+
+add_executable(${PROJECT_NAME} ${SOURCES} ${SHARED_SOURCES})
+target_link_libraries(${PROJECT_NAME} ${SHARED_LIBRARIES})
diff --git a/tutorial/106_Overlays/main.cpp b/tutorial/105_Overlays/main.cpp
similarity index 100%
rename from tutorial/106_Overlays/main.cpp
rename to tutorial/105_Overlays/main.cpp
diff --git a/tutorial/106_Overlays/CMakeLists.txt b/tutorial/106_Overlays/CMakeLists.txt
deleted file mode 100644
index 4562ff336..000000000
--- a/tutorial/106_Overlays/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-project(106_Overlays)
-
-include("../CMakeLists.shared")
-
-set(SOURCES
-${PROJECT_SOURCE_DIR}/main.cpp
-)
-
-add_executable(106_Overlays ${SOURCES} ${SHARED_SOURCES})
-target_link_libraries(106_Overlays ${SHARED_LIBRARIES})
diff --git a/tutorial/107_Picking/CMakeLists.txt b/tutorial/106_Picking/CMakeLists.txt
similarity index 52%
rename from tutorial/107_Picking/CMakeLists.txt
rename to tutorial/106_Picking/CMakeLists.txt
index b90a6d34b..ebfa9b1aa 100644
--- a/tutorial/107_Picking/CMakeLists.txt
+++ b/tutorial/106_Picking/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.6)
-project(107_Picking)
+project(106_Picking)
 
 include("../CMakeLists.shared")
 
@@ -11,5 +11,5 @@ set(SOURCES
 ${PROJECT_SOURCE_DIR}/main.cpp
 )
 
-add_executable(${CMAKE_PROJECT_NAME} ${SOURCES} ${SHARED_SOURCES})
-target_link_libraries(${CMAKE_PROJECT_NAME} ${SHARED_LIBRARIES} ${EMBREE_LIBRARIES})
+add_executable(${PROJECT_NAME} ${SOURCES} ${SHARED_SOURCES})
+target_link_libraries(${PROJECT_NAME} ${SHARED_LIBRARIES} ${EMBREE_LIBRARIES})
diff --git a/tutorial/107_Picking/main.cpp b/tutorial/106_Picking/main.cpp
similarity index 100%
rename from tutorial/107_Picking/main.cpp
rename to tutorial/106_Picking/main.cpp
diff --git a/tutorial/CMakeLists.txt b/tutorial/CMakeLists.txt
new file mode 100644
index 000000000..dbd273a14
--- /dev/null
+++ b/tutorial/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 2.6)
+
+# Chapter 1
+add_subdirectory("101_FileIO")
+add_subdirectory("102_DrawMesh")
+add_subdirectory("103_Events")
+add_subdirectory("104_Colors")
+add_subdirectory("105_Overlays")
+add_subdirectory("106_Picking")