diff --git a/module-01-basics/README.md b/01_essentials/01-basics/README.md
similarity index 100%
rename from module-01-basics/README.md
rename to 01_essentials/01-basics/README.md
diff --git a/module-01-basics/reset.ps1 b/01_essentials/01-basics/reset.ps1
similarity index 100%
rename from module-01-basics/reset.ps1
rename to 01_essentials/01-basics/reset.ps1
diff --git a/module-01-basics/setup.ps1 b/01_essentials/01-basics/setup.ps1
similarity index 100%
rename from module-01-basics/setup.ps1
rename to 01_essentials/01-basics/setup.ps1
diff --git a/module-01-basics/verify.ps1 b/01_essentials/01-basics/verify.ps1
similarity index 100%
rename from module-01-basics/verify.ps1
rename to 01_essentials/01-basics/verify.ps1
diff --git a/module-02-history/README.md b/01_essentials/02-history/README.md
similarity index 100%
rename from module-02-history/README.md
rename to 01_essentials/02-history/README.md
diff --git a/module-02-history/reset.ps1 b/01_essentials/02-history/reset.ps1
similarity index 100%
rename from module-02-history/reset.ps1
rename to 01_essentials/02-history/reset.ps1
diff --git a/module-02-history/setup.ps1 b/01_essentials/02-history/setup.ps1
similarity index 100%
rename from module-02-history/setup.ps1
rename to 01_essentials/02-history/setup.ps1
diff --git a/module-02-history/verify.ps1 b/01_essentials/02-history/verify.ps1
similarity index 100%
rename from module-02-history/verify.ps1
rename to 01_essentials/02-history/verify.ps1
diff --git a/module-03-branching/README.md b/01_essentials/03-branching/README.md
similarity index 100%
rename from module-03-branching/README.md
rename to 01_essentials/03-branching/README.md
diff --git a/module-03-branching/reset.ps1 b/01_essentials/03-branching/reset.ps1
similarity index 100%
rename from module-03-branching/reset.ps1
rename to 01_essentials/03-branching/reset.ps1
diff --git a/module-03-branching/setup.ps1 b/01_essentials/03-branching/setup.ps1
similarity index 100%
rename from module-03-branching/setup.ps1
rename to 01_essentials/03-branching/setup.ps1
diff --git a/module-03-branching/verify.ps1 b/01_essentials/03-branching/verify.ps1
similarity index 100%
rename from module-03-branching/verify.ps1
rename to 01_essentials/03-branching/verify.ps1
diff --git a/module-04-merging/README.md b/01_essentials/04-merging/README.md
similarity index 100%
rename from module-04-merging/README.md
rename to 01_essentials/04-merging/README.md
diff --git a/module-04-merging/reset.ps1 b/01_essentials/04-merging/reset.ps1
similarity index 100%
rename from module-04-merging/reset.ps1
rename to 01_essentials/04-merging/reset.ps1
diff --git a/module-04-merging/setup.ps1 b/01_essentials/04-merging/setup.ps1
similarity index 100%
rename from module-04-merging/setup.ps1
rename to 01_essentials/04-merging/setup.ps1
diff --git a/module-04-merging/verify.ps1 b/01_essentials/04-merging/verify.ps1
similarity index 100%
rename from module-04-merging/verify.ps1
rename to 01_essentials/04-merging/verify.ps1
diff --git a/module-05-merge-conflicts/README.md b/01_essentials/05-merge-conflicts/README.md
similarity index 100%
rename from module-05-merge-conflicts/README.md
rename to 01_essentials/05-merge-conflicts/README.md
diff --git a/module-05-merge-conflicts/reset.ps1 b/01_essentials/05-merge-conflicts/reset.ps1
similarity index 100%
rename from module-05-merge-conflicts/reset.ps1
rename to 01_essentials/05-merge-conflicts/reset.ps1
diff --git a/module-05-merge-conflicts/setup.ps1 b/01_essentials/05-merge-conflicts/setup.ps1
similarity index 100%
rename from module-05-merge-conflicts/setup.ps1
rename to 01_essentials/05-merge-conflicts/setup.ps1
diff --git a/module-05-merge-conflicts/verify.ps1 b/01_essentials/05-merge-conflicts/verify.ps1
similarity index 100%
rename from module-05-merge-conflicts/verify.ps1
rename to 01_essentials/05-merge-conflicts/verify.ps1
diff --git a/module-08-cherry-pick/README.md b/01_essentials/06-cherry-pick/README.md
similarity index 100%
rename from module-08-cherry-pick/README.md
rename to 01_essentials/06-cherry-pick/README.md
diff --git a/module-08-cherry-pick/reset.ps1 b/01_essentials/06-cherry-pick/reset.ps1
similarity index 100%
rename from module-08-cherry-pick/reset.ps1
rename to 01_essentials/06-cherry-pick/reset.ps1
diff --git a/module-08-cherry-pick/setup.ps1 b/01_essentials/06-cherry-pick/setup.ps1
similarity index 100%
rename from module-08-cherry-pick/setup.ps1
rename to 01_essentials/06-cherry-pick/setup.ps1
diff --git a/module-08-cherry-pick/verify.ps1 b/01_essentials/06-cherry-pick/verify.ps1
similarity index 100%
rename from module-08-cherry-pick/verify.ps1
rename to 01_essentials/06-cherry-pick/verify.ps1
diff --git a/module-09-reset-vs-revert/README.md b/01_essentials/07-reset-vs-revert/README.md
similarity index 100%
rename from module-09-reset-vs-revert/README.md
rename to 01_essentials/07-reset-vs-revert/README.md
diff --git a/module-09-reset-vs-revert/reset.ps1 b/01_essentials/07-reset-vs-revert/reset.ps1
similarity index 100%
rename from module-09-reset-vs-revert/reset.ps1
rename to 01_essentials/07-reset-vs-revert/reset.ps1
diff --git a/module-09-reset-vs-revert/setup.ps1 b/01_essentials/07-reset-vs-revert/setup.ps1
similarity index 100%
rename from module-09-reset-vs-revert/setup.ps1
rename to 01_essentials/07-reset-vs-revert/setup.ps1
diff --git a/module-09-reset-vs-revert/verify.ps1 b/01_essentials/07-reset-vs-revert/verify.ps1
similarity index 100%
rename from module-09-reset-vs-revert/verify.ps1
rename to 01_essentials/07-reset-vs-revert/verify.ps1
diff --git a/module-10-stash/README.md b/01_essentials/08-stash/README.md
similarity index 100%
rename from module-10-stash/README.md
rename to 01_essentials/08-stash/README.md
diff --git a/module-10-stash/reset.ps1 b/01_essentials/08-stash/reset.ps1
similarity index 100%
rename from module-10-stash/reset.ps1
rename to 01_essentials/08-stash/reset.ps1
diff --git a/module-10-stash/setup.ps1 b/01_essentials/08-stash/setup.ps1
similarity index 100%
rename from module-10-stash/setup.ps1
rename to 01_essentials/08-stash/setup.ps1
diff --git a/module-10-stash/verify.ps1 b/01_essentials/08-stash/verify.ps1
similarity index 100%
rename from module-10-stash/verify.ps1
rename to 01_essentials/08-stash/verify.ps1
diff --git a/module-11-remotes/README.md b/02_multiplayer/01-remotes/README.md
similarity index 100%
rename from module-11-remotes/README.md
rename to 02_multiplayer/01-remotes/README.md
diff --git a/module-11-remotes/reset.ps1 b/02_multiplayer/01-remotes/reset.ps1
similarity index 100%
rename from module-11-remotes/reset.ps1
rename to 02_multiplayer/01-remotes/reset.ps1
diff --git a/module-11-remotes/setup.ps1 b/02_multiplayer/01-remotes/setup.ps1
similarity index 100%
rename from module-11-remotes/setup.ps1
rename to 02_multiplayer/01-remotes/setup.ps1
diff --git a/module-11-remotes/verify.ps1 b/02_multiplayer/01-remotes/verify.ps1
similarity index 100%
rename from module-11-remotes/verify.ps1
rename to 02_multiplayer/01-remotes/verify.ps1
diff --git a/module-06-rebasing/README.md b/03_advanced/01-rebasing/README.md
similarity index 100%
rename from module-06-rebasing/README.md
rename to 03_advanced/01-rebasing/README.md
diff --git a/module-06-rebasing/reset.ps1 b/03_advanced/01-rebasing/reset.ps1
similarity index 100%
rename from module-06-rebasing/reset.ps1
rename to 03_advanced/01-rebasing/reset.ps1
diff --git a/module-06-rebasing/setup.ps1 b/03_advanced/01-rebasing/setup.ps1
similarity index 100%
rename from module-06-rebasing/setup.ps1
rename to 03_advanced/01-rebasing/setup.ps1
diff --git a/module-06-rebasing/verify.ps1 b/03_advanced/01-rebasing/verify.ps1
similarity index 100%
rename from module-06-rebasing/verify.ps1
rename to 03_advanced/01-rebasing/verify.ps1
diff --git a/module-07-interactive-rebase/README.md b/03_advanced/02-interactive-rebase/README.md
similarity index 100%
rename from module-07-interactive-rebase/README.md
rename to 03_advanced/02-interactive-rebase/README.md
diff --git a/module-07-interactive-rebase/reset.ps1 b/03_advanced/02-interactive-rebase/reset.ps1
similarity index 100%
rename from module-07-interactive-rebase/reset.ps1
rename to 03_advanced/02-interactive-rebase/reset.ps1
diff --git a/module-07-interactive-rebase/setup.ps1 b/03_advanced/02-interactive-rebase/setup.ps1
similarity index 100%
rename from module-07-interactive-rebase/setup.ps1
rename to 03_advanced/02-interactive-rebase/setup.ps1
diff --git a/module-07-interactive-rebase/verify.ps1 b/03_advanced/02-interactive-rebase/verify.ps1
similarity index 100%
rename from module-07-interactive-rebase/verify.ps1
rename to 03_advanced/02-interactive-rebase/verify.ps1
diff --git a/module-12-worktrees/README.md b/03_advanced/03-worktrees/README.md
similarity index 100%
rename from module-12-worktrees/README.md
rename to 03_advanced/03-worktrees/README.md
diff --git a/module-12-worktrees/reset.ps1 b/03_advanced/03-worktrees/reset.ps1
similarity index 100%
rename from module-12-worktrees/reset.ps1
rename to 03_advanced/03-worktrees/reset.ps1
diff --git a/module-12-worktrees/setup.ps1 b/03_advanced/03-worktrees/setup.ps1
similarity index 100%
rename from module-12-worktrees/setup.ps1
rename to 03_advanced/03-worktrees/setup.ps1
diff --git a/module-12-worktrees/verify.ps1 b/03_advanced/03-worktrees/verify.ps1
similarity index 100%
rename from module-12-worktrees/verify.ps1
rename to 03_advanced/03-worktrees/verify.ps1
diff --git a/module-13-bisect/README.md b/03_advanced/04-bisect/README.md
similarity index 100%
rename from module-13-bisect/README.md
rename to 03_advanced/04-bisect/README.md
diff --git a/module-13-bisect/reset.ps1 b/03_advanced/04-bisect/reset.ps1
similarity index 100%
rename from module-13-bisect/reset.ps1
rename to 03_advanced/04-bisect/reset.ps1
diff --git a/module-13-bisect/setup.ps1 b/03_advanced/04-bisect/setup.ps1
similarity index 100%
rename from module-13-bisect/setup.ps1
rename to 03_advanced/04-bisect/setup.ps1
diff --git a/module-13-bisect/verify.ps1 b/03_advanced/04-bisect/verify.ps1
similarity index 100%
rename from module-13-bisect/verify.ps1
rename to 03_advanced/04-bisect/verify.ps1