diff --git a/index.html b/index.html
index 9038cbb..2c4ace3 100644
--- a/index.html
+++ b/index.html
@@ -1,13 +1,15 @@
 <div style="display: inline-flex; flex-direction: column">
-  <a href="/step01/">Step01</a>
-  <a href="/step02/">Step02</a>
-  <a href="/step03/">Step03</a>
-  <a href="/step04/">Step04</a>
-  <a href="/step05/">Step05</a>
-  <a href="/step06/">Step06</a>
-  <a href="/step07/">Step07</a>
-  <a href="/step08/">Step08</a>
-  <a href="/step09/">Step09</a>
-  <a href="/step2-01/">Step2-01</a>
+  <h2>Day 1</h2>
+  <a href="/step1-01/">Step 1</a>
+  <a href="/step1-02/">Step 2</a>
+  <a href="/step1-03/">Step 3</a>
+  <a href="/step1-04/">Step 4</a>
+  <a href="/step1-05/">Step 5</a>
+  <a href="/step1-06/">Step 6</a>
+  <a href="/step1-07/">Step 7</a>
+  <a href="/step1-08/">Step 8</a>
+  <a href="/step1-09/">Step 9</a>
+  <h2>Day 2</h2>
+  <a href="/step2-01/">Step 1</a>
   <a href="/playground/">Playground</a>
 </div>
