diff --git a/08-numbers-and-strings/01-numbers/exercises/01/main.go b/08-numbers-and-strings/01-numbers/exercises/01-do-some-calculations/main.go
similarity index 81%
rename from 08-numbers-and-strings/01-numbers/exercises/01/main.go
rename to 08-numbers-and-strings/01-numbers/exercises/01-do-some-calculations/main.go
index ddf7c15..63e1c30 100644
--- a/08-numbers-and-strings/01-numbers/exercises/01/main.go
+++ b/08-numbers-and-strings/01-numbers/exercises/01-do-some-calculations/main.go
@@ -8,7 +8,8 @@
 package main
 
 // ---------------------------------------------------------
-// EXERCISE
+// EXERCISE: Do Some Calculations
+//
 //  1. Print the sum of 50 and 25
 //  2. Print the difference of 50 and 15.5
 //  3. Print the product of 50 and 0.5
@@ -26,9 +27,4 @@ package main
 // ---------------------------------------------------------
 
 func main() {
-	// ADD YOUR CODE BELOW
-	// USE `fmt.Println` for each question
-
-	// UNCOMMENT IT FIRST, THEN DO NOT TOUCH THIS CODE
-	// fmt.Println(x)
 }
diff --git a/08-numbers-and-strings/01-numbers/exercises/01/solution/main.go b/08-numbers-and-strings/01-numbers/exercises/01-do-some-calculations/solution/main.go
similarity index 100%
rename from 08-numbers-and-strings/01-numbers/exercises/01/solution/main.go
rename to 08-numbers-and-strings/01-numbers/exercises/01-do-some-calculations/solution/main.go
diff --git a/08-numbers-and-strings/01-numbers/exercises/02/main.go b/08-numbers-and-strings/01-numbers/exercises/02-fix-the-float/main.go
similarity index 93%
rename from 08-numbers-and-strings/01-numbers/exercises/02/main.go
rename to 08-numbers-and-strings/01-numbers/exercises/02-fix-the-float/main.go
index 223bb27..49d89ac 100644
--- a/08-numbers-and-strings/01-numbers/exercises/02/main.go
+++ b/08-numbers-and-strings/01-numbers/exercises/02-fix-the-float/main.go
@@ -10,7 +10,8 @@ package main
 import "fmt"
 
 // ---------------------------------------------------------
-// EXERCISE
+// EXERCISE: Fix the Float
+//
 //  Fix the program to print 2.5 instead of 2
 //
 // EXPECTED OUTPUT
diff --git a/08-numbers-and-strings/01-numbers/exercises/02/solution/main.go b/08-numbers-and-strings/01-numbers/exercises/02-fix-the-float/solution/main.go
similarity index 100%
rename from 08-numbers-and-strings/01-numbers/exercises/02/solution/main.go
rename to 08-numbers-and-strings/01-numbers/exercises/02-fix-the-float/solution/main.go
diff --git a/08-numbers-and-strings/01-numbers/exercises/03/main.go b/08-numbers-and-strings/01-numbers/exercises/03-precedence/main.go
similarity index 97%
rename from 08-numbers-and-strings/01-numbers/exercises/03/main.go
rename to 08-numbers-and-strings/01-numbers/exercises/03-precedence/main.go
index aa3099a..faf8e9a 100644
--- a/08-numbers-and-strings/01-numbers/exercises/03/main.go
+++ b/08-numbers-and-strings/01-numbers/exercises/03-precedence/main.go
@@ -10,7 +10,8 @@ package main
 import "fmt"
 
 // ---------------------------------------------------------
-// EXERCISE
+// EXERCISE: Precedence
+//
 //  Change the expressions to produce the expected outputs
 //
 // RESTRICTION
