diff --git a/06-variables/06-project-greeter/exercises/01/main.go b/06-variables/06-project-greeter/exercises/01-count-arguments/main.go
similarity index 82%
rename from 06-variables/06-project-greeter/exercises/01/main.go
rename to 06-variables/06-project-greeter/exercises/01-count-arguments/main.go
index 5e8cfbe..ac828bf 100644
--- a/06-variables/06-project-greeter/exercises/01/main.go
+++ b/06-variables/06-project-greeter/exercises/01-count-arguments/main.go
@@ -8,7 +8,8 @@
 package main
 
 // ---------------------------------------------------------
-// EXERCISE
+// EXERCISE: Count the Arguments
+//
 //  Print the count of the command-line arguments
 //
 // INPUT
@@ -19,9 +20,9 @@ package main
 // ---------------------------------------------------------
 
 func main() {
-	// FIX THIS CODE
+	// UNCOMMENT & FIX THIS CODE
 	// count := ?
 
-	// UNCOMMENT IT FIRST, THEN DO NOT TOUCH THIS CODE
+	// UNCOMMENT IT & THEN DO NOT TOUCH THIS CODE
 	// fmt.Printf("There are %d names.\n", count)
 }
diff --git a/06-variables/06-project-greeter/exercises/01/solution/main.go b/06-variables/06-project-greeter/exercises/01-count-arguments/solution/main.go
similarity index 100%
rename from 06-variables/06-project-greeter/exercises/01/solution/main.go
rename to 06-variables/06-project-greeter/exercises/01-count-arguments/solution/main.go
diff --git a/06-variables/06-project-greeter/exercises/02/main.go b/06-variables/06-project-greeter/exercises/02-print-the-path/main.go
similarity index 81%
rename from 06-variables/06-project-greeter/exercises/02/main.go
rename to 06-variables/06-project-greeter/exercises/02-print-the-path/main.go
index e41e1c2..d5096e5 100644
--- a/06-variables/06-project-greeter/exercises/02/main.go
+++ b/06-variables/06-project-greeter/exercises/02-print-the-path/main.go
@@ -8,9 +8,10 @@
 package main
 
 // ---------------------------------------------------------
-// EXERCISE
-//  Print the path of the running program
-//  By getting it from `os.Args` variable
+// EXERCISE: Print the Path
+//
+//  Print the path of the running program by getting it
+//  from `os.Args` variable.
 //
 // HINT
 //  Use `go build` to build your program.
diff --git a/06-variables/06-project-greeter/exercises/02/solution/main.go b/06-variables/06-project-greeter/exercises/02-print-the-path/solution/main.go
similarity index 100%
rename from 06-variables/06-project-greeter/exercises/02/solution/main.go
rename to 06-variables/06-project-greeter/exercises/02-print-the-path/solution/main.go
diff --git a/06-variables/06-project-greeter/exercises/03/main.go b/06-variables/06-project-greeter/exercises/03-print-your-name/main.go
similarity index 88%
rename from 06-variables/06-project-greeter/exercises/03/main.go
rename to 06-variables/06-project-greeter/exercises/03-print-your-name/main.go
index 9babde4..ce4604b 100644
--- a/06-variables/06-project-greeter/exercises/03/main.go
+++ b/06-variables/06-project-greeter/exercises/03-print-your-name/main.go
@@ -8,8 +8,8 @@
 package main
 
 // ---------------------------------------------------------
-// EXERCISE
-//  Print your name
+// EXERCISE: Print Your Name
+//
 //  Get it from the first command-line argument
 //
 // INPUT
@@ -20,12 +20,14 @@ package main
 //
 // EXAMPLE
 //  go run main.go inanc
-//  inanc
+//
+//    inanc
 //
 // BONUS: Make the output like this:
+//
 //  go run main.go inanc
