diff --git a/01-get-started/README.md b/01-get-started/README.md
new file mode 100644
index 0000000..58094c8
--- /dev/null
+++ b/01-get-started/README.md
@@ -0,0 +1 @@
+This section is in progress. I'm working hard to update the course all the time. Hold on!
\ No newline at end of file
diff --git a/02-write-your-first-program/questions/01-gopath-questions.md b/02-write-your-first-program/questions/01-gopath/README.md
similarity index 100%
rename from 02-write-your-first-program/questions/01-gopath-questions.md
rename to 02-write-your-first-program/questions/01-gopath/README.md
diff --git a/02-write-your-first-program/questions/02-code-your-first-program-questions.md b/02-write-your-first-program/questions/02-code-your-first-program/README.md
similarity index 100%
rename from 02-write-your-first-program/questions/02-code-your-first-program-questions.md
rename to 02-write-your-first-program/questions/02-code-your-first-program/README.md
diff --git a/02-write-your-first-program/questions/03-run-your-first-program-questions.md b/02-write-your-first-program/questions/03-run-your-first-program/README.md
similarity index 100%
rename from 02-write-your-first-program/questions/03-run-your-first-program-questions.md
rename to 02-write-your-first-program/questions/03-run-your-first-program/README.md
diff --git a/03-packages-and-scopes/questions/01-packages-A.md b/03-packages-and-scopes/questions/01-packages-A/README.md
similarity index 100%
rename from 03-packages-and-scopes/questions/01-packages-A.md
rename to 03-packages-and-scopes/questions/01-packages-A/README.md
diff --git a/03-packages-and-scopes/questions/01-packages-B.md b/03-packages-and-scopes/questions/02-packages-B/README.md
similarity index 100%
rename from 03-packages-and-scopes/questions/01-packages-B.md
rename to 03-packages-and-scopes/questions/02-packages-B/README.md
diff --git a/03-packages-and-scopes/questions/02-scopes.md b/03-packages-and-scopes/questions/03-scopes/README.md
similarity index 100%
rename from 03-packages-and-scopes/questions/02-scopes.md
rename to 03-packages-and-scopes/questions/03-scopes/README.md
diff --git a/04-statements-expressions-comments/questions/01-statements.md b/04-statements-expressions-comments/questions/01-statements/README.md
similarity index 100%
rename from 04-statements-expressions-comments/questions/01-statements.md
rename to 04-statements-expressions-comments/questions/01-statements/README.md
diff --git a/04-statements-expressions-comments/questions/02-expressions.md b/04-statements-expressions-comments/questions/02-expressions/README.md
similarity index 100%
rename from 04-statements-expressions-comments/questions/02-expressions.md
rename to 04-statements-expressions-comments/questions/02-expressions/README.md
diff --git a/04-statements-expressions-comments/questions/03-comments.md b/04-statements-expressions-comments/questions/03-comments/README.md
similarity index 100%
rename from 04-statements-expressions-comments/questions/03-comments.md
rename to 04-statements-expressions-comments/questions/03-comments/README.md
diff --git a/05-write-your-first-library-package/questions/questions.md b/05-write-your-first-library-package/questions/README.md
similarity index 100%
rename from 05-write-your-first-library-package/questions/questions.md
rename to 05-write-your-first-library-package/questions/README.md