diff --git a/docs/user/docs.user.md b/docs/user/docs.user.md
index 3aa3c9e..53e5534 100644
--- a/docs/user/docs.user.md
+++ b/docs/user/docs.user.md
@@ -3,7 +3,7 @@
 	"_label": "User Guide",
 	"_toc": [
 		"docs.user.intro",
-		"docs.user.five",
+		"docs.user.five_day_setup",
 		"docs.user.implement",
 		"docs.user.setup",
 		"docs.user.selling",
@@ -30,12 +30,12 @@
 	1. [Open Source](docs.user.intro.open_source.html)
 	1. [Ways to get started](docs.user.intro.try.html)
 	1. [Getting Help](docs.user.help.html)
-1. [Five-Day-Setup](docs.user.five.html)
-	1. [Day-1](docs.user.five.day_1.html)
-	1. [Day-2](docs.user.five.day_2.html)
-	1. [Day-3](docs.user.five.day_3.html)
-	1. [Day-4](docs.user.five.day_4.html)
-	1. [Day-5](docs.user.five.day_5.html)
+1. [Five-Day-Setup](docs.user.five_day_setup.html)
+	1. [Day-1](docs.user.five_day_setup.day_1.html)
+	1. [Day-2](docs.user.five_day_setup.day_2.html)
+	1. [Day-3](docs.user.five_day_setup.day_3.html)
+	1. [Day-4](docs.user.five_day_setup.day_4.html)
+	1. [Day-5](docs.user.five_day_setup.day_5.html)
 1. [Implementation](docs.user.implement.html)
 	1. [Implementation Strategy](docs.user.implement.strategy.html)
 	1. [Concepts](docs.user.implement.concepts.html)
diff --git a/docs/user/five_step_setup/docs.user.five.day_1.md b/docs/user/five_day_setup/docs.user.five_day_setup.day_1.md
similarity index 93%
rename from docs/user/five_step_setup/docs.user.five.day_1.md
rename to docs/user/five_day_setup/docs.user.five_day_setup.day_1.md
index d6786b4..34f85dd 100644
--- a/docs/user/five_step_setup/docs.user.five.day_1.md
+++ b/docs/user/five_day_setup/docs.user.five_day_setup.day_1.md
@@ -26,20 +26,20 @@
 
 The Organisation details are updated in ERPNext, after filling the first form. Go directly to the Customer Icon.
 
-![Customer](img/firstdaysetup_customer.png)
+![Customer](img/firstdaysetup-customer.png)
 <br>
 
 
 After clicking on Customer, a new form will appear. 
 <br>
 
-![Customer](img/firstdaysetup_customer_1.png)
+![Customer](img/firstdaysetup-customer-1.png)
 
 To see how customer details are added, visit [Customer](docs.user.selling.customer.html). Create 5 new customer records in the system. 
 
 Now proceed to make an Item. To go to the main menu, click on erpnext icon which is on the left hand corner of the page. On the main menu page, click on Setup
 
-![Main Menu](img/firstdaysetup_main_menu.png)
+![Main Menu](img/firstdaysetup-main-menu.png)
 
 <br>
 
@@ -48,7 +48,7 @@
 On the setup page go to Item.
 
 
-![Item](img/firstdaysetup_item.png)
+![Item](img/firstdaysetup-item.png)
 
 
 Create a new Item. An Item is your company's product or a service.The term Item is applicable to your core products as well as your raw materials. It can be a product or service that you buy/sell from your customers/ suppliers.
diff --git a/docs/user/five_step_setup/docs.user.five.day_2.md b/docs/user/five_day_setup/docs.user.five_day_setup.day_2.md
similarity index 100%
rename from docs/user/five_step_setup/docs.user.five.day_2.md
rename to docs/user/five_day_setup/docs.user.five_day_setup.day_2.md
diff --git a/docs/user/five_step_setup/docs.user.five.day_3.md b/docs/user/five_day_setup/docs.user.five_day_setup.day_3.md
similarity index 97%
rename from docs/user/five_step_setup/docs.user.five.day_3.md
rename to docs/user/five_day_setup/docs.user.five_day_setup.day_3.md
index 09a5d3f..dc7acef 100644
--- a/docs/user/five_step_setup/docs.user.five.day_3.md
+++ b/docs/user/five_day_setup/docs.user.five_day_setup.day_3.md
@@ -14,7 +14,7 @@
 
 To begin the sales cycle, go to the Selling Icon. On the selling page, click on Lead. 
 
-![Lead](img/thirddaysetup_lead.png)
+![Lead](img/thirddaysetup-lead.png)
 
 Fill the Lead form.
 
@@ -83,7 +83,7 @@
 
 A Journal Voucher or a payment entry can be generated directly from the Sales Invoice.
 
-![Payment Entry](img/thirddaysetup_payment_entry.png)
+![Payment Entry](img/thirddaysetup-payment-entry.png)
 
 > To understand a Journal Voucher in detail, visit [Journal Voucher](docs.user.accounts.journal_voucher.html)
 
diff --git a/docs/user/five_step_setup/docs.user.five.day_4.md b/docs/user/five_day_setup/docs.user.five_day_setup.day_4.md
similarity index 92%
rename from docs/user/five_step_setup/docs.user.five.day_4.md
rename to docs/user/five_day_setup/docs.user.five_day_setup.day_4.md
index d23fe54..f4938e9c 100644
--- a/docs/user/five_step_setup/docs.user.five.day_4.md
+++ b/docs/user/five_day_setup/docs.user.five_day_setup.day_4.md
@@ -33,7 +33,7 @@
 
 To go to Production Order click on the Manufacturing Icon. On the Manufacturing Page, click on Production Order.
 
-![Production Order](img/fourthdaysetup_po.png)
+![Production Order](img/fourthdaysetup-po.png)
 
 <br>
 
@@ -43,7 +43,7 @@
 
 To go to Stock Entry, click on the Stock Icon and go to Stock Entry.
 
-![Stock Entry](img/fourthdaysetup_stock.png)
+![Stock Entry](img/fourthdaysetup-stock.png)
 
 <br>
 
@@ -69,7 +69,7 @@
 
 To go to Warehouse, Click on Stock. On the Stock Page, go to Warehouse.
 
-![Warehouse](img/fourthdaysetup_warehouse.png)
+![Warehouse](img/fourthdaysetup-warehouse.png)
 
 <br>
 
@@ -84,7 +84,7 @@
 
 To go to a Journal Voucher, click on Accounts. On the Accounts page, click on Journal Voucher.
 
-![Journal Voucher](img/fourthdaysetup_jv.png)
+![Journal Voucher](img/fourthdaysetup-jv.png)
 
 > To understand Journal Voucher in detail, visit [Journal Voucher](docs.user.accounts.journal_voucher.html)
 
diff --git a/docs/user/five_step_setup/docs.user.five.day_5.md b/docs/user/five_day_setup/docs.user.five_day_setup.day_5.md
similarity index 94%
rename from docs/user/five_step_setup/docs.user.five.day_5.md
rename to docs/user/five_day_setup/docs.user.five_day_setup.day_5.md
index 30c64c3..b69fccd 100644
--- a/docs/user/five_step_setup/docs.user.five.day_5.md
+++ b/docs/user/five_day_setup/docs.user.five_day_setup.day_5.md
@@ -14,7 +14,7 @@
 
 To create a Task, go to Project and click on Task.
 
-![Tasks](img/fifthdaysetup_task.png)
+![Tasks](img/fifthdaysetup-tasks.png)
 
 <br>
 
diff --git a/docs/user/five_step_setup/docs.user.five.md b/docs/user/five_day_setup/docs.user.five_day_setup.md
similarity index 76%
rename from docs/user/five_step_setup/docs.user.five.md
rename to docs/user/five_day_setup/docs.user.five_day_setup.md
index 21170c5..d296914 100644
--- a/docs/user/five_step_setup/docs.user.five.md
+++ b/docs/user/five_day_setup/docs.user.five_day_setup.md
@@ -2,18 +2,18 @@
 {
 	"_label": "Five-Day Setup",
 	"_toc": [
-		"docs.user.five.day_1",
-		"docs.user.five.day_2",
-		"docs.user.five.day_3",
-		"docs.user.five.day_4",
-		"docs.user.five.day_5"
+		"docs.user.five_day_setup.day_1",
+		"docs.user.five_day_setup.day_2",
+		"docs.user.five_day_setup.day_3",
+		"docs.user.five_day_setup.day_4",
+		"docs.user.five_day_setup.day_5"
 			
 	]
 }
 ---
 Welcome to ERPNext. To be able to setup ERPNext account successfully, a five-day-setup process is recommended. Perform the 5-days-setup instructions and sail through the ERPNext implementation.
 
-The setup help is divided into day-wise instructions for 5 consecutive days. Day 1 will  cover the following topics:
+The setup help is divided into day-wise instructions for 5 consecutive days. 
 
 #### Day 1