diff --git a/011-arrays/011-arrays.go b/011-arrays/arrays.go
similarity index 88%
rename from 011-arrays/011-arrays.go
rename to 011-arrays/arrays.go
index dac13eb..e4834e7 100644
--- a/011-arrays/011-arrays.go
+++ b/011-arrays/arrays.go
@@ -1,3 +1,5 @@
+// ## Arrays
+
 package main
 
 import "fmt"
diff --git a/012-sum/012-sum.go b/012-sum/sum.go
similarity index 96%
rename from 012-sum/012-sum.go
rename to 012-sum/sum.go
index e63c85f..60affa0 100644
--- a/012-sum/012-sum.go
+++ b/012-sum/sum.go
@@ -1,3 +1,5 @@
+// ## Sum
+
 package main
 
 import "fmt"
diff --git a/013-range/013-range.go b/013-range/range.go
similarity index 95%
rename from 013-range/013-range.go
rename to 013-range/range.go
index 8b79de4..e0cba41 100644
--- a/013-range/013-range.go
+++ b/013-range/range.go
@@ -1,3 +1,5 @@
+// ## Range
+
 package main
 
 import "fmt"
diff --git a/014-floats/014-floats.go b/014-floats/floats.go
similarity index 92%
rename from 014-floats/014-floats.go
rename to 014-floats/floats.go
index f0628d3..edbe2d6 100644
--- a/014-floats/014-floats.go
+++ b/014-floats/floats.go
@@ -1,3 +1,5 @@
+// ## Floats
+
 package main
 
 import "fmt"
diff --git a/015-slices/015-slices.go b/015-slices/slices.go
similarity index 94%
rename from 015-slices/015-slices.go
rename to 015-slices/slices.go
index 364109b..6f4c3db 100644
--- a/015-slices/015-slices.go
+++ b/015-slices/slices.go
@@ -1,3 +1,5 @@
+// ## Slices
+
 package main
 
 import "fmt"
diff --git a/016-maps/016-maps.go b/016-maps/maps.go
similarity index 96%
rename from 016-maps/016-maps.go
rename to 016-maps/maps.go
index 56b8b9c..a2ac1f7 100644
--- a/016-maps/016-maps.go
+++ b/016-maps/maps.go
@@ -1,3 +1,5 @@
+// ## Maps
+
 package main
 
 import "fmt"
diff --git a/017-ok-guards/017-ok-guards.go b/017-ok-guards/ok-guards.go
similarity index 83%
rename from 017-ok-guards/017-ok-guards.go
rename to 017-ok-guards/ok-guards.go
index d31f35f..e0ad577 100644
--- a/017-ok-guards/017-ok-guards.go
+++ b/017-ok-guards/ok-guards.go
@@ -1,4 +1,5 @@
-                                    // Ok Guard
+// ## OK Guards
+
 package main
 
 import "fmt"
diff --git a/018-nesting/018-nesting.go b/018-nesting/nesting.go
similarity index 97%
rename from 018-nesting/018-nesting.go
rename to 018-nesting/nesting.go
index 952d351..d910df8 100644
--- a/018-nesting/018-nesting.go
+++ b/018-nesting/nesting.go
@@ -1,3 +1,5 @@
+// ## Nesting
+
 package main
 
 import "fmt"
diff --git a/019-functions/019-functions.go b/019-functions/functions.go
similarity index 94%
rename from 019-functions/019-functions.go
rename to 019-functions/functions.go
index a80bfc3..76dab86 100644
--- a/019-functions/019-functions.go
+++ b/019-functions/functions.go
@@ -1,3 +1,5 @@
+// ## Functions
+
 package main
 
 import "fmt"