diff --git a/src/012-arrays/arrays.go b/src/arrays/arrays.go
similarity index 100%
rename from src/012-arrays/arrays.go
rename to src/arrays/arrays.go
diff --git a/src/063-base64-encoding/base64-encoding.go b/src/base64-encoding/base64-encoding.go
similarity index 100%
rename from src/063-base64-encoding/base64-encoding.go
rename to src/base64-encoding/base64-encoding.go
diff --git a/src/084-basic-authentication/basic-authentication.go b/src/basic-authentication/basic-authentication.go
similarity index 100%
rename from src/084-basic-authentication/basic-authentication.go
rename to src/basic-authentication/basic-authentication.go
diff --git a/src/054-bytes/bytes.go b/src/bytes/bytes.go
similarity index 100%
rename from src/054-bytes/bytes.go
rename to src/bytes/bytes.go
diff --git a/src/085-canonical-hosts/canonical-hosts.go b/src/canonical-hosts/canonical-hosts.go
similarity index 100%
rename from src/085-canonical-hosts/canonical-hosts.go
rename to src/canonical-hosts/canonical-hosts.go
diff --git a/src/085-canonical-hosts/canonical-hosts.sh b/src/canonical-hosts/canonical-hosts.sh
similarity index 100%
rename from src/085-canonical-hosts/canonical-hosts.sh
rename to src/canonical-hosts/canonical-hosts.sh
diff --git a/src/034-channel-buffering/channel-buffering.go b/src/channel-buffering/channel-buffering.go
similarity index 100%
rename from src/034-channel-buffering/channel-buffering.go
rename to src/channel-buffering/channel-buffering.go
diff --git a/src/035-channel-directions/channel-directions.go b/src/channel-directions/channel-directions.go
similarity index 100%
rename from src/035-channel-directions/channel-directions.go
rename to src/channel-directions/channel-directions.go
diff --git a/src/033-channels/channels.go b/src/channels/channels.go
similarity index 100%
rename from src/033-channels/channels.go
rename to src/channels/channels.go
diff --git a/src/043-closing-channels/closing-channels.go b/src/closing-channels/closing-channels.go
similarity index 100%
rename from src/043-closing-channels/closing-channels.go
rename to src/closing-channels/closing-channels.go
diff --git a/src/019-closures/closures.go b/src/closures/closures.go
similarity index 100%
rename from src/019-closures/closures.go
rename to src/closures/closures.go
diff --git a/src/050-collection-functions/collection-functions.go b/src/collection-functions/collection-functions.go
similarity index 100%
rename from src/050-collection-functions/collection-functions.go
rename to src/collection-functions/collection-functions.go
diff --git a/src/067-command-line-arguments/command-line-arguments.go b/src/command-line-arguments/command-line-arguments.go
similarity index 100%
rename from src/067-command-line-arguments/command-line-arguments.go
rename to src/command-line-arguments/command-line-arguments.go
diff --git a/src/067-command-line-arguments/command-line-arguments.sh b/src/command-line-arguments/command-line-arguments.sh
similarity index 100%
rename from src/067-command-line-arguments/command-line-arguments.sh
rename to src/command-line-arguments/command-line-arguments.sh
diff --git a/src/068-command-line-flags/command-line-flags.go b/src/command-line-flags/command-line-flags.go
similarity index 100%
rename from src/068-command-line-flags/command-line-flags.go
rename to src/command-line-flags/command-line-flags.go
diff --git a/src/032-concurrent-goroutines/concurrent-goroutines.go b/src/concurrent-goroutines/concurrent-goroutines.go
similarity index 100%
rename from src/032-concurrent-goroutines/concurrent-goroutines.go
rename to src/concurrent-goroutines/concurrent-goroutines.go
diff --git a/src/008-constants/constants.go b/src/constants/constants.go
similarity index 100%
rename from src/008-constants/constants.go
rename to src/constants/constants.go
diff --git a/src/008-constants/constants.sh b/src/constants/constants.sh
similarity index 100%
rename from src/008-constants/constants.sh
rename to src/constants/constants.sh
diff --git a/src/002-contents/contents.html b/src/contents/contents.html
similarity index 100%
rename from src/002-contents/contents.html
rename to src/contents/contents.html
diff --git a/src/021-defer/defer.go b/src/defer/defer.go
similarity index 100%
rename from src/021-defer/defer.go
rename to src/defer/defer.go
diff --git a/src/058-elapsed-time/elapsed-time.go b/src/elapsed-time/elapsed-time.go
similarity index 100%
rename from src/058-elapsed-time/elapsed-time.go
rename to src/elapsed-time/elapsed-time.go
diff --git a/src/027-embedding/embedding.go b/src/embedding/embedding.go
similarity index 100%
rename from src/027-embedding/embedding.go
rename to src/embedding/embedding.go
diff --git a/src/069-environment-variables/environment-variables.go b/src/environment-variables/environment-variables.go
similarity index 100%
rename from src/069-environment-variables/environment-variables.go
rename to src/environment-variables/environment-variables.go
diff --git a/src/069-environment-variables/environment-variables.sh b/src/environment-variables/environment-variables.sh
similarity index 100%
rename from src/069-environment-variables/environment-variables.sh
rename to src/environment-variables/environment-variables.sh
diff --git a/src/057-epochs/epochs.go b/src/epochs/epochs.go
similarity index 100%
rename from src/057-epochs/epochs.go
rename to src/epochs/epochs.go
diff --git a/src/057-epochs/epochs.sh b/src/epochs/epochs.sh
similarity index 100%
rename from src/057-epochs/epochs.sh
rename to src/epochs/epochs.sh
diff --git a/src/029-errors/errors.go b/src/errors/errors.go
similarity index 100%
rename from src/029-errors/errors.go
rename to src/errors/errors.go
diff --git a/src/071-execing-processes/execing-processes.go b/src/execing-processes/execing-processes.go
similarity index 100%
rename from src/071-execing-processes/execing-processes.go
rename to src/execing-processes/execing-processes.go
diff --git a/src/071-execing-processes/execing-processes.sh b/src/execing-processes/execing-processes.sh
similarity index 100%
rename from src/071-execing-processes/execing-processes.sh
rename to src/execing-processes/execing-processes.sh
diff --git a/src/073-exit/.gitignore b/src/exit/.gitignore
similarity index 100%
rename from src/073-exit/.gitignore
rename to src/exit/.gitignore
diff --git a/src/073-exit/exit.go b/src/exit/exit.go
similarity index 100%
rename from src/073-exit/exit.go
rename to src/exit/exit.go
diff --git a/src/073-exit/exit.sh b/src/exit/exit.sh
similarity index 100%
rename from src/073-exit/exit.sh
rename to src/exit/exit.sh
diff --git a/src/009-for/for.go b/src/for/for.go
similarity index 100%
rename from src/009-for/for.go
rename to src/for/for.go
diff --git a/src/009-for/for.sh b/src/for/for.sh
similarity index 100%
rename from src/009-for/for.sh
rename to src/for/for.sh
diff --git a/src/016-functions/functions.go b/src/functions/functions.go
similarity index 100%
rename from src/016-functions/functions.go
rename to src/functions/functions.go
diff --git a/src/031-goroutines/goroutines.go b/src/goroutines/goroutines.go
similarity index 100%
rename from src/031-goroutines/goroutines.go
rename to src/goroutines/goroutines.go
diff --git a/src/087-graceful-shutdown/graceful-shutdown.go b/src/graceful-shutdown/graceful-shutdown.go
similarity index 100%
rename from src/087-graceful-shutdown/graceful-shutdown.go
rename to src/graceful-shutdown/graceful-shutdown.go
diff --git a/src/087-graceful-shutdown/graceful-shutdown.sh b/src/graceful-shutdown/graceful-shutdown.sh
similarity index 100%
rename from src/087-graceful-shutdown/graceful-shutdown.sh
rename to src/graceful-shutdown/graceful-shutdown.sh
diff --git a/src/079-hello-web/hello-web.go b/src/hello-web/hello-web.go
similarity index 100%
rename from src/079-hello-web/hello-web.go
rename to src/hello-web/hello-web.go
diff --git a/src/004-hello-world/hello-world b/src/hello-world/hello-world
similarity index 100%
rename from src/004-hello-world/hello-world
rename to src/hello-world/hello-world
diff --git a/src/004-hello-world/hello-world.go b/src/hello-world/hello-world.go
similarity index 100%
rename from src/004-hello-world/hello-world.go
rename to src/hello-world/hello-world.go
diff --git a/src/004-hello-world/hello-world.sh b/src/hello-world/hello-world.sh
similarity index 100%
rename from src/004-hello-world/hello-world.sh
rename to src/hello-world/hello-world.sh
diff --git a/src/074-http-client/http-client.go b/src/http-client/http-client.go
similarity index 100%
rename from src/074-http-client/http-client.go
rename to src/http-client/http-client.go
diff --git a/src/075-https-client/https-client.go b/src/https-client/https-client.go
similarity index 100%
rename from src/075-https-client/https-client.go
rename to src/https-client/https-client.go
diff --git a/src/088-https-servers/https-servers.go b/src/https-servers/https-servers.go
similarity index 100%
rename from src/088-https-servers/https-servers.go
rename to src/https-servers/https-servers.go
diff --git a/src/088-https-servers/https-servers.sh b/src/https-servers/https-servers.sh
similarity index 100%
rename from src/088-https-servers/https-servers.sh
rename to src/https-servers/https-servers.sh
diff --git a/src/010-if-else/if-else.go b/src/if-else/if-else.go
similarity index 100%
rename from src/010-if-else/if-else.go
rename to src/if-else/if-else.go
diff --git a/src/010-if-else/if-else.sh b/src/if-else/if-else.sh
similarity index 100%
rename from src/010-if-else/if-else.sh
rename to src/if-else/if-else.sh
diff --git a/src/007-inline-assignment/inline-assignment.go b/src/inline-assignment/inline-assignment.go
similarity index 100%
rename from src/007-inline-assignment/inline-assignment.go
rename to src/inline-assignment/inline-assignment.go
diff --git a/src/007-inline-assignment/inline-assignment.sh b/src/inline-assignment/inline-assignment.sh
similarity index 100%
rename from src/007-inline-assignment/inline-assignment.sh
rename to src/inline-assignment/inline-assignment.sh
diff --git a/src/028-interfaces/interfaces.go b/src/interfaces/interfaces.go
similarity index 100%
rename from src/028-interfaces/interfaces.go
rename to src/interfaces/interfaces.go
diff --git a/src/003-introduction/introduction.html b/src/introduction/introduction.html
similarity index 100%
rename from src/003-introduction/introduction.html
rename to src/introduction/introduction.html
diff --git a/src/055-json/json.go b/src/json/json.go
similarity index 100%
rename from src/055-json/json.go
rename to src/json/json.go
diff --git a/src/066-line-filters/line-filters b/src/line-filters/line-filters
similarity index 100%
rename from src/066-line-filters/line-filters
rename to src/line-filters/line-filters
diff --git a/src/066-line-filters/line-filters.go b/src/line-filters/line-filters.go
similarity index 100%
rename from src/066-line-filters/line-filters.go
rename to src/line-filters/line-filters.go
diff --git a/src/066-line-filters/line-filters.sh b/src/line-filters/line-filters.sh
similarity index 100%
rename from src/066-line-filters/line-filters.sh
rename to src/line-filters/line-filters.sh
diff --git a/src/014-maps/maps.go b/src/maps/maps.go
similarity index 100%
rename from src/014-maps/maps.go
rename to src/maps/maps.go
diff --git a/src/014-maps/maps.sh b/src/maps/maps.sh
similarity index 100%
rename from src/014-maps/maps.sh
rename to src/maps/maps.sh
diff --git a/src/026-methods/methods.go b/src/methods/methods.go
similarity index 100%
rename from src/026-methods/methods.go
rename to src/methods/methods.go
diff --git a/src/086-middleware/middleware.go b/src/middleware/middleware.go
similarity index 100%
rename from src/086-middleware/middleware.go
rename to src/middleware/middleware.go
diff --git a/src/086-middleware/middleware.sh b/src/middleware/middleware.sh
similarity index 100%
rename from src/086-middleware/middleware.sh
rename to src/middleware/middleware.sh
diff --git a/src/017-multiple-return-values/multiple-return-values.go b/src/multiple-return-values/multiple-return-values.go
similarity index 100%
rename from src/017-multiple-return-values/multiple-return-values.go
rename to src/multiple-return-values/multiple-return-values.go
diff --git a/src/017-multiple-return-values/multiple-return-values.sh b/src/multiple-return-values/multiple-return-values.sh
similarity index 100%
rename from src/017-multiple-return-values/multiple-return-values.sh
rename to src/multiple-return-values/multiple-return-values.sh
diff --git a/src/024-new/new.go b/src/new/new.go
similarity index 100%
rename from src/024-new/new.go
rename to src/new/new.go
diff --git a/src/042-nonblocking-channel-operations/nonblocking-channel-operations.go b/src/nonblocking-channel-operations/nonblocking-channel-operations.go
similarity index 100%
rename from src/042-nonblocking-channel-operations/nonblocking-channel-operations.go
rename to src/nonblocking-channel-operations/nonblocking-channel-operations.go
diff --git a/src/060-number-parsing/number-parsing.go b/src/number-parsing/number-parsing.go
similarity index 100%
rename from src/060-number-parsing/number-parsing.go
rename to src/number-parsing/number-parsing.go
diff --git a/src/060-number-parsing/number-parsing.sh b/src/number-parsing/number-parsing.sh
similarity index 100%
rename from src/060-number-parsing/number-parsing.sh
rename to src/number-parsing/number-parsing.sh
diff --git a/src/030-ok-guards/ok-guards.go b/src/ok-guards/ok-guards.go
similarity index 100%
rename from src/030-ok-guards/ok-guards.go
rename to src/ok-guards/ok-guards.go
diff --git a/src/022-panic/panic.go b/src/panic/panic.go
similarity index 100%
rename from src/022-panic/panic.go
rename to src/panic/panic.go
diff --git a/src/022-panic/panic.sh b/src/panic/panic.sh
similarity index 100%
rename from src/022-panic/panic.sh
rename to src/panic/panic.sh
diff --git a/src/023-pointers/pointers.go b/src/pointers/pointers.go
similarity index 100%
rename from src/023-pointers/pointers.go
rename to src/pointers/pointers.go
diff --git a/src/077-postgres/postgres.go b/src/postgres/postgres.go
similarity index 100%
rename from src/077-postgres/postgres.go
rename to src/postgres/postgres.go
diff --git a/src/077-postgres/postgres.sh b/src/postgres/postgres.sh
similarity index 100%
rename from src/077-postgres/postgres.sh
rename to src/postgres/postgres.sh
diff --git a/src/059-random-numbers/random-numbers.go b/src/random-numbers/random-numbers.go
similarity index 100%
rename from src/059-random-numbers/random-numbers.go
rename to src/random-numbers/random-numbers.go
diff --git a/src/059-random-numbers/random-numbers.sh b/src/random-numbers/random-numbers.sh
similarity index 100%
rename from src/059-random-numbers/random-numbers.sh
rename to src/random-numbers/random-numbers.sh
diff --git a/src/015-range/range.go b/src/range/range.go
similarity index 100%
rename from src/015-range/range.go
rename to src/range/range.go
diff --git a/src/040-rate-limiting/rate-limiting.go b/src/rate-limiting/rate-limiting.go
similarity index 100%
rename from src/040-rate-limiting/rate-limiting.go
rename to src/rate-limiting/rate-limiting.go
diff --git a/src/064-reading-files/reading-files.go b/src/reading-files/reading-files.go
similarity index 100%
rename from src/064-reading-files/reading-files.go
rename to src/reading-files/reading-files.go
diff --git a/src/020-recursion/recursion.go b/src/recursion/recursion.go
similarity index 100%
rename from src/020-recursion/recursion.go
rename to src/recursion/recursion.go
diff --git a/src/076-redis/redis.go b/src/redis/redis.go
similarity index 100%
rename from src/076-redis/redis.go
rename to src/redis/redis.go
diff --git a/src/076-redis/redis.sh b/src/redis/redis.sh
similarity index 100%
rename from src/076-redis/redis.sh
rename to src/redis/redis.sh
diff --git a/src/053-regexs/regexs.go b/src/regexs/regexs.go
similarity index 100%
rename from src/053-regexs/regexs.go
rename to src/regexs/regexs.go
diff --git a/src/053-regexs/regexs.sh b/src/regexs/regexs.sh
similarity index 100%
rename from src/053-regexs/regexs.sh
rename to src/regexs/regexs.sh
diff --git a/src/082-request-logging/request-logging.go b/src/request-logging/request-logging.go
similarity index 100%
rename from src/082-request-logging/request-logging.go
rename to src/request-logging/request-logging.go
diff --git a/src/081-request-routing/request-routing.go b/src/request-routing/request-routing.go
similarity index 100%
rename from src/081-request-routing/request-routing.go
rename to src/request-routing/request-routing.go
diff --git a/src/081-request-routing/request-routing.sh b/src/request-routing/request-routing.sh
similarity index 100%
rename from src/081-request-routing/request-routing.sh
rename to src/request-routing/request-routing.sh
diff --git a/src/080-responses/responses.go b/src/responses/responses.go
similarity index 100%
rename from src/080-responses/responses.go
rename to src/responses/responses.go
diff --git a/src/080-responses/responses.sh b/src/responses/responses.sh
similarity index 100%
rename from src/080-responses/responses.sh
rename to src/responses/responses.sh
diff --git a/src/039-scatter-gather/081-scatter-gather.go b/src/scatter-gather/081-scatter-gather.go
similarity index 100%
rename from src/039-scatter-gather/081-scatter-gather.go
rename to src/scatter-gather/081-scatter-gather.go
diff --git a/src/037-select/select.go b/src/select/select.go
similarity index 100%
rename from src/037-select/select.go
rename to src/select/select.go
diff --git a/src/078-sending-email/sending-email.go b/src/sending-email/sending-email.go
similarity index 100%
rename from src/078-sending-email/sending-email.go
rename to src/sending-email/sending-email.go
diff --git a/src/062-sha1-hashes/sha1-hashes.go b/src/sha1-hashes/sha1-hashes.go
similarity index 100%
rename from src/062-sha1-hashes/sha1-hashes.go
rename to src/sha1-hashes/sha1-hashes.go
diff --git a/src/062-sha1-hashes/sha1-hashes.sh b/src/sha1-hashes/sha1-hashes.sh
similarity index 100%
rename from src/062-sha1-hashes/sha1-hashes.sh
rename to src/sha1-hashes/sha1-hashes.sh
diff --git a/src/072-signals/signals b/src/signals/signals
similarity index 100%
rename from src/072-signals/signals
rename to src/signals/signals
diff --git a/src/072-signals/signals.go b/src/signals/signals.go
similarity index 100%
rename from src/072-signals/signals.go
rename to src/signals/signals.go
diff --git a/src/072-signals/signals.sh b/src/signals/signals.sh
similarity index 100%
rename from src/072-signals/signals.sh
rename to src/signals/signals.sh
diff --git a/src/013-slices/slices.go b/src/slices/slices.go
similarity index 100%
rename from src/013-slices/slices.go
rename to src/slices/slices.go
diff --git a/src/049-sorting-by-functions/sorting-by-functions.go b/src/sorting-by-functions/sorting-by-functions.go
similarity index 100%
rename from src/049-sorting-by-functions/sorting-by-functions.go
rename to src/sorting-by-functions/sorting-by-functions.go
diff --git a/src/049-sorting-by-functions/sorting-by-functions.sh b/src/sorting-by-functions/sorting-by-functions.sh
similarity index 100%
rename from src/049-sorting-by-functions/sorting-by-functions.sh
rename to src/sorting-by-functions/sorting-by-functions.sh
diff --git a/src/048-sorting/sorting.go b/src/sorting/sorting.go
similarity index 100%
rename from src/048-sorting/sorting.go
rename to src/sorting/sorting.go
diff --git a/src/048-sorting/sorting.sh b/src/sorting/sorting.sh
similarity index 100%
rename from src/048-sorting/sorting.sh
rename to src/sorting/sorting.sh
diff --git a/src/070-spawning-processes/spawning-processes.go b/src/spawning-processes/spawning-processes.go
similarity index 100%
rename from src/070-spawning-processes/spawning-processes.go
rename to src/spawning-processes/spawning-processes.go
diff --git a/src/070-spawning-processes/spawning-processes.sh b/src/spawning-processes/spawning-processes.sh
similarity index 100%
rename from src/070-spawning-processes/spawning-processes.sh
rename to src/spawning-processes/spawning-processes.sh
diff --git a/src/046-state-goroutine/state-goroutine.go b/src/state-goroutine/state-goroutine.go
similarity index 100%
rename from src/046-state-goroutine/state-goroutine.go
rename to src/state-goroutine/state-goroutine.go
diff --git a/src/047-state-mutex/state-mutex.go b/src/state-mutex/state-mutex.go
similarity index 100%
rename from src/047-state-mutex/state-mutex.go
rename to src/state-mutex/state-mutex.go
diff --git a/src/083-static-content/static-content.go b/src/static-content/static-content.go
similarity index 100%
rename from src/083-static-content/static-content.go
rename to src/static-content/static-content.go
diff --git a/src/083-static-content/static-content.sh b/src/static-content/static-content.sh
similarity index 100%
rename from src/083-static-content/static-content.sh
rename to src/static-content/static-content.sh
diff --git a/src/052-string-formatting/string-formatting.go b/src/string-formatting/string-formatting.go
similarity index 100%
rename from src/052-string-formatting/string-formatting.go
rename to src/string-formatting/string-formatting.go
diff --git a/src/052-string-formatting/string-formatting.sh b/src/string-formatting/string-formatting.sh
similarity index 100%
rename from src/052-string-formatting/string-formatting.sh
rename to src/string-formatting/string-formatting.sh
diff --git a/src/051-string-functions/string-functions.go b/src/string-functions/string-functions.go
similarity index 100%
rename from src/051-string-functions/string-functions.go
rename to src/string-functions/string-functions.go
diff --git a/src/051-string-functions/string-functions.sh b/src/string-functions/string-functions.sh
similarity index 100%
rename from src/051-string-functions/string-functions.sh
rename to src/string-functions/string-functions.sh
diff --git a/src/025-structs/structs.go b/src/structs/structs.go
similarity index 100%
rename from src/025-structs/structs.go
rename to src/structs/structs.go
diff --git a/src/011-switch/switch.go b/src/switch/switch.go
similarity index 100%
rename from src/011-switch/switch.go
rename to src/switch/switch.go
diff --git a/src/011-switch/switch.sh b/src/switch/switch.sh
similarity index 100%
rename from src/011-switch/switch.sh
rename to src/switch/switch.sh
diff --git a/src/036-synchronization/synchronization.go b/src/synchronization/synchronization.go
similarity index 100%
rename from src/036-synchronization/synchronization.go
rename to src/synchronization/synchronization.go
diff --git a/src/036-synchronization/synchronization.sh b/src/synchronization/synchronization.sh
similarity index 100%
rename from src/036-synchronization/synchronization.sh
rename to src/synchronization/synchronization.sh
diff --git a/src/045-tickers/tickers.go b/src/tickers/tickers.go
similarity index 100%
rename from src/045-tickers/tickers.go
rename to src/tickers/tickers.go
diff --git a/src/045-tickers/tickers.sh b/src/tickers/tickers.sh
similarity index 100%
rename from src/045-tickers/tickers.sh
rename to src/tickers/tickers.sh
diff --git a/src/056-time/time.go b/src/time/time.go
similarity index 100%
rename from src/056-time/time.go
rename to src/time/time.go
diff --git a/src/056-time/time.sh b/src/time/time.sh
similarity index 100%
rename from src/056-time/time.sh
rename to src/time/time.sh
diff --git a/src/038-timeouts/timeouts.go b/src/timeouts/timeouts.go
similarity index 100%
rename from src/038-timeouts/timeouts.go
rename to src/timeouts/timeouts.go
diff --git a/src/044-timers/timers.go b/src/timers/timers.go
similarity index 100%
rename from src/044-timers/timers.go
rename to src/timers/timers.go
diff --git a/src/044-timers/tiners.sh b/src/timers/tiners.sh
similarity index 100%
rename from src/044-timers/tiners.sh
rename to src/timers/tiners.sh
diff --git a/src/001-title/title.html b/src/title/title.html
similarity index 100%
rename from src/001-title/title.html
rename to src/title/title.html
diff --git a/src/061-urls/urls.go b/src/urls/urls.go
similarity index 100%
rename from src/061-urls/urls.go
rename to src/urls/urls.go
diff --git a/src/061-urls/urls.sh b/src/urls/urls.sh
similarity index 100%
rename from src/061-urls/urls.sh
rename to src/urls/urls.sh
diff --git a/src/005-values/values.go b/src/values/values.go
similarity index 100%
rename from src/005-values/values.go
rename to src/values/values.go
diff --git a/src/005-values/values.sh b/src/values/values.sh
similarity index 100%
rename from src/005-values/values.sh
rename to src/values/values.sh
diff --git a/src/018-varadic-functions/varadic-functions.go b/src/varadic-functions/varadic-functions.go
similarity index 100%
rename from src/018-varadic-functions/varadic-functions.go
rename to src/varadic-functions/varadic-functions.go
diff --git a/src/018-varadic-functions/varadic-functions.sh b/src/varadic-functions/varadic-functions.sh
similarity index 100%
rename from src/018-varadic-functions/varadic-functions.sh
rename to src/varadic-functions/varadic-functions.sh
diff --git a/src/006-variables/variables.go b/src/variables/variables.go
similarity index 100%
rename from src/006-variables/variables.go
rename to src/variables/variables.go
diff --git a/src/006-variables/variables.sh b/src/variables/variables.sh
similarity index 100%
rename from src/006-variables/variables.sh
rename to src/variables/variables.sh
diff --git a/src/041-worker-pools/worker-pools.go b/src/worker-pools/worker-pools.go
similarity index 100%
rename from src/041-worker-pools/worker-pools.go
rename to src/worker-pools/worker-pools.go
diff --git a/src/065-writing-files/writing-files.go b/src/writing-files/writing-files.go
similarity index 100%
rename from src/065-writing-files/writing-files.go
rename to src/writing-files/writing-files.go