diff --git a/25-functions-and-pointers/01-basics/bad.go b/25-functions/01-basics/bad.go
similarity index 100%
rename from 25-functions-and-pointers/01-basics/bad.go
rename to 25-functions/01-basics/bad.go
diff --git a/25-functions-and-pointers/01-basics/main.go b/25-functions/01-basics/main.go
similarity index 100%
rename from 25-functions-and-pointers/01-basics/main.go
rename to 25-functions/01-basics/main.go
diff --git a/25-functions-and-pointers/02-basics/main.go b/25-functions/02-basics/main.go
similarity index 100%
rename from 25-functions-and-pointers/02-basics/main.go
rename to 25-functions/02-basics/main.go
diff --git a/25-functions-and-pointers/03-refactor-to-funcs/log.txt b/25-functions/03-refactor-to-funcs/log.txt
similarity index 100%
rename from 25-functions-and-pointers/03-refactor-to-funcs/log.txt
rename to 25-functions/03-refactor-to-funcs/log.txt
diff --git a/25-functions-and-pointers/03-refactor-to-funcs/log_err_missing.txt b/25-functions/03-refactor-to-funcs/log_err_missing.txt
similarity index 100%
rename from 25-functions-and-pointers/03-refactor-to-funcs/log_err_missing.txt
rename to 25-functions/03-refactor-to-funcs/log_err_missing.txt
diff --git a/25-functions-and-pointers/03-refactor-to-funcs/log_err_negative.txt b/25-functions/03-refactor-to-funcs/log_err_negative.txt
similarity index 100%
rename from 25-functions-and-pointers/03-refactor-to-funcs/log_err_negative.txt
rename to 25-functions/03-refactor-to-funcs/log_err_negative.txt
diff --git a/25-functions-and-pointers/03-refactor-to-funcs/log_err_str.txt b/25-functions/03-refactor-to-funcs/log_err_str.txt
similarity index 100%
rename from 25-functions-and-pointers/03-refactor-to-funcs/log_err_str.txt
rename to 25-functions/03-refactor-to-funcs/log_err_str.txt
diff --git a/25-functions-and-pointers/03-refactor-to-funcs/main.go b/25-functions/03-refactor-to-funcs/main.go
similarity index 100%
rename from 25-functions-and-pointers/03-refactor-to-funcs/main.go
rename to 25-functions/03-refactor-to-funcs/main.go
diff --git a/25-functions-and-pointers/03-refactor-to-funcs/parser.go b/25-functions/03-refactor-to-funcs/parser.go
similarity index 100%
rename from 25-functions-and-pointers/03-refactor-to-funcs/parser.go
rename to 25-functions/03-refactor-to-funcs/parser.go
diff --git a/25-functions-and-pointers/04-pass-by-value-semantics/log.txt b/25-functions/04-pass-by-value-semantics/log.txt
similarity index 100%
rename from 25-functions-and-pointers/04-pass-by-value-semantics/log.txt
rename to 25-functions/04-pass-by-value-semantics/log.txt
diff --git a/25-functions-and-pointers/04-pass-by-value-semantics/log_err_missing.txt b/25-functions/04-pass-by-value-semantics/log_err_missing.txt
similarity index 100%
rename from 25-functions-and-pointers/04-pass-by-value-semantics/log_err_missing.txt
rename to 25-functions/04-pass-by-value-semantics/log_err_missing.txt
diff --git a/25-functions-and-pointers/04-pass-by-value-semantics/log_err_negative.txt b/25-functions/04-pass-by-value-semantics/log_err_negative.txt
similarity index 100%
rename from 25-functions-and-pointers/04-pass-by-value-semantics/log_err_negative.txt
rename to 25-functions/04-pass-by-value-semantics/log_err_negative.txt
diff --git a/25-functions-and-pointers/04-pass-by-value-semantics/log_err_str.txt b/25-functions/04-pass-by-value-semantics/log_err_str.txt
similarity index 100%
rename from 25-functions-and-pointers/04-pass-by-value-semantics/log_err_str.txt
rename to 25-functions/04-pass-by-value-semantics/log_err_str.txt
diff --git a/25-functions-and-pointers/04-pass-by-value-semantics/main.go b/25-functions/04-pass-by-value-semantics/main.go
similarity index 100%
rename from 25-functions-and-pointers/04-pass-by-value-semantics/main.go
rename to 25-functions/04-pass-by-value-semantics/main.go
diff --git a/25-functions-and-pointers/04-pass-by-value-semantics/parser.go b/25-functions/04-pass-by-value-semantics/parser.go
similarity index 100%
rename from 25-functions-and-pointers/04-pass-by-value-semantics/parser.go
rename to 25-functions/04-pass-by-value-semantics/parser.go
diff --git a/25-functions-and-pointers/05-pointers/main.go b/26-pointers/01-pointers/main.go
similarity index 100%
rename from 25-functions-and-pointers/05-pointers/main.go
rename to 26-pointers/01-pointers/main.go
diff --git a/25-functions-and-pointers/06-pointers-basic-examples/main.go b/26-pointers/02-pointers-basic-examples/main.go
similarity index 100%
rename from 25-functions-and-pointers/06-pointers-basic-examples/main.go
rename to 26-pointers/02-pointers-basic-examples/main.go
diff --git a/25-functions-and-pointers/07-pointers-composites/main.go b/26-pointers/03-pointers-composites/main.go
similarity index 100%
rename from 25-functions-and-pointers/07-pointers-composites/main.go
rename to 26-pointers/03-pointers-composites/main.go
diff --git a/25-functions-and-pointers/08-log-parser-pointers/log.txt b/26-pointers/04-log-parser-pointers/log.txt
similarity index 100%
rename from 25-functions-and-pointers/08-log-parser-pointers/log.txt
rename to 26-pointers/04-log-parser-pointers/log.txt
diff --git a/25-functions-and-pointers/08-log-parser-pointers/log_err_missing.txt b/26-pointers/04-log-parser-pointers/log_err_missing.txt
similarity index 100%
rename from 25-functions-and-pointers/08-log-parser-pointers/log_err_missing.txt
rename to 26-pointers/04-log-parser-pointers/log_err_missing.txt
diff --git a/25-functions-and-pointers/08-log-parser-pointers/log_err_negative.txt b/26-pointers/04-log-parser-pointers/log_err_negative.txt
similarity index 100%
rename from 25-functions-and-pointers/08-log-parser-pointers/log_err_negative.txt
rename to 26-pointers/04-log-parser-pointers/log_err_negative.txt
diff --git a/25-functions-and-pointers/08-log-parser-pointers/log_err_str.txt b/26-pointers/04-log-parser-pointers/log_err_str.txt
similarity index 100%
rename from 25-functions-and-pointers/08-log-parser-pointers/log_err_str.txt
rename to 26-pointers/04-log-parser-pointers/log_err_str.txt
diff --git a/25-functions-and-pointers/08-log-parser-pointers/main.go b/26-pointers/04-log-parser-pointers/main.go
similarity index 100%
rename from 25-functions-and-pointers/08-log-parser-pointers/main.go
rename to 26-pointers/04-log-parser-pointers/main.go
diff --git a/25-functions-and-pointers/08-log-parser-pointers/parser.go b/26-pointers/04-log-parser-pointers/parser.go
similarity index 100%
rename from 25-functions-and-pointers/08-log-parser-pointers/parser.go
rename to 26-pointers/04-log-parser-pointers/parser.go
diff --git a/25-functions-and-pointers/09-log-parser-pointers-vs-values/log.txt b/26-pointers/05-log-parser-pointers-vs-values/log.txt
similarity index 100%
rename from 25-functions-and-pointers/09-log-parser-pointers-vs-values/log.txt
rename to 26-pointers/05-log-parser-pointers-vs-values/log.txt
diff --git a/25-functions-and-pointers/09-log-parser-pointers-vs-values/log_err_missing.txt b/26-pointers/05-log-parser-pointers-vs-values/log_err_missing.txt
similarity index 100%
rename from 25-functions-and-pointers/09-log-parser-pointers-vs-values/log_err_missing.txt
rename to 26-pointers/05-log-parser-pointers-vs-values/log_err_missing.txt
diff --git a/25-functions-and-pointers/09-log-parser-pointers-vs-values/log_err_negative.txt b/26-pointers/05-log-parser-pointers-vs-values/log_err_negative.txt
similarity index 100%
rename from 25-functions-and-pointers/09-log-parser-pointers-vs-values/log_err_negative.txt
rename to 26-pointers/05-log-parser-pointers-vs-values/log_err_negative.txt
diff --git a/25-functions-and-pointers/09-log-parser-pointers-vs-values/log_err_str.txt b/26-pointers/05-log-parser-pointers-vs-values/log_err_str.txt
similarity index 100%
rename from 25-functions-and-pointers/09-log-parser-pointers-vs-values/log_err_str.txt
rename to 26-pointers/05-log-parser-pointers-vs-values/log_err_str.txt
diff --git a/25-functions-and-pointers/09-log-parser-pointers-vs-values/main.go b/26-pointers/05-log-parser-pointers-vs-values/main.go
similarity index 100%
rename from 25-functions-and-pointers/09-log-parser-pointers-vs-values/main.go
rename to 26-pointers/05-log-parser-pointers-vs-values/main.go
diff --git a/25-functions-and-pointers/09-log-parser-pointers-vs-values/parser.go b/26-pointers/05-log-parser-pointers-vs-values/parser.go
similarity index 100%
rename from 25-functions-and-pointers/09-log-parser-pointers-vs-values/parser.go
rename to 26-pointers/05-log-parser-pointers-vs-values/parser.go
diff --git a/26-methods/xxx-log-parser-methods/log.txt b/28-methods/xxx-log-parser-methods/log.txt
similarity index 100%
rename from 26-methods/xxx-log-parser-methods/log.txt
rename to 28-methods/xxx-log-parser-methods/log.txt
diff --git a/26-methods/xxx-log-parser-methods/log_err_missing.txt b/28-methods/xxx-log-parser-methods/log_err_missing.txt
similarity index 100%
rename from 26-methods/xxx-log-parser-methods/log_err_missing.txt
rename to 28-methods/xxx-log-parser-methods/log_err_missing.txt
diff --git a/26-methods/xxx-log-parser-methods/log_err_negative.txt b/28-methods/xxx-log-parser-methods/log_err_negative.txt
similarity index 100%
rename from 26-methods/xxx-log-parser-methods/log_err_negative.txt
rename to 28-methods/xxx-log-parser-methods/log_err_negative.txt
diff --git a/26-methods/xxx-log-parser-methods/log_err_str.txt b/28-methods/xxx-log-parser-methods/log_err_str.txt
similarity index 100%
rename from 26-methods/xxx-log-parser-methods/log_err_str.txt
rename to 28-methods/xxx-log-parser-methods/log_err_str.txt
diff --git a/26-methods/xxx-log-parser-methods/main.go b/28-methods/xxx-log-parser-methods/main.go
similarity index 100%
rename from 26-methods/xxx-log-parser-methods/main.go
rename to 28-methods/xxx-log-parser-methods/main.go
diff --git a/26-methods/xxx-log-parser-methods/packaged/log.txt b/28-methods/xxx-log-parser-methods/packaged/log.txt
similarity index 100%
rename from 26-methods/xxx-log-parser-methods/packaged/log.txt
rename to 28-methods/xxx-log-parser-methods/packaged/log.txt
diff --git a/26-methods/xxx-log-parser-methods/packaged/log_err_missing.txt b/28-methods/xxx-log-parser-methods/packaged/log_err_missing.txt
similarity index 100%
rename from 26-methods/xxx-log-parser-methods/packaged/log_err_missing.txt
rename to 28-methods/xxx-log-parser-methods/packaged/log_err_missing.txt
diff --git a/26-methods/xxx-log-parser-methods/packaged/log_err_negative.txt b/28-methods/xxx-log-parser-methods/packaged/log_err_negative.txt
similarity index 100%
rename from 26-methods/xxx-log-parser-methods/packaged/log_err_negative.txt
rename to 28-methods/xxx-log-parser-methods/packaged/log_err_negative.txt
diff --git a/26-methods/xxx-log-parser-methods/packaged/log_err_str.txt b/28-methods/xxx-log-parser-methods/packaged/log_err_str.txt
similarity index 100%
rename from 26-methods/xxx-log-parser-methods/packaged/log_err_str.txt
rename to 28-methods/xxx-log-parser-methods/packaged/log_err_str.txt
diff --git a/26-methods/xxx-log-parser-methods/packaged/main.go b/28-methods/xxx-log-parser-methods/packaged/main.go
similarity index 100%
rename from 26-methods/xxx-log-parser-methods/packaged/main.go
rename to 28-methods/xxx-log-parser-methods/packaged/main.go
diff --git a/26-methods/xxx-log-parser-methods/packaged/metrics/parser.go b/28-methods/xxx-log-parser-methods/packaged/metrics/parser.go
similarity index 100%
rename from 26-methods/xxx-log-parser-methods/packaged/metrics/parser.go
rename to 28-methods/xxx-log-parser-methods/packaged/metrics/parser.go
diff --git a/26-methods/xxx-log-parser-methods/packaged/metrics/report.go b/28-methods/xxx-log-parser-methods/packaged/metrics/report.go
similarity index 100%
rename from 26-methods/xxx-log-parser-methods/packaged/metrics/report.go
rename to 28-methods/xxx-log-parser-methods/packaged/metrics/report.go
diff --git a/26-methods/xxx-log-parser-methods/packaged/metrics/result.go b/28-methods/xxx-log-parser-methods/packaged/metrics/result.go
similarity index 100%
rename from 26-methods/xxx-log-parser-methods/packaged/metrics/result.go
rename to 28-methods/xxx-log-parser-methods/packaged/metrics/result.go
diff --git a/26-methods/xxx-log-parser-methods/packaged/summarize.go b/28-methods/xxx-log-parser-methods/packaged/summarize.go
similarity index 100%
rename from 26-methods/xxx-log-parser-methods/packaged/summarize.go
rename to 28-methods/xxx-log-parser-methods/packaged/summarize.go
diff --git a/26-methods/xxx-log-parser-methods/parser.go b/28-methods/xxx-log-parser-methods/parser.go
similarity index 100%
rename from 26-methods/xxx-log-parser-methods/parser.go
rename to 28-methods/xxx-log-parser-methods/parser.go
diff --git a/26-methods/xxx-log-parser-methods/report.go b/28-methods/xxx-log-parser-methods/report.go
similarity index 100%
rename from 26-methods/xxx-log-parser-methods/report.go
rename to 28-methods/xxx-log-parser-methods/report.go
diff --git a/26-methods/xxx-log-parser-methods/result.go b/28-methods/xxx-log-parser-methods/result.go
similarity index 100%
rename from 26-methods/xxx-log-parser-methods/result.go
rename to 28-methods/xxx-log-parser-methods/result.go
diff --git a/26-methods/xxx-log-parser-methods/summarize.go b/28-methods/xxx-log-parser-methods/summarize.go
similarity index 100%
rename from 26-methods/xxx-log-parser-methods/summarize.go
rename to 28-methods/xxx-log-parser-methods/summarize.go
diff --git a/28-concurrency/xxx-concurrent-downloader/fetch/danger/main.go b/30-concurrency/xxx-concurrent-downloader/fetch/danger/main.go
similarity index 100%
rename from 28-concurrency/xxx-concurrent-downloader/fetch/danger/main.go
rename to 30-concurrency/xxx-concurrent-downloader/fetch/danger/main.go
diff --git a/28-concurrency/xxx-concurrent-downloader/fetch/danger2/main.go b/30-concurrency/xxx-concurrent-downloader/fetch/danger2/main.go
similarity index 100%
rename from 28-concurrency/xxx-concurrent-downloader/fetch/danger2/main.go
rename to 30-concurrency/xxx-concurrent-downloader/fetch/danger2/main.go
diff --git a/28-concurrency/xxx-concurrent-downloader/fetch/drain.go b/30-concurrency/xxx-concurrent-downloader/fetch/drain.go
similarity index 100%
rename from 28-concurrency/xxx-concurrent-downloader/fetch/drain.go
rename to 30-concurrency/xxx-concurrent-downloader/fetch/drain.go
diff --git a/28-concurrency/xxx-concurrent-downloader/fetch/httpget.go b/30-concurrency/xxx-concurrent-downloader/fetch/httpget.go
similarity index 100%
rename from 28-concurrency/xxx-concurrent-downloader/fetch/httpget.go
rename to 30-concurrency/xxx-concurrent-downloader/fetch/httpget.go
diff --git a/28-concurrency/xxx-concurrent-downloader/fetch/httptransfer.go b/30-concurrency/xxx-concurrent-downloader/fetch/httptransfer.go
similarity index 100%
rename from 28-concurrency/xxx-concurrent-downloader/fetch/httptransfer.go
rename to 30-concurrency/xxx-concurrent-downloader/fetch/httptransfer.go
diff --git a/28-concurrency/xxx-concurrent-downloader/fetch/httptransfer_fake.go b/30-concurrency/xxx-concurrent-downloader/fetch/httptransfer_fake.go
similarity index 100%
rename from 28-concurrency/xxx-concurrent-downloader/fetch/httptransfer_fake.go
rename to 30-concurrency/xxx-concurrent-downloader/fetch/httptransfer_fake.go
diff --git a/28-concurrency/xxx-concurrent-downloader/fetch/progress.go b/30-concurrency/xxx-concurrent-downloader/fetch/progress.go
similarity index 100%
rename from 28-concurrency/xxx-concurrent-downloader/fetch/progress.go
rename to 30-concurrency/xxx-concurrent-downloader/fetch/progress.go
diff --git a/28-concurrency/xxx-concurrent-downloader/fetch/session.go b/30-concurrency/xxx-concurrent-downloader/fetch/session.go
similarity index 100%
rename from 28-concurrency/xxx-concurrent-downloader/fetch/session.go
rename to 30-concurrency/xxx-concurrent-downloader/fetch/session.go
diff --git a/28-concurrency/xxx-concurrent-downloader/fetch/sniffer.go b/30-concurrency/xxx-concurrent-downloader/fetch/sniffer.go
similarity index 100%
rename from 28-concurrency/xxx-concurrent-downloader/fetch/sniffer.go
rename to 30-concurrency/xxx-concurrent-downloader/fetch/sniffer.go
diff --git a/28-concurrency/xxx-concurrent-downloader/fetch/storage.go b/30-concurrency/xxx-concurrent-downloader/fetch/storage.go
similarity index 100%
rename from 28-concurrency/xxx-concurrent-downloader/fetch/storage.go
rename to 30-concurrency/xxx-concurrent-downloader/fetch/storage.go
diff --git a/28-concurrency/xxx-concurrent-downloader/fetch/ui.go b/30-concurrency/xxx-concurrent-downloader/fetch/ui.go
similarity index 100%
rename from 28-concurrency/xxx-concurrent-downloader/fetch/ui.go
rename to 30-concurrency/xxx-concurrent-downloader/fetch/ui.go
diff --git a/28-concurrency/xxx-concurrent-downloader/main.go b/30-concurrency/xxx-concurrent-downloader/main.go
similarity index 100%
rename from 28-concurrency/xxx-concurrent-downloader/main.go
rename to 30-concurrency/xxx-concurrent-downloader/main.go