diff --git a/08-numbers-and-strings/01-numbers/exercises/03/solution/main.go b/08-numbers-and-strings/01-numbers/exercises/03-precedence/solution/main.go
similarity index 100%
rename from 08-numbers-and-strings/01-numbers/exercises/03/solution/main.go
rename to 08-numbers-and-strings/01-numbers/exercises/03-precedence/solution/main.go
diff --git a/08-numbers-and-strings/01-numbers/exercises/04/main.go b/08-numbers-and-strings/01-numbers/exercises/04-incdecs/main.go
similarity index 96%
rename from 08-numbers-and-strings/01-numbers/exercises/04/main.go
rename to 08-numbers-and-strings/01-numbers/exercises/04-incdecs/main.go
index 6f937c6..c441a85 100644
--- a/08-numbers-and-strings/01-numbers/exercises/04/main.go
+++ b/08-numbers-and-strings/01-numbers/exercises/04-incdecs/main.go
@@ -8,7 +8,8 @@
 package main
 
 // ---------------------------------------------------------
-// EXERCISE
+// EXERCISE: Incdecs
+//
 //  1. Increase the `counter` 5 times
 //  2. Decrease the `factor` 2 times
 //  3. Print the product of counter and factor
diff --git a/08-numbers-and-strings/01-numbers/exercises/04/solution/main.go b/08-numbers-and-strings/01-numbers/exercises/04-incdecs/solution/main.go
similarity index 100%
rename from 08-numbers-and-strings/01-numbers/exercises/04/solution/main.go
rename to 08-numbers-and-strings/01-numbers/exercises/04-incdecs/solution/main.go
diff --git a/08-numbers-and-strings/01-numbers/exercises/05/main.go b/08-numbers-and-strings/01-numbers/exercises/05-manipulate-a-counter/main.go
similarity index 96%
rename from 08-numbers-and-strings/01-numbers/exercises/05/main.go
rename to 08-numbers-and-strings/01-numbers/exercises/05-manipulate-a-counter/main.go
index 231c8b5..32ebec1 100644
--- a/08-numbers-and-strings/01-numbers/exercises/05/main.go
+++ b/08-numbers-and-strings/01-numbers/exercises/05-manipulate-a-counter/main.go
@@ -10,7 +10,8 @@ package main
 import "fmt"
 
 // ---------------------------------------------------------
-// EXERCISE
+// EXERCISE: Manipulate a Counter
+//
 //  1. Write the simplest line of code to increase
 //     the counter variable by 1.
 //
diff --git a/08-numbers-and-strings/01-numbers/exercises/05/solution/main.go b/08-numbers-and-strings/01-numbers/exercises/05-manipulate-a-counter/solution/main.go
similarity index 100%
rename from 08-numbers-and-strings/01-numbers/exercises/05/solution/main.go
rename to 08-numbers-and-strings/01-numbers/exercises/05-manipulate-a-counter/solution/main.go
diff --git a/08-numbers-and-strings/01-numbers/exercises/06/main.go b/08-numbers-and-strings/01-numbers/exercises/06-simplify-the-assignments/main.go
similarity index 94%
rename from 08-numbers-and-strings/01-numbers/exercises/06/main.go
rename to 08-numbers-and-strings/01-numbers/exercises/06-simplify-the-assignments/main.go
index 4d29663..4c88753 100644
--- a/08-numbers-and-strings/01-numbers/exercises/06/main.go
+++ b/08-numbers-and-strings/01-numbers/exercises/06-simplify-the-assignments/main.go
@@ -10,7 +10,8 @@ package main
 import "fmt"
 
 // ---------------------------------------------------------
-// EXERCISE
+// EXERCISE: Simplify the Assignments
+//
 //  Simplify the code (refactor)
 //
 // RESTRICTION
diff --git a/08-numbers-and-strings/01-numbers/exercises/06/solution/main.go b/08-numbers-and-strings/01-numbers/exercises/06-simplify-the-assignments/solution/main.go
similarity index 100%
rename from 08-numbers-and-strings/01-numbers/exercises/06/solution/main.go
rename to 08-numbers-and-strings/01-numbers/exercises/06-simplify-the-assignments/solution/main.go
diff --git a/08-numbers-and-strings/01-numbers/exercises/07-capstone1/main.go b/08-numbers-and-strings/01-numbers/exercises/07-circle-area/main.go
similarity index 96%
rename from 08-numbers-and-strings/01-numbers/exercises/07-capstone1/main.go
rename to 08-numbers-and-strings/01-numbers/exercises/07-circle-area/main.go
index 3e5cb06..efe858e 100644
--- a/08-numbers-and-strings/01-numbers/exercises/07-capstone1/main.go
+++ b/08-numbers-and-strings/01-numbers/exercises/07-circle-area/main.go
@@ -12,7 +12,8 @@ import (
 )
 
 // ---------------------------------------------------------