-//  Hi inanc
-//  How are you?
+//    Hi inanc
+//    How are you?
 // ---------------------------------------------------------
 
 func main() {
diff --git a/06-variables/06-project-greeter/exercises/03/solution/main.go b/06-variables/06-project-greeter/exercises/03-print-your-name/solution/main.go
similarity index 100%
rename from 06-variables/06-project-greeter/exercises/03/solution/main.go
rename to 06-variables/06-project-greeter/exercises/03-print-your-name/solution/main.go
diff --git a/06-variables/06-project-greeter/exercises/04/main.go b/06-variables/06-project-greeter/exercises/04-greet-more-people/main.go
similarity index 95%
rename from 06-variables/06-project-greeter/exercises/04/main.go
rename to 06-variables/06-project-greeter/exercises/04-greet-more-people/main.go
index ba5b705..dc7a46b 100644
--- a/06-variables/06-project-greeter/exercises/04/main.go
+++ b/06-variables/06-project-greeter/exercises/04-greet-more-people/main.go
@@ -8,8 +8,7 @@
 package main
 
 // ---------------------------------------------------------
-// EXERCISE
-//  Greet more people
+// EXERCISE: Greet More People
 //
 // RESTRICTIONS
 //  Be sure to match to the expected output below
diff --git a/06-variables/06-project-greeter/exercises/04/solution/main.go b/06-variables/06-project-greeter/exercises/04-greet-more-people/solution/main.go
similarity index 100%
rename from 06-variables/06-project-greeter/exercises/04/solution/main.go
rename to 06-variables/06-project-greeter/exercises/04-greet-more-people/solution/main.go
diff --git a/06-variables/06-project-greeter/exercises/05/main.go b/06-variables/06-project-greeter/exercises/05-greet-5-people/main.go
similarity index 84%
rename from 06-variables/06-project-greeter/exercises/05/main.go
rename to 06-variables/06-project-greeter/exercises/05-greet-5-people/main.go
index 110a27c..30f5e9e 100644
--- a/06-variables/06-project-greeter/exercises/05/main.go
+++ b/06-variables/06-project-greeter/exercises/05-greet-5-people/main.go
@@ -8,10 +8,11 @@
 package main
 
 // ---------------------------------------------------------
-// EXERCISE
-//  Greeat 5 people this time.
-//  Do not copy paste from the previous exercise!
-//  And do not look at it.
+// EXERCISE: Greet 5 People
+//
+//  Greet 5 people this time.
+//
+//  Please do not copy paste from the previous exercise!
 //
 // RESTRICTION
 //  This time do not use variables.
diff --git a/06-variables/06-project-greeter/exercises/05/solution/main.go b/06-variables/06-project-greeter/exercises/05-greet-5-people/solution/main.go
similarity index 100%
rename from 06-variables/06-project-greeter/exercises/05/solution/main.go
rename to 06-variables/06-project-greeter/exercises/05-greet-5-people/solution/main.go
diff --git a/06-variables/06-project-greeter/exercises/README.md b/06-variables/06-project-greeter/exercises/README.md
new file mode 100644
index 0000000..8161b47
--- /dev/null
+++ b/06-variables/06-project-greeter/exercises/README.md
@@ -0,0 +1,11 @@
+# Command Line Arguments
+
+1. **[Count the Arguments](https://github.com/inancgumus/learngo/tree/master/06-variables/06-project-greeter/exercises/01-count-arguments)**
+
+2. **[Print the Path](https://github.com/inancgumus/learngo/tree/master/06-variables/06-project-greeter/exercises/02-print-the-path)**
+
+3. **[Print Your Name](https://github.com/inancgumus/learngo/tree/master/06-variables/06-project-greeter/exercises/03-print-your-name)**
+
+4. **[Greet More People](https://github.com/inancgumus/learngo/tree/master/06-variables/06-project-greeter/exercises/04-greet-more-people)**
+
+5. **[Greet 5 People](https://github.com/inancgumus/learngo/tree/master/06-variables/06-project-greeter/exercises/05-greet-5-people)**