diff --git a/13-loops/exercises/01-basics.md b/13-loops/exercises/01-basics.md
new file mode 100644
index 0000000..4d757d0
--- /dev/null
+++ b/13-loops/exercises/01-basics.md
@@ -0,0 +1,13 @@
+# Loops
+
+1. **[Sum the Numbers](https://github.com/inancgumus/learngo/tree/master/13-loops/exercises/01-sum-the-numbers)**
+
+2. **[Sum the Numbers: Verbose Edition](https://github.com/inancgumus/learngo/tree/master/13-loops/exercises/02-sum-the-numbers-verbose)**
+
+3. **[Sum up to N](https://github.com/inancgumus/learngo/tree/master/13-loops/exercises/03-sum-up-to-n)**
+
+4. **[Only Evens](https://github.com/inancgumus/learngo/tree/master/13-loops/exercises/04-only-evens)**
+
+5. **[Break Up](https://github.com/inancgumus/learngo/tree/master/13-loops/exercises/05-break-up)**
+
+6. **[Infinite Kill](https://github.com/inancgumus/learngo/tree/master/13-loops/exercises/06-infinite-kill)**
\ No newline at end of file
diff --git a/13-loops/exercises/01-sum-the-numbers/main.go b/13-loops/exercises/01-sum-the-numbers/main.go
index 82b0848..f929d06 100644
--- a/13-loops/exercises/01-sum-the-numbers/main.go
+++ b/13-loops/exercises/01-sum-the-numbers/main.go
@@ -8,7 +8,7 @@
 package main
 
 // ---------------------------------------------------------
-// EXERCISE: Sum the numbers
+// EXERCISE: Sum the Numbers
 //
 //  1. By using a loop, sum the numbers between 1 and 10.
 //  2. Print the sum.
diff --git a/13-loops/exercises/02-multiplication-table.md b/13-loops/exercises/02-multiplication-table.md
new file mode 100644
index 0000000..acedee1
--- /dev/null
+++ b/13-loops/exercises/02-multiplication-table.md
@@ -0,0 +1,5 @@
+# Multiplication Table
+
+1. **[Dynamic Table](https://github.com/inancgumus/learngo/tree/master/13-loops/exercises/07-multiplication-table-exercises/01-dynamic-table)**
+
+2. **[Math Table](https://github.com/inancgumus/learngo/tree/master/13-loops/exercises/07-multiplication-table-exercises/02-math-tables)**
\ No newline at end of file
diff --git a/13-loops/exercises/02-sum-the-numbers-verbose/main.go b/13-loops/exercises/02-sum-the-numbers-verbose/main.go
index 9df3100..1017dd5 100644
--- a/13-loops/exercises/02-sum-the-numbers-verbose/main.go
+++ b/13-loops/exercises/02-sum-the-numbers-verbose/main.go
@@ -8,7 +8,7 @@
 package main
 
 // ---------------------------------------------------------
-// EXERCISE: Sum the numbers verbose edition
+// EXERCISE: Sum the Numbers: Verbose Edition
 //
 //  By using a loop, sum the numbers between 1 and 10.
 //
diff --git a/13-loops/exercises/03-lucky-number.md b/13-loops/exercises/03-lucky-number.md
new file mode 100644
index 0000000..50c15ae
--- /dev/null
+++ b/13-loops/exercises/03-lucky-number.md
@@ -0,0 +1,13 @@
+# Lucky Number
+
+1. **[First Turn Winner](https://github.com/inancgumus/learngo/tree/master/13-loops/exercises/08-lucky-number-exercises/01-first-turn-winner)**
+
+2. **[Random Messages](https://github.com/inancgumus/learngo/tree/master/13-loops/exercises/08-lucky-number-exercises/02-random-messages)**
+
+3. **[Double Guesses](https://github.com/inancgumus/learngo/tree/master/13-loops/exercises/08-lucky-number-exercises/03-double-guesses)**
+
+4. **[Verbose Mode](https://github.com/inancgumus/learngo/tree/master/13-loops/exercises/08-lucky-number-exercises/04-verbose-mode)**
+
+5. **[Enough Picks](https://github.com/inancgumus/learngo/tree/master/13-loops/exercises/08-lucky-number-exercises/05-enough-picks)**
+
+6. **[Dynamic Difficulty](https://github.com/inancgumus/learngo/tree/master/13-loops/exercises/08-lucky-number-exercises/06-dynamic-difficulty)**
\ No newline at end of file
diff --git a/13-loops/exercises/04-only-evens/main.go b/13-loops/exercises/04-only-evens/main.go
index 88871e5..7c3410a 100644
--- a/13-loops/exercises/04-only-evens/main.go
+++ b/13-loops/exercises/04-only-evens/main.go
@@ -8,7 +8,7 @@
 package main
 
 // ---------------------------------------------------------
-// EXERCISE: Only evens
+// EXERCISE: Only Evens
 //
 //  1. Extend the "Sum up to N" exercise
 //  2. Sum only the even numbers
diff --git a/13-loops/exercises/04-word-finder.md b/13-loops/exercises/04-word-finder.md
new file mode 100644
index 0000000..c08c2c8
--- /dev/null
+++ b/13-loops/exercises/04-word-finder.md
@@ -0,0 +1,5 @@
+# Word Finder
+
+1. **[Case Insensitive Search](https://github.com/inancgumus/learngo/tree/master/13-loops/exercises/09-word-finder-exercises/01-case-insensitive)**
+
+2. **[Path Searcher](https://github.com/inancgumus/learngo/tree/master/13-loops/exercises/09-word-finder-exercises/02-path-searcher)**
\ No newline at end of file
diff --git a/13-loops/exercises/05-break-up/main.go b/13-loops/exercises/05-break-up/main.go
index e3a9b06..a3f6ab4 100644
--- a/13-loops/exercises/05-break-up/main.go
+++ b/13-loops/exercises/05-break-up/main.go
@@ -8,7 +8,7 @@
 package main
 
 // ---------------------------------------------------------
-// EXERCISE: Break up
+// EXERCISE: Break Up
 //
 //  1. Extend the "Only Evens" exercise
 //  2. This time, use an infinite loop.
diff --git a/13-loops/exercises/05-crunch-the-primes.md b/13-loops/exercises/05-crunch-the-primes.md
new file mode 100644
index 0000000..d11bebf
--- /dev/null
+++ b/13-loops/exercises/05-crunch-the-primes.md
@@ -0,0 +1,3 @@
+# Crunch the Primes
+
+1. **[Crunch the primes](https://github.com/inancgumus/learngo/tree/master/13-loops/exercises/10-crunch-the-primes)**
diff --git a/13-loops/exercises/08-multiplication-table-exercises/01-dynamic-table/main.go b/13-loops/exercises/07-multiplication-table-exercises/01-dynamic-table/main.go
similarity index 100%
rename from 13-loops/exercises/08-multiplication-table-exercises/01-dynamic-table/main.go
rename to 13-loops/exercises/07-multiplication-table-exercises/01-dynamic-table/main.go
diff --git a/13-loops/exercises/08-multiplication-table-exercises/01-dynamic-table/solution/main.go b/13-loops/exercises/07-multiplication-table-exercises/01-dynamic-table/solution/main.go
similarity index 100%
rename from 13-loops/exercises/08-multiplication-table-exercises/01-dynamic-table/solution/main.go
rename to 13-loops/exercises/07-multiplication-table-exercises/01-dynamic-table/solution/main.go
diff --git a/13-loops/exercises/08-multiplication-table-exercises/02-math-tables/main.go b/13-loops/exercises/07-multiplication-table-exercises/02-math-tables/main.go
similarity index 100%
rename from 13-loops/exercises/08-multiplication-table-exercises/02-math-tables/main.go
rename to 13-loops/exercises/07-multiplication-table-exercises/02-math-tables/main.go
diff --git a/13-loops/exercises/08-multiplication-table-exercises/02-math-tables/solution/main.go b/13-loops/exercises/07-multiplication-table-exercises/02-math-tables/solution/main.go
similarity index 100%
rename from 13-loops/exercises/08-multiplication-table-exercises/02-math-tables/solution/main.go
rename to 13-loops/exercises/07-multiplication-table-exercises/02-math-tables/solution/main.go
diff --git a/13-loops/exercises/09-lucky-number-exercises/01-first-turn-winner/main.go b/13-loops/exercises/08-lucky-number-exercises/01-first-turn-winner/main.go
similarity index 100%
rename from 13-loops/exercises/09-lucky-number-exercises/01-first-turn-winner/main.go
rename to 13-loops/exercises/08-lucky-number-exercises/01-first-turn-winner/main.go
diff --git a/13-loops/exercises/09-lucky-number-exercises/01-first-turn-winner/solution-better/main.go b/13-loops/exercises/08-lucky-number-exercises/01-first-turn-winner/solution-better/main.go
similarity index 100%
rename from 13-loops/exercises/09-lucky-number-exercises/01-first-turn-winner/solution-better/main.go
rename to 13-loops/exercises/08-lucky-number-exercises/01-first-turn-winner/solution-better/main.go
diff --git a/13-loops/exercises/09-lucky-number-exercises/01-first-turn-winner/solution/main.go b/13-loops/exercises/08-lucky-number-exercises/01-first-turn-winner/solution/main.go
similarity index 100%
rename from 13-loops/exercises/09-lucky-number-exercises/01-first-turn-winner/solution/main.go
rename to 13-loops/exercises/08-lucky-number-exercises/01-first-turn-winner/solution/main.go
diff --git a/13-loops/exercises/09-lucky-number-exercises/02-random-messages/main.go b/13-loops/exercises/08-lucky-number-exercises/02-random-messages/main.go
similarity index 100%
rename from 13-loops/exercises/09-lucky-number-exercises/02-random-messages/main.go
rename to 13-loops/exercises/08-lucky-number-exercises/02-random-messages/main.go
diff --git a/13-loops/exercises/09-lucky-number-exercises/02-random-messages/solution/main.go b/13-loops/exercises/08-lucky-number-exercises/02-random-messages/solution/main.go
similarity index 100%
rename from 13-loops/exercises/09-lucky-number-exercises/02-random-messages/solution/main.go
rename to 13-loops/exercises/08-lucky-number-exercises/02-random-messages/solution/main.go
diff --git a/13-loops/exercises/09-lucky-number-exercises/03-double-guesses/main.go b/13-loops/exercises/08-lucky-number-exercises/03-double-guesses/main.go
similarity index 100%
rename from 13-loops/exercises/09-lucky-number-exercises/03-double-guesses/main.go
rename to 13-loops/exercises/08-lucky-number-exercises/03-double-guesses/main.go
diff --git a/13-loops/exercises/09-lucky-number-exercises/03-double-guesses/solution/main.go b/13-loops/exercises/08-lucky-number-exercises/03-double-guesses/solution/main.go
similarity index 100%
rename from 13-loops/exercises/09-lucky-number-exercises/03-double-guesses/solution/main.go
rename to 13-loops/exercises/08-lucky-number-exercises/03-double-guesses/solution/main.go
diff --git a/13-loops/exercises/09-lucky-number-exercises/04-verbose-mode/main.go b/13-loops/exercises/08-lucky-number-exercises/04-verbose-mode/main.go
similarity index 100%
rename from 13-loops/exercises/09-lucky-number-exercises/04-verbose-mode/main.go
rename to 13-loops/exercises/08-lucky-number-exercises/04-verbose-mode/main.go
diff --git a/13-loops/exercises/09-lucky-number-exercises/04-verbose-mode/solution/main.go b/13-loops/exercises/08-lucky-number-exercises/04-verbose-mode/solution/main.go
similarity index 100%
rename from 13-loops/exercises/09-lucky-number-exercises/04-verbose-mode/solution/main.go
rename to 13-loops/exercises/08-lucky-number-exercises/04-verbose-mode/solution/main.go
diff --git a/13-loops/exercises/09-lucky-number-exercises/05-enough-picks/main.go b/13-loops/exercises/08-lucky-number-exercises/05-enough-picks/main.go
similarity index 100%
rename from 13-loops/exercises/09-lucky-number-exercises/05-enough-picks/main.go
rename to 13-loops/exercises/08-lucky-number-exercises/05-enough-picks/main.go
diff --git a/13-loops/exercises/09-lucky-number-exercises/05-enough-picks/solution/main.go b/13-loops/exercises/08-lucky-number-exercises/05-enough-picks/solution/main.go
similarity index 100%
rename from 13-loops/exercises/09-lucky-number-exercises/05-enough-picks/solution/main.go
rename to 13-loops/exercises/08-lucky-number-exercises/05-enough-picks/solution/main.go
diff --git a/13-loops/exercises/09-lucky-number-exercises/06-dynamic-difficulty/main.go b/13-loops/exercises/08-lucky-number-exercises/06-dynamic-difficulty/main.go
similarity index 100%
rename from 13-loops/exercises/09-lucky-number-exercises/06-dynamic-difficulty/main.go
rename to 13-loops/exercises/08-lucky-number-exercises/06-dynamic-difficulty/main.go
diff --git a/13-loops/exercises/09-lucky-number-exercises/06-dynamic-difficulty/solution/main.go b/13-loops/exercises/08-lucky-number-exercises/06-dynamic-difficulty/solution/main.go
similarity index 100%
rename from 13-loops/exercises/09-lucky-number-exercises/06-dynamic-difficulty/solution/main.go
rename to 13-loops/exercises/08-lucky-number-exercises/06-dynamic-difficulty/solution/main.go
diff --git a/13-loops/exercises/10-word-finder-exercises/01-case-insensitive/main.go b/13-loops/exercises/09-word-finder-exercises/01-case-insensitive/main.go
similarity index 94%
rename from 13-loops/exercises/10-word-finder-exercises/01-case-insensitive/main.go
rename to 13-loops/exercises/09-word-finder-exercises/01-case-insensitive/main.go
index f1beff2..f9eb0de 100644
--- a/13-loops/exercises/10-word-finder-exercises/01-case-insensitive/main.go
+++ b/13-loops/exercises/09-word-finder-exercises/01-case-insensitive/main.go
@@ -8,7 +8,7 @@
 package main
 
 // ---------------------------------------------------------
-// EXERCISE: Case Insentive Search
+// EXERCISE: Case Insensitive Search
 //
 //  Allow for case-insensitive searching
 //
diff --git a/13-loops/exercises/10-word-finder-exercises/01-case-insensitive/solution/main.go b/13-loops/exercises/09-word-finder-exercises/01-case-insensitive/solution/main.go
similarity index 100%
rename from 13-loops/exercises/10-word-finder-exercises/01-case-insensitive/solution/main.go
rename to 13-loops/exercises/09-word-finder-exercises/01-case-insensitive/solution/main.go
diff --git a/13-loops/exercises/10-word-finder-exercises/02-path-searcher/main.go b/13-loops/exercises/09-word-finder-exercises/02-path-searcher/main.go
similarity index 100%
rename from 13-loops/exercises/10-word-finder-exercises/02-path-searcher/main.go
rename to 13-loops/exercises/09-word-finder-exercises/02-path-searcher/main.go
diff --git a/13-loops/exercises/10-word-finder-exercises/02-path-searcher/solution/main.go b/13-loops/exercises/09-word-finder-exercises/02-path-searcher/solution/main.go
similarity index 100%
rename from 13-loops/exercises/10-word-finder-exercises/02-path-searcher/solution/main.go
rename to 13-loops/exercises/09-word-finder-exercises/02-path-searcher/solution/main.go
diff --git a/13-loops/exercises/07-crunch-the-primes/main.go b/13-loops/exercises/10-crunch-the-primes/main.go
similarity index 100%
rename from 13-loops/exercises/07-crunch-the-primes/main.go
rename to 13-loops/exercises/10-crunch-the-primes/main.go
diff --git a/13-loops/exercises/07-crunch-the-primes/solution/main.go b/13-loops/exercises/10-crunch-the-primes/solution/main.go
similarity index 100%
rename from 13-loops/exercises/07-crunch-the-primes/solution/main.go
rename to 13-loops/exercises/10-crunch-the-primes/solution/main.go