diff --git a/step2-07/demo/README.md b/bonus-servicecalls/demo/README.md
similarity index 98%
rename from step2-07/demo/README.md
rename to bonus-servicecalls/demo/README.md
index f78aede..3d1e21d 100644
--- a/step2-07/demo/README.md
+++ b/bonus-servicecalls/demo/README.md
@@ -1,4 +1,4 @@
-# Step 2.7: Service calls (Demo)
+# Bonus: Service calls (Demo)
 
 [Lessons](../)
 
diff --git a/step2-07/demo/index.html b/bonus-servicecalls/demo/index.html
similarity index 100%
rename from step2-07/demo/index.html
rename to bonus-servicecalls/demo/index.html
diff --git a/step2-07/demo/src/actions/index.ts b/bonus-servicecalls/demo/src/actions/index.ts
similarity index 100%
rename from step2-07/demo/src/actions/index.ts
rename to bonus-servicecalls/demo/src/actions/index.ts
diff --git a/step2-07/demo/src/components/TodoApp.tsx b/bonus-servicecalls/demo/src/components/TodoApp.tsx
similarity index 100%
rename from step2-07/demo/src/components/TodoApp.tsx
rename to bonus-servicecalls/demo/src/components/TodoApp.tsx
diff --git a/step2-07/demo/src/components/TodoFooter.tsx b/bonus-servicecalls/demo/src/components/TodoFooter.tsx
similarity index 100%
rename from step2-07/demo/src/components/TodoFooter.tsx
rename to bonus-servicecalls/demo/src/components/TodoFooter.tsx
diff --git a/step2-07/demo/src/components/TodoHeader.tsx b/bonus-servicecalls/demo/src/components/TodoHeader.tsx
similarity index 100%
rename from step2-07/demo/src/components/TodoHeader.tsx
rename to bonus-servicecalls/demo/src/components/TodoHeader.tsx
diff --git a/step2-07/demo/src/components/TodoList.tsx b/bonus-servicecalls/demo/src/components/TodoList.tsx
similarity index 100%
rename from step2-07/demo/src/components/TodoList.tsx
rename to bonus-servicecalls/demo/src/components/TodoList.tsx
diff --git a/step2-07/demo/src/components/TodoListItem.tsx b/bonus-servicecalls/demo/src/components/TodoListItem.tsx
similarity index 100%
rename from step2-07/demo/src/components/TodoListItem.tsx
rename to bonus-servicecalls/demo/src/components/TodoListItem.tsx
diff --git a/step2-07/demo/src/index.tsx b/bonus-servicecalls/demo/src/index.tsx
similarity index 100%
rename from step2-07/demo/src/index.tsx
rename to bonus-servicecalls/demo/src/index.tsx
diff --git a/step2-07/demo/src/reducers/index.ts b/bonus-servicecalls/demo/src/reducers/index.ts
similarity index 100%
rename from step2-07/demo/src/reducers/index.ts
rename to bonus-servicecalls/demo/src/reducers/index.ts
diff --git a/step2-07/demo/src/service/index.ts b/bonus-servicecalls/demo/src/service/index.ts
similarity index 100%
rename from step2-07/demo/src/service/index.ts
rename to bonus-servicecalls/demo/src/service/index.ts
diff --git a/step2-07/demo/src/store/index.ts b/bonus-servicecalls/demo/src/store/index.ts
similarity index 100%
rename from step2-07/demo/src/store/index.ts
rename to bonus-servicecalls/demo/src/store/index.ts
diff --git a/index.html b/index.html
index 5007546..2dbc1d4 100644
--- a/index.html
+++ b/index.html
@@ -130,8 +130,16 @@
             </div>
           </div>
         </li>
+      </ul>
+    </div>
+    <div class="Container">
+      <ul class="Tiles">
+        <li class="Tile Tile--intro">
+          <h2>Bonus Content</h2>
+          Some Extra Bonus Lessons!! Yay! Bonus!!
+        </li>
         <li class="Tile Tile--numbered">
-          <a target="_blank" href="./step2-07/demo/" class="Tile-link">
+          <a target="_blank" href="./bonus-servicecalls/demo/" class="Tile-link">
             Redux: Service Calls
           </a>
         </li>
diff --git a/webpack.config.js b/webpack.config.js
index b8e1733..2500139 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -9,8 +9,12 @@ const outPath = path.resolve(__dirname, 'docs');
 const entries = {};
 const nonWebpackedEntries = [];
 
+function isValidLessonFolder(folder) {
+  return folder.includes('step') || folder.includes('playground') || folder.includes('bonus');
+}
+
 function* getEntryPoint(step) {
-  if (step.includes('step') || step.includes('playground')) {
+  if (isValidLessonFolder(step)) {
     for (let prefix of ['', 'demo/', 'exercise/', 'final/']) {
       for (let suffix of ['.js', '.jsx', '.ts', '.tsx']) {
         const entryRequest = `./${step}/${prefix}src/index${suffix}`;
@@ -34,7 +38,7 @@ fs.readdirSync('./').filter(step => {
     }
   }
 
-  if (!isEntryPoint && (step.includes('step') || step.includes('playground'))) {
+  if (!isEntryPoint && isValidLessonFolder(step)) {
     nonWebpackedEntries.push(step);
   }
 });