-// EXERCISE
+// EXERCISE: Circle Area
+//
 //  Calculate the area of a circle from the given radius
 //
 // CIRCLE AREA FORMULA
diff --git a/08-numbers-and-strings/01-numbers/exercises/07-capstone1/solution/main.go b/08-numbers-and-strings/01-numbers/exercises/07-circle-area/solution/main.go
similarity index 100%
rename from 08-numbers-and-strings/01-numbers/exercises/07-capstone1/solution/main.go
rename to 08-numbers-and-strings/01-numbers/exercises/07-circle-area/solution/main.go
diff --git a/08-numbers-and-strings/01-numbers/exercises/08-capstone2/main.go b/08-numbers-and-strings/01-numbers/exercises/08-sphere-area/main.go
similarity index 97%
rename from 08-numbers-and-strings/01-numbers/exercises/08-capstone2/main.go
rename to 08-numbers-and-strings/01-numbers/exercises/08-sphere-area/main.go
index 32ebb5a..5aa6124 100644
--- a/08-numbers-and-strings/01-numbers/exercises/08-capstone2/main.go
+++ b/08-numbers-and-strings/01-numbers/exercises/08-sphere-area/main.go
@@ -12,7 +12,8 @@ import (
 )
 
 // ---------------------------------------------------------
-// EXERCISE
+// EXERCISE: Sphere Area
+//
 //  1. Get the radius from the command-line
 //  2. Convert it to a float64
 //  3. Calculate the surface area of a sphere
diff --git a/08-numbers-and-strings/01-numbers/exercises/08-capstone2/solution/main.go b/08-numbers-and-strings/01-numbers/exercises/08-sphere-area/solution/main.go
similarity index 100%
rename from 08-numbers-and-strings/01-numbers/exercises/08-capstone2/solution/main.go
rename to 08-numbers-and-strings/01-numbers/exercises/08-sphere-area/solution/main.go
diff --git a/08-numbers-and-strings/01-numbers/exercises/09-capstone3/main.go b/08-numbers-and-strings/01-numbers/exercises/09-sphere-volume/main.go
similarity index 96%
rename from 08-numbers-and-strings/01-numbers/exercises/09-capstone3/main.go
rename to 08-numbers-and-strings/01-numbers/exercises/09-sphere-volume/main.go
index 062409e..db265a1 100644
--- a/08-numbers-and-strings/01-numbers/exercises/09-capstone3/main.go
+++ b/08-numbers-and-strings/01-numbers/exercises/09-sphere-volume/main.go
@@ -12,7 +12,8 @@ import (
 )
 
 // ---------------------------------------------------------
-// EXERCISE
+// EXERCISE: Sphere Volume
+//
 //  1. Get the radius from the command-line
 //  2. Convert it to a float64
 //  3. Calculate the volume of a sphere
