diff --git a/src/065-four-spaces-of-typescript-declarations/156-declare-module-for-overriding-third-party-libraries.problem.ts b/src/062-the-global-namespace/156-modifying-window.problem.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/156-declare-module-for-overriding-third-party-libraries.problem.ts
rename to src/062-the-global-namespace/156-modifying-window.problem.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/156-declare-module-for-overriding-third-party-libraries.solution.ts b/src/062-the-global-namespace/156-modifying-window.solution.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/156-declare-module-for-overriding-third-party-libraries.solution.ts
rename to src/062-the-global-namespace/156-modifying-window.solution.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/157-lib-d-ts.problem.ts b/src/062-the-global-namespace/157-modifying-globalthis.problem.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/157-lib-d-ts.problem.ts
rename to src/062-the-global-namespace/157-modifying-globalthis.problem.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/157-lib-d-ts.solution.ts b/src/062-the-global-namespace/157-modifying-globalthis.solution.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/157-lib-d-ts.solution.ts
rename to src/062-the-global-namespace/157-modifying-globalthis.solution.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/158-using-target-to-change-lib-d-ts.problem.ts b/src/062-the-global-namespace/158-modifying-process-env.problem.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/158-using-target-to-change-lib-d-ts.problem.ts
rename to src/062-the-global-namespace/158-modifying-process-env.problem.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/158-using-target-to-change-lib-d-ts.solution.ts b/src/062-the-global-namespace/158-modifying-process-env.solution.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/158-using-target-to-change-lib-d-ts.solution.ts
rename to src/062-the-global-namespace/158-modifying-process-env.solution.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/159-lib-dom-d-ts.problem.ts b/src/065-four-spaces-of-typescript-declarations/159-declare-module-for-overriding-third-party-libraries.problem.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/159-lib-dom-d-ts.problem.ts
rename to src/065-four-spaces-of-typescript-declarations/159-declare-module-for-overriding-third-party-libraries.problem.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/159-lib-dom-d-ts.solution.ts b/src/065-four-spaces-of-typescript-declarations/159-declare-module-for-overriding-third-party-libraries.solution.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/159-lib-dom-d-ts.solution.ts
rename to src/065-four-spaces-of-typescript-declarations/159-declare-module-for-overriding-third-party-libraries.solution.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/160-third-party-types.problem.ts b/src/065-four-spaces-of-typescript-declarations/160-lib-d-ts.problem.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/160-third-party-types.problem.ts
rename to src/065-four-spaces-of-typescript-declarations/160-lib-d-ts.problem.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/160-third-party-types.solution.ts b/src/065-four-spaces-of-typescript-declarations/160-lib-d-ts.solution.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/160-third-party-types.solution.ts
rename to src/065-four-spaces-of-typescript-declarations/160-lib-d-ts.solution.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/161-type-roots-in-tsconfig.problem.ts b/src/065-four-spaces-of-typescript-declarations/161-using-target-to-change-lib-d-ts.problem.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/161-type-roots-in-tsconfig.problem.ts
rename to src/065-four-spaces-of-typescript-declarations/161-using-target-to-change-lib-d-ts.problem.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/161-type-roots-in-tsconfig.solution.ts b/src/065-four-spaces-of-typescript-declarations/161-using-target-to-change-lib-d-ts.solution.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/161-type-roots-in-tsconfig.solution.ts
rename to src/065-four-spaces-of-typescript-declarations/161-using-target-to-change-lib-d-ts.solution.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/162-types-that-ship-with-libraries.problem.ts b/src/065-four-spaces-of-typescript-declarations/162-lib-dom-d-ts.problem.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/162-types-that-ship-with-libraries.problem.ts
rename to src/065-four-spaces-of-typescript-declarations/162-lib-dom-d-ts.problem.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/162-types-that-ship-with-libraries.solution.ts b/src/065-four-spaces-of-typescript-declarations/162-lib-dom-d-ts.solution.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/162-types-that-ship-with-libraries.solution.ts
rename to src/065-four-spaces-of-typescript-declarations/162-lib-dom-d-ts.solution.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/163-modifying-window.problem.ts b/src/065-four-spaces-of-typescript-declarations/163-third-party-types.problem.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/163-modifying-window.problem.ts
rename to src/065-four-spaces-of-typescript-declarations/163-third-party-types.problem.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/163-modifying-window.solution.ts b/src/065-four-spaces-of-typescript-declarations/163-third-party-types.solution.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/163-modifying-window.solution.ts
rename to src/065-four-spaces-of-typescript-declarations/163-third-party-types.solution.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/164-modifying-globalthis.problem.ts b/src/065-four-spaces-of-typescript-declarations/164-type-roots-in-tsconfig.problem.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/164-modifying-globalthis.problem.ts
rename to src/065-four-spaces-of-typescript-declarations/164-type-roots-in-tsconfig.problem.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/164-modifying-globalthis.solution.ts b/src/065-four-spaces-of-typescript-declarations/164-type-roots-in-tsconfig.solution.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/164-modifying-globalthis.solution.ts
rename to src/065-four-spaces-of-typescript-declarations/164-type-roots-in-tsconfig.solution.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/165-modifying-process-env.problem.ts b/src/065-four-spaces-of-typescript-declarations/165-types-that-ship-with-libraries.problem.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/165-modifying-process-env.problem.ts
rename to src/065-four-spaces-of-typescript-declarations/165-types-that-ship-with-libraries.problem.ts
diff --git a/src/065-four-spaces-of-typescript-declarations/165-modifying-process-env.solution.ts b/src/065-four-spaces-of-typescript-declarations/165-types-that-ship-with-libraries.solution.ts
similarity index 100%
rename from src/065-four-spaces-of-typescript-declarations/165-modifying-process-env.solution.ts
rename to src/065-four-spaces-of-typescript-declarations/165-types-that-ship-with-libraries.solution.ts
diff --git a/src/090-the-style-guide/196-hungarian-notation.problem.ts b/src/090-the-style-guide/196-hungarian-notation.problem.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/090-the-style-guide/196-hungarian-notation.solution.ts b/src/090-the-style-guide/196-hungarian-notation.solution.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/090-the-style-guide/197-where-to-put-your-types.problem.ts b/src/090-the-style-guide/197-where-to-put-your-types.problem.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/090-the-style-guide/197-where-to-put-your-types.solution.ts b/src/090-the-style-guide/197-where-to-put-your-types.solution.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/090-the-style-guide/198-colocation-of-types.problem.ts b/src/090-the-style-guide/198-colocation-of-types.problem.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/090-the-style-guide/198-colocation-of-types.solution.ts b/src/090-the-style-guide/198-colocation-of-types.solution.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/095-migrating-from-javascript/199-strict-file-by-file-vs-ramp-up-strictness.problem.ts b/src/095-migrating-from-javascript/199-strict-file-by-file-vs-ramp-up-strictness.problem.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/095-migrating-from-javascript/199-strict-file-by-file-vs-ramp-up-strictness.solution.ts b/src/095-migrating-from-javascript/199-strict-file-by-file-vs-ramp-up-strictness.solution.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/095-migrating-from-javascript/200-dependencies-first.problem.ts b/src/095-migrating-from-javascript/200-dependencies-first.problem.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/095-migrating-from-javascript/200-dependencies-first.solution.ts b/src/095-migrating-from-javascript/200-dependencies-first.solution.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/095-migrating-from-javascript/201-madge.problem.ts b/src/095-migrating-from-javascript/201-madge.problem.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/095-migrating-from-javascript/201-madge.solution.ts b/src/095-migrating-from-javascript/201-madge.solution.ts
new file mode 100644
index 0000000..e69de29