diff --git a/008-for/for.go b/007-for/for.go
similarity index 100%
rename from 008-for/for.go
rename to 007-for/for.go
diff --git a/008-for/for.sh b/007-for/for.sh
similarity index 100%
rename from 008-for/for.sh
rename to 007-for/for.sh
diff --git a/009-if-else/if-else.go b/008-if-else/if-else.go
similarity index 100%
rename from 009-if-else/if-else.go
rename to 008-if-else/if-else.go
diff --git a/009-if-else/if-else.sh b/008-if-else/if-else.sh
similarity index 100%
rename from 009-if-else/if-else.sh
rename to 008-if-else/if-else.sh
diff --git a/010-case/case.go b/009-case/case.go
similarity index 100%
rename from 010-case/case.go
rename to 009-case/case.go
diff --git a/010-case/case.sh b/009-case/case.sh
similarity index 100%
rename from 010-case/case.sh
rename to 009-case/case.sh
diff --git a/011-arrays/arrays.go b/010-arrays/arrays.go
similarity index 100%
rename from 011-arrays/arrays.go
rename to 010-arrays/arrays.go
diff --git a/012-sum/sum.go b/011-sum/sum.go
similarity index 100%
rename from 012-sum/sum.go
rename to 011-sum/sum.go
diff --git a/013-range/range.go b/012-range/range.go
similarity index 100%
rename from 013-range/range.go
rename to 012-range/range.go
diff --git a/014-floats/floats.go b/013-floats/floats.go
similarity index 100%
rename from 014-floats/floats.go
rename to 013-floats/floats.go
diff --git a/015-slices/slices.go b/014-slices/slices.go
similarity index 100%
rename from 015-slices/slices.go
rename to 014-slices/slices.go
diff --git a/016-maps/maps.go b/015-maps/maps.go
similarity index 100%
rename from 016-maps/maps.go
rename to 015-maps/maps.go
diff --git a/018-nesting/nesting.go b/016-nesting/nesting.go
similarity index 100%
rename from 018-nesting/nesting.go
rename to 016-nesting/nesting.go
diff --git a/019-functions/functions.go b/017-functions/functions.go
similarity index 100%
rename from 019-functions/functions.go
rename to 017-functions/functions.go
diff --git a/020-returns/returns.go b/018-returns/returns.go
similarity index 100%
rename from 020-returns/returns.go
rename to 018-returns/returns.go
diff --git a/020-returns/returns.sh b/018-returns/returns.sh
similarity index 100%
rename from 020-returns/returns.sh
rename to 018-returns/returns.sh
diff --git a/021-varadic/varadic.go b/019-varadic/varadic.go
similarity index 100%
rename from 021-varadic/varadic.go
rename to 019-varadic/varadic.go
diff --git a/021-varadic/varadic.sh b/019-varadic/varadic.sh
similarity index 100%
rename from 021-varadic/varadic.sh
rename to 019-varadic/varadic.sh
diff --git a/022-closures/closures.go b/020-closures/closures.go
similarity index 100%
rename from 022-closures/closures.go
rename to 020-closures/closures.go
diff --git a/023-recursion/recursion.go b/021-recursion/recursion.go
similarity index 100%
rename from 023-recursion/recursion.go
rename to 021-recursion/recursion.go
diff --git a/024-defer/defer.go b/022-defer/defer.go
similarity index 100%
rename from 024-defer/defer.go
rename to 022-defer/defer.go
diff --git a/025-panic/panic.go b/023-panic/panic.go
similarity index 100%
rename from 025-panic/panic.go
rename to 023-panic/panic.go
diff --git a/025-panic/panic.sh b/023-panic/panic.sh
similarity index 100%
rename from 025-panic/panic.sh
rename to 023-panic/panic.sh
diff --git a/026-recover/recover.go b/024-recover/recover.go
similarity index 100%
rename from 026-recover/recover.go
rename to 024-recover/recover.go
diff --git a/027-pointers/pointers.go b/025-pointers/pointers.go
similarity index 100%
rename from 027-pointers/pointers.go
rename to 025-pointers/pointers.go
diff --git a/028-new/new.go b/026-new/new.go
similarity index 100%
rename from 028-new/new.go
rename to 026-new/new.go
diff --git a/029-structs/structs.go b/027-structs/structs.go
similarity index 100%
rename from 029-structs/structs.go
rename to 027-structs/structs.go
diff --git a/030-fields/fields.go b/028-fields/fields.go
similarity index 100%
rename from 030-fields/fields.go
rename to 028-fields/fields.go
diff --git a/031-methods/methods.go b/029-methods/methods.go
similarity index 100%
rename from 031-methods/methods.go
rename to 029-methods/methods.go
diff --git a/032-embedding/embedding.go b/030-embedding/embedding.go
similarity index 100%
rename from 032-embedding/embedding.go
rename to 030-embedding/embedding.go
diff --git a/033-interfaces/interfaces.go b/031-interfaces/interfaces.go
similarity index 100%
rename from 033-interfaces/interfaces.go
rename to 031-interfaces/interfaces.go
diff --git a/017-ok-guards/ok-guards.go b/032-ok-guards/ok-guards.go
similarity index 100%
rename from 017-ok-guards/ok-guards.go
rename to 032-ok-guards/ok-guards.go
diff --git a/051-errors/errors.go b/033-errors/errors.go
similarity index 100%
rename from 051-errors/errors.go
rename to 033-errors/errors.go
diff --git a/080-scatter-gather/081-scatter-gather.go b/042-scatter-gather/081-scatter-gather.go
similarity index 100%
rename from 080-scatter-gather/081-scatter-gather.go
rename to 042-scatter-gather/081-scatter-gather.go
diff --git a/077-rate-limiting/rate-limiting.go b/043-rate-limiting/rate-limiting.go
similarity index 100%
rename from 077-rate-limiting/rate-limiting.go
rename to 043-rate-limiting/rate-limiting.go
diff --git a/045-burstable-rate-limiting/burstable-rate-limiting.go b/044-burstable-rate-limiting/burstable-rate-limiting.go
similarity index 100%
rename from 045-burstable-rate-limiting/burstable-rate-limiting.go
rename to 044-burstable-rate-limiting/burstable-rate-limiting.go
diff --git a/094-worker-pool/worker-pool.go b/045-worker-pool/worker-pool.go
similarity index 100%
rename from 094-worker-pool/worker-pool.go
rename to 045-worker-pool/worker-pool.go
diff --git a/083-sort/sort.go b/046-sort/sort.go
similarity index 100%
rename from 083-sort/sort.go
rename to 046-sort/sort.go
diff --git a/083-sort/sort.sh b/046-sort/sort.sh
similarity index 100%
rename from 083-sort/sort.sh
rename to 046-sort/sort.sh
diff --git a/084-sort-by-function/sort-by-function.go b/047-sort-by-function/sort-by-function.go
similarity index 100%
rename from 084-sort-by-function/sort-by-function.go
rename to 047-sort-by-function/sort-by-function.go
diff --git a/084-sort-by-function/sort-by-function.sh b/047-sort-by-function/sort-by-function.sh
similarity index 100%
rename from 084-sort-by-function/sort-by-function.sh
rename to 047-sort-by-function/sort-by-function.sh
diff --git a/042-string-functions/string-functions.go b/048-string-functions/string-functions.go
similarity index 100%
rename from 042-string-functions/string-functions.go
rename to 048-string-functions/string-functions.go
diff --git a/086-string-formatting/string-formatting.go b/049-string-formatting/string-formatting.go
similarity index 100%
rename from 086-string-formatting/string-formatting.go
rename to 049-string-formatting/string-formatting.go
diff --git a/086-string-formatting/string-formatting.sh b/049-string-formatting/string-formatting.sh
similarity index 100%
rename from 086-string-formatting/string-formatting.sh
rename to 049-string-formatting/string-formatting.sh
diff --git a/079-regexs/regexs.go b/050-regexs/regexs.go
similarity index 100%
rename from 079-regexs/regexs.go
rename to 050-regexs/regexs.go
diff --git a/079-regexs/regexs.sh b/050-regexs/regexs.sh
similarity index 100%
rename from 079-regexs/regexs.sh
rename to 050-regexs/regexs.sh
diff --git a/043-bytes/bytes.go b/051-bytes/bytes.go
similarity index 100%
rename from 043-bytes/bytes.go
rename to 051-bytes/bytes.go
diff --git a/073-json/json.go b/052-json/json.go
similarity index 100%
rename from 073-json/json.go
rename to 052-json/json.go
diff --git a/090-time/time.go b/054-time/time.go
similarity index 100%
rename from 090-time/time.go
rename to 054-time/time.go
diff --git a/090-time/time.sh b/054-time/time.sh
similarity index 100%
rename from 090-time/time.sh
rename to 054-time/time.sh
diff --git a/050-epoch/epoch.go b/055-epoch/epoch.go
similarity index 100%
rename from 050-epoch/epoch.go
rename to 055-epoch/epoch.go
diff --git a/050-epoch/epoch.sh b/055-epoch/epoch.sh
similarity index 100%
rename from 050-epoch/epoch.sh
rename to 055-epoch/epoch.sh
diff --git a/046-elapsed/elapsed.go b/056-elapsed/elapsed.go
similarity index 100%
rename from 046-elapsed/elapsed.go
rename to 056-elapsed/elapsed.go
diff --git a/091-timers/timers.go b/057-timers/timers.go
similarity index 100%
rename from 091-timers/timers.go
rename to 057-timers/timers.go
diff --git a/091-timers/tiners.sh b/057-timers/tiners.sh
similarity index 100%
rename from 091-timers/tiners.sh
rename to 057-timers/tiners.sh
diff --git a/089-tickers/tickers.go b/058-tickers/tickers.go
similarity index 100%
rename from 089-tickers/tickers.go
rename to 058-tickers/tickers.go
diff --git a/089-tickers/tickers.sh b/058-tickers/tickers.sh
similarity index 100%
rename from 089-tickers/tickers.sh
rename to 058-tickers/tickers.sh
diff --git a/076-rand/rand.go b/059-rand/rand.go
similarity index 100%
rename from 076-rand/rand.go
rename to 059-rand/rand.go
diff --git a/076-rand/rand.sh b/059-rand/rand.sh
similarity index 100%
rename from 076-rand/rand.sh
rename to 059-rand/rand.sh
diff --git a/074-number-parsing/number-parsing.go b/060-number-parsing/number-parsing.go
similarity index 100%
rename from 074-number-parsing/number-parsing.go
rename to 060-number-parsing/number-parsing.go
diff --git a/074-number-parsing/number-parsing.sh b/060-number-parsing/number-parsing.sh
similarity index 100%
rename from 074-number-parsing/number-parsing.sh
rename to 060-number-parsing/number-parsing.sh
diff --git a/048-enumerable/enumerable.go b/061-enumerable/enumerable.go
similarity index 100%
rename from 048-enumerable/enumerable.go
rename to 061-enumerable/enumerable.go
diff --git a/092-urls/urls.go b/062-urls/urls.go
similarity index 100%
rename from 092-urls/urls.go
rename to 062-urls/urls.go
diff --git a/092-urls/urls.sh b/062-urls/urls.sh
similarity index 100%
rename from 092-urls/urls.sh
rename to 062-urls/urls.sh
diff --git a/054-file-open/file-open.go b/063-file-open/file-open.go
similarity index 100%
rename from 054-file-open/file-open.go
rename to 063-file-open/file-open.go
diff --git a/055-file-read/file-read.go b/064-file-read/file-read.go
similarity index 100%
rename from 055-file-read/file-read.go
rename to 064-file-read/file-read.go
diff --git a/056-file-write/file-write.go b/065-file-write/file-write.go
similarity index 100%
rename from 056-file-write/file-write.go
rename to 065-file-write/file-write.go
diff --git a/044-command-line-arguments/command-line-arguments.go b/066-command-line-arguments/command-line-arguments.go
similarity index 100%
rename from 044-command-line-arguments/command-line-arguments.go
rename to 066-command-line-arguments/command-line-arguments.go
diff --git a/044-command-line-arguments/command-line-arguments.sh b/066-command-line-arguments/command-line-arguments.sh
similarity index 100%
rename from 044-command-line-arguments/command-line-arguments.sh
rename to 066-command-line-arguments/command-line-arguments.sh
diff --git a/057-command-line-flags/command-line-flags.go b/067-command-line-flags/command-line-flags.go
similarity index 100%
rename from 057-command-line-flags/command-line-flags.go
rename to 067-command-line-flags/command-line-flags.go
diff --git a/049-env/env.go b/068-env/env.go
similarity index 100%
rename from 049-env/env.go
rename to 068-env/env.go
diff --git a/049-env/env.sh b/068-env/env.sh
similarity index 100%
rename from 049-env/env.sh
rename to 068-env/env.sh
diff --git a/082-signals/signals.go b/069-signals/signals.go
similarity index 100%
rename from 082-signals/signals.go
rename to 069-signals/signals.go
diff --git a/082-signals/signals.sh b/069-signals/signals.sh
similarity index 100%
rename from 082-signals/signals.sh
rename to 069-signals/signals.sh
diff --git a/053-exit/exit.go b/070-exit/exit.go
similarity index 100%
rename from 053-exit/exit.go
rename to 070-exit/exit.go
diff --git a/053-exit/exit.sh b/070-exit/exit.sh
similarity index 100%
rename from 053-exit/exit.sh
rename to 070-exit/exit.sh
diff --git a/085-spawn/spawn.go b/071-spawn/spawn.go
similarity index 100%
rename from 085-spawn/spawn.go
rename to 071-spawn/spawn.go
diff --git a/085-spawn/spawn.sh b/071-spawn/spawn.sh
similarity index 100%
rename from 085-spawn/spawn.sh
rename to 071-spawn/spawn.sh
diff --git a/052-exec/exec.go b/072-exec/exec.go
similarity index 100%
rename from 052-exec/exec.go
rename to 072-exec/exec.go
diff --git a/007-reading-input/reading-input.go b/073-reading-input/reading-input.go
similarity index 100%
rename from 007-reading-input/reading-input.go
rename to 073-reading-input/reading-input.go
diff --git a/007-reading-input/reading-input.sh b/073-reading-input/reading-input.sh
similarity index 100%
rename from 007-reading-input/reading-input.sh
rename to 073-reading-input/reading-input.sh
diff --git a/093-users/users.go b/074-users/users.go
similarity index 100%
rename from 093-users/users.go
rename to 074-users/users.go
diff --git a/093-users/users.sh b/074-users/users.sh
similarity index 100%
rename from 093-users/users.sh
rename to 074-users/users.sh
diff --git a/095-line-filter/line-filter.go b/075-line-filter/line-filter.go
similarity index 100%
rename from 095-line-filter/line-filter.go
rename to 075-line-filter/line-filter.go
diff --git a/095-line-filter/line-filter.sh b/075-line-filter/line-filter.sh
similarity index 100%
rename from 095-line-filter/line-filter.sh
rename to 075-line-filter/line-filter.sh
diff --git a/087-tcp-client/tcp-client.go b/076-tcp-client/tcp-client.go
similarity index 100%
rename from 087-tcp-client/tcp-client.go
rename to 076-tcp-client/tcp-client.go
diff --git a/087-tcp-client/tcp-client.sh b/076-tcp-client/tcp-client.sh
similarity index 100%
rename from 087-tcp-client/tcp-client.sh
rename to 076-tcp-client/tcp-client.sh
diff --git a/059-http-client/http-client.go b/077-http-client/http-client.go
similarity index 100%
rename from 059-http-client/http-client.go
rename to 077-http-client/http-client.go
diff --git a/058-http-client-basic/http-client-basic.go b/078-http-client-basic/http-client-basic.go
similarity index 100%
rename from 058-http-client-basic/http-client-basic.go
rename to 078-http-client-basic/http-client-basic.go
diff --git a/071-https-client/https-client.go b/079-https-client/https-client.go
similarity index 100%
rename from 071-https-client/https-client.go
rename to 079-https-client/https-client.go
diff --git a/078-redis/redis.go b/080-redis/redis.go
similarity index 100%
rename from 078-redis/redis.go
rename to 080-redis/redis.go
diff --git a/078-redis/redis.sh b/080-redis/redis.sh
similarity index 100%
rename from 078-redis/redis.sh
rename to 080-redis/redis.sh
diff --git a/075-postgres/postgres.go b/081-postgres/postgres.go
similarity index 100%
rename from 075-postgres/postgres.go
rename to 081-postgres/postgres.go
diff --git a/075-postgres/postgres.sh b/081-postgres/postgres.sh
similarity index 100%
rename from 075-postgres/postgres.sh
rename to 081-postgres/postgres.sh
diff --git a/047-email/email.go b/082-email/email.go
similarity index 100%
rename from 047-email/email.go
rename to 082-email/email.go
diff --git a/088-tcp-server/tcp-server.go b/083-tcp-server/tcp-server.go
similarity index 100%
rename from 088-tcp-server/tcp-server.go
rename to 083-tcp-server/tcp-server.go
diff --git a/088-tcp-server/tcp-server.sh b/083-tcp-server/tcp-server.sh
similarity index 100%
rename from 088-tcp-server/tcp-server.sh
rename to 083-tcp-server/tcp-server.sh
diff --git a/060-http-server-basic/http-server-basic.go b/084-http-server-basic/http-server-basic.go
similarity index 100%
rename from 060-http-server-basic/http-server-basic.go
rename to 084-http-server-basic/http-server-basic.go
diff --git a/061-http-server-canonical-host/http-server-canonical-host.go b/085-http-server-canonical-host/http-server-canonical-host.go
similarity index 100%
rename from 061-http-server-canonical-host/http-server-canonical-host.go
rename to 085-http-server-canonical-host/http-server-canonical-host.go
diff --git a/061-http-server-canonical-host/http-server-canonical-host.sh b/085-http-server-canonical-host/http-server-canonical-host.sh
similarity index 100%
rename from 061-http-server-canonical-host/http-server-canonical-host.sh
rename to 085-http-server-canonical-host/http-server-canonical-host.sh
diff --git a/062-http-server-graceful-shutdown/http-server-graceful-shutdown.go b/086-http-server-graceful-shutdown/http-server-graceful-shutdown.go
similarity index 100%
rename from 062-http-server-graceful-shutdown/http-server-graceful-shutdown.go
rename to 086-http-server-graceful-shutdown/http-server-graceful-shutdown.go
diff --git a/062-http-server-graceful-shutdown/http-server-graceful-shutdown.sh b/086-http-server-graceful-shutdown/http-server-graceful-shutdown.sh
similarity index 100%
rename from 062-http-server-graceful-shutdown/http-server-graceful-shutdown.sh
rename to 086-http-server-graceful-shutdown/http-server-graceful-shutdown.sh
diff --git a/063-http-server-log/http-server-log.go b/087-http-server-log/http-server-log.go
similarity index 100%
rename from 063-http-server-log/http-server-log.go
rename to 087-http-server-log/http-server-log.go
diff --git a/064-http-server-middleware/http-server-middleware.go b/088-http-server-middleware/http-server-middleware.go
similarity index 100%
rename from 064-http-server-middleware/http-server-middleware.go
rename to 088-http-server-middleware/http-server-middleware.go
diff --git a/065-http-server-routing/http-server-routing.go b/089-http-server-routing/http-server-routing.go
similarity index 100%
rename from 065-http-server-routing/http-server-routing.go
rename to 089-http-server-routing/http-server-routing.go
diff --git a/065-http-server-routing/http-server-routing.sh b/089-http-server-routing/http-server-routing.sh
similarity index 100%
rename from 065-http-server-routing/http-server-routing.sh
rename to 089-http-server-routing/http-server-routing.sh
diff --git a/066-http-server-static-dynamic/http-server-static-dynamic.go b/090-http-server-static-dynamic/http-server-static-dynamic.go
similarity index 100%
rename from 066-http-server-static-dynamic/http-server-static-dynamic.go
rename to 090-http-server-static-dynamic/http-server-static-dynamic.go
diff --git a/066-http-server-static-dynamic/http-server-static-dynamic.sh b/090-http-server-static-dynamic/http-server-static-dynamic.sh
similarity index 100%
rename from 066-http-server-static-dynamic/http-server-static-dynamic.sh
rename to 090-http-server-static-dynamic/http-server-static-dynamic.sh
diff --git a/067-http-server-static-select/http-server-static-select.go b/091-http-server-static-select/http-server-static-select.go
similarity index 100%
rename from 067-http-server-static-select/http-server-static-select.go
rename to 091-http-server-static-select/http-server-static-select.go
diff --git a/067-http-server-static-select/http-server-static-select.sh b/091-http-server-static-select/http-server-static-select.sh
similarity index 100%
rename from 067-http-server-static-select/http-server-static-select.sh
rename to 091-http-server-static-select/http-server-static-select.sh
diff --git a/068-http-server-static/http-server-static.go b/092-http-server-static/http-server-static.go
similarity index 100%
rename from 068-http-server-static/http-server-static.go
rename to 092-http-server-static/http-server-static.go
diff --git a/068-http-server-static/http-server-static.sh b/092-http-server-static/http-server-static.sh
similarity index 100%
rename from 068-http-server-static/http-server-static.sh
rename to 092-http-server-static/http-server-static.sh
diff --git a/069-http-server-status-code/http-server-status-code.go b/093-http-server-status-code/http-server-status-code.go
similarity index 100%
rename from 069-http-server-status-code/http-server-status-code.go
rename to 093-http-server-status-code/http-server-status-code.go
diff --git a/069-http-server-status-code/http-server-status-code.sh b/093-http-server-status-code/http-server-status-code.sh
similarity index 100%
rename from 069-http-server-status-code/http-server-status-code.sh
rename to 093-http-server-status-code/http-server-status-code.sh
diff --git a/070-http-server/http-server.go b/094-http-server/http-server.go
similarity index 100%
rename from 070-http-server/http-server.go
rename to 094-http-server/http-server.go
diff --git a/072-https-server/https-server.go b/095-https-server/https-server.go
similarity index 100%
rename from 072-https-server/https-server.go
rename to 095-https-server/https-server.go
diff --git a/072-https-server/https-server.sh b/095-https-server/https-server.sh
similarity index 100%
rename from 072-https-server/https-server.sh
rename to 095-https-server/https-server.sh
diff --git a/tool/renumber.go b/tool/renumber.go
index 67fa073..735d0be 100644
--- a/tool/renumber.go
+++ b/tool/renumber.go
@@ -40,8 +40,8 @@ func main() {
     indexNamesAll := strings.Split(string(indexBytes), "\n")
     indexNames := make([]string, 0)
     for _, indexName := range indexNamesAll {
-        if (indexName !=) "" && !(indexName.Contains("#")) {
-            indexNames := append(indexNames, indexName)
+        if (indexName != "") && !strings.Contains(indexName, "#") {
+            indexNames = append(indexNames, indexName)
         }
     }