diff --git a/08-numbers-and-strings/01-numbers/exercises/09-capstone3/solution/main.go b/08-numbers-and-strings/01-numbers/exercises/09-sphere-volume/solution/main.go
similarity index 100%
rename from 08-numbers-and-strings/01-numbers/exercises/09-capstone3/solution/main.go
rename to 08-numbers-and-strings/01-numbers/exercises/09-sphere-volume/solution/main.go
diff --git a/08-numbers-and-strings/01-numbers/exercises/README.md b/08-numbers-and-strings/01-numbers/exercises/README.md
new file mode 100644
index 0000000..3d3551d
--- /dev/null
+++ b/08-numbers-and-strings/01-numbers/exercises/README.md
@@ -0,0 +1,19 @@
+# Numbers, Precedence, and Assignment Operations
+
+1. **[Do Some Calculations](https://github.com/inancgumus/learngo/tree/master/08-numbers-and-strings/01-numbers/exercises/01-do-some-calculations)**
+
+2. **[Fix the Float](https://github.com/inancgumus/learngo/tree/master/08-numbers-and-strings/01-numbers/exercises/02-fix-the-float)**
+
+3. **[Precedence](https://github.com/inancgumus/learngo/tree/master/08-numbers-and-strings/01-numbers/exercises/03-precedence)**
+
+4. **[IncDecs](https://github.com/inancgumus/learngo/tree/master/08-numbers-and-strings/01-numbers/exercises/04-incdecs)**
+
+5. **[Manipulate a Counter](https://github.com/inancgumus/learngo/tree/master/08-numbers-and-strings/01-numbers/exercises/05-manipulate-a-counter)**
+
+6. **[Simplify the Assignments](https://github.com/inancgumus/learngo/tree/master/08-numbers-and-strings/01-numbers/exercises/06-simplify-the-assignments)**
+
+7. **[Circle Area](https://github.com/inancgumus/learngo/tree/master/08-numbers-and-strings/01-numbers/exercises/07-circle-area)**
+
+8. **[Sphere Area](https://github.com/inancgumus/learngo/tree/master/08-numbers-and-strings/01-numbers/exercises/08-sphere-area)**
+
+9. **[Sphere Volume](https://github.com/inancgumus/learngo/tree/master/08-numbers-and-strings/01-numbers/exercises/09-sphere-volume)**
diff --git a/08-numbers-and-strings/02-strings/README.md b/08-numbers-and-strings/02-strings/README.md
new file mode 100644
index 0000000..233a5de
--- /dev/null
+++ b/08-numbers-and-strings/02-strings/README.md
@@ -0,0 +1,18 @@
+# Basic Strings
+
+1. **[Windows Path](https://github.com/inancgumus/learngo/tree/master/08-numbers-and-strings/02-strings/exercises/01-windows-path)**
+
+2. **[Print JSON](https://github.com/inancgumus/learngo/tree/master/08-numbers-and-strings/02-strings/exercises/02-print-json)**
+
+3. **[Raw Concat](https://github.com/inancgumus/learngo/tree/master/08-numbers-and-strings/02-strings/exercises/03-raw-concat)**
+
+4. **[Count the Chars](https://github.com/inancgumus/learngo/tree/master/08-numbers-and-strings/02-strings/exercises/04-count-the-chars)**
+
+5. **[Improved Banger](https://github.com/inancgumus/learngo/tree/master/08-numbers-and-strings/02-strings/exercises/05-improved-banger)**
+
+6. **[ToLowercase](https://github.com/inancgumus/learngo/tree/master/08-numbers-and-strings/02-strings/exercises/06-tolowercase)**
+
+7. **[Trim It](https://github.com/inancgumus/learngo/tree/master/08-numbers-and-strings/02-strings/exercises/07-trim-it)**
+
+8. **[Right Trim It](https://github.com/inancgumus/learngo/tree/master/08-numbers-and-strings/02-strings/exercises/08-right-trim-it)**
+
diff --git a/08-numbers-and-strings/02-strings/exercises/01/main.go b/08-numbers-and-strings/02-strings/exercises/01-windows-path/main.go
similarity index 96%
rename from 08-numbers-and-strings/02-strings/exercises/01/main.go
rename to 08-numbers-and-strings/02-strings/exercises/01-windows-path/main.go
index e87b2d9..d9508e8 100644
--- a/08-numbers-and-strings/02-strings/exercises/01/main.go
+++ b/08-numbers-and-strings/02-strings/exercises/01-windows-path/main.go
@@ -10,7 +10,8 @@ package main
 import "fmt"
 
 // ---------------------------------------------------------
-// EXERCISE
+// EXERCISE: Windows Path
+//
 //  1. Change the following program
 //  2. It should use a raw string literal instead
 //
diff --git a/08-numbers-and-strings/02-strings/exercises/01/solution/main.go b/08-numbers-and-strings/02-strings/exercises/01-windows-path/solution/main.go
similarity index 100%
rename from 08-numbers-and-strings/02-strings/exercises/01/solution/main.go
rename to 08-numbers-and-strings/02-strings/exercises/01-windows-path/solution/main.go
diff --git a/08-numbers-and-strings/02-strings/exercises/02/main.go b/08-numbers-and-strings/02-strings/exercises/02-print-json/main.go
similarity index 97%
rename from 08-numbers-and-strings/02-strings/exercises/02/main.go
rename to 08-numbers-and-strings/02-strings/exercises/02-print-json/main.go
index df19c51..761fe63 100644
--- a/08-numbers-and-strings/02-strings/exercises/02/main.go
+++ b/08-numbers-and-strings/02-strings/exercises/02-print-json/main.go
@@ -10,7 +10,8 @@ package main
 import "fmt"
 
 // ---------------------------------------------------------
-// EXERCISE
+// EXERCISE: Print JSON
+//
 //  1. Change the following program
 //  2. It should use a raw string literal instead
 //
diff --git a/08-numbers-and-strings/02-strings/exercises/02/solution/main.go b/08-numbers-and-strings/02-strings/exercises/02-print-json/solution/main.go
similarity index 100%
rename from 08-numbers-and-strings/02-strings/exercises/02/solution/main.go
rename to 08-numbers-and-strings/02-strings/exercises/02-print-json/solution/main.go
diff --git a/08-numbers-and-strings/02-strings/exercises/03/main.go b/08-numbers-and-strings/02-strings/exercises/03-raw-concat/main.go
similarity index 97%
rename from 08-numbers-and-strings/02-strings/exercises/03/main.go
rename to 08-numbers-and-strings/02-strings/exercises/03-raw-concat/main.go
index ac0760b..6cf1b8d 100644
--- a/08-numbers-and-strings/02-strings/exercises/03/main.go
+++ b/08-numbers-and-strings/02-strings/exercises/03-raw-concat/main.go
@@ -10,7 +10,8 @@ package main
 import "fmt"
 
 // ---------------------------------------------------------
-// EXERCISE
+// EXERCISE: Raw Concat
+//
 //  1. Initialize the name variable
 //     by getting input from the command line
 //
diff --git a/08-numbers-and-strings/02-strings/exercises/03/solution/main.go b/08-numbers-and-strings/02-strings/exercises/03-raw-concat/solution/main.go
similarity index 100%
rename from 08-numbers-and-strings/02-strings/exercises/03/solution/main.go
rename to 08-numbers-and-strings/02-strings/exercises/03-raw-concat/solution/main.go
diff --git a/08-numbers-and-strings/02-strings/exercises/04/main.go b/08-numbers-and-strings/02-strings/exercises/04-count-the-chars/main.go
similarity index 95%
rename from 08-numbers-and-strings/02-strings/exercises/04/main.go
rename to 08-numbers-and-strings/02-strings/exercises/04-count-the-chars/main.go
index 0c9a27e..6cdaae0 100644
--- a/08-numbers-and-strings/02-strings/exercises/04/main.go
+++ b/08-numbers-and-strings/02-strings/exercises/04-count-the-chars/main.go
@@ -13,7 +13,8 @@ import (
 )
 
 // ---------------------------------------------------------
-// EXERCISE
+// EXERCISE: Count the Chars
+//
 //  1. Change the following program to work with unicode
 //     characters.
 //
diff --git a/08-numbers-and-strings/02-strings/exercises/04/solution/main.go b/08-numbers-and-strings/02-strings/exercises/04-count-the-chars/solution/main.go
similarity index 100%
rename from 08-numbers-and-strings/02-strings/exercises/04/solution/main.go
rename to 08-numbers-and-strings/02-strings/exercises/04-count-the-chars/solution/main.go
diff --git a/08-numbers-and-strings/02-strings/exercises/05/main.go b/08-numbers-and-strings/02-strings/exercises/05-improved-banger/main.go
similarity index 94%
rename from 08-numbers-and-strings/02-strings/exercises/05/main.go
rename to 08-numbers-and-strings/02-strings/exercises/05-improved-banger/main.go
index 15f55d1..13b9b8e 100644
--- a/08-numbers-and-strings/02-strings/exercises/05/main.go
+++ b/08-numbers-and-strings/02-strings/exercises/05-improved-banger/main.go
@@ -14,7 +14,8 @@ import (
 )
 
 // ---------------------------------------------------------
-// EXERCISE
+// EXERCISE: Improved Banger
+//
 //  Change the Banger program the work with Unicode
 //  characters.
 //
diff --git a/08-numbers-and-strings/02-strings/exercises/05/solution/main.go b/08-numbers-and-strings/02-strings/exercises/05-improved-banger/solution/main.go
similarity index 100%
rename from 08-numbers-and-strings/02-strings/exercises/05/solution/main.go
rename to 08-numbers-and-strings/02-strings/exercises/05-improved-banger/solution/main.go
diff --git a/08-numbers-and-strings/02-strings/exercises/06/main.go b/08-numbers-and-strings/02-strings/exercises/06-tolowercase/main.go
similarity index 80%
rename from 08-numbers-and-strings/02-strings/exercises/06/main.go
rename to 08-numbers-and-strings/02-strings/exercises/06-tolowercase/main.go
index 5abcf68..cbc48c3 100644
--- a/08-numbers-and-strings/02-strings/exercises/06/main.go
+++ b/08-numbers-and-strings/02-strings/exercises/06-tolowercase/main.go
@@ -8,12 +8,17 @@
 package main
 
 // ---------------------------------------------------------
-// EXERCISE
+// EXERCISE: ToLowercase
+//
 //  1. Look at the documentation of strings package
 //  2. Find a function that changes the letters into lowercase
 //  3. Get a value from the command-line
 //  4. Print the given value in lowercase letters
 //
+// HINT
+//  Check out the strings package from Go online documentation.
+//  You will find the lowercase function there.
+//
 // INPUT
 //  "SHEPARD"
 //
diff --git a/08-numbers-and-strings/02-strings/exercises/06/solution/main.go b/08-numbers-and-strings/02-strings/exercises/06-tolowercase/solution/main.go
similarity index 100%
rename from 08-numbers-and-strings/02-strings/exercises/06/solution/main.go
rename to 08-numbers-and-strings/02-strings/exercises/06-tolowercase/solution/main.go
diff --git a/08-numbers-and-strings/02-strings/exercises/07/main.go b/08-numbers-and-strings/02-strings/exercises/07-trim-it/main.go
similarity index 96%
rename from 08-numbers-and-strings/02-strings/exercises/07/main.go
rename to 08-numbers-and-strings/02-strings/exercises/07-trim-it/main.go
index 28185c6..a7207e3 100644
--- a/08-numbers-and-strings/02-strings/exercises/07/main.go
+++ b/08-numbers-and-strings/02-strings/exercises/07-trim-it/main.go
@@ -12,7 +12,8 @@ import (
 )
 
 // ---------------------------------------------------------
-// EXERCISE
+// EXERCISE: Trim It
+//
 //  1. Look at the documentation of strings package
 //  2. Find a function that trims the spaces from
 //     the given string
diff --git a/08-numbers-and-strings/02-strings/exercises/07/solution/main.go b/08-numbers-and-strings/02-strings/exercises/07-trim-it/solution/main.go
similarity index 100%
rename from 08-numbers-and-strings/02-strings/exercises/07/solution/main.go
rename to 08-numbers-and-strings/02-strings/exercises/07-trim-it/solution/main.go
diff --git a/08-numbers-and-strings/02-strings/exercises/08/main.go b/08-numbers-and-strings/02-strings/exercises/08-right-trim-it/main.go
similarity index 96%
rename from 08-numbers-and-strings/02-strings/exercises/08/main.go
rename to 08-numbers-and-strings/02-strings/exercises/08-right-trim-it/main.go
index d76c42c..1f0e0e8 100644
--- a/08-numbers-and-strings/02-strings/exercises/08/main.go
+++ b/08-numbers-and-strings/02-strings/exercises/08-right-trim-it/main.go
@@ -12,7 +12,8 @@ import (
 )
 
 // ---------------------------------------------------------
-// EXERCISE
+// EXERCISE: Right Trim It
+//
 //  1. Look at the documentation of strings package
 //  2. Find a function that trims the spaces from
 //     only the right-most part of the given string
diff --git a/08-numbers-and-strings/02-strings/exercises/08/solution/main.go b/08-numbers-and-strings/02-strings/exercises/08-right-trim-it/solution/main.go
similarity index 100%
rename from 08-numbers-and-strings/02-strings/exercises/08/solution/main.go
rename to 08-numbers-and-strings/02-strings/exercises/08-right-trim-it/solution/main.go