diff --git a/step01/index.html b/step1-01/index.html
similarity index 100%
rename from step01/index.html
rename to step1-01/index.html
diff --git a/step02/index.html b/step1-02/index.html
similarity index 100%
rename from step02/index.html
rename to step1-02/index.html
diff --git a/step02/style.css b/step1-02/style.css
similarity index 100%
rename from step02/style.css
rename to step1-02/style.css
diff --git a/step03/index.html b/step1-03/index.html
similarity index 100%
rename from step03/index.html
rename to step1-03/index.html
diff --git a/step03/style.css b/step1-03/style.css
similarity index 100%
rename from step03/style.css
rename to step1-03/style.css
diff --git a/step04/index.html b/step1-04/index.html
similarity index 100%
rename from step04/index.html
rename to step1-04/index.html
diff --git a/step04/src/App.tsx b/step1-04/src/App.tsx
similarity index 100%
rename from step04/src/App.tsx
rename to step1-04/src/App.tsx
diff --git a/step04/src/index.tsx b/step1-04/src/index.tsx
similarity index 100%
rename from step04/src/index.tsx
rename to step1-04/src/index.tsx
diff --git a/step05/index.html b/step1-05/index.html
similarity index 100%
rename from step05/index.html
rename to step1-05/index.html
diff --git a/step05/src/App.tsx b/step1-05/src/App.tsx
similarity index 100%
rename from step05/src/App.tsx
rename to step1-05/src/App.tsx
diff --git a/step05/src/components/TodoFooter.tsx b/step1-05/src/components/TodoFooter.tsx
similarity index 100%
rename from step05/src/components/TodoFooter.tsx
rename to step1-05/src/components/TodoFooter.tsx
diff --git a/step05/src/components/TodoHeader.tsx b/step1-05/src/components/TodoHeader.tsx
similarity index 100%
rename from step05/src/components/TodoHeader.tsx
rename to step1-05/src/components/TodoHeader.tsx
diff --git a/step05/src/components/TodoList.tsx b/step1-05/src/components/TodoList.tsx
similarity index 100%
rename from step05/src/components/TodoList.tsx
rename to step1-05/src/components/TodoList.tsx
diff --git a/step05/src/components/TodoListItem.tsx b/step1-05/src/components/TodoListItem.tsx
similarity index 100%
rename from step05/src/components/TodoListItem.tsx
rename to step1-05/src/components/TodoListItem.tsx
diff --git a/step05/src/index.tsx b/step1-05/src/index.tsx
similarity index 100%
rename from step05/src/index.tsx
rename to step1-05/src/index.tsx
diff --git a/step05/src/style.css b/step1-05/src/style.css
similarity index 100%
rename from step05/src/style.css
rename to step1-05/src/style.css
diff --git a/step06/index.html b/step1-06/index.html
similarity index 100%
rename from step06/index.html
rename to step1-06/index.html
diff --git a/step06/src/App.tsx b/step1-06/src/App.tsx
similarity index 100%
rename from step06/src/App.tsx
rename to step1-06/src/App.tsx
diff --git a/step06/src/components/TodoFooter.tsx b/step1-06/src/components/TodoFooter.tsx
similarity index 100%
rename from step06/src/components/TodoFooter.tsx
rename to step1-06/src/components/TodoFooter.tsx
diff --git a/step06/src/components/TodoHeader.tsx b/step1-06/src/components/TodoHeader.tsx
similarity index 100%
rename from step06/src/components/TodoHeader.tsx
rename to step1-06/src/components/TodoHeader.tsx
diff --git a/step06/src/components/TodoList.tsx b/step1-06/src/components/TodoList.tsx
similarity index 100%
rename from step06/src/components/TodoList.tsx
rename to step1-06/src/components/TodoList.tsx
diff --git a/step06/src/components/TodoListItem.tsx b/step1-06/src/components/TodoListItem.tsx
similarity index 100%
rename from step06/src/components/TodoListItem.tsx
rename to step1-06/src/components/TodoListItem.tsx
diff --git a/step06/src/index.tsx b/step1-06/src/index.tsx
similarity index 100%
rename from step06/src/index.tsx
rename to step1-06/src/index.tsx
diff --git a/step06/src/style.css b/step1-06/src/style.css
similarity index 100%
rename from step06/src/style.css
rename to step1-06/src/style.css
diff --git a/step07/index.html b/step1-07/index.html
similarity index 100%
rename from step07/index.html
rename to step1-07/index.html
diff --git a/step07/src/App.tsx b/step1-07/src/App.tsx
similarity index 100%
rename from step07/src/App.tsx
rename to step1-07/src/App.tsx
diff --git a/step07/src/components/TodoFooter.tsx b/step1-07/src/components/TodoFooter.tsx
similarity index 100%
rename from step07/src/components/TodoFooter.tsx
rename to step1-07/src/components/TodoFooter.tsx
diff --git a/step07/src/components/TodoHeader.tsx b/step1-07/src/components/TodoHeader.tsx
similarity index 100%
rename from step07/src/components/TodoHeader.tsx
rename to step1-07/src/components/TodoHeader.tsx
diff --git a/step07/src/components/TodoList.tsx b/step1-07/src/components/TodoList.tsx
similarity index 100%
rename from step07/src/components/TodoList.tsx
rename to step1-07/src/components/TodoList.tsx
diff --git a/step07/src/components/TodoListItem.tsx b/step1-07/src/components/TodoListItem.tsx
similarity index 100%
rename from step07/src/components/TodoListItem.tsx
rename to step1-07/src/components/TodoListItem.tsx
diff --git a/step07/src/index.tsx b/step1-07/src/index.tsx
similarity index 100%
rename from step07/src/index.tsx
rename to step1-07/src/index.tsx
diff --git a/step07/src/style.css b/step1-07/src/style.css
similarity index 100%
rename from step07/src/style.css
rename to step1-07/src/style.css
diff --git a/webpack.config.js b/webpack.config.js
index 47bb2e1..8330b18 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -3,10 +3,10 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
 
 const entries = {
-  step04: './step04/src/index',
-  step05: './step05/src/index',
-  step06: './step06/src/index',
-  step07: './step07/src/index',
+  'step1-04': './step1-04/src/index',
+  'step1-05': './step1-05/src/index',
+  'step1-06': './step1-06/src/index',
+  'step1-07': './step1-07/src/index',
   'step2-01': './step2-01/src/index',
   'step2-02': './step2-02/src/index',
   playground: './playground/src/index'