diff --git a/src/060-modules-and-namespaces/128-module-or-script.problem.ts b/src/040-deriving-types-from-values/128-using-numeric-comparators-on-enums.problem.ts
similarity index 100%
rename from src/060-modules-and-namespaces/128-module-or-script.problem.ts
rename to src/040-deriving-types-from-values/128-using-numeric-comparators-on-enums.problem.ts
diff --git a/src/060-modules-and-namespaces/128-module-or-script.solution.ts b/src/040-deriving-types-from-values/128-using-numeric-comparators-on-enums.solution.ts
similarity index 100%
rename from src/060-modules-and-namespaces/128-module-or-script.solution.ts
rename to src/040-deriving-types-from-values/128-using-numeric-comparators-on-enums.solution.ts
diff --git a/src/060-modules-and-namespaces/129-module-detection-force.problem.ts b/src/060-modules-and-namespaces/129-module-or-script.problem.ts
similarity index 100%
rename from src/060-modules-and-namespaces/129-module-detection-force.problem.ts
rename to src/060-modules-and-namespaces/129-module-or-script.problem.ts
diff --git a/src/060-modules-and-namespaces/129-module-detection-force.solution.ts b/src/060-modules-and-namespaces/129-module-or-script.solution.ts
similarity index 100%
rename from src/060-modules-and-namespaces/129-module-detection-force.solution.ts
rename to src/060-modules-and-namespaces/129-module-or-script.solution.ts
diff --git a/src/060-modules-and-namespaces/130-isolated-modules.problem.ts b/src/060-modules-and-namespaces/130-module-detection-force.problem.ts
similarity index 100%
rename from src/060-modules-and-namespaces/130-isolated-modules.problem.ts
rename to src/060-modules-and-namespaces/130-module-detection-force.problem.ts
diff --git a/src/060-modules-and-namespaces/130-isolated-modules.solution.ts b/src/060-modules-and-namespaces/130-module-detection-force.solution.ts
similarity index 100%
rename from src/060-modules-and-namespaces/130-isolated-modules.solution.ts
rename to src/060-modules-and-namespaces/130-module-detection-force.solution.ts
diff --git a/src/060-modules-and-namespaces/131-cjs-vs-esm.problem.ts b/src/060-modules-and-namespaces/131-isolated-modules.problem.ts
similarity index 100%
rename from src/060-modules-and-namespaces/131-cjs-vs-esm.problem.ts
rename to src/060-modules-and-namespaces/131-isolated-modules.problem.ts
diff --git a/src/060-modules-and-namespaces/131-cjs-vs-esm.solution.ts b/src/060-modules-and-namespaces/131-isolated-modules.solution.ts
similarity index 100%
rename from src/060-modules-and-namespaces/131-cjs-vs-esm.solution.ts
rename to src/060-modules-and-namespaces/131-isolated-modules.solution.ts
diff --git a/src/060-modules-and-namespaces/132-module-resolution-bundler-or-nodenext.problem.ts b/src/060-modules-and-namespaces/132-cjs-vs-esm.problem.ts
similarity index 100%
rename from src/060-modules-and-namespaces/132-module-resolution-bundler-or-nodenext.problem.ts
rename to src/060-modules-and-namespaces/132-cjs-vs-esm.problem.ts
diff --git a/src/060-modules-and-namespaces/132-module-resolution-bundler-or-nodenext.solution.ts b/src/060-modules-and-namespaces/132-cjs-vs-esm.solution.ts
similarity index 100%
rename from src/060-modules-and-namespaces/132-module-resolution-bundler-or-nodenext.solution.ts
rename to src/060-modules-and-namespaces/132-cjs-vs-esm.solution.ts
diff --git a/src/060-modules-and-namespaces/133-declaration-files.problem.ts b/src/060-modules-and-namespaces/133-module-resolution-bundler-or-nodenext.problem.ts
similarity index 100%
rename from src/060-modules-and-namespaces/133-declaration-files.problem.ts
rename to src/060-modules-and-namespaces/133-module-resolution-bundler-or-nodenext.problem.ts
diff --git a/src/060-modules-and-namespaces/133-declaration-files.solution.ts b/src/060-modules-and-namespaces/133-module-resolution-bundler-or-nodenext.solution.ts
similarity index 100%
rename from src/060-modules-and-namespaces/133-declaration-files.solution.ts
rename to src/060-modules-and-namespaces/133-module-resolution-bundler-or-nodenext.solution.ts
diff --git a/src/060-modules-and-namespaces/134-skip-lib-check-true.problem.ts b/src/060-modules-and-namespaces/134-declaration-files.problem.ts
similarity index 100%
rename from src/060-modules-and-namespaces/134-skip-lib-check-true.problem.ts
rename to src/060-modules-and-namespaces/134-declaration-files.problem.ts
diff --git a/src/060-modules-and-namespaces/134-skip-lib-check-true.solution.ts b/src/060-modules-and-namespaces/134-declaration-files.solution.ts
similarity index 100%
rename from src/060-modules-and-namespaces/134-skip-lib-check-true.solution.ts
rename to src/060-modules-and-namespaces/134-declaration-files.solution.ts
diff --git a/src/060-modules-and-namespaces/135-declaration-files-can-be-modules-or-scripts.problem.ts b/src/060-modules-and-namespaces/135-skip-lib-check-true.problem.ts
similarity index 100%
rename from src/060-modules-and-namespaces/135-declaration-files-can-be-modules-or-scripts.problem.ts
rename to src/060-modules-and-namespaces/135-skip-lib-check-true.problem.ts
diff --git a/src/060-modules-and-namespaces/135-declaration-files-can-be-modules-or-scripts.solution.ts b/src/060-modules-and-namespaces/135-skip-lib-check-true.solution.ts
similarity index 100%
rename from src/060-modules-and-namespaces/135-declaration-files-can-be-modules-or-scripts.solution.ts
rename to src/060-modules-and-namespaces/135-skip-lib-check-true.solution.ts
diff --git a/src/060-modules-and-namespaces/136-declaration-files-can-be-used-to-type-js-files.problem.ts b/src/060-modules-and-namespaces/136-declaration-files-can-be-modules-or-scripts.problem.ts
similarity index 100%
rename from src/060-modules-and-namespaces/136-declaration-files-can-be-used-to-type-js-files.problem.ts
rename to src/060-modules-and-namespaces/136-declaration-files-can-be-modules-or-scripts.problem.ts
diff --git a/src/060-modules-and-namespaces/136-declaration-files-can-be-used-to-type-js-files.solution.ts b/src/060-modules-and-namespaces/136-declaration-files-can-be-modules-or-scripts.solution.ts
similarity index 100%
rename from src/060-modules-and-namespaces/136-declaration-files-can-be-used-to-type-js-files.solution.ts
rename to src/060-modules-and-namespaces/136-declaration-files-can-be-modules-or-scripts.solution.ts
diff --git a/src/060-modules-and-namespaces/137-should-you-use-declaration-files.problem.ts b/src/060-modules-and-namespaces/137-declaration-files-can-be-used-to-type-js-files.problem.ts
similarity index 100%
rename from src/060-modules-and-namespaces/137-should-you-use-declaration-files.problem.ts
rename to src/060-modules-and-namespaces/137-declaration-files-can-be-used-to-type-js-files.problem.ts
diff --git a/src/060-modules-and-namespaces/137-should-you-use-declaration-files.solution.ts b/src/060-modules-and-namespaces/137-declaration-files-can-be-used-to-type-js-files.solution.ts
similarity index 100%
rename from src/060-modules-and-namespaces/137-should-you-use-declaration-files.solution.ts
rename to src/060-modules-and-namespaces/137-declaration-files-can-be-used-to-type-js-files.solution.ts
diff --git a/src/060-modules-and-namespaces/138-namespaces.problem.ts b/src/060-modules-and-namespaces/138-should-you-use-declaration-files.problem.ts
similarity index 100%
rename from src/060-modules-and-namespaces/138-namespaces.problem.ts
rename to src/060-modules-and-namespaces/138-should-you-use-declaration-files.problem.ts
diff --git a/src/060-modules-and-namespaces/138-namespaces.solution.ts b/src/060-modules-and-namespaces/138-should-you-use-declaration-files.solution.ts
similarity index 100%
rename from src/060-modules-and-namespaces/138-namespaces.solution.ts
rename to src/060-modules-and-namespaces/138-should-you-use-declaration-files.solution.ts
diff --git a/src/060-modules-and-namespaces/139-namespaces-can-be-used-as-types-or-values.problem.ts b/src/060-modules-and-namespaces/139-namespaces.problem.ts
similarity index 100%
rename from src/060-modules-and-namespaces/139-namespaces-can-be-used-as-types-or-values.problem.ts
rename to src/060-modules-and-namespaces/139-namespaces.problem.ts
diff --git a/src/060-modules-and-namespaces/139-namespaces-can-be-used-as-types-or-values.solution.ts b/src/060-modules-and-namespaces/139-namespaces.solution.ts
similarity index 100%
rename from src/060-modules-and-namespaces/139-namespaces-can-be-used-as-types-or-values.solution.ts
rename to src/060-modules-and-namespaces/139-namespaces.solution.ts
diff --git a/src/060-modules-and-namespaces/140-namespaces-can-declaration-merge.problem.ts b/src/060-modules-and-namespaces/140-namespaces-can-be-used-as-types-or-values.problem.ts
similarity index 100%
rename from src/060-modules-and-namespaces/140-namespaces-can-declaration-merge.problem.ts
rename to src/060-modules-and-namespaces/140-namespaces-can-be-used-as-types-or-values.problem.ts
diff --git a/src/060-modules-and-namespaces/140-namespaces-can-declaration-merge.solution.ts b/src/060-modules-and-namespaces/140-namespaces-can-be-used-as-types-or-values.solution.ts
similarity index 100%
rename from src/060-modules-and-namespaces/140-namespaces-can-declaration-merge.solution.ts
rename to src/060-modules-and-namespaces/140-namespaces-can-be-used-as-types-or-values.solution.ts
diff --git a/src/060-modules-and-namespaces/141-interfaces-within-namespaces-can-declaration-merge.problem.ts b/src/060-modules-and-namespaces/141-namespaces-can-declaration-merge.problem.ts
similarity index 100%
rename from src/060-modules-and-namespaces/141-interfaces-within-namespaces-can-declaration-merge.problem.ts
rename to src/060-modules-and-namespaces/141-namespaces-can-declaration-merge.problem.ts
diff --git a/src/060-modules-and-namespaces/141-interfaces-within-namespaces-can-declaration-merge.solution.ts b/src/060-modules-and-namespaces/141-namespaces-can-declaration-merge.solution.ts
similarity index 100%
rename from src/060-modules-and-namespaces/141-interfaces-within-namespaces-can-declaration-merge.solution.ts
rename to src/060-modules-and-namespaces/141-namespaces-can-declaration-merge.solution.ts
diff --git a/src/060-modules-and-namespaces/142-should-you-use-namespaces.problem.ts b/src/060-modules-and-namespaces/142-interfaces-within-namespaces-can-declaration-merge.problem.ts
similarity index 100%
rename from src/060-modules-and-namespaces/142-should-you-use-namespaces.problem.ts
rename to src/060-modules-and-namespaces/142-interfaces-within-namespaces-can-declaration-merge.problem.ts
diff --git a/src/060-modules-and-namespaces/142-should-you-use-namespaces.solution.ts b/src/060-modules-and-namespaces/142-interfaces-within-namespaces-can-declaration-merge.solution.ts
similarity index 100%
rename from src/060-modules-and-namespaces/142-should-you-use-namespaces.solution.ts
rename to src/060-modules-and-namespaces/142-interfaces-within-namespaces-can-declaration-merge.solution.ts
diff --git a/src/062-the-global-namespace/143-ambient-context-and-declare-const.problem.ts b/src/060-modules-and-namespaces/143-should-you-use-namespaces.problem.ts
similarity index 100%
rename from src/062-the-global-namespace/143-ambient-context-and-declare-const.problem.ts
rename to src/060-modules-and-namespaces/143-should-you-use-namespaces.problem.ts
diff --git a/src/062-the-global-namespace/143-ambient-context-and-declare-const.solution.ts b/src/060-modules-and-namespaces/143-should-you-use-namespaces.solution.ts
similarity index 100%
rename from src/062-the-global-namespace/143-ambient-context-and-declare-const.solution.ts
rename to src/060-modules-and-namespaces/143-should-you-use-namespaces.solution.ts
diff --git a/src/062-the-global-namespace/144-declare-global.problem.ts b/src/062-the-global-namespace/144-ambient-context-and-declare-const.problem.ts
similarity index 100%
rename from src/062-the-global-namespace/144-declare-global.problem.ts
rename to src/062-the-global-namespace/144-ambient-context-and-declare-const.problem.ts
diff --git a/src/062-the-global-namespace/144-declare-global.solution.ts b/src/062-the-global-namespace/144-ambient-context-and-declare-const.solution.ts
similarity index 100%
rename from src/062-the-global-namespace/144-declare-global.solution.ts
rename to src/062-the-global-namespace/144-ambient-context-and-declare-const.solution.ts
diff --git a/src/062-the-global-namespace/145-globals-are-tied-to-a-single-tsconfig.problem.ts b/src/062-the-global-namespace/145-declare-global.problem.ts
similarity index 100%
rename from src/062-the-global-namespace/145-globals-are-tied-to-a-single-tsconfig.problem.ts
rename to src/062-the-global-namespace/145-declare-global.problem.ts
diff --git a/src/062-the-global-namespace/145-globals-are-tied-to-a-single-tsconfig.solution.ts b/src/062-the-global-namespace/145-declare-global.solution.ts
similarity index 100%
rename from src/062-the-global-namespace/145-globals-are-tied-to-a-single-tsconfig.solution.ts
rename to src/062-the-global-namespace/145-declare-global.solution.ts
diff --git a/src/062-the-global-namespace/146-declare-global-or-declaration-file.problem.ts b/src/062-the-global-namespace/146-globals-are-tied-to-a-single-tsconfig.problem.ts
similarity index 100%
rename from src/062-the-global-namespace/146-declare-global-or-declaration-file.problem.ts
rename to src/062-the-global-namespace/146-globals-are-tied-to-a-single-tsconfig.problem.ts
diff --git a/src/062-the-global-namespace/146-declare-global-or-declaration-file.solution.ts b/src/062-the-global-namespace/146-globals-are-tied-to-a-single-tsconfig.solution.ts
similarity index 100%
rename from src/062-the-global-namespace/146-declare-global-or-declaration-file.solution.ts
rename to src/062-the-global-namespace/146-globals-are-tied-to-a-single-tsconfig.solution.ts
diff --git a/src/062-the-global-namespace/147-declare-module.problem.ts b/src/062-the-global-namespace/147-declare-global-or-declaration-file.problem.ts
similarity index 100%
rename from src/062-the-global-namespace/147-declare-module.problem.ts
rename to src/062-the-global-namespace/147-declare-global-or-declaration-file.problem.ts
diff --git a/src/062-the-global-namespace/147-declare-module.solution.ts b/src/062-the-global-namespace/147-declare-global-or-declaration-file.solution.ts
similarity index 100%
rename from src/062-the-global-namespace/147-declare-module.solution.ts
rename to src/062-the-global-namespace/147-declare-global-or-declaration-file.solution.ts
diff --git a/src/062-the-global-namespace/148-wildcard-in-declare-module.problem.ts b/src/062-the-global-namespace/148-declare-module.problem.ts
similarity index 100%
rename from src/062-the-global-namespace/148-wildcard-in-declare-module.problem.ts
rename to src/062-the-global-namespace/148-declare-module.problem.ts
diff --git a/src/062-the-global-namespace/148-wildcard-in-declare-module.solution.ts b/src/062-the-global-namespace/148-declare-module.solution.ts
similarity index 100%
rename from src/062-the-global-namespace/148-wildcard-in-declare-module.solution.ts
rename to src/062-the-global-namespace/148-declare-module.solution.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/149-declare-module-for-overriding-third-party-libraries.problem.ts b/src/062-the-global-namespace/149-wildcard-in-declare-module.problem.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/149-declare-module-for-overriding-third-party-libraries.problem.ts
rename to src/062-the-global-namespace/149-wildcard-in-declare-module.problem.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/149-declare-module-for-overriding-third-party-libraries.solution.ts b/src/062-the-global-namespace/149-wildcard-in-declare-module.solution.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/149-declare-module-for-overriding-third-party-libraries.solution.ts
rename to src/062-the-global-namespace/149-wildcard-in-declare-module.solution.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/150-lib-d-ts.problem.ts b/src/065-four-spaces-of-typescript-declarations/150-declare-module-for-overriding-third-party-libraries.problem.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/150-lib-d-ts.problem.ts
rename to src/065-four-spaces-of-typescript-declarations/150-declare-module-for-overriding-third-party-libraries.problem.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/150-lib-d-ts.solution.ts b/src/065-four-spaces-of-typescript-declarations/150-declare-module-for-overriding-third-party-libraries.solution.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/150-lib-d-ts.solution.ts
rename to src/065-four-spaces-of-typescript-declarations/150-declare-module-for-overriding-third-party-libraries.solution.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/151-using-target-to-change-lib-d-ts.problem.ts b/src/065-four-spaces-of-typescript-declarations/151-lib-d-ts.problem.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/151-using-target-to-change-lib-d-ts.problem.ts
rename to src/065-four-spaces-of-typescript-declarations/151-lib-d-ts.problem.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/151-using-target-to-change-lib-d-ts.solution.ts b/src/065-four-spaces-of-typescript-declarations/151-lib-d-ts.solution.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/151-using-target-to-change-lib-d-ts.solution.ts
rename to src/065-four-spaces-of-typescript-declarations/151-lib-d-ts.solution.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/152-lib-dom-d-ts.problem.ts b/src/065-four-spaces-of-typescript-declarations/152-using-target-to-change-lib-d-ts.problem.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/152-lib-dom-d-ts.problem.ts
rename to src/065-four-spaces-of-typescript-declarations/152-using-target-to-change-lib-d-ts.problem.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/152-lib-dom-d-ts.solution.ts b/src/065-four-spaces-of-typescript-declarations/152-using-target-to-change-lib-d-ts.solution.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/152-lib-dom-d-ts.solution.ts
rename to src/065-four-spaces-of-typescript-declarations/152-using-target-to-change-lib-d-ts.solution.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/153-third-party-types.problem.ts b/src/065-four-spaces-of-typescript-declarations/153-lib-dom-d-ts.problem.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/153-third-party-types.problem.ts
rename to src/065-four-spaces-of-typescript-declarations/153-lib-dom-d-ts.problem.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/153-third-party-types.solution.ts b/src/065-four-spaces-of-typescript-declarations/153-lib-dom-d-ts.solution.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/153-third-party-types.solution.ts
rename to src/065-four-spaces-of-typescript-declarations/153-lib-dom-d-ts.solution.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/154-type-roots-in-tsconfig.problem.ts b/src/065-four-spaces-of-typescript-declarations/154-third-party-types.problem.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/154-type-roots-in-tsconfig.problem.ts
rename to src/065-four-spaces-of-typescript-declarations/154-third-party-types.problem.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/154-type-roots-in-tsconfig.solution.ts b/src/065-four-spaces-of-typescript-declarations/154-third-party-types.solution.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/154-type-roots-in-tsconfig.solution.ts
rename to src/065-four-spaces-of-typescript-declarations/154-third-party-types.solution.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/155-setting-up-types-for-node.problem.ts b/src/065-four-spaces-of-typescript-declarations/155-type-roots-in-tsconfig.problem.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/155-setting-up-types-for-node.problem.ts
rename to src/065-four-spaces-of-typescript-declarations/155-type-roots-in-tsconfig.problem.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/155-setting-up-types-for-node.solution.ts b/src/065-four-spaces-of-typescript-declarations/155-type-roots-in-tsconfig.solution.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/155-setting-up-types-for-node.solution.ts
rename to src/065-four-spaces-of-typescript-declarations/155-type-roots-in-tsconfig.solution.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/156-types-that-ship-with-libraries.problem.ts b/src/065-four-spaces-of-typescript-declarations/156-setting-up-types-for-node.problem.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/156-types-that-ship-with-libraries.problem.ts
rename to src/065-four-spaces-of-typescript-declarations/156-setting-up-types-for-node.problem.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/156-types-that-ship-with-libraries.solution.ts b/src/065-four-spaces-of-typescript-declarations/156-setting-up-types-for-node.solution.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/156-types-that-ship-with-libraries.solution.ts
rename to src/065-four-spaces-of-typescript-declarations/156-setting-up-types-for-node.solution.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/157-modifying-window.problem.ts b/src/065-four-spaces-of-typescript-declarations/157-types-that-ship-with-libraries.problem.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/157-modifying-window.problem.ts
rename to src/065-four-spaces-of-typescript-declarations/157-types-that-ship-with-libraries.problem.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/157-modifying-window.solution.ts b/src/065-four-spaces-of-typescript-declarations/157-types-that-ship-with-libraries.solution.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/157-modifying-window.solution.ts
rename to src/065-four-spaces-of-typescript-declarations/157-types-that-ship-with-libraries.solution.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/158-modifying-globalthis.problem.ts b/src/065-four-spaces-of-typescript-declarations/158-modifying-window.problem.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/158-modifying-globalthis.problem.ts
rename to src/065-four-spaces-of-typescript-declarations/158-modifying-window.problem.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/158-modifying-globalthis.solution.ts b/src/065-four-spaces-of-typescript-declarations/158-modifying-window.solution.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/158-modifying-globalthis.solution.ts
rename to src/065-four-spaces-of-typescript-declarations/158-modifying-window.solution.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/159-modifying-process-env.problem.ts b/src/065-four-spaces-of-typescript-declarations/159-modifying-globalthis.problem.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/159-modifying-process-env.problem.ts
rename to src/065-four-spaces-of-typescript-declarations/159-modifying-globalthis.problem.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/159-modifying-process-env.solution.ts b/src/065-four-spaces-of-typescript-declarations/159-modifying-globalthis.solution.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/159-modifying-process-env.solution.ts
rename to src/065-four-spaces-of-typescript-declarations/159-modifying-globalthis.solution.ts
diff --git a/src/075-designing-your-types/160-domain-modelling-in-typescript.problem.ts b/src/065-four-spaces-of-typescript-declarations/160-modifying-process-env.problem.ts
similarity index 100%
rename from src/075-designing-your-types/160-domain-modelling-in-typescript.problem.ts
rename to src/065-four-spaces-of-typescript-declarations/160-modifying-process-env.problem.ts
diff --git a/src/075-designing-your-types/160-domain-modelling-in-typescript.solution.ts b/src/065-four-spaces-of-typescript-declarations/160-modifying-process-env.solution.ts
similarity index 100%
rename from src/075-designing-your-types/160-domain-modelling-in-typescript.solution.ts
rename to src/065-four-spaces-of-typescript-declarations/160-modifying-process-env.solution.ts
diff --git a/src/075-designing-your-types/161-intro-to-helper-types.problem.ts b/src/075-designing-your-types/161-domain-modelling-in-typescript.problem.ts
similarity index 100%
rename from src/075-designing-your-types/161-intro-to-helper-types.problem.ts
rename to src/075-designing-your-types/161-domain-modelling-in-typescript.problem.ts
diff --git a/src/075-designing-your-types/161-intro-to-helper-types.solution.ts b/src/075-designing-your-types/161-domain-modelling-in-typescript.solution.ts
similarity index 100%
rename from src/075-designing-your-types/161-intro-to-helper-types.solution.ts
rename to src/075-designing-your-types/161-domain-modelling-in-typescript.solution.ts
diff --git a/src/075-designing-your-types/162-multiple-type-parameters.problem.ts b/src/075-designing-your-types/162-intro-to-helper-types.problem.ts
similarity index 100%
rename from src/075-designing-your-types/162-multiple-type-parameters.problem.ts
rename to src/075-designing-your-types/162-intro-to-helper-types.problem.ts
diff --git a/src/075-designing-your-types/162-multiple-type-parameters.solution.ts b/src/075-designing-your-types/162-intro-to-helper-types.solution.ts
similarity index 100%
rename from src/075-designing-your-types/162-multiple-type-parameters.solution.ts
rename to src/075-designing-your-types/162-intro-to-helper-types.solution.ts
diff --git a/src/075-designing-your-types/163-default-type-parameters.problem.ts b/src/075-designing-your-types/163-multiple-type-parameters.problem.ts
similarity index 100%
rename from src/075-designing-your-types/163-default-type-parameters.problem.ts
rename to src/075-designing-your-types/163-multiple-type-parameters.problem.ts
diff --git a/src/075-designing-your-types/163-default-type-parameters.solution.ts b/src/075-designing-your-types/163-multiple-type-parameters.solution.ts
similarity index 100%
rename from src/075-designing-your-types/163-default-type-parameters.solution.ts
rename to src/075-designing-your-types/163-multiple-type-parameters.solution.ts
diff --git a/src/075-designing-your-types/164-type-helper-constraints.problem.ts b/src/075-designing-your-types/164-default-type-parameters.problem.ts
similarity index 100%
rename from src/075-designing-your-types/164-type-helper-constraints.problem.ts
rename to src/075-designing-your-types/164-default-type-parameters.problem.ts
diff --git a/src/075-designing-your-types/164-type-helper-constraints.solution.ts b/src/075-designing-your-types/164-default-type-parameters.solution.ts
similarity index 100%
rename from src/075-designing-your-types/164-type-helper-constraints.solution.ts
rename to src/075-designing-your-types/164-default-type-parameters.solution.ts
diff --git a/src/075-designing-your-types/165-tighter-version-of-omit.problem.ts b/src/075-designing-your-types/165-type-helper-constraints.problem.ts
similarity index 100%
rename from src/075-designing-your-types/165-tighter-version-of-omit.problem.ts
rename to src/075-designing-your-types/165-type-helper-constraints.problem.ts
diff --git a/src/075-designing-your-types/165-tighter-version-of-omit.solution.ts b/src/075-designing-your-types/165-type-helper-constraints.solution.ts
similarity index 100%
rename from src/075-designing-your-types/165-tighter-version-of-omit.solution.ts
rename to src/075-designing-your-types/165-type-helper-constraints.solution.ts
diff --git a/src/075-designing-your-types/166-template-literal-types.problem.ts b/src/075-designing-your-types/166-tighter-version-of-omit.problem.ts
similarity index 100%
rename from src/075-designing-your-types/166-template-literal-types.problem.ts
rename to src/075-designing-your-types/166-tighter-version-of-omit.problem.ts
diff --git a/src/075-designing-your-types/166-template-literal-types.solution.ts b/src/075-designing-your-types/166-tighter-version-of-omit.solution.ts
similarity index 100%
rename from src/075-designing-your-types/166-template-literal-types.solution.ts
rename to src/075-designing-your-types/166-tighter-version-of-omit.solution.ts
diff --git a/src/075-designing-your-types/167-passing-unions-to-template-literal-types.problem.ts b/src/075-designing-your-types/167-template-literal-types.problem.ts
similarity index 100%
rename from src/075-designing-your-types/167-passing-unions-to-template-literal-types.problem.ts
rename to src/075-designing-your-types/167-template-literal-types.problem.ts
diff --git a/src/075-designing-your-types/167-passing-unions-to-template-literal-types.solution.ts b/src/075-designing-your-types/167-template-literal-types.solution.ts
similarity index 100%
rename from src/075-designing-your-types/167-passing-unions-to-template-literal-types.solution.ts
rename to src/075-designing-your-types/167-template-literal-types.solution.ts
diff --git a/src/080-configuring-typescript/168-introduction-to-tsconfig.problem.ts b/src/075-designing-your-types/168-passing-unions-to-template-literal-types.problem.ts
similarity index 100%
rename from src/080-configuring-typescript/168-introduction-to-tsconfig.problem.ts
rename to src/075-designing-your-types/168-passing-unions-to-template-literal-types.problem.ts
diff --git a/src/080-configuring-typescript/168-introduction-to-tsconfig.solution.ts b/src/075-designing-your-types/168-passing-unions-to-template-literal-types.solution.ts
similarity index 100%
rename from src/080-configuring-typescript/168-introduction-to-tsconfig.solution.ts
rename to src/075-designing-your-types/168-passing-unions-to-template-literal-types.solution.ts
diff --git a/src/080-configuring-typescript/169-tsconfig-bases.problem.ts b/src/080-configuring-typescript/169-introduction-to-tsconfig.problem.ts
similarity index 100%
rename from src/080-configuring-typescript/169-tsconfig-bases.problem.ts
rename to src/080-configuring-typescript/169-introduction-to-tsconfig.problem.ts
diff --git a/src/080-configuring-typescript/169-tsconfig-bases.solution.ts b/src/080-configuring-typescript/169-introduction-to-tsconfig.solution.ts
similarity index 100%
rename from src/080-configuring-typescript/169-tsconfig-bases.solution.ts
rename to src/080-configuring-typescript/169-introduction-to-tsconfig.solution.ts
diff --git a/src/080-configuring-typescript/170-multiple-tsconfig-json-files.problem.ts b/src/080-configuring-typescript/170-tsconfig-bases.problem.ts
similarity index 100%
rename from src/080-configuring-typescript/170-multiple-tsconfig-json-files.problem.ts
rename to src/080-configuring-typescript/170-tsconfig-bases.problem.ts
diff --git a/src/080-configuring-typescript/170-multiple-tsconfig-json-files.solution.ts b/src/080-configuring-typescript/170-tsconfig-bases.solution.ts
similarity index 100%
rename from src/080-configuring-typescript/170-multiple-tsconfig-json-files.solution.ts
rename to src/080-configuring-typescript/170-tsconfig-bases.solution.ts
diff --git a/src/080-configuring-typescript/171-extending-from-other-tsconfig-json-files.problem.ts b/src/080-configuring-typescript/171-multiple-tsconfig-json-files.problem.ts
similarity index 100%
rename from src/080-configuring-typescript/171-extending-from-other-tsconfig-json-files.problem.ts
rename to src/080-configuring-typescript/171-multiple-tsconfig-json-files.problem.ts
diff --git a/src/080-configuring-typescript/171-extending-from-other-tsconfig-json-files.solution.ts b/src/080-configuring-typescript/171-multiple-tsconfig-json-files.solution.ts
similarity index 100%
rename from src/080-configuring-typescript/171-extending-from-other-tsconfig-json-files.solution.ts
rename to src/080-configuring-typescript/171-multiple-tsconfig-json-files.solution.ts
diff --git a/src/080-configuring-typescript/172-project-references.problem.ts b/src/080-configuring-typescript/172-extending-from-other-tsconfig-json-files.problem.ts
similarity index 100%
rename from src/080-configuring-typescript/172-project-references.problem.ts
rename to src/080-configuring-typescript/172-extending-from-other-tsconfig-json-files.problem.ts
diff --git a/src/080-configuring-typescript/172-project-references.solution.ts b/src/080-configuring-typescript/172-extending-from-other-tsconfig-json-files.solution.ts
similarity index 100%
rename from src/080-configuring-typescript/172-project-references.solution.ts
rename to src/080-configuring-typescript/172-extending-from-other-tsconfig-json-files.solution.ts
diff --git a/src/080-configuring-typescript/173-jsx.problem.ts b/src/080-configuring-typescript/173-project-references.problem.ts
similarity index 100%
rename from src/080-configuring-typescript/173-jsx.problem.ts
rename to src/080-configuring-typescript/173-project-references.problem.ts
diff --git a/src/080-configuring-typescript/173-jsx.solution.ts b/src/080-configuring-typescript/173-project-references.solution.ts
similarity index 100%
rename from src/080-configuring-typescript/173-jsx.solution.ts
rename to src/080-configuring-typescript/173-project-references.solution.ts
diff --git a/src/080-configuring-typescript/174-rules-that-make-up-strict-mode.problem.ts b/src/080-configuring-typescript/174-jsx.problem.ts
similarity index 100%
rename from src/080-configuring-typescript/174-rules-that-make-up-strict-mode.problem.ts
rename to src/080-configuring-typescript/174-jsx.problem.ts
diff --git a/src/080-configuring-typescript/174-rules-that-make-up-strict-mode.solution.ts b/src/080-configuring-typescript/174-jsx.solution.ts
similarity index 100%
rename from src/080-configuring-typescript/174-rules-that-make-up-strict-mode.solution.ts
rename to src/080-configuring-typescript/174-jsx.solution.ts
diff --git a/src/080-configuring-typescript/175-no-unchecked-indexed-access.problem.ts b/src/080-configuring-typescript/175-rules-that-make-up-strict-mode.problem.ts
similarity index 100%
rename from src/080-configuring-typescript/175-no-unchecked-indexed-access.problem.ts
rename to src/080-configuring-typescript/175-rules-that-make-up-strict-mode.problem.ts
diff --git a/src/080-configuring-typescript/175-no-unchecked-indexed-access.solution.ts b/src/080-configuring-typescript/175-rules-that-make-up-strict-mode.solution.ts
similarity index 100%
rename from src/080-configuring-typescript/175-no-unchecked-indexed-access.solution.ts
rename to src/080-configuring-typescript/175-rules-that-make-up-strict-mode.solution.ts
diff --git a/src/080-configuring-typescript/176-creating-declaration-files-and-declaration-maps.problem.ts b/src/080-configuring-typescript/176-no-unchecked-indexed-access.problem.ts
similarity index 100%
rename from src/080-configuring-typescript/176-creating-declaration-files-and-declaration-maps.problem.ts
rename to src/080-configuring-typescript/176-no-unchecked-indexed-access.problem.ts
diff --git a/src/080-configuring-typescript/176-creating-declaration-files-and-declaration-maps.solution.ts b/src/080-configuring-typescript/176-no-unchecked-indexed-access.solution.ts
similarity index 100%
rename from src/080-configuring-typescript/176-creating-declaration-files-and-declaration-maps.solution.ts
rename to src/080-configuring-typescript/176-no-unchecked-indexed-access.solution.ts
diff --git a/src/080-configuring-typescript/177-creating-declaration-files-and-declaration-maps.problem.ts b/src/080-configuring-typescript/177-creating-declaration-files-and-declaration-maps.problem.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/080-configuring-typescript/177-creating-declaration-files-and-declaration-maps.solution.ts b/src/080-configuring-typescript/177-creating-declaration-files-and-declaration-maps.solution.ts
new file mode 100644
index 0000000..e69de29